From 3f6464696e4e7d60fb01bb9b98fe926aaa557351 Mon Sep 17 00:00:00 2001 From: clenk Date: Mon, 24 Oct 2016 16:01:47 -0400 Subject: [PATCH 1/3] Update namespaces to OASIS for v1.2.1 --- cybox/bindings/cybox_common.py | 10 +- .../extensions/location/ciq_address_3_0.py | 6 +- cybox/common/byterun.py | 4 +- cybox/common/contributor.py | 4 +- cybox/common/data_segment.py | 4 +- cybox/common/daterange.py | 2 +- cybox/common/datetimewithprecision.py | 4 +- cybox/common/digitalsignature.py | 4 +- cybox/common/environment_variable.py | 4 +- cybox/common/extracted_features.py | 8 +- cybox/common/extracted_string.py | 4 +- cybox/common/hashes.py | 4 +- cybox/common/measuresource.py | 2 +- cybox/common/object_properties.py | 2 +- cybox/common/platform_specification.py | 4 +- cybox/common/properties.py | 2 +- cybox/common/structured_text.py | 2 +- cybox/common/time.py | 2 +- cybox/common/tools.py | 4 +- cybox/common/vocabs.py | 26 +-- cybox/core/action.py | 16 +- cybox/core/action_reference.py | 2 +- cybox/core/event.py | 2 +- cybox/core/frequency.py | 2 +- cybox/core/object.py | 4 +- cybox/core/observable.py | 8 +- cybox/core/pattern_fidelity.py | 6 +- cybox/objects/__init__.py | 174 ++++++++--------- cybox/objects/account_object.py | 6 +- cybox/objects/address_object.py | 2 +- cybox/objects/api_object.py | 2 +- cybox/objects/archive_file_object.py | 2 +- cybox/objects/arp_cache_object.py | 4 +- cybox/objects/artifact_object.py | 10 +- cybox/objects/as_object.py | 2 +- cybox/objects/code_object.py | 6 +- cybox/objects/custom_object.py | 2 +- cybox/objects/device_object.py | 2 +- cybox/objects/disk_object.py | 4 +- cybox/objects/disk_partition_object.py | 2 +- cybox/objects/dns_cache_object.py | 4 +- cybox/objects/dns_query_object.py | 6 +- cybox/objects/dns_record_object.py | 2 +- cybox/objects/domain_name_object.py | 2 +- cybox/objects/email_message_object.py | 18 +- cybox/objects/file_object.py | 20 +- cybox/objects/gui_dialogbox_object.py | 2 +- cybox/objects/gui_object.py | 2 +- cybox/objects/gui_window_object.py | 2 +- cybox/objects/hostname_object.py | 2 +- cybox/objects/http_session_object.py | 24 +-- cybox/objects/image_file_object.py | 2 +- cybox/objects/library_object.py | 2 +- cybox/objects/link_object.py | 2 +- cybox/objects/linux_package_object.py | 2 +- cybox/objects/memory_object.py | 2 +- cybox/objects/mutex_object.py | 2 +- cybox/objects/network_connection_object.py | 4 +- cybox/objects/network_packet_object.py | 146 +++++++------- cybox/objects/network_route_entry_object.py | 2 +- cybox/objects/network_route_object.py | 4 +- cybox/objects/network_socket_object.py | 4 +- cybox/objects/network_subnet_object.py | 4 +- cybox/objects/pdf_file_object.py | 10 +- cybox/objects/pipe_object.py | 2 +- cybox/objects/port_object.py | 2 +- cybox/objects/process_object.py | 12 +- cybox/objects/product_object.py | 2 +- cybox/objects/semaphore_object.py | 2 +- cybox/objects/sms_message_object.py | 2 +- cybox/objects/socket_address_object.py | 2 +- cybox/objects/system_object.py | 18 +- cybox/objects/uri_object.py | 2 +- cybox/objects/user_account_object.py | 6 +- cybox/objects/volume_object.py | 4 +- cybox/objects/whois_object.py | 18 +- cybox/objects/win_computer_account_object.py | 10 +- cybox/objects/win_critical_section_object.py | 2 +- cybox/objects/win_driver_object.py | 6 +- cybox/objects/win_event_log_object.py | 4 +- cybox/objects/win_event_object.py | 2 +- cybox/objects/win_executable_file_object.py | 46 ++--- cybox/objects/win_file_object.py | 12 +- cybox/objects/win_filemapping_object.py | 2 +- cybox/objects/win_handle_object.py | 4 +- cybox/objects/win_hook_object.py | 2 +- cybox/objects/win_kernel_hook_object.py | 2 +- cybox/objects/win_kernel_object.py | 10 +- cybox/objects/win_mailslot_object.py | 2 +- .../objects/win_memory_page_region_object.py | 2 +- cybox/objects/win_mutex_object.py | 2 +- .../objects/win_network_route_entry_object.py | 2 +- cybox/objects/win_network_share_object.py | 2 +- cybox/objects/win_pipe_object.py | 2 +- cybox/objects/win_prefetch_object.py | 8 +- cybox/objects/win_process_object.py | 6 +- cybox/objects/win_registry_key_object.py | 8 +- cybox/objects/win_semaphore_object.py | 2 +- cybox/objects/win_service_object.py | 4 +- cybox/objects/win_system_object.py | 6 +- cybox/objects/win_system_restore_object.py | 4 +- cybox/objects/win_task_object.py | 16 +- cybox/objects/win_thread_object.py | 2 +- cybox/objects/win_user_object.py | 6 +- cybox/objects/win_volume_object.py | 4 +- cybox/objects/win_waitable_timer_object.py | 2 +- cybox/objects/x509_certificate_object.py | 16 +- cybox/test/common/vocab_test.py | 2 +- cybox/test/extensions/location/ciq_test.py | 3 +- cybox/utils/nsparser.py | 180 +++++++++--------- docs/examples.rst | 2 +- 111 files changed, 544 insertions(+), 543 deletions(-) diff --git a/cybox/bindings/cybox_common.py b/cybox/bindings/cybox_common.py index 28d57b62..f0ae1596 100644 --- a/cybox/bindings/cybox_common.py +++ b/cybox/bindings/cybox_common.py @@ -158,11 +158,11 @@ class LocationType(GeneratedsSuper): """The LocationType is used to express geographic location information.This type is extended through the xsi:type mechanism. The default type is CIQAddress3.0InstanceType in the - http://cybox.mitre.org/extensions/Address#CIQAddress3.0-1 + http://docs.oasis-open.org/cti/ns/cybox/address/ciq-address-3.0-1 namespace. This type is defined in the - extensions/location/ciq_address_3.0.xsd file or at the URL http: - //cybox.mitre.org/XMLSchema/extensions/location/ciq_address_3.0/ - 1.0/ciq_address_3.0.xsd.Those who wish to express a simple name + extensions/location/ciq_address_3.0.xsd file or at the URL http://docs. + oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/location/ciq-address- + 3.0.xsd. Those who wish to express a simple name may also do so by not specifying an xsi:type and using the Name field of this type.Specifies a unique ID for this Location.Specifies a reference to a unique ID defined elsewhere.""" @@ -6828,7 +6828,7 @@ class PlatformSpecificationType(GeneratedsSuper): Common Platform Enumeration (CPE) Applicability Language schema to do so. The extension that defines this is captured in the CPE23PlatformSpecificationType in the - http://cybox.mitre.org/extensions/platform#CPE2.3-1 namespace. + http://docs.oasis-open.org/cti/ns/cybox/platform/cpe-2.3-1 namespace. This type is defined in the extensions/platform/cpe2.3.xsd file.""" subclass = None diff --git a/cybox/bindings/extensions/location/ciq_address_3_0.py b/cybox/bindings/extensions/location/ciq_address_3_0.py index 8831a249..c9868e8f 100644 --- a/cybox/bindings/extensions/location/ciq_address_3_0.py +++ b/cybox/bindings/extensions/location/ciq_address_3_0.py @@ -7,12 +7,12 @@ import cybox.bindings.cybox_common as cybox_common -XML_NS = "http://cybox.mitre.org/extensions/Address#CIQAddress3.0-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/cybox/address/ciq-address-3.0-1" XML_NS_XPIL = "urn:oasis:names:tc:ciq:xpil:3" XML_NS_XNL = "urn:oasis:names:tc:ciq:xnl:3" XML_NS_XAL = "urn:oasis:names:tc:ciq:xal:3" -XML_NS_CYBOX_EXT ="http://stix.mitre.org/extensions/Identity#CIQIdentity3.0-1" +XML_NS_CYBOX_EXT ="http://docs.oasis-open.org/cti/ns/stix/extensions/identity/ciq-3.0-identity-1" etree_.register_namespace('xal', XML_NS_XAL) etree_.register_namespace('xpil', XML_NS_XPIL) @@ -30,7 +30,7 @@ class CIQAddress3_0InstanceType(cybox_common.LocationType): def __init__(self, idref=None, id=None, Name=None, Specification=None): super(CIQAddress3_0InstanceType, self).__init__(idref, id, Name, ) self.Specification = Specification - self.xmlns = "http://cybox.mitre.org/extensions/Address#CIQAddress3.0-1" + self.xmlns = "http://docs.oasis-open.org/cti/ns/cybox/address/ciq-address-3.0-1" self.xmlns_prefix = "ciqAddress" self.xml_type = "CIQAddress3.0InstanceType" def factory(*args_, **kwargs_): diff --git a/cybox/common/byterun.py b/cybox/common/byterun.py index 84c5aa6e..069f27a4 100644 --- a/cybox/common/byterun.py +++ b/cybox/common/byterun.py @@ -11,7 +11,7 @@ class ByteRun(entities.Entity): _binding = common_binding _binding_class = common_binding.ByteRunType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' offset = fields.TypedField("Offset", Integer) byte_order = fields.TypedField("Byte_Order", String) @@ -24,5 +24,5 @@ class ByteRun(entities.Entity): class ByteRuns(entities.EntityList): _binding_class = common_binding.ByteRunsType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' byte_run = fields.TypedField("Byte_Run", ByteRun, multiple=True) diff --git a/cybox/common/contributor.py b/cybox/common/contributor.py index 320ab166..9fe4e082 100644 --- a/cybox/common/contributor.py +++ b/cybox/common/contributor.py @@ -11,7 +11,7 @@ class Contributor(entities.Entity): _binding = common_binding _binding_class = common_binding.ContributorType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' role = fields.TypedField("Role") name = fields.TypedField("Name") @@ -24,5 +24,5 @@ class Contributor(entities.Entity): class Personnel(entities.EntityList): _binding_class = common_binding.PersonnelType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' contributor = fields.TypedField("Contributor", Contributor, multiple=True) \ No newline at end of file diff --git a/cybox/common/data_segment.py b/cybox/common/data_segment.py index 95191d8f..a25b30d4 100644 --- a/cybox/common/data_segment.py +++ b/cybox/common/data_segment.py @@ -10,7 +10,7 @@ class DataSize(String): _binding = common_binding _binding_class = common_binding.DataSizeType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' units = fields.TypedField("units") @@ -21,7 +21,7 @@ def is_plain(self): class DataSegment(entities.Entity): _binding = common_binding _binding_class = common_binding.DataSegmentType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' id_ = fields.TypedField("id") data_format = fields.TypedField("Data_Format") diff --git a/cybox/common/daterange.py b/cybox/common/daterange.py index 10692686..5a22b40b 100644 --- a/cybox/common/daterange.py +++ b/cybox/common/daterange.py @@ -11,7 +11,7 @@ class DateRange(entities.Entity): _binding = common_binding _binding_class = common_binding.DateRangeType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' start_date = fields.TypedField("Start_Date", DateWithPrecision) end_date = fields.TypedField("End_Date", DateWithPrecision) diff --git a/cybox/common/datetimewithprecision.py b/cybox/common/datetimewithprecision.py index 25bc40da..1a95f322 100644 --- a/cybox/common/datetimewithprecision.py +++ b/cybox/common/datetimewithprecision.py @@ -39,7 +39,7 @@ def validate_time_precision(instance, value): class DateTimeWithPrecision(entities.Entity): _binding = common_binding _binding_class = common_binding.DateTimeWithPrecisionType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' value = fields.DateTimeField("valueOf_", key_name="value") precision = fields.TypedField("precision", preset_hook=validate_datetime_precision) @@ -58,7 +58,7 @@ def to_dict(self): class DateWithPrecision(entities.Entity): _binding = common_binding _binding_class = common_binding.DateWithPrecisionType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' value = fields.DateField("valueOf_", key_name="value") precision = fields.TypedField("precision", preset_hook=validate_date_precision) diff --git a/cybox/common/digitalsignature.py b/cybox/common/digitalsignature.py index 4b4739b9..004c5bb1 100644 --- a/cybox/common/digitalsignature.py +++ b/cybox/common/digitalsignature.py @@ -11,7 +11,7 @@ class DigitalSignature(entities.Entity): _binding = common_binding _binding_class = common_binding.DigitalSignatureInfoType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' signature_exists = fields.TypedField("signature_exists") signature_verified = fields.TypedField("signature_verified") @@ -23,5 +23,5 @@ class DigitalSignature(entities.Entity): class DigitalSignatureList(entities.EntityList): _binding = common_binding _binding_class = common_binding.DigitalSignaturesType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' digital_signature = fields.TypedField("Digital_Signature", DigitalSignature, multiple=True) \ No newline at end of file diff --git a/cybox/common/environment_variable.py b/cybox/common/environment_variable.py index b3c67378..c025c606 100644 --- a/cybox/common/environment_variable.py +++ b/cybox/common/environment_variable.py @@ -9,7 +9,7 @@ class EnvironmentVariable(entities.Entity): - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' _binding = common_binding _binding_class = _binding.EnvironmentVariableType @@ -19,5 +19,5 @@ class EnvironmentVariable(entities.Entity): class EnvironmentVariableList(entities.EntityList): _binding_class = common_binding.EnvironmentVariableListType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' environment_variable = fields.TypedField("Environment_Variable", EnvironmentVariable, multiple=True) diff --git a/cybox/common/extracted_features.py b/cybox/common/extracted_features.py index 6a038041..fd68eaa8 100644 --- a/cybox/common/extracted_features.py +++ b/cybox/common/extracted_features.py @@ -12,28 +12,28 @@ class Imports(entities.EntityList): _binding = common_binding _binding_class = common_binding.ImportsType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' import_ = fields.TypedField("Import", String, multiple=True) class Functions(entities.EntityList): _binding = common_binding _binding_class = common_binding.FunctionsType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' function = fields.TypedField("Function", String, multiple=True) class CodeSnippets(entities.EntityList): _binding = common_binding _binding_class = common_binding.CodeSnippetsType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' code_snippet = fields.TypedField("Code_Snippet", ObjectProperties, factory=ObjectPropertiesFactory, multiple=True) class ExtractedFeatures(entities.Entity): _binding = common_binding _binding_class = common_binding.ExtractedFeaturesType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' strings = fields.TypedField("Strings", ExtractedStrings) imports = fields.TypedField("Imports", Imports) diff --git a/cybox/common/extracted_string.py b/cybox/common/extracted_string.py index ffac6ef7..bda44bf5 100644 --- a/cybox/common/extracted_string.py +++ b/cybox/common/extracted_string.py @@ -14,7 +14,7 @@ class ExtractedString(entities.Entity): _binding = common_binding _binding_class = common_binding.ExtractedStringType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' encoding = vocabs.VocabField("Encoding", CharacterEncoding) string_value = fields.TypedField("String_Value", String) @@ -32,5 +32,5 @@ def __init__(self, string_value=None): class ExtractedStrings(entities.EntityList): _binding_class = common_binding.ExtractedStringsType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' extracted_string = fields.TypedField("String", ExtractedString, multiple=True) \ No newline at end of file diff --git a/cybox/common/hashes.py b/cybox/common/hashes.py index ebd6257b..a533ff8f 100644 --- a/cybox/common/hashes.py +++ b/cybox/common/hashes.py @@ -47,7 +47,7 @@ def _set_hash_type(entity, value): class Hash(entities.Entity): _binding = common_binding _binding_class = common_binding.HashType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' type_ = VocabField("Type", HashName) simple_hash_value = fields.TypedField("Simple_Hash_Value", HexBinary, @@ -137,7 +137,7 @@ def __str__(self): class HashList(entities.EntityList): _binding = common_binding _binding_class = common_binding.HashListType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' hashes = fields.TypedField("Hash", Hash, multiple=True) @property diff --git a/cybox/common/measuresource.py b/cybox/common/measuresource.py index 67c6af9a..14aaaed5 100644 --- a/cybox/common/measuresource.py +++ b/cybox/common/measuresource.py @@ -14,7 +14,7 @@ class MeasureSource(entities.Entity): _binding = common_binding _binding_class = common_binding.MeasureSourceType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' class_ = fields.TypedField("classxx", key_name="class") source_type = fields.TypedField("source_type") diff --git a/cybox/common/object_properties.py b/cybox/common/object_properties.py index be576e51..eff4b5f7 100644 --- a/cybox/common/object_properties.py +++ b/cybox/common/object_properties.py @@ -29,7 +29,7 @@ def is_plain(self): class CustomProperties(entities.EntityList): _binding = common_binding _binding_class = common_binding.CustomPropertiesType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' property_ = fields.TypedField("Property", Property, multiple=True) diff --git a/cybox/common/platform_specification.py b/cybox/common/platform_specification.py index ad64d858..6ba317b5 100644 --- a/cybox/common/platform_specification.py +++ b/cybox/common/platform_specification.py @@ -11,7 +11,7 @@ class PlatformIdentifier(String): _binding = common_binding _binding_class = _binding.PlatformIdentifierType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' system = fields.TypedField("system") system_ref = fields.TypedField("system_ref") @@ -19,7 +19,7 @@ class PlatformIdentifier(String): class PlatformSpecification(entities.Entity): """CybOX Common PlatformSpecification object representation""" - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' _binding = common_binding _binding_class = _binding.PlatformSpecificationType diff --git a/cybox/common/properties.py b/cybox/common/properties.py index e863bca0..ea809519 100644 --- a/cybox/common/properties.py +++ b/cybox/common/properties.py @@ -60,7 +60,7 @@ class BaseProperty(PatternFieldGroup, entities.Entity): # that here. Some BaseProperty subclasses might have to override this. _binding = common_binding _binding_class = _binding.BaseObjectPropertyType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' # If `True`, force the "datatype" attribute to be output. This is # necessary in some cases diff --git a/cybox/common/structured_text.py b/cybox/common/structured_text.py index 8a4d1f8f..3d6144a0 100644 --- a/cybox/common/structured_text.py +++ b/cybox/common/structured_text.py @@ -12,7 +12,7 @@ class StructuredText(entities.Entity): _binding = common_binding _binding_class = _binding.StructuredTextType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' value = fields.TypedField("valueOf_", key_name="value") structuring_format = fields.TypedField("structuring_format") diff --git a/cybox/common/time.py b/cybox/common/time.py index 0e17b768..84520ad7 100644 --- a/cybox/common/time.py +++ b/cybox/common/time.py @@ -11,7 +11,7 @@ class Time(entities.Entity): _binding = common_binding _binding_class = common_binding.TimeType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' start_time = fields.TypedField("Start_Time", DateTimeWithPrecision) end_time = fields.TypedField("End_Time", DateTimeWithPrecision) diff --git a/cybox/common/tools.py b/cybox/common/tools.py index 01a91586..d19e8c87 100644 --- a/cybox/common/tools.py +++ b/cybox/common/tools.py @@ -11,7 +11,7 @@ class ToolInformation(entities.Entity): _binding = common_binding _binding_class = common_binding.ToolInformationType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' id_ = fields.IdField("id") idref = fields.IdrefField("idref") @@ -42,5 +42,5 @@ def __init__(self, tool_name=None, tool_vendor=None): class ToolInformationList(entities.EntityList): _binding_class = common_binding.ToolsInformationType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' tool = fields.TypedField("Tool", ToolInformation, multiple=True) \ No newline at end of file diff --git a/cybox/common/vocabs.py b/cybox/common/vocabs.py index eaafb178..56e3d985 100644 --- a/cybox/common/vocabs.py +++ b/cybox/common/vocabs.py @@ -85,7 +85,7 @@ def check_type(self, value): class VocabString(PatternFieldGroup, entities.Entity): - _namespace = 'http://cybox.mitre.org/default_vocabularies-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/vocabularies-2' # All subclasses should override this _XSI_TYPE = None _ALLOWED_VALUES = () @@ -169,7 +169,7 @@ def register_vocab(cls): @register_vocab class EventType(VocabString): - _namespace = 'http://cybox.mitre.org/default_vocabularies-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/vocabularies-2' _XSI_TYPE = 'cyboxVocabs:EventTypeVocab-1.0.1' _VOCAB_VERSION = '1.0.1' @@ -214,7 +214,7 @@ class EventType(VocabString): @register_vocab class ActionType(VocabString): - _namespace = 'http://cybox.mitre.org/default_vocabularies-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/vocabularies-2' _XSI_TYPE = 'cyboxVocabs:ActionTypeVocab-1.0' _VOCAB_VERSION = '1.0' @@ -333,7 +333,7 @@ class ActionType(VocabString): @register_vocab class ActionObjectAssociationType(VocabString): - _namespace = 'http://cybox.mitre.org/default_vocabularies-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/vocabularies-2' _XSI_TYPE = 'cyboxVocabs:ActionObjectAssociationTypeVocab-1.0' _VOCAB_VERSION = '1.0' @@ -345,7 +345,7 @@ class ActionObjectAssociationType(VocabString): @register_vocab class HashName(VocabString): - _namespace = 'http://cybox.mitre.org/default_vocabularies-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/vocabularies-2' _XSI_TYPE = 'cyboxVocabs:HashNameVocab-1.0' _VOCAB_VERSION = '1.0' @@ -361,7 +361,7 @@ class HashName(VocabString): @register_vocab class ActionArgumentName(VocabString): - _namespace = 'http://cybox.mitre.org/default_vocabularies-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/vocabularies-2' _XSI_TYPE = 'cyboxVocabs:ActionArgumentNameVocab-1.0' _VOCAB_VERSION = '1.0' @@ -420,7 +420,7 @@ class ActionArgumentName(VocabString): @register_vocab class ActionRelationshipType(VocabString): - _namespace = 'http://cybox.mitre.org/default_vocabularies-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/vocabularies-2' _XSI_TYPE = 'cyboxVocabs:ActionRelationshipTypeVocab-1.0' _VOCAB_VERSION = '1.0' @@ -435,7 +435,7 @@ class ActionRelationshipType(VocabString): @register_vocab class ObjectRelationship(VocabString): - _namespace = 'http://cybox.mitre.org/default_vocabularies-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/vocabularies-2' _XSI_TYPE = 'cyboxVocabs:ObjectRelationshipVocab-1.1' _VOCAB_VERSION = '1.1' @@ -579,7 +579,7 @@ class ObjectRelationship(VocabString): @register_vocab class CharacterEncoding(VocabString): - _namespace = 'http://cybox.mitre.org/default_vocabularies-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/vocabularies-2' _XSI_TYPE = 'cyboxVocabs:CharacterEncodingVocab-1.0' _VOCAB_VERSION = '1.0' @@ -600,7 +600,7 @@ class CharacterEncoding(VocabString): @register_vocab class ObjectState(VocabString): - _namespace = 'http://cybox.mitre.org/default_vocabularies-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/vocabularies-2' _XSI_TYPE = 'cyboxVocabs:ObjectStateVocab-1.0' _VOCAB_VERSION = '1.0' @@ -618,7 +618,7 @@ class ObjectState(VocabString): @register_vocab class ToolType(VocabString): - _namespace = 'http://cybox.mitre.org/default_vocabularies-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/vocabularies-2' _XSI_TYPE = 'cyboxVocabs:ToolTypeVocab-1.1' _VOCAB_VERSION = '1.1' @@ -650,7 +650,7 @@ class ToolType(VocabString): @register_vocab class ActionName(VocabString): - _namespace = 'http://cybox.mitre.org/default_vocabularies-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/vocabularies-2' _XSI_TYPE = 'cyboxVocabs:ActionNameVocab-1.1' _VOCAB_VERSION = '1.1' @@ -839,7 +839,7 @@ class ActionName(VocabString): @register_vocab class InformationSourceType(VocabString): - _namespace = 'http://cybox.mitre.org/default_vocabularies-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/vocabularies-2' _XSI_TYPE = 'cyboxVocabs:InformationSourceTypeVocab-1.0' _VOCAB_VERSION = '1.0' diff --git a/cybox/core/action.py b/cybox/core/action.py index bc6ffea2..211dbf59 100644 --- a/cybox/core/action.py +++ b/cybox/core/action.py @@ -19,14 +19,14 @@ class ActionAliases(entities.EntityList): _binding = core_binding _binding_class = core_binding.ActionAliasesType - _namespace = 'http://cybox.mitre.org/cybox-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/core-2' action_alias = fields.TypedField("Action_Alias", cybox.Unicode, multiple=True) class ActionArgument(entities.Entity): _binding = core_binding _binding_class = core_binding.ActionArgumentType - _namespace = 'http://cybox.mitre.org/cybox-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/core-2' argument_name = VocabField("Argument_Name", ArgumentName) argument_value = fields.TypedField("Argument_Value") @@ -34,19 +34,19 @@ class ActionArgument(entities.Entity): class ActionArguments(entities.EntityList): _binding_class = core_binding.ActionArgumentsType - _namespace = 'http://cybox.mitre.org/cybox-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/core-2' action_argument = fields.TypedField("Action_Argument", ActionArgument, multiple=True) class AssociatedObjects(entities.EntityList): _binding_class = core_binding.AssociatedObjectsType - _namespace = 'http://cybox.mitre.org/cybox-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/core-2' associated_object = fields.TypedField("Associated_Object", AssociatedObject, multiple=True) class ActionRelationship(entities.Entity): _binding = core_binding _binding_class = _binding.ActionRelationshipType - _namespace = 'http://cybox.mitre.org/cybox-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/core-2' type = VocabField("Type", ActionType) action_references = fields.TypedField("Action_Reference", ActionReference, multiple=True) @@ -56,13 +56,13 @@ class ActionRelationships(entities.EntityList): _binding_class = core_binding.ActionRelationshipsType _binding_var = "Relationship" _contained_type = ActionRelationship - _namespace = 'http://cybox.mitre.org/cybox-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/core-2' relationship = fields.TypedField("Relationship", ActionRelationship, multiple=True) class Action(entities.Entity): _binding = core_binding _binding_class = core_binding.ActionType - _namespace = 'http://cybox.mitre.org/cybox-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/core-2' id_ = fields.TypedField("id") idref = fields.TypedField("idref") @@ -83,5 +83,5 @@ class Action(entities.Entity): class Actions(entities.EntityList): _binding_class = core_binding.ActionsType - _namespace = 'http://cybox.mitre.org/cybox-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/core-2' action = fields.TypedField("Action", Action, multiple=True) \ No newline at end of file diff --git a/cybox/core/action_reference.py b/cybox/core/action_reference.py index e3a3633d..a6b67635 100644 --- a/cybox/core/action_reference.py +++ b/cybox/core/action_reference.py @@ -12,7 +12,7 @@ class ActionReference(entities.Entity): _binding = core_binding _binding_class = core_binding.ActionReferenceType - _namespace = 'http://cybox.mitre.org/cybox-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/core-2' action_id = fields.TypedField("action_id") diff --git a/cybox/core/event.py b/cybox/core/event.py index e7a7810d..a610427b 100644 --- a/cybox/core/event.py +++ b/cybox/core/event.py @@ -13,7 +13,7 @@ class Event(entities.Entity): _binding = core_binding _binding_class = core_binding.EventType - _namespace = 'http://cybox.mitre.org/cybox-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/core-2' id_ = fields.TypedField("id") idref = fields.TypedField("idref") diff --git a/cybox/core/frequency.py b/cybox/core/frequency.py index dfeb70b1..f416eccd 100644 --- a/cybox/core/frequency.py +++ b/cybox/core/frequency.py @@ -10,7 +10,7 @@ class Frequency(entities.Entity): _binding = core_binding _binding_class = core_binding.FrequencyType - _namespace = 'http://cybox.mitre.org/cybox-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/core-2' rate = fields.TypedField("rate") units = fields.TypedField("units") diff --git a/cybox/core/object.py b/cybox/core/object.py index 122028ff..3143bc51 100644 --- a/cybox/core/object.py +++ b/cybox/core/object.py @@ -57,7 +57,7 @@ class Object(entities.Entity): """ _binding = core_binding _binding_class = _binding.ObjectType - _namespace = 'http://cybox.mitre.org/cybox-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/core-2' id_ = fields.IdField("id", postset_hook=_cache_object) idref = fields.IdrefField("idref") @@ -169,7 +169,7 @@ def from_dict(cls, cls_dict): class RelatedObjects(entities.EntityList): - _namespace = "http://cybox.mitre.org/cybox-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/core-2" _binding = core_binding _binding_class = _binding.RelatedObjectsType related_object = fields.TypedField("Related_Object", RelatedObject, multiple=True) diff --git a/cybox/core/observable.py b/cybox/core/observable.py index 18045dc0..b25a79ed 100644 --- a/cybox/core/observable.py +++ b/cybox/core/observable.py @@ -58,7 +58,7 @@ def validate_observable_composition(instance, value): class Keywords(entities.EntityList): _binding = core_binding _binding_class = core_binding.KeywordsType - _namespace = 'http://cybox.mitre.org/cybox-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/core-2' keyword = fields.TypedField("Keyword", Unicode, multiple=True) class Observable(entities.Entity): @@ -66,7 +66,7 @@ class Observable(entities.Entity): """ _binding = core_binding _binding_class = _binding.ObservableType - _namespace = 'http://cybox.mitre.org/cybox-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/core-2' id_ = fields.IdField("id") idref = fields.IdrefField("idref") @@ -130,7 +130,7 @@ class Observables(entities.EntityList): """ _binding = core_binding _binding_class = _binding.ObservablesType - _namespace = 'http://cybox.mitre.org/cybox-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/core-2' observable_package_source = fields.TypedField("Observable_Package_Source", MeasureSource) observables = fields.TypedField("Observable", Observable, multiple=True, key_name="observables") @@ -171,7 +171,7 @@ class ObservableComposition(entities.EntityList): _binding = core_binding _binding_class = _binding.ObservableCompositionType - _namespace = 'http://cybox.mitre.org/cybox-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/core-2' OPERATOR_AND = 'AND' OPERATOR_OR = 'OR' diff --git a/cybox/core/pattern_fidelity.py b/cybox/core/pattern_fidelity.py index f82a39ce..a0c26b79 100644 --- a/cybox/core/pattern_fidelity.py +++ b/cybox/core/pattern_fidelity.py @@ -11,7 +11,7 @@ class ObfuscationTechnique(entities.Entity): _binding = core_binding - _namespace = 'http://cybox.mitre.org/cybox-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/core-2' _binding_class = core_binding.ObfuscationTechniqueType description = fields.TypedField("Description", StructuredText) @@ -20,14 +20,14 @@ class ObfuscationTechnique(entities.Entity): class ObfuscationTechniques(entities.EntityList): _binding = core_binding - _namespace = 'http://cybox.mitre.org/cybox-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/core-2' _binding_class = core_binding.ObfuscationTechniquesType obfuscation_technique = fields.TypedField("Obfuscation_Technique", ObfuscationTechnique, multiple=True) class PatternFidelity(entities.Entity): _binding = core_binding - _namespace = 'http://cybox.mitre.org/cybox-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/core-2' _binding_class = core_binding.PatternFidelityType noisiness = fields.TypedField("Noisiness") diff --git a/cybox/objects/__init__.py b/cybox/objects/__init__.py index c3df4ef0..e87c26e1 100644 --- a/cybox/objects/__init__.py +++ b/cybox/objects/__init__.py @@ -85,93 +85,93 @@ def get_class_for_object_type(self, object_type): # This is loaded by the ObjectMetadata class and should not be accessed # directly. OBJ_LIST = [ - ('AccountObjectType', 'cybox.objects.account_object.Account', 'account_object', 'http://cybox.mitre.org/objects#AccountObject-2', []), - ('AddressObjectType', 'cybox.objects.address_object.Address', 'address_object', 'http://cybox.mitre.org/objects#AddressObject-2', []), - ('APIObjectType', 'cybox.objects.api_object.API', 'api_object', 'http://cybox.mitre.org/objects#APIObject-2', []), - ('ArchiveFileObjectType', 'cybox.objects.archive_file_object.ArchiveFile', 'archive_file_object', 'http://cybox.mitre.org/objects#ArchiveFileObject-1', ['FileObjectType']), - ('ArtifactObjectType', 'cybox.objects.artifact_object.Artifact', 'artifact_object', 'http://cybox.mitre.org/objects#ArtifactObject-2', []), - ('ARPCacheObjectType', 'cybox.objects.arp_cache_object.ARPCache', 'arp_cache_object', 'http://cybox.mitre.org/objects#ARPCacheObject-1', []), - ('ASObjectType', 'cybox.objects.as_object.AS', 'as_object', 'http://cybox.mitre.org/objects#ASObject-1', []), - ('CodeObjectType', 'cybox.objects.code_object.Code', 'code_object', 'http://cybox.mitre.org/objects#CodeObject-2', []), - ('CustomObjectType', 'cybox.objects.custom_object.Custom', 'custom_object', 'http://cybox.mitre.org/objects#CustomObject-1', []), - ('DeviceObjectType', 'cybox.objects.device_object.Device', 'device_object', 'http://cybox.mitre.org/objects#DeviceObject-2', []), - ('DiskObjectType', 'cybox.objects.disk_object.Disk', 'disk_object', 'http://cybox.mitre.org/objects#DiskObject-2', ['DiskPartitionObjectType']), - ('DiskPartitionObjectType', 'cybox.objects.disk_partition_object.DiskPartition', 'disk_partition_object', 'http://cybox.mitre.org/objects#DiskPartitionObject-2', []), - ('DNSCacheObjectType', 'cybox.objects.dns_cache_object.DNSCache', 'dns_cache_object', 'http://cybox.mitre.org/objects#DNSCacheObject-2', ['DNSRecordObjectType', 'AddressObjectType', 'URIObjectType']), - ('DNSQueryObjectType', 'cybox.objects.dns_query_object.DNSQuery', 'dns_query_object', 'http://cybox.mitre.org/objects#DNSQueryObject-2', ['DNSRecordObjectType', 'URIObjectType', 'AddressObjectType']), - ('DNSRecordObjectType', 'cybox.objects.dns_record_object.DNSRecord', 'dns_record_object', 'http://cybox.mitre.org/objects#DNSRecordObject-2', ['URIObjectType', 'AddressObjectType']), - ('DomainNameObjectType', 'cybox.objects.domain_name_object.DomainName', 'domain_name_object', 'http://cybox.mitre.org/objects#DomainNameObject-1', []), - ('EmailMessageObjectType', 'cybox.objects.email_message_object.EmailMessage', 'email_message_object', 'http://cybox.mitre.org/objects#EmailMessageObject-2', ['FileObjectType', 'AddressObjectType', 'URIObjectType']), - ('FileObjectType', 'cybox.objects.file_object.File', 'file_object', 'http://cybox.mitre.org/objects#FileObject-2', []), - ('GUIDialogboxObjectType', 'cybox.objects.gui_dialogbox_object.GUIDialogbox', 'gui_dialogbox_object', 'http://cybox.mitre.org/objects#GUIDialogboxObject-2', ['GUIObjectType']), - ('GUIObjectType', 'cybox.objects.gui_object.GUI', 'gui_object', 'http://cybox.mitre.org/objects#GUIObject-2', []), - ('GUIWindowObjectType', 'cybox.objects.gui_window_object.GUIWindow', 'gui_window_object', 'http://cybox.mitre.org/objects#GUIWindowObject-2', ['GUIObjectType']), - ('HostnameObjectType', 'cybox.objects.hostname_object.Hostname', 'hostname_object', 'http://cybox.mitre.org/objects#HostnameObject-1', []), - ('HTTPSessionObjectType', 'cybox.objects.http_session_object.HTTPSession', 'http_session_object', 'http://cybox.mitre.org/objects#HTTPSessionObject-2', ['AddressObjectType', 'PortObjectType', 'URIObjectType']), - ('ImageFileObjectType', 'cybox.objects.image_file_object.ImageFile', 'image_file_object', 'http://cybox.mitre.org/objects#ImageFileObject-1', ['FileObjectType']), - ('LibraryObjectType', 'cybox.objects.library_object.Library', 'library_object', 'http://cybox.mitre.org/objects#LibraryObject-2', []), - ('LinkObjectType', 'cybox.objects.link_object.Link', 'link_object', 'http://cybox.mitre.org/objects#LinkObject-1', ['URIObjectType']), - ('LinuxPackageObjectType', 'cybox.objects.linux_package_object.LinuxPackage', 'linux_package_object', 'http://cybox.mitre.org/objects#LinuxPackageObject-2', []), - ('MemoryObjectType', 'cybox.objects.memory_object.Memory', 'memory_object', 'http://cybox.mitre.org/objects#MemoryObject-2', []), - ('MutexObjectType', 'cybox.objects.mutex_object.Mutex', 'mutex_object', 'http://cybox.mitre.org/objects#MutexObject-2', []), - ('NetRouteObjectType', 'cybox.objects.network_route_object.NetRoute', 'network_route_object', 'http://cybox.mitre.org/objects#NetworkRouteObject-2', ['NetworkRouteEntryObjectType', 'AddressObjectType']), - ('NetworkConnectionObjectType', 'cybox.objects.network_connection_object.NetworkConnection', 'network_connection_object', 'http://cybox.mitre.org/objects#NetworkConnectionObject-2', ['SocketAddressObjectType', 'HTTPSessionObjectType', 'DNSQueryObjectType', 'DNSRecordObjectType', 'URIObjectType']), - ('NetworkFlowObjectType', None, 'network_flow_object', 'http://cybox.mitre.org/objects#NetworkFlowObject-2', ['NetworkPacketType', 'AddressObjectType', 'SocketAddressObjectType']), - ('NetworkPacketObjectType', 'cybox.objects.network_packet_object.NetworkPacket', 'network_packet_object', 'http://cybox.mitre.org/objects#PacketObject-2', ['AddressObjectType', 'PortObjectType']), - ('NetworkRouteEntryObjectType', 'cybox.objects.network_route_entry_object.NetworkRouteEntry', 'network_route_entry_object', 'http://cybox.mitre.org/objects#NetworkRouteEntryObject-2', ['AddressObjectType']), - ('NetworkSocketObjectType', 'cybox.objects.network_socket_object.NetworkSocket', 'network_socket_object', 'http://cybox.mitre.org/objects#NetworkSocketObject-2', ['SocketAddressObjectType']), - ('NetworkSubnetObjectType', 'cybox.objects.network_subnet_object.NetworkSubnet', 'network_subnet_object', 'http://cybox.mitre.org/objects#NetworkSubnetObject-2', ['NetworkRouteEntryObjectType', 'AddressObjectType']), - ('PDFFileObjectType', 'cybox.objects.pdf_file_object.PDFFile', 'pdf_file_object', 'http://cybox.mitre.org/objects#PDFFileObject-1', ['FileObjectType']), - ('PipeObjectType', 'cybox.objects.pipe_object.Pipe', 'pipe_object', 'http://cybox.mitre.org/objects#PipeObject-2', []), - ('PortObjectType', 'cybox.objects.port_object.Port', 'port_object', 'http://cybox.mitre.org/objects#PortObject-2', []), - ('ProcessObjectType', 'cybox.objects.process_object.Process', 'process_object', 'http://cybox.mitre.org/objects#ProcessObject-2', ['NetworkConnectionObjectType', 'PortObjectType']), - ('ProductObjectType', 'cybox.objects.product_object.Product', 'product_object', 'http://cybox.mitre.org/objects#ProductObject-2', []), - ('SemaphoreObjectType', 'cybox.objects.semaphore_object.Semaphore', 'semaphore_object', 'http://cybox.mitre.org/objects#SemaphoreObject-2', []), - ('SMSMessageObjectType', 'cybox.objects.sms_message_object.SMSMessage', 'sms_message_object', 'http://cybox.mitre.org/objects#SMSMessageObject-1', []), - ('SocketAddressObjectType', 'cybox.objects.socket_address_object.SocketAddress', 'socket_address_object', 'http://cybox.mitre.org/objects#SocketAddressObject-1', ['AddressObjectType', 'PortObjectType']), - ('SystemObjectType', 'cybox.objects.system_object.System', 'system_object', 'http://cybox.mitre.org/objects#SystemObject-2', ['AddressObjectType']), - ('UnixFileObjectType', None, 'unix_file_object', 'http://cybox.mitre.org/objects#UnixFileObject-2', ['FileObjectType']), - ('UnixNetworkRouteEntryObjectType', None, 'unix_network_route_entry_object', 'http://cybox.mitre.org/objects#UnixNetworkRouteEntryObject-2', ['NetworkRouteEntryObjectType', 'AddressObjectType']), - ('UnixPipeObjectType', None, 'unix_pipe_object', 'http://cybox.mitre.org/objects#UnixPipeObject', ['PipeObjectType']), - ('UnixProcessObjectType', None, 'unix_process_object', 'http://cybox.mitre.org/objects#UnixProcessObject-2', ['ProcessObjectType', 'AddressObjectType', 'PortObjectType']), - ('UnixUserAccountObjectType', None, 'unix_user_account_object', 'http://cybox.mitre.org/objects#UnixUserAccountObject-2', ['UserAccountObjectType', 'AccountObjectType']), - ('UnixVolumeObjectType', None, 'unix_volume_object', 'http://cybox.mitre.org/objects#UnixVolumeObject-2', ['VolumeObjectType']), - ('URIObjectType', 'cybox.objects.uri_object.URI', 'uri_object', 'http://cybox.mitre.org/objects#URIObject-2', []), - ('URLHistoryObjectType', None, 'url_history_object', 'http://cybox.mitre.org/objects#URLHistoryObject-1', ['URIObjectType','HostnameObjectType']), - ('UserAccountObjectType', 'cybox.objects.user_account_object.UserAccount', 'user_account_object', 'http://cybox.mitre.org/objects#UserAccountObject-2', ['AccountObjectType']), - ('VolumeObjectType', 'cybox.objects.volume_object.Volume', 'volume_object', 'http://cybox.mitre.org/objects#VolumeObject-2', []), - ('WhoisObjectType', 'cybox.objects.whois_object.WhoisEntry', 'whois_object', 'http://cybox.mitre.org/objects#WhoisObject-2', ['URIObjectType', 'AddressObjectType']), - ('WindowsComputerAccountObjectType', 'cybox.objects.win_computer_account_object.WinComputerAccount', 'win_computer_account_object', 'http://cybox.mitre.org/objects#WinComputerAccountObject-2', ['AccountObjectType', 'PortObjectType']), - ('WindowsCriticalSectionObjectType', 'cybox.objects.win_critical_section_object.WinCriticalSection', 'win_critical_section_object', 'http://cybox.mitre.org/objects#WinCriticalSectionObject-2', []), - ('WindowsDriverObjectType', 'cybox.objects.win_driver_object.WinDriver', 'win_driver_object', 'http://cybox.mitre.org/objects#WinDriverObject-3', []), - ('WindowsEventLogObjectType', 'cybox.objects.win_event_log_object.WinEventLog', 'win_event_log_object', 'http://cybox.mitre.org/objects#WinEventLogObject-2', []), - ('WindowsEventObjectType', 'cybox.objects.win_event_object.WinEvent', 'win_event_object', 'http://cybox.mitre.org/objects#WinEventObject-2', ['WindowsHandleObjectType']), - ('WindowsExecutableFileObjectType', 'cybox.objects.win_executable_file_object.WinExecutableFile', 'win_executable_file_object', 'http://cybox.mitre.org/objects#WinExecutableFileObject-2', ['WindowsFileObjectType', 'FileObjectType', 'WinComputerAccountObjectType', 'AccountObjectType', 'PortObjectType']), - ('WindowsFileObjectType', 'cybox.objects.win_file_object.WinFile', 'win_file_object', 'http://cybox.mitre.org/objects#WinFileObject-2', ['FileObjectType', 'WinComputerAccountObjectType', 'AccountObjectType', 'PortObjectType']), - ('WindowsFilemappingObjectType', 'cybox.objects.win_filemapping_object.WinFilemapping', 'win_filemapping_object', 'http://cybox.mitre.org/objects#WinFilemappingObject-1', ['WindowsHandleObjectType']), - ('WindowsHandleObjectType', 'cybox.objects.win_handle_object.WinHandle', 'win_handle_object', 'http://cybox.mitre.org/objects#WinHandleObject-2', []), - ('WindowsHookObjectType', 'cybox.objects.win_hook_object.WinHook', 'windows_hook_object', 'http://cybox.mitre.org/objects#WinHookObject-1', ['WindowsHandleObjectType','LibraryObjectType']), - ('WindowsKernelHookObjectType', 'cybox.objects.win_kernel_hook_object.WinKernelHook', 'win_kernel_hook_object', 'http://cybox.mitre.org/objects#WinKernelHookObject-2', []), - ('WindowsKernelObjectType', 'cybox.objects.win_kernel_object.WinKernel', 'win_kernel_object', 'http://cybox.mitre.org/objects#WinKernelObject-2', []), - ('WindowsMailslotObjectType', 'cybox.objects.win_mailslot_object.WinMailslot', 'win_mailslot_object', 'http://cybox.mitre.org/objects#WinMailslotObject-2', ['WindowsHandleObjectType']), - ('WindowsMemoryPageRegionObjectType', 'cybox.objects.win_memory_page_region_object.WinMemoryPageRegion', 'win_memory_page_region_object', 'http://cybox.mitre.org/objects#WinMemoryPageRegionObject-2', ['MemoryObjectType']), - ('WindowsMutexObjectType', 'cybox.objects.win_mutex_object.WinMutex', 'win_mutex_object', 'http://cybox.mitre.org/objects#WinMutexObject-2', ['WindowsHandleObjectType', 'MutexObjectType']), - ('WindowsNetworkRouteEntryObjectType', 'cybox.objects.win_network_route_entry_object.WinNetworkRouteEntry', 'win_network_route_entry_object', 'http://cybox.mitre.org/objects#WinNetworkRouteEntryObject-2', ['NetworkRouteEntryObjectType', 'AddressObjectType']), - ('WindowsNetworkShareObjectType', 'cybox.objects.win_network_share_object.WinNetworkShare', 'win_network_share_object', 'http://cybox.mitre.org/objects#WinNetworkShareObject-2', []), - ('WindowsPipeObjectType', 'cybox.objects.win_pipe_object.WinPipe', 'win_pipe_object', 'http://cybox.mitre.org/objects#WinPipeObject-2', ['PipeObjectType']), - ('WindowsPrefetchObjectType', 'cybox.objects.win_prefetch_object.WinPrefetch', 'win_prefetch_object', 'http://cybox.mitre.org/objects#WinPrefetchObject-2', ['WindowsVolumeObjectType', 'VolumeObjectType', 'DeviceObjectType']), - ('WindowsProcessObjectType', 'cybox.objects.win_process_object.WinProcess', 'win_process_object', 'http://cybox.mitre.org/objects#WinProcessObject-2', ['ProcessObjectType', 'WindowsHandleObjectType', 'MemoryObjectType', 'AddressObjectType', 'PortObjectType']), - ('WindowsRegistryKeyObjectType', 'cybox.objects.win_registry_key_object.WinRegistryKey', 'win_registry_key_object', 'http://cybox.mitre.org/objects#WinRegistryKeyObject-2', ['WindowsHandleObjectType']), - ('WindowsSemaphoreObjectType', 'cybox.objects.win_semaphore_object.WinSemaphore', 'win_semaphore_object', 'http://cybox.mitre.org/objects#WinSemaphoreObject-2', ['WindowsHandleObjectType', 'SemaphoreObjectType']), - ('WindowsServiceObjectType', 'cybox.objects.win_service_object.WinService', 'win_service_object', 'http://cybox.mitre.org/objects#WinServiceObject-2', ['WindowsProcessObjectType', 'WindowsHandleObjectType', 'MemoryObjectType', 'AddressObjectType', 'PortObjectType']), - ('WindowsSystemObjectType', 'cybox.objects.win_system_object.WinSystem', 'win_system_object', 'http://cybox.mitre.org/objects#WinSystemObject-2', ['WindowsHandleObjectType', 'SystemObjectType', 'AddressObjectType']), - ('WindowsSystemRestoreObjectType', 'cybox.objects.win_system_restore_object.WinSystemRestore', 'win_system_restore_object', 'http://cybox.mitre.org/objects#WinSystemRestoreObject-2', []), - ('WindowsTaskObjectType', 'cybox.objects.win_task_object.WinTask', 'win_task_object', 'http://cybox.mitre.org/objects#WinTaskObject-2', ['EmailMessageObjectType', 'FileObjectType', 'AddressObjectType', 'URIObjectType']), - ('WindowsThreadObjectType', 'cybox.objects.win_thread_object.WinThread', 'win_thread_object', 'http://cybox.mitre.org/objects#WinThreadObject-2', ['WindowsHandleObjectType']), - ('WindowsUserAccountObjectType', 'cybox.objects.win_user_object.WinUser', 'win_user_account_object', 'http://cybox.mitre.org/objects#WinUserAccountObject-2', ['UserAccountObjectType', 'AccountObjectType']), - ('WindowsVolumeObjectType', 'cybox.objects.win_volume_object.WinVolume', 'win_volume_object', 'http://cybox.mitre.org/objects#WinVolumeObject-2', ['VolumeObjectType']), - ('WindowsWaitableTimerObjectType', 'cybox.objects.win_waitable_timer_object.WinWaitableTimer', 'win_waitable_timer_object', 'http://cybox.mitre.org/objects#WinWaitableTimerObject-2', ['WindowsHandleObjectType']), - ('X509CertificateObjectType', 'cybox.objects.x509_certificate_object.X509Certificate', 'x509_certificate_object', 'http://cybox.mitre.org/objects#X509CertificateObject-2', []), + ('AccountObjectType', 'cybox.objects.account_object.Account', 'account_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/account-2', []), + ('AddressObjectType', 'cybox.objects.address_object.Address', 'address_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/address-2', []), + ('APIObjectType', 'cybox.objects.api_object.API', 'api_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/api-2', []), + ('ArchiveFileObjectType', 'cybox.objects.archive_file_object.ArchiveFile', 'archive_file_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/archive-file-1', ['FileObjectType']), + ('ArtifactObjectType', 'cybox.objects.artifact_object.Artifact', 'artifact_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/artifact-2', []), + ('ARPCacheObjectType', 'cybox.objects.arp_cache_object.ARPCache', 'arp_cache_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/arp-cache-1', []), + ('ASObjectType', 'cybox.objects.as_object.AS', 'as_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/as-1', []), + ('CodeObjectType', 'cybox.objects.code_object.Code', 'code_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/code-2', []), + ('CustomObjectType', 'cybox.objects.custom_object.Custom', 'custom_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/custom-1', []), + ('DeviceObjectType', 'cybox.objects.device_object.Device', 'device_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/device-2', []), + ('DiskObjectType', 'cybox.objects.disk_object.Disk', 'disk_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/disk-2', ['DiskPartitionObjectType']), + ('DiskPartitionObjectType', 'cybox.objects.disk_partition_object.DiskPartition', 'disk_partition_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/disk-partition-2', []), + ('DNSCacheObjectType', 'cybox.objects.dns_cache_object.DNSCache', 'dns_cache_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/dns-cache-2', ['DNSRecordObjectType', 'AddressObjectType', 'URIObjectType']), + ('DNSQueryObjectType', 'cybox.objects.dns_query_object.DNSQuery', 'dns_query_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/dns-query-2', ['DNSRecordObjectType', 'URIObjectType', 'AddressObjectType']), + ('DNSRecordObjectType', 'cybox.objects.dns_record_object.DNSRecord', 'dns_record_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/dns-record-2', ['URIObjectType', 'AddressObjectType']), + ('DomainNameObjectType', 'cybox.objects.domain_name_object.DomainName', 'domain_name_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/domain-name-1', []), + ('EmailMessageObjectType', 'cybox.objects.email_message_object.EmailMessage', 'email_message_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/email-message-2', ['FileObjectType', 'AddressObjectType', 'URIObjectType']), + ('FileObjectType', 'cybox.objects.file_object.File', 'file_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/file-2', []), + ('GUIDialogboxObjectType', 'cybox.objects.gui_dialogbox_object.GUIDialogbox', 'gui_dialogbox_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/gui-dialogbox-2', ['GUIObjectType']), + ('GUIObjectType', 'cybox.objects.gui_object.GUI', 'gui_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/gui-2', []), + ('GUIWindowObjectType', 'cybox.objects.gui_window_object.GUIWindow', 'gui_window_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/gui-window-2', ['GUIObjectType']), + ('HostnameObjectType', 'cybox.objects.hostname_object.Hostname', 'hostname_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/hostname-1', []), + ('HTTPSessionObjectType', 'cybox.objects.http_session_object.HTTPSession', 'http_session_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/http-session-2', ['AddressObjectType', 'PortObjectType', 'URIObjectType']), + ('ImageFileObjectType', 'cybox.objects.image_file_object.ImageFile', 'image_file_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/image-file-1', ['FileObjectType']), + ('LibraryObjectType', 'cybox.objects.library_object.Library', 'library_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/library-2', []), + ('LinkObjectType', 'cybox.objects.link_object.Link', 'link_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/link-1', ['URIObjectType']), + ('LinuxPackageObjectType', 'cybox.objects.linux_package_object.LinuxPackage', 'linux_package_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/linux-package-2', []), + ('MemoryObjectType', 'cybox.objects.memory_object.Memory', 'memory_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/memory-2', []), + ('MutexObjectType', 'cybox.objects.mutex_object.Mutex', 'mutex_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/mutex-2', []), + ('NetRouteObjectType', 'cybox.objects.network_route_object.NetRoute', 'network_route_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/network-route-2', ['NetworkRouteEntryObjectType', 'AddressObjectType']), + ('NetworkConnectionObjectType', 'cybox.objects.network_connection_object.NetworkConnection', 'network_connection_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/network-connection-2', ['SocketAddressObjectType', 'HTTPSessionObjectType', 'DNSQueryObjectType', 'DNSRecordObjectType', 'URIObjectType']), + ('NetworkFlowObjectType', None, 'network_flow_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/network-flow-2', ['NetworkPacketType', 'AddressObjectType', 'SocketAddressObjectType']), + ('NetworkPacketObjectType', 'cybox.objects.network_packet_object.NetworkPacket', 'network_packet_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2', ['AddressObjectType', 'PortObjectType']), + ('NetworkRouteEntryObjectType', 'cybox.objects.network_route_entry_object.NetworkRouteEntry', 'network_route_entry_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/network-route-entry-2', ['AddressObjectType']), + ('NetworkSocketObjectType', 'cybox.objects.network_socket_object.NetworkSocket', 'network_socket_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/network-socket-2', ['SocketAddressObjectType']), + ('NetworkSubnetObjectType', 'cybox.objects.network_subnet_object.NetworkSubnet', 'network_subnet_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/network-subnet-2', ['NetworkRouteEntryObjectType', 'AddressObjectType']), + ('PDFFileObjectType', 'cybox.objects.pdf_file_object.PDFFile', 'pdf_file_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/pdf-file-1', ['FileObjectType']), + ('PipeObjectType', 'cybox.objects.pipe_object.Pipe', 'pipe_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/pipe-2', []), + ('PortObjectType', 'cybox.objects.port_object.Port', 'port_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/port-2', []), + ('ProcessObjectType', 'cybox.objects.process_object.Process', 'process_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/process-2', ['NetworkConnectionObjectType', 'PortObjectType']), + ('ProductObjectType', 'cybox.objects.product_object.Product', 'product_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/product-2', []), + ('SemaphoreObjectType', 'cybox.objects.semaphore_object.Semaphore', 'semaphore_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/semaphore-2', []), + ('SMSMessageObjectType', 'cybox.objects.sms_message_object.SMSMessage', 'sms_message_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/sms-message-1', []), + ('SocketAddressObjectType', 'cybox.objects.socket_address_object.SocketAddress', 'socket_address_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/socket-address-1', ['AddressObjectType', 'PortObjectType']), + ('SystemObjectType', 'cybox.objects.system_object.System', 'system_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/system-2', ['AddressObjectType']), + ('UnixFileObjectType', None, 'unix_file_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/unix-file-2', ['FileObjectType']), + ('UnixNetworkRouteEntryObjectType', None, 'unix_network_route_entry_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/unix-network-route-entry-2', ['NetworkRouteEntryObjectType', 'AddressObjectType']), + ('UnixPipeObjectType', None, 'unix_pipe_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/unix-pipe-2', ['PipeObjectType']), + ('UnixProcessObjectType', None, 'unix_process_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/unix-process-2', ['ProcessObjectType', 'AddressObjectType', 'PortObjectType']), + ('UnixUserAccountObjectType', None, 'unix_user_account_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/unix-user-account-2', ['UserAccountObjectType', 'AccountObjectType']), + ('UnixVolumeObjectType', None, 'unix_volume_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/unix-volume-2', ['VolumeObjectType']), + ('URIObjectType', 'cybox.objects.uri_object.URI', 'uri_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/uri-2', []), + ('URLHistoryObjectType', None, 'url_history_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/url-history-1', ['URIObjectType','HostnameObjectType']), + ('UserAccountObjectType', 'cybox.objects.user_account_object.UserAccount', 'user_account_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/user-account-2', ['AccountObjectType']), + ('VolumeObjectType', 'cybox.objects.volume_object.Volume', 'volume_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/volume-2', []), + ('WhoisObjectType', 'cybox.objects.whois_object.WhoisEntry', 'whois_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/whois-2', ['URIObjectType', 'AddressObjectType']), + ('WindowsComputerAccountObjectType', 'cybox.objects.win_computer_account_object.WinComputerAccount', 'win_computer_account_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-computer-account-2', ['AccountObjectType', 'PortObjectType']), + ('WindowsCriticalSectionObjectType', 'cybox.objects.win_critical_section_object.WinCriticalSection', 'win_critical_section_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-critical-section-2', []), + ('WindowsDriverObjectType', 'cybox.objects.win_driver_object.WinDriver', 'win_driver_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-driver-3', []), + ('WindowsEventLogObjectType', 'cybox.objects.win_event_log_object.WinEventLog', 'win_event_log_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-event-log-2', []), + ('WindowsEventObjectType', 'cybox.objects.win_event_object.WinEvent', 'win_event_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-event-2', ['WindowsHandleObjectType']), + ('WindowsExecutableFileObjectType', 'cybox.objects.win_executable_file_object.WinExecutableFile', 'win_executable_file_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2', ['WindowsFileObjectType', 'FileObjectType', 'WinComputerAccountObjectType', 'AccountObjectType', 'PortObjectType']), + ('WindowsFileObjectType', 'cybox.objects.win_file_object.WinFile', 'win_file_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-file-2', ['FileObjectType', 'WinComputerAccountObjectType', 'AccountObjectType', 'PortObjectType']), + ('WindowsFilemappingObjectType', 'cybox.objects.win_filemapping_object.WinFilemapping', 'win_filemapping_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-filemapping-1', ['WindowsHandleObjectType']), + ('WindowsHandleObjectType', 'cybox.objects.win_handle_object.WinHandle', 'win_handle_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-handle-2', []), + ('WindowsHookObjectType', 'cybox.objects.win_hook_object.WinHook', 'windows_hook_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-hook-1', ['WindowsHandleObjectType','LibraryObjectType']), + ('WindowsKernelHookObjectType', 'cybox.objects.win_kernel_hook_object.WinKernelHook', 'win_kernel_hook_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-kernel-hook-2', []), + ('WindowsKernelObjectType', 'cybox.objects.win_kernel_object.WinKernel', 'win_kernel_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-kernel-2', []), + ('WindowsMailslotObjectType', 'cybox.objects.win_mailslot_object.WinMailslot', 'win_mailslot_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-mailslot-2', ['WindowsHandleObjectType']), + ('WindowsMemoryPageRegionObjectType', 'cybox.objects.win_memory_page_region_object.WinMemoryPageRegion', 'win_memory_page_region_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-memory-page-region-2', ['MemoryObjectType']), + ('WindowsMutexObjectType', 'cybox.objects.win_mutex_object.WinMutex', 'win_mutex_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-mutex-2', ['WindowsHandleObjectType', 'MutexObjectType']), + ('WindowsNetworkRouteEntryObjectType', 'cybox.objects.win_network_route_entry_object.WinNetworkRouteEntry', 'win_network_route_entry_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-network-route-entry-2', ['NetworkRouteEntryObjectType', 'AddressObjectType']), + ('WindowsNetworkShareObjectType', 'cybox.objects.win_network_share_object.WinNetworkShare', 'win_network_share_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-network-share-2', []), + ('WindowsPipeObjectType', 'cybox.objects.win_pipe_object.WinPipe', 'win_pipe_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-pipe-2', ['PipeObjectType']), + ('WindowsPrefetchObjectType', 'cybox.objects.win_prefetch_object.WinPrefetch', 'win_prefetch_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-prefetch-2', ['WindowsVolumeObjectType', 'VolumeObjectType', 'DeviceObjectType']), + ('WindowsProcessObjectType', 'cybox.objects.win_process_object.WinProcess', 'win_process_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-process-2', ['ProcessObjectType', 'WindowsHandleObjectType', 'MemoryObjectType', 'AddressObjectType', 'PortObjectType']), + ('WindowsRegistryKeyObjectType', 'cybox.objects.win_registry_key_object.WinRegistryKey', 'win_registry_key_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-registry-key-2', ['WindowsHandleObjectType']), + ('WindowsSemaphoreObjectType', 'cybox.objects.win_semaphore_object.WinSemaphore', 'win_semaphore_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-semaphore-2', ['WindowsHandleObjectType', 'SemaphoreObjectType']), + ('WindowsServiceObjectType', 'cybox.objects.win_service_object.WinService', 'win_service_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-service-2', ['WindowsProcessObjectType', 'WindowsHandleObjectType', 'MemoryObjectType', 'AddressObjectType', 'PortObjectType']), + ('WindowsSystemObjectType', 'cybox.objects.win_system_object.WinSystem', 'win_system_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-system-2', ['WindowsHandleObjectType', 'SystemObjectType', 'AddressObjectType']), + ('WindowsSystemRestoreObjectType', 'cybox.objects.win_system_restore_object.WinSystemRestore', 'win_system_restore_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-system-restore-2', []), + ('WindowsTaskObjectType', 'cybox.objects.win_task_object.WinTask', 'win_task_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-task-2', ['EmailMessageObjectType', 'FileObjectType', 'AddressObjectType', 'URIObjectType']), + ('WindowsThreadObjectType', 'cybox.objects.win_thread_object.WinThread', 'win_thread_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-thread-2', ['WindowsHandleObjectType']), + ('WindowsUserAccountObjectType', 'cybox.objects.win_user_object.WinUser', 'win_user_account_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-user-account-2', ['UserAccountObjectType', 'AccountObjectType']), + ('WindowsVolumeObjectType', 'cybox.objects.win_volume_object.WinVolume', 'win_volume_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-volume-2', ['VolumeObjectType']), + ('WindowsWaitableTimerObjectType', 'cybox.objects.win_waitable_timer_object.WinWaitableTimer', 'win_waitable_timer_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-waitable-timer-2', ['WindowsHandleObjectType']), + ('X509CertificateObjectType', 'cybox.objects.x509_certificate_object.X509Certificate', 'x509_certificate_object', 'http://docs.oasis-open.org/cti/ns/cybox/objects/x509-certificate-2', []), ] diff --git a/cybox/objects/account_object.py b/cybox/objects/account_object.py index 82255efb..476ebfa5 100644 --- a/cybox/objects/account_object.py +++ b/cybox/objects/account_object.py @@ -12,7 +12,7 @@ class StructuredAuthenticationMechanism(entities.Entity): _binding = account_binding _binding_class = account_binding.StructuredAuthenticationMechanismType - _namespace = 'http://cybox.mitre.org/objects#AccountObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/account-2' _XSI_NS = "AccountObj" _XSI_TYPE = "AccountObjectType" @@ -22,7 +22,7 @@ class StructuredAuthenticationMechanism(entities.Entity): class Authentication(entities.Entity): _binding = account_binding _binding_class = account_binding.AuthenticationType - _namespace = 'http://cybox.mitre.org/objects#AccountObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/account-2' _XSI_NS = "AccountObj" _XSI_TYPE = "AccountObjectType" @@ -35,7 +35,7 @@ class Authentication(entities.Entity): class Account(ObjectProperties): _binding = account_binding _binding_class = account_binding.AccountObjectType - _namespace = 'http://cybox.mitre.org/objects#AccountObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/account-2' _XSI_NS = "AccountObj" _XSI_TYPE = "AccountObjectType" diff --git a/cybox/objects/address_object.py b/cybox/objects/address_object.py index bac38abb..fa84deee 100644 --- a/cybox/objects/address_object.py +++ b/cybox/objects/address_object.py @@ -12,7 +12,7 @@ class Address(ObjectProperties): _binding = address_binding _binding_class = _binding.AddressObjectType - _namespace = 'http://cybox.mitre.org/objects#AddressObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/address-2' _value_field = 'address_value' _XSI_NS = 'AddressObj' _XSI_TYPE = 'AddressObjectType' diff --git a/cybox/objects/api_object.py b/cybox/objects/api_object.py index ef571c5a..9f1c2f27 100644 --- a/cybox/objects/api_object.py +++ b/cybox/objects/api_object.py @@ -10,7 +10,7 @@ class API(ObjectProperties): _binding = api_binding _binding_class = api_binding.APIObjectType - _namespace = "http://cybox.mitre.org/objects#APIObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/api-2" _XSI_NS = "APIObj" _XSI_TYPE = "APIObjectType" diff --git a/cybox/objects/archive_file_object.py b/cybox/objects/archive_file_object.py index b37418bb..4fc5aea2 100644 --- a/cybox/objects/archive_file_object.py +++ b/cybox/objects/archive_file_object.py @@ -11,7 +11,7 @@ class ArchiveFile(File): _binding = archive_binding _binding_class = archive_binding.ArchiveFileObjectType - _namespace = 'http://cybox.mitre.org/objects#ArchiveFileObject-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/archive-file-1' _XSI_NS = "ArchiveFileObj" _XSI_TYPE = "ArchiveFileObjectType" diff --git a/cybox/objects/arp_cache_object.py b/cybox/objects/arp_cache_object.py index fced17a8..ae79f3a1 100644 --- a/cybox/objects/arp_cache_object.py +++ b/cybox/objects/arp_cache_object.py @@ -13,7 +13,7 @@ class ARPCacheEntry(entities.Entity): _binding = arp_binding _binding_class = arp_binding.ARPCacheEntryType - _namespace = "http://cybox.mitre.org/objects#ARPCacheObject-1" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/arp-cache-1" ip_address = fields.TypedField("IP_Address", Address) physical_address = fields.TypedField("Physical_Address", String) @@ -24,7 +24,7 @@ class ARPCacheEntry(entities.Entity): class ARPCache(ObjectProperties): _binding = arp_binding _binding_class = arp_binding.ARPCacheObjectType - _namespace = "http://cybox.mitre.org/objects#ARPCacheObject-1" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/arp-cache-1" _XSI_NS = "ARPCacheObj" _XSI_TYPE = "ARPCacheObjectType" diff --git a/cybox/objects/artifact_object.py b/cybox/objects/artifact_object.py index ac20622e..09a5f23d 100644 --- a/cybox/objects/artifact_object.py +++ b/cybox/objects/artifact_object.py @@ -25,14 +25,14 @@ def validate_artifact_type(instance, value): class RawArtifact(String): _binding_class = artifact_binding.RawArtifactType - _namespace = 'http://cybox.mitre.org/objects#ArtifactObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/artifact-2' byte_order = fields.TypedField("byte_order") class Packaging(entities.Entity): """An individual packaging layer.""" - _namespace = 'http://cybox.mitre.org/objects#ArtifactObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/artifact-2' _binding = artifact_binding _binding_class = _binding.PackagingType @@ -50,7 +50,7 @@ class Artifact(ObjectProperties): # or `packed_data` respectively. Raw_Artifact will be set on export. _binding = artifact_binding _binding_class = _binding.ArtifactObjectType - _namespace = 'http://cybox.mitre.org/objects#ArtifactObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/artifact-2' _XSI_NS = "ArtifactObj" _XSI_TYPE = "ArtifactObjectType" @@ -223,7 +223,7 @@ class Compression(Packaging): Currently only zlib and bz2 are supported. Also, compression_mechanism_ref is not currently supported. """ - _namespace = 'http://cybox.mitre.org/objects#ArtifactObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/artifact-2' _binding = artifact_binding _binding_class = _binding.CompressionType @@ -267,7 +267,7 @@ class Encryption(Packaging): """ An encryption packaging layer. """ - _namespace = 'http://cybox.mitre.org/objects#ArtifactObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/artifact-2' _binding = artifact_binding _binding_class = _binding.EncryptionType diff --git a/cybox/objects/as_object.py b/cybox/objects/as_object.py index 7154afb7..9627dcf9 100644 --- a/cybox/objects/as_object.py +++ b/cybox/objects/as_object.py @@ -10,7 +10,7 @@ class AutonomousSystem(ObjectProperties): _binding = as_binding _binding_class = as_binding.ASObjectType - _namespace = "http://cybox.mitre.org/objects#ASObject-1" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/as-1" _XSI_NS = "ASObj" _XSI_TYPE = "ASObjectType" diff --git a/cybox/objects/code_object.py b/cybox/objects/code_object.py index 1c5aff44..759db79a 100644 --- a/cybox/objects/code_object.py +++ b/cybox/objects/code_object.py @@ -12,7 +12,7 @@ class CodeSegmentXOR(String): _binding = code_binding _binding_class = code_binding.CodeSegmentXORType - _namespace = "http://cybox.mitre.org/objects#CodeObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/code-2" xor_pattern = fields.TypedField('xor_pattern') @@ -23,14 +23,14 @@ def is_plain(self): class TargetedPlatforms(entities.EntityList): _binding = code_binding _binding_class = code_binding.TargetedPlatformsType - _namespace = "http://cybox.mitre.org/objects#CodeObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/code-2" targeted_platform = fields.TypedField("Targeted_Platform", PlatformSpecification, multiple=True) class Code(ObjectProperties): _binding = code_binding _binding_class = code_binding.CodeObjectType - _namespace = "http://cybox.mitre.org/objects#CodeObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/code-2" _XSI_NS = "CodeObj" _XSI_TYPE = "CodeObjectType" diff --git a/cybox/objects/custom_object.py b/cybox/objects/custom_object.py index 22ea49c1..6245cc43 100644 --- a/cybox/objects/custom_object.py +++ b/cybox/objects/custom_object.py @@ -11,7 +11,7 @@ class Custom(ObjectProperties): _binding = custom_binding _binding_class = custom_binding.CustomObjectType - _namespace = "http://cybox.mitre.org/objects#CustomObject-1" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/custom-1" _XSI_NS = "CustomObj" _XSI_TYPE = "CustomObjectType" diff --git a/cybox/objects/device_object.py b/cybox/objects/device_object.py index 474d573d..71b67d8e 100644 --- a/cybox/objects/device_object.py +++ b/cybox/objects/device_object.py @@ -10,7 +10,7 @@ class Device(ObjectProperties): _binding = device_binding _binding_class = device_binding.DeviceObjectType - _namespace = "http://cybox.mitre.org/objects#DeviceObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/device-2" _XSI_NS = "DeviceObj" _XSI_TYPE = "DeviceObjectType" diff --git a/cybox/objects/disk_object.py b/cybox/objects/disk_object.py index 39240eb7..1ba53174 100644 --- a/cybox/objects/disk_object.py +++ b/cybox/objects/disk_object.py @@ -12,14 +12,14 @@ class PartitionList(entities.EntityList): _binding = disk_binding _binding_class = disk_binding.PartitionListType - _namespace = "http://cybox.mitre.org/objects#DiskObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/disk-2" partition = fields.TypedField("Partition", DiskPartition, multiple=True) class Disk(ObjectProperties): _binding = disk_binding _binding_class = disk_binding.DiskObjectType - _namespace = "http://cybox.mitre.org/objects#DiskObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/disk-2" _XSI_NS = "DiskObj" _XSI_TYPE = "DiskObjectType" diff --git a/cybox/objects/disk_partition_object.py b/cybox/objects/disk_partition_object.py index f49919db..d758cedd 100644 --- a/cybox/objects/disk_partition_object.py +++ b/cybox/objects/disk_partition_object.py @@ -11,7 +11,7 @@ class DiskPartition(ObjectProperties): _binding = disk_partition_binding _binding_class = disk_partition_binding.DiskPartitionObjectType - _namespace = "http://cybox.mitre.org/objects#DiskPartitionObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/disk-partition-2" _XSI_NS = "DiskPartitionObj" _XSI_TYPE = "DiskPartitionObjectType" diff --git a/cybox/objects/dns_cache_object.py b/cybox/objects/dns_cache_object.py index adca421a..aa4e7af3 100644 --- a/cybox/objects/dns_cache_object.py +++ b/cybox/objects/dns_cache_object.py @@ -10,7 +10,7 @@ class DNSCacheEntry(entities.Entity): - _namespace = "http://cybox.mitre.org/objects#DNSCacheObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/dns-cache-2" _binding = dns_cache_binding _binding_class = dns_cache_binding.DNSCacheEntryType @@ -21,7 +21,7 @@ class DNSCacheEntry(entities.Entity): class DNSCache(ObjectProperties): _binding = dns_cache_binding _binding_class = dns_cache_binding.DNSCacheObjectType - _namespace = "http://cybox.mitre.org/objects#DNSCacheObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/dns-cache-2" _XSI_NS = "DNSCacheObj" _XSI_TYPE = "DNSCacheObjectType" diff --git a/cybox/objects/dns_query_object.py b/cybox/objects/dns_query_object.py index 85e3eedf..f46f6d3e 100644 --- a/cybox/objects/dns_query_object.py +++ b/cybox/objects/dns_query_object.py @@ -13,12 +13,12 @@ class DNSResourceRecords(entities.EntityList): _binding = dns_query_binding _binding_class = dns_query_binding.DNSResourceRecordsType - _namespace = "http://cybox.mitre.org/objects#DNSQueryObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/dns-query-2" resource_record = fields.TypedField("Resource_Record", DNSRecord, multiple=True) class DNSQuestion(entities.Entity): - _namespace = "http://cybox.mitre.org/objects#DNSQueryObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/dns-query-2" _binding = dns_query_binding _binding_class = dns_query_binding.DNSQuestionType @@ -30,7 +30,7 @@ class DNSQuestion(entities.Entity): class DNSQuery(ObjectProperties): _binding = dns_query_binding _binding_class = dns_query_binding.DNSQueryObjectType - _namespace = "http://cybox.mitre.org/objects#DNSQueryObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/dns-query-2" _XSI_NS = "DNSQueryObj" _XSI_TYPE = "DNSQueryObjectType" diff --git a/cybox/objects/dns_record_object.py b/cybox/objects/dns_record_object.py index dd9c24d5..439dad28 100644 --- a/cybox/objects/dns_record_object.py +++ b/cybox/objects/dns_record_object.py @@ -14,7 +14,7 @@ class DNSRecord(ObjectProperties): _binding = dns_record_binding _binding_class = dns_record_binding.DNSRecordObjectType - _namespace = 'http://cybox.mitre.org/objects#DNSRecordObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/dns-record-2' _XSI_NS = "DNSRecordObj" _XSI_TYPE = "DNSRecordObjectType" diff --git a/cybox/objects/domain_name_object.py b/cybox/objects/domain_name_object.py index 05e16e6e..3a788fcc 100644 --- a/cybox/objects/domain_name_object.py +++ b/cybox/objects/domain_name_object.py @@ -11,7 +11,7 @@ class DomainName(ObjectProperties): _binding = domainname_binding _binding_class = domainname_binding.DomainNameObjectType - _namespace = "http://cybox.mitre.org/objects#DomainNameObject-1" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/domain-name-1" _XSI_NS = "DomainNameObj" _XSI_TYPE = "DomainNameObjectType" diff --git a/cybox/objects/email_message_object.py b/cybox/objects/email_message_object.py index a2901b16..b5f77383 100644 --- a/cybox/objects/email_message_object.py +++ b/cybox/objects/email_message_object.py @@ -48,33 +48,33 @@ def _fix_value(self, value): class AttachmentReference(_Reference, entities.Entity): _binding = email_message_binding _binding_class = email_message_binding.AttachmentReferenceType - _namespace = "http://cybox.mitre.org/objects#EmailMessageObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/email-message-2" class LinkReference(_Reference, entities.Entity): _binding = email_message_binding _binding_class = email_message_binding.LinkReferenceType - _namespace = "http://cybox.mitre.org/objects#EmailMessageObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/email-message-2" class Attachments(_ReferenceList, entities.EntityList): _binding = email_message_binding _binding_class = email_message_binding.AttachmentsType - _namespace = 'http://cybox.mitre.org/objects#EmailMessageObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/email-message-2' file = fields.TypedField("File", AttachmentReference, multiple=True) class Links(_ReferenceList, entities.EntityList): _binding = email_message_binding _binding_class = email_message_binding.LinksType - _namespace = 'http://cybox.mitre.org/objects#EmailMessageObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/email-message-2' link = fields.TypedField("Link", LinkReference, multiple=True) class EmailRecipients(entities.EntityList): _binding = email_message_binding _binding_class = email_message_binding.EmailRecipientsType - _namespace = 'http://cybox.mitre.org/objects#EmailMessageObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/email-message-2' _try_cast = True # EmailRecipients allows you to pass recipients via the constructor recipient = fields.TypedField("Recipient", EmailAddress, multiple=True) @@ -82,7 +82,7 @@ class EmailRecipients(entities.EntityList): class ReceivedLine(entities.Entity): _binding = email_message_binding _binding_class = email_message_binding.EmailReceivedLineType - _namespace = "http://cybox.mitre.org/objects#EmailMessageObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/email-message-2" from_ = fields.TypedField("From", String) by = fields.TypedField("By", String) @@ -98,14 +98,14 @@ class ReceivedLine(entities.Entity): class ReceivedLineList(entities.EntityList): _binding = email_message_binding _binding_class = email_message_binding.EmailReceivedLineListType - _namespace = "http://cybox.mitre.org/objects#EmailMessageObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/email-message-2" received = fields.TypedField("Received", ReceivedLine, multiple=True) class EmailHeader(entities.Entity): _binding = email_message_binding _binding_class = email_message_binding.EmailHeaderType - _namespace = "http://cybox.mitre.org/objects#EmailMessageObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/email-message-2" received_lines = fields.TypedField("Received_Lines", ReceivedLineList) to = fields.TypedField("To", EmailRecipients) @@ -132,7 +132,7 @@ class EmailHeader(entities.Entity): class EmailMessage(ObjectProperties): _binding = email_message_binding _binding_class = email_message_binding.EmailMessageObjectType - _namespace = 'http://cybox.mitre.org/objects#EmailMessageObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/email-message-2' _XSI_NS = "EmailMessageObj" _XSI_TYPE = "EmailMessageObjectType" diff --git a/cybox/objects/file_object.py b/cybox/objects/file_object.py index bf18a1cd..5898c1f9 100644 --- a/cybox/objects/file_object.py +++ b/cybox/objects/file_object.py @@ -13,7 +13,7 @@ class FilePath(String): _binding = file_binding _binding_class = file_binding.FilePathType - _namespace = 'http://cybox.mitre.org/objects#FileObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/file-2' fully_qualified = fields.TypedField("fully_qualified") @@ -24,7 +24,7 @@ def is_plain(self): class EPJumpCode(entities.Entity): _binding = file_binding _binding_class = file_binding.EPJumpCodeType - _namespace = 'http://cybox.mitre.org/objects#FileObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/file-2' depth = fields.TypedField("Depth", Integer) opcodes = fields.TypedField("Opcodes", String) @@ -33,7 +33,7 @@ class EPJumpCode(entities.Entity): class EntryPointSignature(entities.Entity): _binding = file_binding _binding_class = file_binding.EntryPointSignatureType - _namespace = 'http://cybox.mitre.org/objects#FileObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/file-2' name = fields.TypedField("Name", String) type_ = fields.TypedField("Type") @@ -42,14 +42,14 @@ class EntryPointSignature(entities.Entity): class EntryPointSignatureList(entities.EntityList): _binding = file_binding _binding_class = file_binding.EntryPointSignatureListType - _namespace = 'http://cybox.mitre.org/objects#FileObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/file-2' entry_point_signature = fields.TypedField("Entry_Point_Signature", EntryPointSignature, multiple=True) class Packer(entities.Entity): _binding = file_binding _binding_class = file_binding.PackerType - _namespace = 'http://cybox.mitre.org/objects#FileObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/file-2' name = fields.TypedField("Name", String) version = fields.TypedField("Version", String) @@ -63,27 +63,27 @@ class Packer(entities.Entity): class PackerList(entities.EntityList): _binding = file_binding _binding_class = file_binding.PackerListType - _namespace = 'http://cybox.mitre.org/objects#FileObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/file-2' packer = fields.TypedField("Packer", Packer, multiple=True) class SymLinksList(entities.EntityList): _binding = file_binding _binding_class = file_binding.SymLinksListType - _namespace = 'http://cybox.mitre.org/objects#FileObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/file-2' sym_link = fields.TypedField("Sym_Link", String, multiple=True) class FileAttribute(entities.Entity): """An abstract class for file attributes.""" - _namespace = 'http://cybox.mitre.org/objects#FileObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/file-2' _binding = file_binding _binding_class = _binding.FileAttributeType class FilePermissions(entities.Entity): """An abstract class for file permissions.""" - _namespace = 'http://cybox.mitre.org/objects#FileObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/file-2' _binding = file_binding _binding_class = _binding.FilePermissionsType @@ -91,7 +91,7 @@ class FilePermissions(entities.Entity): class File(ObjectProperties): _binding = file_binding _binding_class = file_binding.FileObjectType - _namespace = 'http://cybox.mitre.org/objects#FileObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/file-2' _XSI_NS = "FileObj" _XSI_TYPE = "FileObjectType" diff --git a/cybox/objects/gui_dialogbox_object.py b/cybox/objects/gui_dialogbox_object.py index 7a66581b..dd0e3edf 100644 --- a/cybox/objects/gui_dialogbox_object.py +++ b/cybox/objects/gui_dialogbox_object.py @@ -11,7 +11,7 @@ class GUIDialogbox(GUI): _binding = gui_dialogbox_binding _binding_class = gui_dialogbox_binding.GUIDialogboxObjectType - _namespace = "http://cybox.mitre.org/objects#GUIDialogboxObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/gui-dialogbox-2" _XSI_NS = "GUIDialogBoxObj" _XSI_TYPE = "GUIDialogboxObjectType" diff --git a/cybox/objects/gui_object.py b/cybox/objects/gui_object.py index 74fbdad1..895f9e32 100644 --- a/cybox/objects/gui_object.py +++ b/cybox/objects/gui_object.py @@ -10,7 +10,7 @@ class GUI(ObjectProperties): _binding = gui_binding _binding_class = gui_binding.GUIObjectType - _namespace = "http://cybox.mitre.org/objects#GUIObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/gui-2" _XSI_NS = "GUIObj" _XSI_TYPE = "GUIObjectType" diff --git a/cybox/objects/gui_window_object.py b/cybox/objects/gui_window_object.py index 75ae5f27..1021bdca 100644 --- a/cybox/objects/gui_window_object.py +++ b/cybox/objects/gui_window_object.py @@ -11,7 +11,7 @@ class GUIWindow(GUI): _binding = gui_window_binding _binding_class = gui_window_binding.GUIWindowObjectType - _namespace = "http://cybox.mitre.org/objects#GUIWindowObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/gui-window-2" _XSI_NS = "GUIWindowObj" _XSI_TYPE = "GUIWindowObjectType" diff --git a/cybox/objects/hostname_object.py b/cybox/objects/hostname_object.py index fc92eee8..72ac865b 100644 --- a/cybox/objects/hostname_object.py +++ b/cybox/objects/hostname_object.py @@ -10,7 +10,7 @@ class Hostname(ObjectProperties): _binding = hostname_binding _binding_class = hostname_binding.HostnameObjectType - _namespace = "http://cybox.mitre.org/objects#HostnameObject-1" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/hostname-1" _XSI_NS = "HostnameObj" _XSI_TYPE = "HostnameObjectType" diff --git a/cybox/objects/http_session_object.py b/cybox/objects/http_session_object.py index 6221a79c..17b3e00e 100644 --- a/cybox/objects/http_session_object.py +++ b/cybox/objects/http_session_object.py @@ -14,7 +14,7 @@ class HTTPRequestLine(entities.Entity): _binding = http_session_binding _binding_class = http_session_binding.HTTPRequestLineType - _namespace = "http://cybox.mitre.org/objects#HTTPSessionObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/http-session-2" http_method = fields.TypedField("HTTP_Method", String) value = fields.TypedField("Value", String) @@ -24,7 +24,7 @@ class HTTPRequestLine(entities.Entity): class HostField(entities.Entity): _binding = http_session_binding _binding_class = http_session_binding.HostFieldType - _namespace = "http://cybox.mitre.org/objects#HTTPSessionObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/http-session-2" domain_name = fields.TypedField("Domain_Name", URI) port = fields.TypedField("Port", Port) @@ -33,7 +33,7 @@ class HostField(entities.Entity): class HTTPRequestHeaderFields(entities.Entity): _binding = http_session_binding _binding_class = http_session_binding.HTTPRequestHeaderFieldsType - _namespace = "http://cybox.mitre.org/objects#HTTPSessionObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/http-session-2" accept = fields.TypedField("Accept", String) accept_charset = fields.TypedField("Accept_Charset", String) @@ -76,7 +76,7 @@ class HTTPRequestHeaderFields(entities.Entity): class HTTPRequestHeader(entities.Entity): _binding = http_session_binding _binding_class = http_session_binding.HTTPRequestHeaderType - _namespace = "http://cybox.mitre.org/objects#HTTPSessionObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/http-session-2" raw_header = fields.TypedField("Raw_Header", String) parsed_header = fields.TypedField("Parsed_Header", HTTPRequestHeaderFields) @@ -85,7 +85,7 @@ class HTTPRequestHeader(entities.Entity): class HTTPMessage(entities.Entity): _binding = http_session_binding _binding_class = http_session_binding.HTTPMessageType - _namespace = "http://cybox.mitre.org/objects#HTTPSessionObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/http-session-2" length = fields.TypedField("Length", PositiveInteger) message_body = fields.TypedField("Message_Body", String) @@ -94,7 +94,7 @@ class HTTPMessage(entities.Entity): class HTTPClientRequest(entities.Entity): _binding = http_session_binding _binding_class = http_session_binding.HTTPClientRequestType - _namespace = "http://cybox.mitre.org/objects#HTTPSessionObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/http-session-2" http_request_line = fields.TypedField("HTTP_Request_Line", HTTPRequestLine) http_request_header = fields.TypedField("HTTP_Request_Header", @@ -105,7 +105,7 @@ class HTTPClientRequest(entities.Entity): class HTTPStatusLine(entities.Entity): _binding = http_session_binding _binding_class = http_session_binding.HTTPStatusLineType - _namespace = "http://cybox.mitre.org/objects#HTTPSessionObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/http-session-2" version = fields.TypedField("Version", String) status_code = fields.TypedField("Status_Code", PositiveInteger) @@ -115,7 +115,7 @@ class HTTPStatusLine(entities.Entity): class HTTPResponseHeaderFields(entities.Entity): _binding = http_session_binding _binding_class = http_session_binding.HTTPResponseHeaderFieldsType - _namespace = "http://cybox.mitre.org/objects#HTTPSessionObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/http-session-2" access_control_allow_origin = \ fields.TypedField("Access_Control_Allow_Origin", String) @@ -162,7 +162,7 @@ class HTTPResponseHeaderFields(entities.Entity): class HTTPResponseHeader(entities.Entity): _binding = http_session_binding _binding_class = http_session_binding.HTTPResponseHeaderType - _namespace = "http://cybox.mitre.org/objects#HTTPSessionObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/http-session-2" raw_header = fields.TypedField("Raw_Header", String) parsed_header = fields.TypedField("Parsed_Header", HTTPResponseHeaderFields) @@ -171,7 +171,7 @@ class HTTPResponseHeader(entities.Entity): class HTTPServerResponse(entities.Entity): _binding = http_session_binding _binding_class = http_session_binding.HTTPServerResponseType - _namespace = "http://cybox.mitre.org/objects#HTTPSessionObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/http-session-2" http_status_line = fields.TypedField("HTTP_Status_Line", HTTPStatusLine) http_response_header = fields.TypedField("HTTP_Response_Header", @@ -182,7 +182,7 @@ class HTTPServerResponse(entities.Entity): class HTTPRequestResponse(entities.Entity): _binding = http_session_binding _binding_class = http_session_binding.HTTPRequestResponseType - _namespace = "http://cybox.mitre.org/objects#HTTPSessionObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/http-session-2" ordinal_position = fields.TypedField("ordinal_position") http_client_request = fields.TypedField("HTTP_Client_Request", HTTPClientRequest) @@ -193,7 +193,7 @@ class HTTPRequestResponse(entities.Entity): class HTTPSession(ObjectProperties): _binding = http_session_binding _binding_class = http_session_binding.HTTPSessionObjectType - _namespace = "http://cybox.mitre.org/objects#HTTPSessionObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/http-session-2" _XSI_NS = "HTTPSessionObj" _XSI_TYPE = "HTTPSessionObjectType" diff --git a/cybox/objects/image_file_object.py b/cybox/objects/image_file_object.py index 27a92cc1..a9817f4f 100644 --- a/cybox/objects/image_file_object.py +++ b/cybox/objects/image_file_object.py @@ -11,7 +11,7 @@ class ImageFile(File): _binding = image_binding _binding_class = image_binding.ImageFileObjectType - _namespace = 'http://cybox.mitre.org/objects#ImageFileObject-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/image-file-1' _XSI_NS = "ImageFileObj" _XSI_TYPE = "ImageFileObjectType" diff --git a/cybox/objects/library_object.py b/cybox/objects/library_object.py index 9b29c7f1..675b4e97 100644 --- a/cybox/objects/library_object.py +++ b/cybox/objects/library_object.py @@ -11,7 +11,7 @@ class Library(ObjectProperties): _binding = library_binding _binding_class = library_binding.LibraryObjectType - _namespace = "http://cybox.mitre.org/objects#LibraryObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/library-2" _XSI_NS = "LibraryObj" _XSI_TYPE = "LibraryObjectType" diff --git a/cybox/objects/link_object.py b/cybox/objects/link_object.py index 1f420518..3d47295c 100644 --- a/cybox/objects/link_object.py +++ b/cybox/objects/link_object.py @@ -11,7 +11,7 @@ class Link(URI): _binding = link_binding _binding_class = link_binding.LinkObjectType - _namespace = "http://cybox.mitre.org/objects#LinkObject-1" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/link-1" _XSI_NS = "LinkObj" _XSI_TYPE = "LinkObjectType" diff --git a/cybox/objects/linux_package_object.py b/cybox/objects/linux_package_object.py index 7a51717b..19c15123 100644 --- a/cybox/objects/linux_package_object.py +++ b/cybox/objects/linux_package_object.py @@ -15,7 +15,7 @@ class LinuxPackageArchitecture(VocabString): class LinuxPackage(ObjectProperties): _binding = linux_package_binding _binding_class = linux_package_binding.LinuxPackageObjectType - _namespace = "http://cybox.mitre.org/objects#LinuxPackageObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/linux-package-2" _XSI_NS = "LinuxPackageObj" _XSI_TYPE = "LinuxPackageObjectType" diff --git a/cybox/objects/memory_object.py b/cybox/objects/memory_object.py index 2193af10..3ee0fc10 100644 --- a/cybox/objects/memory_object.py +++ b/cybox/objects/memory_object.py @@ -11,7 +11,7 @@ class Memory(ObjectProperties): _binding = memory_binding _binding_class = memory_binding.MemoryObjectType - _namespace = 'http://cybox.mitre.org/objects#MemoryObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/memory-2' _XSI_NS = "MemoryObj" _XSI_TYPE = "MemoryObjectType" diff --git a/cybox/objects/mutex_object.py b/cybox/objects/mutex_object.py index baced429..de16cc04 100644 --- a/cybox/objects/mutex_object.py +++ b/cybox/objects/mutex_object.py @@ -10,7 +10,7 @@ class Mutex(ObjectProperties): _binding = mutex_binding _binding_class = mutex_binding.MutexObjectType - _namespace = "http://cybox.mitre.org/objects#MutexObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/mutex-2" _XSI_NS = "MutexObj" _XSI_TYPE = "MutexObjectType" diff --git a/cybox/objects/network_connection_object.py b/cybox/objects/network_connection_object.py index fae1100f..919387f6 100644 --- a/cybox/objects/network_connection_object.py +++ b/cybox/objects/network_connection_object.py @@ -14,7 +14,7 @@ class Layer7Connections(entities.Entity): _binding = network_connection_binding _binding_class = network_connection_binding.Layer7ConnectionsType - _namespace = "http://cybox.mitre.org/objects#NetworkConnectionObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-connection-2" http_session = fields.TypedField("HTTP_Session", HTTPSession) dns_query = fields.TypedField("DNS_Query", DNSQuery, multiple=True) @@ -23,7 +23,7 @@ class Layer7Connections(entities.Entity): class NetworkConnection(ObjectProperties): _binding = network_connection_binding _binding_class = network_connection_binding.NetworkConnectionObjectType - _namespace = "http://cybox.mitre.org/objects#NetworkConnectionObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-connection-2" _XSI_NS = "NetworkConnectionObj" _XSI_TYPE = "NetworkConnectionObjectType" diff --git a/cybox/objects/network_packet_object.py b/cybox/objects/network_packet_object.py index df26f39f..b6bc2ad6 100644 --- a/cybox/objects/network_packet_object.py +++ b/cybox/objects/network_packet_object.py @@ -14,7 +14,7 @@ class TypeLength(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.TypeLengthType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" # TODO: choice length = fields.TypedField("Length", HexBinary) @@ -24,7 +24,7 @@ class TypeLength(entities.Entity): class EthernetHeader(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.EthernetHeaderType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" destination_mac_addr = fields.TypedField("Destination_MAC_Addr", Address) source_mac_addr = fields.TypedField("Source_MAC_Addr", Address) @@ -35,7 +35,7 @@ class EthernetHeader(entities.Entity): class EthernetInterface(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.EthernetInterfaceType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" ethernet_header = fields.TypedField("Ethernet_Header", EthernetHeader) @@ -43,7 +43,7 @@ class EthernetInterface(entities.Entity): class PhysicalInterface(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.PhysicalInterfaceType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" ethernet = fields.TypedField("Ethernet", EthernetInterface) @@ -51,7 +51,7 @@ class PhysicalInterface(entities.Entity): class ARP(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.ARPType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" hardware_addr_type = fields.TypedField("Hardware_Addr_Type", String) proto_addr_type = fields.TypedField("Proto_Addr_Type", String) @@ -67,7 +67,7 @@ class ARP(entities.Entity): class _ICMPHeader(entities.Entity): """Abstract Type""" _binding = network_packet_binding - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" type_ = fields.TypedField("Type", HexBinary) code = fields.TypedField("Code", HexBinary) @@ -86,7 +86,7 @@ class NDPLinkAddr(entities.Entity): """Abstract Type""" _binding = network_packet_binding _binding_class = network_packet_binding.NDPLinkAddrType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" length = fields.TypedField("Length", HexBinary) link_layer_mac_addr = fields.TypedField("Link_Layer_MAC_Addr", Address) @@ -95,7 +95,7 @@ class NDPLinkAddr(entities.Entity): class RouterSolicitationOptions(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.RouterSolicitationOptionsType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" src_link_addr = fields.TypedField("Src_Link_Addr", NDPLinkAddr) @@ -103,7 +103,7 @@ class RouterSolicitationOptions(entities.Entity): class RouterSolicitation(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.RouterSolicitationType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" options = fields.TypedField("Options", RouterSolicitationOptions, multiple=True) @@ -112,7 +112,7 @@ class RouterSolicitation(entities.Entity): class NDPMTU(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.NDPMTUType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" length = fields.TypedField("Length", Integer) mtu = fields.TypedField("MTU", Integer) @@ -121,7 +121,7 @@ class NDPMTU(entities.Entity): class Prefix(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.PrefixType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" #TODO: choice ipv6_addr = fields.TypedField("IPv6_Addr", Address) @@ -131,7 +131,7 @@ class Prefix(entities.Entity): class NDPPrefixInfo(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.NDPPrefixInfoType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" link_flag = fields.TypedField("link_flag") addr_config_flag = fields.TypedField("addr_config_flag") @@ -145,7 +145,7 @@ class NDPPrefixInfo(entities.Entity): class RouterAdvertisementOptions(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.RouterAdvertisementOptionsType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" #TODO: choice src_link_addr = fields.TypedField("Src_Link_Addr", NDPLinkAddr) @@ -156,7 +156,7 @@ class RouterAdvertisementOptions(entities.Entity): class RouterAdvertisement(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.RouterAdvertisementType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" managed_address_config_flag = \ fields.TypedField("managed_address_config_flag") @@ -171,7 +171,7 @@ class RouterAdvertisement(entities.Entity): class NeighborSolicitationOptions(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.NeighborSolicitationOptionsType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" src_link_addr = fields.TypedField("Src_Link_Addr", NDPLinkAddr) @@ -179,7 +179,7 @@ class NeighborSolicitationOptions(entities.Entity): class NeighborSolicitation(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.NeighborSolicitationType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" target_ipv6_addr = fields.TypedField("Target_IPv6_Addr", Address) options = fields.TypedField("Options", NeighborSolicitationOptions) @@ -188,7 +188,7 @@ class NeighborSolicitation(entities.Entity): class NeighborOptions(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.NeighborOptionsType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" target_link_addr = fields.TypedField("Target_Link_Addr", NDPLinkAddr) @@ -196,7 +196,7 @@ class NeighborOptions(entities.Entity): class NeighborAdvertisement(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.NeighborAdvertisementType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" router_flag = fields.TypedField("router_flag") solicited_flag = fields.TypedField("solicited_flag") @@ -208,7 +208,7 @@ class NeighborAdvertisement(entities.Entity): class NDPRedirectedHeader(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.NDPRedirectedHeaderType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" length = fields.TypedField("Length", HexBinary) ipheader_and_data = fields.TypedField("IPHeader_And_Data", HexBinary) @@ -217,7 +217,7 @@ class NDPRedirectedHeader(entities.Entity): class RedirectOptions(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.RedirectOptionsType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" target_link_addr = fields.TypedField("Target_Link_Addr", NDPLinkAddr) redirected_header = fields.TypedField("Redirected_Header", @@ -227,7 +227,7 @@ class RedirectOptions(entities.Entity): class Redirect(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.RedirectType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" target_ipv6_addr = fields.TypedField("Target_IPv6_Addr", Address) dest_ipv6_addr = fields.TypedField("Dest_IPv6_Addr", Address) @@ -237,7 +237,7 @@ class Redirect(entities.Entity): class NDP(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.NDPType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" icmpv6_header = fields.TypedField("ICMPv6_Header", ICMPv6Header) @@ -256,7 +256,7 @@ class NDP(entities.Entity): class LogicalProtocol(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.LogicalProtocolType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" #TODO: choice arp_rarp = fields.TypedField("ARP_RARP", ARP) @@ -266,7 +266,7 @@ class LogicalProtocol(entities.Entity): class LinkLayer(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.LinkLayerType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" physical_interface = fields.TypedField("Physical_Interface", PhysicalInterface) logical_protocols = fields.TypedField("Logical_Protocols", LogicalProtocol) @@ -275,7 +275,7 @@ class LinkLayer(entities.Entity): class IPv4Flags(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.IPv4FlagsType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" reserved = fields.TypedField("Reserved", Integer) do_not_fragment = fields.TypedField("Do_Not_Fragment", String) @@ -289,7 +289,7 @@ def __init__(self): class IPv4Option(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.IPv4OptionType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" copy_flag = fields.TypedField("Copy_Flag", String) class_ = fields.TypedField("Class", String) @@ -299,7 +299,7 @@ class IPv4Option(entities.Entity): class IPv4Header(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.IPv4HeaderType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" ip_version = fields.TypedField("IP_Version", String) header_length = fields.TypedField("Header_Length", Integer) @@ -320,7 +320,7 @@ class IPv4Header(entities.Entity): class IPv4Packet(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.IPv4PacketType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" ipv4_header = fields.TypedField("IPv4_Header", IPv4Header) data = fields.TypedField("Data", HexBinary) @@ -329,7 +329,7 @@ class IPv4Packet(entities.Entity): class FragmentationRequired(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.FragmentationRequiredType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" fragmentation_required = fields.TypedField("Fragmentation_Required") next_hop_mtu = fields.TypedField("Next_Hop_MTU", HexBinary) @@ -338,7 +338,7 @@ class FragmentationRequired(entities.Entity): class ICMPv4DestinationUnreachable(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.ICMPv4DestinationUnreachableType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" #TODO: choice destination_network_unreachable = \ @@ -374,7 +374,7 @@ class ICMPv4DestinationUnreachable(entities.Entity): class ICMPv4SourceQuench(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.ICMPv4SourceQuenchType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" source_quench = fields.TypedField("Source_Quench") @@ -382,7 +382,7 @@ class ICMPv4SourceQuench(entities.Entity): class ICMPv4RedirectMessage(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.ICMPv4RedirectMessageType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" # TODO: choice of first 4 network_redirect = fields.TypedField("Network_Redirect") @@ -396,7 +396,7 @@ class ICMPv4RedirectMessage(entities.Entity): class ICMPv4TimeExceeded(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.ICMPv4TimeExceededType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" # TODO: choice ttl_exceeded_in_transit = fields.TypedField("TTL_Exceeded_In_Transit") @@ -407,7 +407,7 @@ class ICMPv4TimeExceeded(entities.Entity): class ICMPv4ErrorMessageContent(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.ICMPv4ErrorMessageContentType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" ip_header = fields.TypedField("IP_Header", IPv4Header) first_eight_bytes = fields.TypedField("First_Eight_Bytes", HexBinary) @@ -416,7 +416,7 @@ class ICMPv4ErrorMessageContent(entities.Entity): class ICMPv4ErrorMessage(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.ICMPv4ErrorMessageType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" destination_unreachable = fields.TypedField("Destination_Unreachable", ICMPv4DestinationUnreachable) @@ -430,7 +430,7 @@ class ICMPv4ErrorMessage(entities.Entity): class _ICMPEchoReply(entities.Entity): _binding = network_packet_binding - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" echo_reply = fields.TypedField("Echo_Reply") data = fields.TypedField("Data", HexBinary) @@ -438,7 +438,7 @@ class _ICMPEchoReply(entities.Entity): class _ICMPEchoRequest(entities.Entity): _binding = network_packet_binding - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" echo_request = fields.TypedField("Echo_Request") data = fields.TypedField("Data", HexBinary) @@ -463,7 +463,7 @@ class ICMPv6EchoRequest(_ICMPEchoRequest): class ICMPv4TimestampRequest(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.ICMPv4TimestampRequestType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" timestamp = fields.TypedField("Timestamp") originate_timestamp = fields.TypedField("Originate_Timestamp", @@ -473,7 +473,7 @@ class ICMPv4TimestampRequest(entities.Entity): class ICMPv4TimestampReply(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.ICMPv4TimestampReplyType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" timestamp_reply = fields.TypedField("Timestamp_Reply") originate_timestamp = fields.TypedField("Originate_Timestamp", @@ -487,7 +487,7 @@ class ICMPv4TimestampReply(entities.Entity): class ICMPv4AddressMaskRequest(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.ICMPv4AddressMaskRequestType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" address_mask_request = fields.TypedField("Address_Mask_Request") address_mask = fields.TypedField("Address_Mask", Address) @@ -496,7 +496,7 @@ class ICMPv4AddressMaskRequest(entities.Entity): class ICMPv4AddressMaskReply(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.ICMPv4AddressMaskReplyType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" address_mask_reply = fields.TypedField("Address_Mask_Reply") address_mask = fields.TypedField("Address_Mask", Address) @@ -504,7 +504,7 @@ class ICMPv4AddressMaskReply(entities.Entity): class _ICMPInfoMessageContent(entities.Entity): _binding = network_packet_binding - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" identifier = fields.TypedField("Identifier", HexBinary) sequence_number = fields.TypedField("Sequence_Number", HexBinary) @@ -521,7 +521,7 @@ class ICMPv6InfoMessageContent(_ICMPInfoMessageContent): class ICMPv4InfoMessage(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.ICMPv4InfoMessageType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" #TODO: choice of first 6 echo_reply = fields.TypedField("Echo_Reply", ICMPv4EchoReply) @@ -541,7 +541,7 @@ class ICMPv4InfoMessage(entities.Entity): class ICMPv4Traceroute(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.ICMPv4TracerouteType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" outbound_packet_forward_success = \ fields.TypedField("Outbound_Packet_Forward_Success") @@ -556,7 +556,7 @@ class ICMPv4Traceroute(entities.Entity): class ICMPv4Packet(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.ICMPv4PacketType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" icmpv4_header = fields.TypedField("ICMPv4_Header", ICMPv4Header) @@ -569,7 +569,7 @@ class ICMPv4Packet(entities.Entity): class IPv6Header(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.IPv6HeaderType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" ip_version = fields.TypedField("IP_Version", String) traffic_class = fields.TypedField("Traffic_Class", HexBinary) @@ -584,7 +584,7 @@ class IPv6Header(entities.Entity): class IPv6Option(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.IPv6OptionType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" do_not_recogn_action = fields.TypedField("Do_Not_Recogn_Action", String) packet_change = fields.TypedField("Packet_Change", String) @@ -594,7 +594,7 @@ class IPv6Option(entities.Entity): class Pad1(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.Pad1Type - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" octet = fields.TypedField("Octet", HexBinary) @@ -602,7 +602,7 @@ class Pad1(entities.Entity): class PadN(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.PadNType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" octet = fields.TypedField("Octet", HexBinary) option_data_length = fields.TypedField("Option_Data_Length", Integer) @@ -612,7 +612,7 @@ class PadN(entities.Entity): class OptionData(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.OptionDataType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" option_type = fields.TypedField("Option_Type", IPv6Option) option_data_len = fields.TypedField("Option_Data_Len", HexBinary) @@ -625,7 +625,7 @@ class OptionData(entities.Entity): class _IPv6ExtHeader(entities.Entity): """Shared by a couple types""" _binding = network_packet_binding - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" next_header = fields.TypedField("Next_Header", String) header_ext_len = fields.TypedField("Header_Ext_Len", HexBinary) @@ -639,7 +639,7 @@ class HopByHopOptions(_IPv6ExtHeader): class Routing(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.RoutingType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" next_header = fields.TypedField("Next_Header", String) header_ext_len = fields.TypedField("Header_Ext_Len", Integer) @@ -651,7 +651,7 @@ class Routing(entities.Entity): class FragmentHeader(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.FragmentHeaderType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" next_header = fields.TypedField("Next_Header", HexBinary) fragment_offset = fields.TypedField("Fragment_Offset", HexBinary) @@ -662,7 +662,7 @@ class FragmentHeader(entities.Entity): class Fragment(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.FragmentType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" fragment_header = fields.TypedField("Fragment_Header", FragmentHeader) fragment = fields.TypedField("Fragment", HexBinary) @@ -675,7 +675,7 @@ class DestinationOptions(_IPv6ExtHeader): class AuthenticationHeader(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.AuthenticationHeaderType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" next_header = fields.TypedField("Next_Header", String) header_ext_len = fields.TypedField("Header_Ext_Len", HexBinary) @@ -688,7 +688,7 @@ class AuthenticationHeader(entities.Entity): class EncapsulatingSecurityPayload(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.EncapsulatingSecurityPayloadType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" security_parameters_index = fields.TypedField("Security_Parameters_Index", HexBinary) @@ -703,7 +703,7 @@ class EncapsulatingSecurityPayload(entities.Entity): class IPv6ExtHeader(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.IPv6ExtHeaderType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" #TODO: choice hop_by_hop_options = fields.TypedField("Hop_by_Hop_Options", HopByHopOptions) @@ -717,7 +717,7 @@ class IPv6ExtHeader(entities.Entity): class IPv6Packet(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.IPv6PacketType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" ipv6_header = fields.TypedField("IPv6_Header", IPv6Header) data = fields.TypedField("Data", HexBinary) @@ -727,7 +727,7 @@ class IPv6Packet(entities.Entity): class ICMPv6DestinationUnreachable(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.ICMPv6DestinationUnreachableType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" #TODO: choice no_route = fields.TypedField("No_Route") @@ -742,7 +742,7 @@ class ICMPv6DestinationUnreachable(entities.Entity): class ICMPv6PacketTooBig(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.ICMPv6PacketTooBigType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" packet_too_big = fields.TypedField("Packet_Too_Big") mtu = fields.TypedField("MTU", HexBinary) @@ -751,7 +751,7 @@ class ICMPv6PacketTooBig(entities.Entity): class ICMPv6TimeExceeded(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.ICMPv6TimeExceededType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" #TODO: choice hop_limit_exceeded = fields.TypedField("Hop_Limit_Exceeded") @@ -762,7 +762,7 @@ class ICMPv6TimeExceeded(entities.Entity): class ICMPv6ParameterProblem(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.ICMPv6ParameterProblemType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" #TODO: choice of first 3 erroneous_header_field = fields.TypedField("Erroneous_Header_Field") @@ -776,7 +776,7 @@ class ICMPv6ParameterProblem(entities.Entity): class ICMPv6ErrorMessage(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.ICMPv6ErrorMessageType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" destination_unreachable = fields.TypedField("Destination_Unreachable", ICMPv6DestinationUnreachable) @@ -790,7 +790,7 @@ class ICMPv6ErrorMessage(entities.Entity): class ICMPv6InfoMessage(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.ICMPv6InfoMessageType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" #TODO: choice of first 2 echo_request = fields.TypedField("Echo_Request", ICMPv6EchoRequest) @@ -803,7 +803,7 @@ class ICMPv6InfoMessage(entities.Entity): class ICMPv6Packet(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.ICMPv6PacketType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" icmpv6_header = fields.TypedField("ICMPv6_Header", ICMPv6Header) error_msg = fields.TypedField("Error_Msg", ICMPv6ErrorMessage) @@ -813,7 +813,7 @@ class ICMPv6Packet(entities.Entity): class InternetLayer(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.InternetLayerType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" #TODO: choice ipv4 = fields.TypedField("IPv4", IPv4Packet) @@ -825,7 +825,7 @@ class InternetLayer(entities.Entity): class TCPFlags(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.TCPFlagsType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" ns = fields.TypedField("ns") cwr = fields.TypedField("cwr") @@ -841,7 +841,7 @@ class TCPFlags(entities.Entity): class TCPHeader(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.TCPHeaderType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" src_port = fields.TypedField("Src_Port", Port) dest_port = fields.TypedField("Dest_Port", Port) @@ -858,7 +858,7 @@ class TCPHeader(entities.Entity): class TCP(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.TCPType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" tcp_header = fields.TypedField("TCP_Header", TCPHeader) options = fields.TypedField("Options", HexBinary) @@ -868,7 +868,7 @@ class TCP(entities.Entity): class UDPHeader(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.UDPHeaderType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" srcport = fields.TypedField("SrcPort", Port) destport = fields.TypedField("DestPort", Port) @@ -879,7 +879,7 @@ class UDPHeader(entities.Entity): class UDP(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.UDPType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" udp_header = fields.TypedField("UDP_Header", UDPHeader) data = fields.TypedField("Data", DataSegment) @@ -888,7 +888,7 @@ class UDP(entities.Entity): class TransportLayer(entities.Entity): _binding = network_packet_binding _binding_class = network_packet_binding.TransportLayerType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" tcp = fields.TypedField("TCP", TCP) udp = fields.TypedField("UDP", UDP) @@ -897,7 +897,7 @@ class TransportLayer(entities.Entity): class NetworkPacket(ObjectProperties): _binding = network_packet_binding _binding_class = network_packet_binding.NetworkPacketObjectType - _namespace = "http://cybox.mitre.org/objects#PacketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2" _XSI_NS = "PacketObj" _XSI_TYPE = "NetworkPacketObjectType" diff --git a/cybox/objects/network_route_entry_object.py b/cybox/objects/network_route_entry_object.py index 43ce65f4..590ee82d 100644 --- a/cybox/objects/network_route_entry_object.py +++ b/cybox/objects/network_route_entry_object.py @@ -11,7 +11,7 @@ class NetworkRouteEntry(ObjectProperties): _binding = network_route_entry_binding _binding_class = network_route_entry_binding.NetworkRouteEntryObjectType - _namespace = "http://cybox.mitre.org/objects#NetworkRouteEntryObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-route-entry-2" _XSI_NS = "NetworkRouteEntryObj" _XSI_TYPE = "NetworkRouteEntryObjectType" diff --git a/cybox/objects/network_route_object.py b/cybox/objects/network_route_object.py index 77f58683..09be4f45 100644 --- a/cybox/objects/network_route_object.py +++ b/cybox/objects/network_route_object.py @@ -12,14 +12,14 @@ class NetworkRouteEntries(entities.EntityList): _binding = network_route_binding _binding_class = network_route_binding.NetworkRouteEntriesType - _namespace = "http://cybox.mitre.org/objects#NetworkRouteObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-route-2" network_route_entry = fields.TypedField("Network_Route_Entry", NetworkRouteEntry, multiple=True) class NetRoute(ObjectProperties): _binding = network_route_binding _binding_class = network_route_binding.NetRouteObjectType - _namespace = "http://cybox.mitre.org/objects#NetworkRouteObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-route-2" _XSI_NS = "NetworkRouteObj" _XSI_TYPE = "NetRouteObjectType" diff --git a/cybox/objects/network_socket_object.py b/cybox/objects/network_socket_object.py index 19664bb8..302c9244 100644 --- a/cybox/objects/network_socket_object.py +++ b/cybox/objects/network_socket_object.py @@ -12,7 +12,7 @@ class SocketOptions(entities.Entity): _binding = network_socket_binding _binding_class = network_socket_binding.SocketOptionsType - _namespace = "http://cybox.mitre.org/objects#NetworkSocketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-socket-2" ip_multicast_if = fields.TypedField("IP_MULTICAST_IF", String) ip_multicast_if2 = fields.TypedField("IP_MULTICAST_IF2", String) @@ -40,7 +40,7 @@ class SocketOptions(entities.Entity): class NetworkSocket(ObjectProperties): _binding = network_socket_binding _binding_class = network_socket_binding.NetworkSocketObjectType - _namespace = "http://cybox.mitre.org/objects#NetworkSocketObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-socket-2" _XSI_NS = "NetworkSocketObj" _XSI_TYPE = "NetworkSocketObjectType" diff --git a/cybox/objects/network_subnet_object.py b/cybox/objects/network_subnet_object.py index 707aab50..51c598eb 100644 --- a/cybox/objects/network_subnet_object.py +++ b/cybox/objects/network_subnet_object.py @@ -12,14 +12,14 @@ class Routes(entities.EntityList): _binding = network_subnet_binding _binding_class = network_subnet_binding.RoutesType - _namespace = "http://cybox.mitre.org/objects#NetworkSubnetObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-subnet-2" route = fields.TypedField("Route", NetworkRouteEntry, multiple=True) class NetworkSubnet(ObjectProperties): _binding = network_subnet_binding _binding_class = network_subnet_binding.NetworkSubnetObjectType - _namespace = "http://cybox.mitre.org/objects#NetworkSubnetObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/network-subnet-2" _XSI_NS = "NetworkSubnetObj" _XSI_TYPE = "NetworkSubnetObjectType" diff --git a/cybox/objects/pdf_file_object.py b/cybox/objects/pdf_file_object.py index 9d1f8c8f..8ae9111c 100644 --- a/cybox/objects/pdf_file_object.py +++ b/cybox/objects/pdf_file_object.py @@ -12,7 +12,7 @@ class PDFKeywordCount(entities.Entity): _binding = pdf_file_binding _binding_class = pdf_file_binding.PDFKeywordCountType - _namespace = 'http://cybox.mitre.org/objects#PDFFileObject-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/pdf-file-1' non_obfuscated_count = fields.TypedField("Non_Obfuscated_Count", NonNegativeInteger) obfuscated_count = fields.TypedField("Obfuscated_Count", NonNegativeInteger) @@ -21,7 +21,7 @@ class PDFKeywordCount(entities.Entity): class PDFKeywordCounts(entities.Entity): _binding = pdf_file_binding _binding_class = pdf_file_binding.PDFKeywordCountsType - _namespace = 'http://cybox.mitre.org/objects#PDFFileObject-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/pdf-file-1' page_count = fields.TypedField("Page_Count", PDFKeywordCount) encrypt_count = fields.TypedField("Encrypt_Count", PDFKeywordCount) @@ -46,7 +46,7 @@ class PDFKeywordCounts(entities.Entity): class PDFDocumentInformationDictionary(entities.Entity): _binding = pdf_file_binding _binding_class = pdf_file_binding.PDFDocumentInformationDictionaryType - _namespace = 'http://cybox.mitre.org/objects#PDFFileObject-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/pdf-file-1' title = fields.TypedField("Title", String) author = fields.TypedField("Author", String) @@ -62,7 +62,7 @@ class PDFDocumentInformationDictionary(entities.Entity): class PDFFileMetadata(entities.Entity): _binding = pdf_file_binding _binding_class = pdf_file_binding.PDFFileMetadataType - _namespace = 'http://cybox.mitre.org/objects#PDFFileObject-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/pdf-file-1' encrypted = fields.TypedField("encrypted") optimized = fields.TypedField("optimized") @@ -76,7 +76,7 @@ class PDFFileMetadata(entities.Entity): class PDFFile(File): _binding = pdf_file_binding _binding_class = pdf_file_binding.PDFFileObjectType - _namespace = 'http://cybox.mitre.org/objects#PDFFileObject-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/pdf-file-1' _XSI_NS = "PDFFileObj" _XSI_TYPE = "PDFFileObjectType" diff --git a/cybox/objects/pipe_object.py b/cybox/objects/pipe_object.py index d739a3e5..d334064e 100644 --- a/cybox/objects/pipe_object.py +++ b/cybox/objects/pipe_object.py @@ -8,7 +8,7 @@ class Pipe(ObjectProperties): - _namespace = 'http://cybox.mitre.org/objects#PipeObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/pipe-2' _XSI_NS = "PipeObj" _XSI_TYPE = "PipeObjectType" _binding = pipe_binding diff --git a/cybox/objects/port_object.py b/cybox/objects/port_object.py index ee4a5a49..988f97e7 100644 --- a/cybox/objects/port_object.py +++ b/cybox/objects/port_object.py @@ -10,7 +10,7 @@ class Port(ObjectProperties): _binding = port_binding _binding_class = port_binding.PortObjectType - _namespace = 'http://cybox.mitre.org/objects#PortObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/port-2' _XSI_NS = "PortObj" _XSI_TYPE = "PortObjectType" diff --git a/cybox/objects/process_object.py b/cybox/objects/process_object.py index 05d6d96a..68997aab 100644 --- a/cybox/objects/process_object.py +++ b/cybox/objects/process_object.py @@ -13,35 +13,35 @@ class PortList(entities.EntityList): _binding = process_binding _binding_class = process_binding.PortListType - _namespace = "http://cybox.mitre.org/objects#ProcessObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/process-2" port = fields.TypedField("Port", Port, multiple=True) class NetworkConnectionList(entities.EntityList): _binding = process_binding _binding_class = process_binding.NetworkConnectionListType - _namespace = "http://cybox.mitre.org/objects#ProcessObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/process-2" network_connection = fields.TypedField("Network_Connection", NetworkConnection, multiple=True) class ChildPIDList(entities.EntityList): _binding = process_binding _binding_class = process_binding.ChildPIDListType - _namespace = "http://cybox.mitre.org/objects#ProcessObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/process-2" child_pid = fields.TypedField("Child_PID", UnsignedInteger, multiple=True) class ArgumentList(entities.EntityList): _binding = process_binding _binding_class = process_binding.ArgumentListType - _namespace = "http://cybox.mitre.org/objects#ProcessObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/process-2" argument = fields.TypedField("Argument", String, multiple=True) class ImageInfo(entities.Entity): _binding = process_binding _binding_class = process_binding.ImageInfoType - _namespace = "http://cybox.mitre.org/objects#ProcessObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/process-2" file_name = fields.TypedField("File_Name", String) command_line = fields.TypedField("Command_Line", String) @@ -52,7 +52,7 @@ class ImageInfo(entities.Entity): class Process(ObjectProperties): _binding = process_binding _binding_class = process_binding.ProcessObjectType - _namespace = "http://cybox.mitre.org/objects#ProcessObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/process-2" _XSI_NS = "ProcessObj" _XSI_TYPE = "ProcessObjectType" diff --git a/cybox/objects/product_object.py b/cybox/objects/product_object.py index ae5e2a82..f055ffcb 100644 --- a/cybox/objects/product_object.py +++ b/cybox/objects/product_object.py @@ -11,7 +11,7 @@ class Product(ObjectProperties): _binding = product_binding _binding_class = product_binding.ProductObjectType - _namespace = 'http://cybox.mitre.org/objects#ProductObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/product-2' _XSI_NS = 'ProductObj' _XSI_TYPE = "ProductObjectType" diff --git a/cybox/objects/semaphore_object.py b/cybox/objects/semaphore_object.py index 1ce1082b..8a1d12e3 100644 --- a/cybox/objects/semaphore_object.py +++ b/cybox/objects/semaphore_object.py @@ -11,7 +11,7 @@ class Semaphore(ObjectProperties): _binding = semaphore_binding _binding_class = semaphore_binding.SemaphoreObjectType - _namespace = 'http://cybox.mitre.org/objects#SemaphoreObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/semaphore-2' _XSI_NS = "SemaphoreObj" _XSI_TYPE = "SemaphoreObjectType" diff --git a/cybox/objects/sms_message_object.py b/cybox/objects/sms_message_object.py index f68f025e..24671163 100644 --- a/cybox/objects/sms_message_object.py +++ b/cybox/objects/sms_message_object.py @@ -10,7 +10,7 @@ class SMSMessage(ObjectProperties): _binding = sms_binding _binding_class = sms_binding.SMSMessageObjectType - _namespace = 'http://cybox.mitre.org/objects#SMSMessageObject-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/sms-message-1' _XSI_NS = 'SMSMessageObj' _XSI_TYPE = "SMSMessageObjectType" diff --git a/cybox/objects/socket_address_object.py b/cybox/objects/socket_address_object.py index 5945b2cc..5b34d02b 100644 --- a/cybox/objects/socket_address_object.py +++ b/cybox/objects/socket_address_object.py @@ -13,7 +13,7 @@ class SocketAddress(ObjectProperties): _binding = socket_address_binding _binding_class = socket_address_binding.SocketAddressObjectType - _namespace = "http://cybox.mitre.org/objects#SocketAddressObject-1" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/socket-address-1" _XSI_NS = "SocketAddressObj" _XSI_TYPE = "SocketAddressObjectType" diff --git a/cybox/objects/system_object.py b/cybox/objects/system_object.py index df25f5fc..d6123e5d 100644 --- a/cybox/objects/system_object.py +++ b/cybox/objects/system_object.py @@ -12,18 +12,18 @@ class DHCPServerList(entities.EntityList): _binding_class = system_binding.DHCPServerListType - _namespace = "http://cybox.mitre.org/objects#SystemObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/system-2" dhcp_server_address = fields.TypedField("DHCP_Server_Address", Address, multiple=True) class IPGatewayList(entities.EntityList): _binding_class = system_binding.IPGatewayListType - _namespace = "http://cybox.mitre.org/objects#SystemObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/system-2" ip_gateway_address = fields.TypedField("IP_Gateway_Address", Address, multiple=True) class IPInfo(entities.Entity): - _namespace = "http://cybox.mitre.org/objects#SystemObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/system-2" _binding = system_binding _binding_class = system_binding.IPInfoType @@ -33,12 +33,12 @@ class IPInfo(entities.Entity): class IPInfoList(entities.EntityList): _binding_class = system_binding.IPInfoListType - _namespace = "http://cybox.mitre.org/objects#SystemObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/system-2" ip_info_list = fields.TypedField("IP_Info_List", IPInfo, multiple=True) class OS(entities.Entity): - _namespace = "http://cybox.mitre.org/objects#SystemObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/system-2" _binding = system_binding _binding_class = system_binding.OSType @@ -51,7 +51,7 @@ class OS(entities.Entity): class BIOSInfo(entities.Entity): - _namespace = "http://cybox.mitre.org/objects#SystemObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/system-2" _binding = system_binding _binding_class = system_binding.BIOSInfoType @@ -63,7 +63,7 @@ class BIOSInfo(entities.Entity): class NetworkInterface(entities.Entity): - _namespace = "http://cybox.mitre.org/objects#SystemObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/system-2" _binding = system_binding _binding_class = system_binding.NetworkInterfaceType @@ -79,12 +79,12 @@ class NetworkInterface(entities.Entity): class NetworkInterfaceList(entities.EntityList): _binding_class = system_binding.NetworkInterfaceListType - _namespace = "http://cybox.mitre.org/objects#SystemObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/system-2" network_interface = fields.TypedField("Network_Interface", NetworkInterface, multiple=True) class System(ObjectProperties): - _namespace = "http://cybox.mitre.org/objects#SystemObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/system-2" _XSI_NS = "SystemObj" _XSI_TYPE = "SystemObjectType" _binding = system_binding diff --git a/cybox/objects/uri_object.py b/cybox/objects/uri_object.py index 4e0ac02f..de81f9da 100644 --- a/cybox/objects/uri_object.py +++ b/cybox/objects/uri_object.py @@ -12,7 +12,7 @@ class URI(ObjectProperties): _binding = uri_binding _binding_class = uri_binding.URIObjectType - _namespace = 'http://cybox.mitre.org/objects#URIObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/uri-2' _XSI_NS = 'URIObj' _XSI_TYPE = "URIObjectType" diff --git a/cybox/objects/user_account_object.py b/cybox/objects/user_account_object.py index 229289d1..4f11c5f8 100644 --- a/cybox/objects/user_account_object.py +++ b/cybox/objects/user_account_object.py @@ -19,7 +19,7 @@ def __init__(self): class GroupList(entities.EntityList): _binding = user_account_binding _binding_class = user_account_binding.GroupListType - _namespace = 'http://cybox.mitre.org/objects#UserAccountObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/user-account-2' group = fields.TypedField("Group", Group, multiple=True) @@ -33,14 +33,14 @@ def __init__(self): class PrivilegeList(entities.EntityList): _binding = user_account_binding _binding_class = user_account_binding.PrivilegeListType - _namespace = 'http://cybox.mitre.org/objects#UserAccountObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/user-account-2' privilege = fields.TypedField("Privilege", Privilege, multiple=True) class UserAccount(Account): _binding = user_account_binding _binding_class = user_account_binding.UserAccountObjectType - _namespace = 'http://cybox.mitre.org/objects#UserAccountObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/user-account-2' _XSI_NS = "UserAccountObj" _XSI_TYPE = "UserAccountObjectType" diff --git a/cybox/objects/volume_object.py b/cybox/objects/volume_object.py index d6972629..26b54245 100644 --- a/cybox/objects/volume_object.py +++ b/cybox/objects/volume_object.py @@ -11,14 +11,14 @@ class FileSystemFlagList(entities.EntityList): _binding = volume_binding _binding_class = volume_binding.FileSystemFlagListType - _namespace = "http://cybox.mitre.org/objects#VolumeObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/volume-2" file_system_flag = fields.TypedField("File_System_Flag", String, multiple=True) class Volume(ObjectProperties): _binding = volume_binding _binding_class = volume_binding.VolumeObjectType - _namespace = "http://cybox.mitre.org/objects#VolumeObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/volume-2" _XSI_NS = "VolumeObj" _XSI_TYPE = "VolumeObjectType" diff --git a/cybox/objects/whois_object.py b/cybox/objects/whois_object.py index ab00a441..6c23fa1f 100644 --- a/cybox/objects/whois_object.py +++ b/cybox/objects/whois_object.py @@ -15,26 +15,26 @@ class WhoisNameservers(entities.EntityList): _binding = whois_binding _binding_class = whois_binding.WhoisNameserversType - _namespace = "http://cybox.mitre.org/objects#WhoisObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/whois-2" nameserver = fields.TypedField("Nameserver", URI, multiple=True) class WhoisStatus(BaseProperty): _binding = whois_binding _binding_class = whois_binding.WhoisStatusType - _namespace = "http://cybox.mitre.org/objects#WhoisObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/whois-2" datatype = "string" class WhoisStatuses(entities.EntityList): _binding = whois_binding _binding_class = whois_binding.WhoisStatusesType - _namespace = "http://cybox.mitre.org/objects#WhoisObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/whois-2" status = fields.TypedField("Status", WhoisStatus, multiple=True) class WhoisContact(entities.Entity): _binding = whois_binding _binding_class = whois_binding.WhoisContactType - _namespace = "http://cybox.mitre.org/objects#WhoisObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/whois-2" contact_type = fields.TypedField("contact_type") contact_id = fields.TypedField("Contact_ID", String) @@ -49,12 +49,12 @@ class WhoisContact(entities.Entity): class WhoisContacts(entities.EntityList): _binding = whois_binding _binding_class = whois_binding.WhoisContactsType - _namespace = "http://cybox.mitre.org/objects#WhoisObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/whois-2" contact = fields.TypedField("Contact", WhoisContact, multiple=True) class WhoisRegistrant(WhoisContact): - _namespace = "http://cybox.mitre.org/objects#WhoisObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/whois-2" _binding = whois_binding _binding_class = whois_binding.WhoisRegistrantInfoType @@ -64,14 +64,14 @@ class WhoisRegistrant(WhoisContact): class WhoisRegistrants(entities.EntityList): _binding = whois_binding _binding_class = whois_binding.WhoisRegistrantsType - _namespace = "http://cybox.mitre.org/objects#WhoisObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/whois-2" registrant = fields.TypedField("Registrant", WhoisRegistrant, multiple=True) class WhoisRegistrar(entities.Entity): _binding = whois_binding _binding_class = whois_binding.WhoisRegistrarInfoType - _namespace = "http://cybox.mitre.org/objects#WhoisObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/whois-2" registrar_id = fields.TypedField("Registrar_ID", String) registrar_guid = fields.TypedField("Registrar_GUID", String) @@ -87,7 +87,7 @@ class WhoisRegistrar(entities.Entity): class WhoisEntry(ObjectProperties): _binding = whois_binding _binding_class = whois_binding.WhoisObjectType - _namespace = "http://cybox.mitre.org/objects#WhoisObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/whois-2" _XSI_NS = 'WhoisObj' _XSI_TYPE = 'WhoisObjectType' diff --git a/cybox/objects/win_computer_account_object.py b/cybox/objects/win_computer_account_object.py index 64640207..8c088eef 100644 --- a/cybox/objects/win_computer_account_object.py +++ b/cybox/objects/win_computer_account_object.py @@ -13,7 +13,7 @@ class FullyQualifiedName(entities.Entity): _binding = account_binding _binding_class = account_binding.FullyQualifiedNameType - _namespace = 'http://cybox.mitre.org/objects#WinComputerAccountObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-computer-account-2' netbeui_name = fields.TypedField("NetBEUI_Name", String) full_name = fields.TypedField("Full_Name", String) @@ -22,7 +22,7 @@ class FullyQualifiedName(entities.Entity): class KerberosService(entities.Entity): _binding = account_binding _binding_class = account_binding.KerberosServiceType - _namespace = 'http://cybox.mitre.org/objects#WinComputerAccountObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-computer-account-2' computer = fields.TypedField("Computer", String) name = fields.TypedField("Name", String) @@ -33,7 +33,7 @@ class KerberosService(entities.Entity): class KerberosDelegation(entities.Entity): _binding = account_binding _binding_class = account_binding.KerberosDelegationType - _namespace = 'http://cybox.mitre.org/objects#WinComputerAccountObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-computer-account-2' bitmask = fields.TypedField("Bitmask", HexBinary) service = fields.TypedField("Service", KerberosService) @@ -42,7 +42,7 @@ class KerberosDelegation(entities.Entity): class Kerberos(entities.Entity): _binding = account_binding _binding_class = account_binding.KerberosType - _namespace = 'http://cybox.mitre.org/objects#WinComputerAccountObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-computer-account-2' delegation = fields.TypedField("Delegation", KerberosDelegation) ticket = fields.TypedField("Ticket", UnsignedLong) @@ -51,7 +51,7 @@ class Kerberos(entities.Entity): class WinComputerAccount(Account): _binding = account_binding _binding_class = account_binding.WindowsComputerAccountObjectType - _namespace = 'http://cybox.mitre.org/objects#WinComputerAccountObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-computer-account-2' _XSI_NS = "WinComputerAccountObj" _XSI_TYPE = "WindowsComputerAccountObjectType" diff --git a/cybox/objects/win_critical_section_object.py b/cybox/objects/win_critical_section_object.py index c0b21db8..2e430e62 100644 --- a/cybox/objects/win_critical_section_object.py +++ b/cybox/objects/win_critical_section_object.py @@ -10,7 +10,7 @@ class WinCriticalSection(ObjectProperties): _binding = win_critical_section_binding _binding_class = win_critical_section_binding.WindowsCriticalSectionObjectType - _namespace = 'http://cybox.mitre.org/objects#WinCriticalSectionObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-critical-section-2' _XSI_NS = "WinCriticalSectionObj" _XSI_TYPE = "WindowsCriticalSectionObjectType" diff --git a/cybox/objects/win_driver_object.py b/cybox/objects/win_driver_object.py index 8a4a5b6a..8e2cd942 100644 --- a/cybox/objects/win_driver_object.py +++ b/cybox/objects/win_driver_object.py @@ -12,7 +12,7 @@ class DeviceObjectStruct(entities.Entity): _binding = win_driver_binding _binding_class = win_driver_binding.DeviceObjectStructType - _namespace = "http://cybox.mitre.org/objects#WinDriverObject-3" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-driver-3" _XSI_NS = "WinDriverObj" _XSI_TYPE = "DeviceObjectStructType" @@ -29,7 +29,7 @@ class DeviceObjectStruct(entities.Entity): class DeviceObjectList(entities.EntityList): _binding = win_driver_binding _binding_class = win_driver_binding.DeviceObjectListType - _namespace = "http://cybox.mitre.org/objects#WinDriverObject-3" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-driver-3" _XSI_NS = "WinDriverObj" _XSI_TYPE = "DeviceObjectListType" device_object_struct = fields.TypedField("Device_Object_Struct", DeviceObjectStruct, multiple=True) @@ -38,7 +38,7 @@ class DeviceObjectList(entities.EntityList): class WinDriver(WinExecutableFile): _binding = win_driver_binding _binding_class = win_driver_binding.WindowsDriverObjectType - _namespace = "http://cybox.mitre.org/objects#WinDriverObject-3" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-driver-3" _XSI_NS = "WinDriverObj" _XSI_TYPE = "WindowsDriverObjectType" diff --git a/cybox/objects/win_event_log_object.py b/cybox/objects/win_event_log_object.py index 34164b34..c05e6138 100644 --- a/cybox/objects/win_event_log_object.py +++ b/cybox/objects/win_event_log_object.py @@ -11,14 +11,14 @@ class UnformattedMessageList(entities.EntityList): _binding = win_event_log_binding _binding_class = win_event_log_binding.UnformattedMessageListType - _namespace = "http://cybox.mitre.org/objects#WinEventLogObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-event-log-2" unformatted_message = fields.TypedField("Unformatted_Message", String, multiple=True) class WinEventLog(ObjectProperties): _binding = win_event_log_binding _binding_class = win_event_log_binding.WindowsEventLogObjectType - _namespace = "http://cybox.mitre.org/objects#WinEventLogObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-event-log-2" _XSI_NS = "WinEventLogObj" _XSI_TYPE = "WindowsEventLogObjectType" diff --git a/cybox/objects/win_event_object.py b/cybox/objects/win_event_object.py index 1f080cbd..ac653fd1 100644 --- a/cybox/objects/win_event_object.py +++ b/cybox/objects/win_event_object.py @@ -12,7 +12,7 @@ class WinEvent(ObjectProperties): _binding = win_event_binding _binding_class = win_event_binding.WindowsEventObjectType - _namespace = "http://cybox.mitre.org/objects#WinEventObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-event-2" _XSI_NS = "WinEventObj" _XSI_TYPE = "WindowsEventObjectType" diff --git a/cybox/objects/win_executable_file_object.py b/cybox/objects/win_executable_file_object.py index 2e4a8507..16cb5f6d 100644 --- a/cybox/objects/win_executable_file_object.py +++ b/cybox/objects/win_executable_file_object.py @@ -13,7 +13,7 @@ class Entropy(entities.Entity): _binding = win_executable_file_binding _binding_class = win_executable_file_binding.EntropyType - _namespace = "http://cybox.mitre.org/objects#WinExecutableFileObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2" value = fields.TypedField("Value", Float) min = fields.TypedField("Min", Float) @@ -23,7 +23,7 @@ class Entropy(entities.Entity): class PEBuildInformation(entities.Entity): _binding = win_executable_file_binding _binding_class = win_executable_file_binding.PEBuildInformationType - _namespace = "http://cybox.mitre.org/objects#WinExecutableFileObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2" linker_name = fields.TypedField("Linker_Name", String) linker_version = fields.TypedField("Linker_Version", String) @@ -34,7 +34,7 @@ class PEBuildInformation(entities.Entity): class PEExportedFunction(entities.Entity): _binding = win_executable_file_binding _binding_class = win_executable_file_binding.PEExportedFunctionType - _namespace = "http://cybox.mitre.org/objects#WinExecutableFileObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2" function_name = fields.TypedField("Function_Name", String) entry_point = fields.TypedField("Entry_Point", HexBinary) @@ -43,14 +43,14 @@ class PEExportedFunction(entities.Entity): class PEExportedFunctions(entities.EntityList): _binding_class = win_executable_file_binding.PEExportedFunctionsType - _namespace = "http://cybox.mitre.org/objects#WinExecutableFileObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2" exported_function = fields.TypedField("Exported_Function", PEExportedFunction, multiple=True) class PEExports(entities.Entity): _binding = win_executable_file_binding _binding_class = win_executable_file_binding.PEExportsType - _namespace = "http://cybox.mitre.org/objects#WinExecutableFileObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2" name = fields.TypedField("Name", String) exported_functions = fields.TypedField("Exported_Functions", PEExportedFunctions) @@ -63,7 +63,7 @@ class PEExports(entities.Entity): class DOSHeader(entities.Entity): _binding = win_executable_file_binding _binding_class = win_executable_file_binding.DOSHeaderType - _namespace = "http://cybox.mitre.org/objects#WinExecutableFileObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2" e_magic = fields.TypedField("e_magic", HexBinary) e_cblp = fields.TypedField("e_cblp", HexBinary) @@ -90,7 +90,7 @@ class DOSHeader(entities.Entity): class PEFileHeader(entities.Entity): _binding = win_executable_file_binding _binding_class = win_executable_file_binding.PEFileHeaderType - _namespace = "http://cybox.mitre.org/objects#WinExecutableFileObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2" machine = fields.TypedField("Machine", HexBinary) number_of_sections = fields.TypedField("Number_Of_Sections", NonNegativeInteger) @@ -105,7 +105,7 @@ class PEFileHeader(entities.Entity): class PEDataDirectoryStruct(entities.Entity): _binding = win_executable_file_binding _binding_class = win_executable_file_binding.PEDataDirectoryStructType - _namespace = "http://cybox.mitre.org/objects#WinExecutableFileObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2" virtual_address = fields.TypedField("Virtual_Address", HexBinary) size = fields.TypedField("Size", NonNegativeInteger) @@ -114,7 +114,7 @@ class PEDataDirectoryStruct(entities.Entity): class DataDirectory(entities.Entity): _binding = win_executable_file_binding _binding_class = win_executable_file_binding.DataDirectoryType - _namespace = "http://cybox.mitre.org/objects#WinExecutableFileObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2" export_table = fields.TypedField("Export_Table", PEDataDirectoryStruct) import_table = fields.TypedField("Import_Table", PEDataDirectoryStruct) @@ -137,7 +137,7 @@ class DataDirectory(entities.Entity): class PEOptionalHeader(entities.Entity): _binding = win_executable_file_binding _binding_class = win_executable_file_binding.PEOptionalHeaderType - _namespace = "http://cybox.mitre.org/objects#WinExecutableFileObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2" magic = fields.TypedField("Magic", HexBinary) major_linker_version = fields.TypedField("Major_Linker_Version", HexBinary) @@ -176,7 +176,7 @@ class PEOptionalHeader(entities.Entity): class PEHeaders(entities.Entity): _binding = win_executable_file_binding _binding_class = win_executable_file_binding.PEHeadersType - _namespace = "http://cybox.mitre.org/objects#WinExecutableFileObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2" dos_header = fields.TypedField("DOS_Header", DOSHeader) signature = fields.TypedField("Signature", HexBinary) @@ -189,7 +189,7 @@ class PEHeaders(entities.Entity): class PEImportedFunction(entities.Entity): _binding = win_executable_file_binding _binding_class = win_executable_file_binding.PEImportedFunctionType - _namespace = "http://cybox.mitre.org/objects#WinExecutableFileObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2" function_name = fields.TypedField("Function_Name", String) hint = fields.TypedField("Hint", HexBinary) @@ -200,14 +200,14 @@ class PEImportedFunction(entities.Entity): class PEImportedFunctions(entities.EntityList): _binding_class = win_executable_file_binding.PEImportedFunctionsType - _namespace = "http://cybox.mitre.org/objects#WinExecutableFileObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2" imported_function = fields.TypedField("Imported_Function", PEImportedFunction, multiple=True) class PEImport(entities.Entity): _binding = win_executable_file_binding _binding_class = win_executable_file_binding.PEImportType - _namespace = "http://cybox.mitre.org/objects#WinExecutableFileObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2" delay_load = fields.TypedField("delay_load") initially_visible = fields.TypedField("initially_visible") @@ -218,14 +218,14 @@ class PEImport(entities.Entity): class PEImportList(entities.EntityList): _binding_class = win_executable_file_binding.PEImportListType - _namespace = "http://cybox.mitre.org/objects#WinExecutableFileObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2" import_ = fields.TypedField("Import", PEImport, multiple=True) class PEChecksum(entities.Entity): _binding = win_executable_file_binding _binding_class = win_executable_file_binding.PEChecksumType - _namespace = "http://cybox.mitre.org/objects#WinExecutableFileObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2" pe_computed_api = fields.TypedField("PE_Computed_API", Long) pe_file_api = fields.TypedField("PE_File_API", Long) @@ -235,7 +235,7 @@ class PEChecksum(entities.Entity): class PEResource(entities.Entity): _binding = win_executable_file_binding _binding_class = win_executable_file_binding.PEResourceType - _namespace = "http://cybox.mitre.org/objects#WinExecutableFileObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2" type_ = fields.TypedField("Type", String) name = fields.TypedField("Name", String) @@ -249,7 +249,7 @@ class PEResource(entities.Entity): class PEResourceList(entities.EntityList): _binding_class = win_executable_file_binding.PEResourceListType - _namespace = "http://cybox.mitre.org/objects#WinExecutableFileObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2" resource = fields.TypedField("Resource", PEResource, multiple=True) #VersionInfoResource temporary fix @@ -273,7 +273,7 @@ def from_list(cls, seq): class PESectionHeaderStruct(entities.Entity): _binding = win_executable_file_binding _binding_class = win_executable_file_binding.PESectionHeaderStructType - _namespace = "http://cybox.mitre.org/objects#WinExecutableFileObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2" name = fields.TypedField("Name", String) virtual_size = fields.TypedField("Virtual_Size", HexBinary) @@ -290,7 +290,7 @@ class PESectionHeaderStruct(entities.Entity): class PESection(entities.Entity): _binding = win_executable_file_binding _binding_class = win_executable_file_binding.PESectionType - _namespace = "http://cybox.mitre.org/objects#WinExecutableFileObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2" section_header = fields.TypedField("Section_Header", PESectionHeaderStruct) data_hashes = fields.TypedField("Data_Hashes", HashList) @@ -300,14 +300,14 @@ class PESection(entities.Entity): class PESectionList(entities.EntityList): _binding_class = win_executable_file_binding.PESectionListType - _namespace = "http://cybox.mitre.org/objects#WinExecutableFileObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2" section = fields.TypedField("Section", PESection, multiple=True) class PEVersionInfoResource(PEResource): _binding = win_executable_file_binding _binding_class = win_executable_file_binding.PEVersionInfoResourceType - _namespace = "http://cybox.mitre.org/objects#WinExecutableFileObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2" comments = fields.TypedField("Comments", String) companyname = fields.TypedField("CompanyName", String) @@ -344,7 +344,7 @@ def keyword_test(pe_resource_dict): class WinExecutableFile(WinFile): _binding = win_executable_file_binding _binding_class = win_executable_file_binding.WindowsExecutableFileObjectType - _namespace = "http://cybox.mitre.org/objects#WinExecutableFileObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2" _XSI_NS = "WinExecutableFileObj" _XSI_TYPE = "WindowsExecutableFileObjectType" diff --git a/cybox/objects/win_file_object.py b/cybox/objects/win_file_object.py index 8a9c023c..493f5643 100644 --- a/cybox/objects/win_file_object.py +++ b/cybox/objects/win_file_object.py @@ -12,7 +12,7 @@ class Stream(entities.Entity): _binding = win_file_binding _binding_class = win_file_binding.StreamObjectType - _namespace = 'http://cybox.mitre.org/objects#WinFileObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-file-2' name = fields.TypedField("Name", String) size_in_bytes = fields.TypedField("Size_In_Bytes", UnsignedLong) @@ -22,27 +22,27 @@ class Stream(entities.Entity): class StreamList(entities.EntityList): _binding = win_file_binding _binding_class = win_file_binding.StreamListType - _namespace = 'http://cybox.mitre.org/objects#WinFileObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-file-2' stream = fields.TypedField("Stream", Stream, multiple=True) class WindowsFileAttribute(String): _binding = win_file_binding _binding_class = win_file_binding.WindowsFileAttributeType - _namespace = 'http://cybox.mitre.org/objects#WinFileObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-file-2' class WindowsFileAttributes(FileAttribute, entities.EntityList): _binding = win_file_binding _binding_class = win_file_binding.WindowsFileAttributesType - _namespace = 'http://cybox.mitre.org/objects#WinFileObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-file-2' attribute = fields.TypedField("Attribute", WindowsFileAttribute, multiple=True) class WindowsFilePermissions(FilePermissions): _binding = win_file_binding _binding_class = win_file_binding.WindowsFilePermissionsType - _namespace = 'http://cybox.mitre.org/objects#WinFileObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-file-2' full_control = fields.TypedField("Full_Control") modify = fields.TypedField("Modify") @@ -54,7 +54,7 @@ class WindowsFilePermissions(FilePermissions): class WinFile(File): _binding = win_file_binding _binding_class = win_file_binding.WindowsFileObjectType - _namespace = 'http://cybox.mitre.org/objects#WinFileObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-file-2' _XSI_NS = "WinFileObj" _XSI_TYPE = "WindowsFileObjectType" diff --git a/cybox/objects/win_filemapping_object.py b/cybox/objects/win_filemapping_object.py index 48547fa5..2efa86a2 100644 --- a/cybox/objects/win_filemapping_object.py +++ b/cybox/objects/win_filemapping_object.py @@ -11,7 +11,7 @@ class WinFilemapping(ObjectProperties): _binding = win_filemapping_binding _binding_class = win_filemapping_binding.WindowsFilemappingObjectType - _namespace = "http://cybox.mitre.org/objects#WinFilemappingObject-1" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-filemapping-1" _XSI_NS = "WinFilemappingObj" _XSI_TYPE = "WindowsFilemappingObjectType" diff --git a/cybox/objects/win_handle_object.py b/cybox/objects/win_handle_object.py index d18350e2..e4723de4 100644 --- a/cybox/objects/win_handle_object.py +++ b/cybox/objects/win_handle_object.py @@ -12,7 +12,7 @@ class WinHandle(ObjectProperties): _binding = win_handle_binding _binding_class = win_handle_binding.WindowsHandleObjectType - _namespace = 'http://cybox.mitre.org/objects#WinHandleObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-handle-2' _XSI_NS = "WinHandleObj" _XSI_TYPE = "WindowsHandleObjectType" @@ -27,5 +27,5 @@ class WinHandle(ObjectProperties): class WinHandleList(entities.EntityList): _binding = win_handle_binding _binding_class = win_handle_binding.WindowsHandleListType - _namespace = 'http://cybox.mitre.org/objects#WinHandleObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-handle-2' handle = fields.TypedField("Handle", WinHandle, multiple=True) \ No newline at end of file diff --git a/cybox/objects/win_hook_object.py b/cybox/objects/win_hook_object.py index 309f3f83..a5301822 100644 --- a/cybox/objects/win_hook_object.py +++ b/cybox/objects/win_hook_object.py @@ -12,7 +12,7 @@ class WinHook(ObjectProperties): _binding = win_hook_binding _binding_class = win_hook_binding.WindowsHookObjectType - _namespace = 'http://cybox.mitre.org/objects#WinHookObject-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-hook-1' _XSI_NS = "WinHookObj" _XSI_TYPE = "WindowsHookObjectType" diff --git a/cybox/objects/win_kernel_hook_object.py b/cybox/objects/win_kernel_hook_object.py index dbda7f26..8cdabb65 100644 --- a/cybox/objects/win_kernel_hook_object.py +++ b/cybox/objects/win_kernel_hook_object.py @@ -11,7 +11,7 @@ class WinKernelHook(ObjectProperties): _binding = win_kernel_hook_binding _binding_class = win_kernel_hook_binding.WindowsKernelHookObjectType - _namespace = "http://cybox.mitre.org/objects#WinKernelHookObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-kernel-hook-2" _XSI_NS = "WinKernelHookObj" _XSI_TYPE = "WindowsKernelHookObjectType" diff --git a/cybox/objects/win_kernel_object.py b/cybox/objects/win_kernel_object.py index 1a251851..de92ea68 100644 --- a/cybox/objects/win_kernel_object.py +++ b/cybox/objects/win_kernel_object.py @@ -9,7 +9,7 @@ class IDTEntry(entities.Entity): - _namespace = "http://cybox.mitre.org/objects#WinKernelObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-kernel-2" _binding = win_kernel_binding _binding_class = win_kernel_binding.IDTEntryType @@ -23,12 +23,12 @@ class IDTEntry(entities.Entity): class IDTEntryList(entities.EntityList): _binding = win_kernel_binding _binding_class = win_kernel_binding.IDTEntryListType - _namespace = "http://cybox.mitre.org/objects#WinKernelObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-kernel-2" idt_entry = fields.TypedField("IDT_Entry", IDTEntry, multiple=True) class SSDTEntry(entities.Entity): - _namespace = "http://cybox.mitre.org/objects#WinKernelObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-kernel-2" _binding = win_kernel_binding _binding_class = win_kernel_binding.SSDTEntryType @@ -42,14 +42,14 @@ class SSDTEntry(entities.Entity): class SSDTEntryList(entities.EntityList): _binding = win_kernel_binding _binding_class = win_kernel_binding.SSDTEntryListType - _namespace = "http://cybox.mitre.org/objects#WinKernelObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-kernel-2" ssdt_entry = fields.TypedField("SSDT_Entry", SSDTEntry, multiple=True) class WinKernel(ObjectProperties): _binding = win_kernel_binding _binding_class = win_kernel_binding.WindowsKernelObjectType - _namespace = "http://cybox.mitre.org/objects#WinKernelObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-kernel-2" _XSI_NS = "WinKernelObj" _XSI_TYPE = "WindowsKernelObjectType" diff --git a/cybox/objects/win_mailslot_object.py b/cybox/objects/win_mailslot_object.py index 16aff11a..0b8a3532 100644 --- a/cybox/objects/win_mailslot_object.py +++ b/cybox/objects/win_mailslot_object.py @@ -11,7 +11,7 @@ class WinMailslot(ObjectProperties): _binding = win_mailslot_binding _binding_class = win_mailslot_binding.WindowsMailslotObjectType - _namespace = "http://cybox.mitre.org/objects#WinMailslotObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-mailslot-2" _XSI_NS = "WinMailslotObj" _XSI_TYPE = "WindowsMailslotObjectType" diff --git a/cybox/objects/win_memory_page_region_object.py b/cybox/objects/win_memory_page_region_object.py index 5c984372..4bd4c706 100644 --- a/cybox/objects/win_memory_page_region_object.py +++ b/cybox/objects/win_memory_page_region_object.py @@ -11,7 +11,7 @@ class WinMemoryPageRegion(Memory): _binding = win_memory_page_region_binding _binding_class = win_memory_page_region_binding.WindowsMemoryPageRegionObjectType - _namespace = "http://cybox.mitre.org/objects#WinMemoryPageRegionObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-memory-page-region-2" _XSI_NS = "WinMemoryPageRegionObj" _XSI_TYPE = "WindowsMemoryPageRegionObjectType" diff --git a/cybox/objects/win_mutex_object.py b/cybox/objects/win_mutex_object.py index 30a00e08..cbe8ece9 100644 --- a/cybox/objects/win_mutex_object.py +++ b/cybox/objects/win_mutex_object.py @@ -12,7 +12,7 @@ class WinMutex(Mutex): _binding = win_mutex_binding _binding_class = win_mutex_binding.WindowsMutexObjectType - _namespace = "http://cybox.mitre.org/objects#WinMutexObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-mutex-2" _XSI_NS = "WinMutexObj" _XSI_TYPE = "WindowsMutexObjectType" diff --git a/cybox/objects/win_network_route_entry_object.py b/cybox/objects/win_network_route_entry_object.py index 61af9793..df77d184 100644 --- a/cybox/objects/win_network_route_entry_object.py +++ b/cybox/objects/win_network_route_entry_object.py @@ -11,7 +11,7 @@ class WinNetworkRouteEntry(NetworkRouteEntry): _binding = win_network_route_entry_binding _binding_class = win_network_route_entry_binding.WindowsNetworkRouteEntryObjectType - _namespace = "http://cybox.mitre.org/objects#WinNetworkRouteEntryObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-network-route-entry-2" _XSI_NS = "WinNetworkRouteEntryObj" _XSI_TYPE = "WindowsNetworkRouteEntryObjectType" diff --git a/cybox/objects/win_network_share_object.py b/cybox/objects/win_network_share_object.py index b84ca6d5..f98abbb7 100644 --- a/cybox/objects/win_network_share_object.py +++ b/cybox/objects/win_network_share_object.py @@ -10,7 +10,7 @@ class WinNetworkShare(ObjectProperties): _binding = win_network_share_binding _binding_class = win_network_share_binding.WindowsNetworkShareObjectType - _namespace = "http://cybox.mitre.org/objects#WinNetworkShareObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-network-share-2" _XSI_NS = "WinNetworkShareObj" _XSI_TYPE = "WindowsNetworkShareObjectType" diff --git a/cybox/objects/win_pipe_object.py b/cybox/objects/win_pipe_object.py index bbbd355b..e88beaca 100644 --- a/cybox/objects/win_pipe_object.py +++ b/cybox/objects/win_pipe_object.py @@ -12,7 +12,7 @@ class WinPipe(Pipe): _binding = win_pipe_binding _binding_class = win_pipe_binding.WindowsPipeObjectType - _namespace = 'http://cybox.mitre.org/objects#WinPipeObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-pipe-2' _XSI_NS = "WinPipeObj" _XSI_TYPE = "WindowsPipeObjectType" diff --git a/cybox/objects/win_prefetch_object.py b/cybox/objects/win_prefetch_object.py index 87325967..9bd7182c 100644 --- a/cybox/objects/win_prefetch_object.py +++ b/cybox/objects/win_prefetch_object.py @@ -13,21 +13,21 @@ class AccessedFileList(entities.EntityList): _binding = win_prefetch_binding _binding_class = win_prefetch_binding.AccessedFileListType - _namespace = "http://cybox.mitre.org/objects#WinPrefetchObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-prefetch-2" accessed_file = fields.TypedField("Accessed_File", String, multiple=True) class AccessedDirectoryList(entities.EntityList): _binding = win_prefetch_binding _binding_class = win_prefetch_binding.AccessedDirectoryListType - _namespace = "http://cybox.mitre.org/objects#WinPrefetchObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-prefetch-2" accessed_directory = fields.TypedField("Accessed_Directory", String, multiple=True) class Volume(entities.Entity): _binding = win_prefetch_binding _binding_class = win_prefetch_binding.VolumeType - _namespace = "http://cybox.mitre.org/objects#WinPrefetchObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-prefetch-2" volumeitem = fields.TypedField("VolumeItem", WinVolume, multiple=True) deviceitem = fields.TypedField("DeviceItem", Device, multiple=True) @@ -36,7 +36,7 @@ class Volume(entities.Entity): class WinPrefetch(ObjectProperties): _binding = win_prefetch_binding _binding_class = win_prefetch_binding.WindowsPrefetchObjectType - _namespace = "http://cybox.mitre.org/objects#WinPrefetchObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-prefetch-2" _XSI_NS = "WinPrefetchObj" _XSI_TYPE = "WindowsPrefetchObjectType" diff --git a/cybox/objects/win_process_object.py b/cybox/objects/win_process_object.py index 949fbaa7..4ffa65f9 100644 --- a/cybox/objects/win_process_object.py +++ b/cybox/objects/win_process_object.py @@ -16,14 +16,14 @@ class MemorySectionList(entities.EntityList): _binding = win_process_binding _binding_class = win_process_binding.MemorySectionListType - _namespace = "http://cybox.mitre.org/objects#WinProcessObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-process-2" memory_section = fields.TypedField("Memory_Section", Memory, multiple=True) class StartupInfo(entities.Entity): _binding = win_process_binding _binding_class = win_process_binding.StartupInfoType - _namespace = "http://cybox.mitre.org/objects#WinProcessObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-process-2" lpdesktop = fields.TypedField("lpDesktop", String) lptitle = fields.TypedField("lpTitle", String) @@ -44,7 +44,7 @@ class StartupInfo(entities.Entity): class WinProcess(Process): _binding = win_process_binding _binding_class = win_process_binding.WindowsProcessObjectType - _namespace = "http://cybox.mitre.org/objects#WinProcessObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-process-2" _XSI_NS = "WinProcessObj" _XSI_TYPE = "WindowsProcessObjectType" diff --git a/cybox/objects/win_registry_key_object.py b/cybox/objects/win_registry_key_object.py index 6f88504c..da875f32 100644 --- a/cybox/objects/win_registry_key_object.py +++ b/cybox/objects/win_registry_key_object.py @@ -14,7 +14,7 @@ class RegistryValue(entities.Entity): _binding = win_registry_key_binding _binding_class = win_registry_key_binding.RegistryValueType - _namespace = "http://cybox.mitre.org/objects#WinRegistryKeyObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-registry-key-2" name = fields.TypedField("Name", String) data = fields.TypedField("Data", String) @@ -25,21 +25,21 @@ class RegistryValue(entities.Entity): class RegistryValues(entities.EntityList): _binding = win_registry_key_binding _binding_class = win_registry_key_binding.RegistryValuesType - _namespace = "http://cybox.mitre.org/objects#WinRegistryKeyObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-registry-key-2" value = fields.TypedField("Value", RegistryValue, multiple=True) class RegistrySubkeys(entities.EntityList): _binding = win_registry_key_binding _binding_class = win_registry_key_binding.RegistrySubkeysType - _namespace = "http://cybox.mitre.org/objects#WinRegistryKeyObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-registry-key-2" subkey = fields.TypedField("Subkey", type_="cybox.objects.win_registry_key_object.WinRegistryKey", multiple=True) class WinRegistryKey(ObjectProperties): _binding = win_registry_key_binding _binding_class = win_registry_key_binding.WindowsRegistryKeyObjectType - _namespace = "http://cybox.mitre.org/objects#WinRegistryKeyObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-registry-key-2" _XSI_NS = "WinRegistryKeyObj" _XSI_TYPE = "WindowsRegistryKeyObjectType" diff --git a/cybox/objects/win_semaphore_object.py b/cybox/objects/win_semaphore_object.py index 8c5d4c29..4e91f2c9 100644 --- a/cybox/objects/win_semaphore_object.py +++ b/cybox/objects/win_semaphore_object.py @@ -12,7 +12,7 @@ class WinSemaphore(Semaphore): _binding = semaphore_binding _binding_class = semaphore_binding.WindowsSemaphoreObjectType - _namespace = 'http://cybox.mitre.org/objects#WinSemaphoreObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-semaphore-2' _XSI_NS = "WinSemaphoreObj" _XSI_TYPE = "WindowsSemaphoreObjectType" diff --git a/cybox/objects/win_service_object.py b/cybox/objects/win_service_object.py index dc9b0ae7..dc5c9dc1 100644 --- a/cybox/objects/win_service_object.py +++ b/cybox/objects/win_service_object.py @@ -13,14 +13,14 @@ class ServiceDescriptionList(entities.EntityList): _binding = win_service_binding _binding_class = win_service_binding.ServiceDescriptionListType - _namespace = "http://cybox.mitre.org/objects#WinServiceObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-service-2" description = fields.TypedField("Description", String, multiple=True) class WinService(WinProcess): _binding = win_service_binding _binding_class = win_service_binding.WindowsServiceObjectType - _namespace = "http://cybox.mitre.org/objects#WinServiceObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-service-2" _XSI_NS = "WinServiceObj" _XSI_TYPE = "WindowsServiceObjectType" diff --git a/cybox/objects/win_system_object.py b/cybox/objects/win_system_object.py index 00a84548..03dff6aa 100644 --- a/cybox/objects/win_system_object.py +++ b/cybox/objects/win_system_object.py @@ -13,7 +13,7 @@ class GlobalFlag(entities.Entity): _binding = win_system_binding _binding_class = win_system_binding.GlobalFlagType - _namespace = "http://cybox.mitre.org/objects#WinSystemObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-system-2" abbreviation = fields.TypedField("Abbreviation", String) destination = fields.TypedField("Destination", String) @@ -24,14 +24,14 @@ class GlobalFlag(entities.Entity): class GlobalFlagList(entities.EntityList): _binding = win_system_binding _binding_class = win_system_binding.GlobalFlagListType - _namespace = "http://cybox.mitre.org/objects#WinSystemObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-system-2" global_flag = fields.TypedField("Global_Flag", GlobalFlag, multiple=True) class WinSystem(System): _binding = win_system_binding _binding_class = win_system_binding.WindowsSystemObjectType - _namespace = "http://cybox.mitre.org/objects#WinSystemObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-system-2" _XSI_NS = "WinSystemObj" _XSI_TYPE = "WindowsSystemObjectType" diff --git a/cybox/objects/win_system_restore_object.py b/cybox/objects/win_system_restore_object.py index 323d761c..4bfedbe6 100644 --- a/cybox/objects/win_system_restore_object.py +++ b/cybox/objects/win_system_restore_object.py @@ -11,14 +11,14 @@ class HiveList(entities.EntityList): _binding = win_system_restore_binding _binding_class = win_system_restore_binding.HiveListType - _namespace = "http://cybox.mitre.org/objects#WinSystemObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-system-2" hive = fields.TypedField("Hive", String, multiple=True) class WinSystemRestore(ObjectProperties): _binding = win_system_restore_binding _binding_class = win_system_restore_binding.WindowsSystemRestoreObjectType - _namespace = "http://cybox.mitre.org/objects#WinSystemRestoreObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-system-restore-2" _XSI_NS = "WinSystemRestoreObj" _XSI_TYPE = "WindowsSystemRestoreObjectType" diff --git a/cybox/objects/win_task_object.py b/cybox/objects/win_task_object.py index 12f7e82c..2190d089 100644 --- a/cybox/objects/win_task_object.py +++ b/cybox/objects/win_task_object.py @@ -13,7 +13,7 @@ class Trigger(entities.Entity): _binding = win_task_binding _binding_class = win_task_binding.TriggerType - _namespace = 'http://cybox.mitre.org/objects#WinTaskObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-task-2' trigger_begin = fields.TypedField("Trigger_Begin", DateTime) trigger_delay = fields.TypedField("Trigger_Delay", Duration) @@ -28,14 +28,14 @@ class Trigger(entities.Entity): class TriggerList(entities.EntityList): _binding = win_task_binding _binding_class = win_task_binding.TriggerListType - _namespace = 'http://cybox.mitre.org/objects#WinTaskObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-task-2' trigger = fields.TypedField("Trigger", Trigger, multiple=True) class IComHandlerAction(entities.Entity): _binding = win_task_binding _binding_class = win_task_binding.IComHandlerActionType - _namespace = 'http://cybox.mitre.org/objects#WinTaskObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-task-2' com_data = fields.TypedField("COM_Data", String) com_class_id = fields.TypedField("COM_Class_ID", String) @@ -44,7 +44,7 @@ class IComHandlerAction(entities.Entity): class IExecAction(entities.Entity): _binding = win_task_binding _binding_class = win_task_binding.IExecActionType - _namespace = 'http://cybox.mitre.org/objects#WinTaskObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-task-2' exec_arguments = fields.TypedField("Exec_Arguments", String) exec_program_path = fields.TypedField("Exec_Program_Path", String) @@ -55,7 +55,7 @@ class IExecAction(entities.Entity): class IShowMessageAction(entities.Entity): _binding = win_task_binding _binding_class = win_task_binding.IShowMessageActionType - _namespace = 'http://cybox.mitre.org/objects#WinTaskObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-task-2' show_message_body = fields.TypedField("Show_Message_Body", String) show_message_title = fields.TypedField("Show_Message_Title", String) @@ -64,7 +64,7 @@ class IShowMessageAction(entities.Entity): class TaskAction(entities.Entity): _binding = win_task_binding _binding_class = win_task_binding.TaskActionType - _namespace = 'http://cybox.mitre.org/objects#WinTaskObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-task-2' action_type = fields.TypedField("Action_Type", String) action_id = fields.TypedField("Action_ID", String) @@ -79,14 +79,14 @@ class TaskAction(entities.Entity): class TaskActionList(entities.EntityList): _binding = win_task_binding _binding_class = win_task_binding.TaskActionListType - _namespace = 'http://cybox.mitre.org/objects#WinTaskObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-task-2' action = fields.TypedField("Action", TaskAction, multiple=True) class WinTask(ObjectProperties): _binding = win_task_binding _binding_class = win_task_binding.WindowsTaskObjectType - _namespace = 'http://cybox.mitre.org/objects#WinTaskObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-task-2' _XSI_NS = "WinTaskObj" _XSI_TYPE = "WindowsTaskObjectType" diff --git a/cybox/objects/win_thread_object.py b/cybox/objects/win_thread_object.py index 08e063d2..e1c8fe45 100644 --- a/cybox/objects/win_thread_object.py +++ b/cybox/objects/win_thread_object.py @@ -12,7 +12,7 @@ class WinThread(ObjectProperties): _binding = win_thread_binding _binding_class = win_thread_binding.WindowsThreadObjectType - _namespace = 'http://cybox.mitre.org/objects#WinThreadObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-thread-2' _XSI_NS = "WinThreadObj" _XSI_TYPE = "WindowsThreadObjectType" diff --git a/cybox/objects/win_user_object.py b/cybox/objects/win_user_object.py index f6abadb3..784e2611 100644 --- a/cybox/objects/win_user_object.py +++ b/cybox/objects/win_user_object.py @@ -13,7 +13,7 @@ class WinGroup(entities.Entity): _binding = win_user_binding _binding_class = win_user_binding.WindowsGroupType - _namespace = 'http://cybox.mitre.org/objects#WinUserAccountObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-user-account-2' name = fields.TypedField("Name", String) @@ -27,7 +27,7 @@ class WinGroupList(GroupList): class WinPrivilege(entities.Entity): _binding = win_user_binding _binding_class = win_user_binding.WindowsPrivilegeType - _namespace = 'http://cybox.mitre.org/objects#WinUserAccountObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-user-account-2' user_right = fields.TypedField("User_Right", String) @@ -41,7 +41,7 @@ class WinPrivilegeList(PrivilegeList): class WinUser(UserAccount): _binding = win_user_binding _binding_class = win_user_binding.WindowsUserAccountObjectType - _namespace = 'http://cybox.mitre.org/objects#WinUserAccountObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/win-user-account-2' _XSI_NS = "WinUserAccountObj" _XSI_TYPE = "WindowsUserAccountObjectType" diff --git a/cybox/objects/win_volume_object.py b/cybox/objects/win_volume_object.py index 54924ad5..53dfc0f7 100644 --- a/cybox/objects/win_volume_object.py +++ b/cybox/objects/win_volume_object.py @@ -12,14 +12,14 @@ class WindowsVolumeAttributesList(entities.EntityList): _binding = win_volume_binding _binding_class = win_volume_binding.WindowsVolumeAttributesListType - _namespace = "http://cybox.mitre.org/objects#WinVolumeObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-volume-2" attribute = fields.TypedField("Attribute", String, multiple=True) class WinVolume(Volume): _binding = win_volume_binding _binding_class = win_volume_binding.WindowsVolumeObjectType - _namespace = "http://cybox.mitre.org/objects#WinVolumeObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-volume-2" _XSI_NS = "WinVolumeObj" _XSI_TYPE = "WindowsVolumeObjectType" diff --git a/cybox/objects/win_waitable_timer_object.py b/cybox/objects/win_waitable_timer_object.py index 0fce1e2f..555ebdf2 100644 --- a/cybox/objects/win_waitable_timer_object.py +++ b/cybox/objects/win_waitable_timer_object.py @@ -10,7 +10,7 @@ class WinWaitableTimer(ObjectProperties): _binding = win_waitable_timer_binding _binding_class = win_waitable_timer_binding.WindowsWaitableTimerObjectType - _namespace = "http://cybox.mitre.org/objects#WinWaitableTimerObject-2" + _namespace = "http://docs.oasis-open.org/cti/ns/cybox/objects/win-waitable-timer-2" _XSI_NS = "WinWaitableTimerObj" _XSI_TYPE = "WindowsWaitableTimerObjectType" diff --git a/cybox/objects/x509_certificate_object.py b/cybox/objects/x509_certificate_object.py index ec3cc60b..e2daa229 100644 --- a/cybox/objects/x509_certificate_object.py +++ b/cybox/objects/x509_certificate_object.py @@ -11,7 +11,7 @@ class Validity(entities.Entity): _binding = x509_certificate_binding _binding_class = x509_certificate_binding.ValidityType - _namespace = 'http://cybox.mitre.org/objects#X509CertificateObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/x509-certificate-2' not_before = fields.TypedField("Not_Before", DateTime) not_after = fields.TypedField("Not_After", DateTime) @@ -19,7 +19,7 @@ class Validity(entities.Entity): class RSAPublicKey(entities.Entity): _binding = x509_certificate_binding _binding_class = x509_certificate_binding.RSAPublicKeyType - _namespace = 'http://cybox.mitre.org/objects#X509CertificateObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/x509-certificate-2' modulus = fields.TypedField("Modulus", String) exponent = fields.TypedField("Exponent", Integer) @@ -28,7 +28,7 @@ class RSAPublicKey(entities.Entity): class SubjectPublicKey(entities.Entity): _binding = x509_certificate_binding _binding_class = x509_certificate_binding.SubjectPublicKeyType - _namespace = 'http://cybox.mitre.org/objects#X509CertificateObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/x509-certificate-2' public_key_algorithm = fields.TypedField("Public_Key_Algorithm", String) rsa_public_key = fields.TypedField("RSA_Public_Key", RSAPublicKey) @@ -37,7 +37,7 @@ class SubjectPublicKey(entities.Entity): class X509V3Extensions(entities.Entity): _binding = x509_certificate_binding _binding_class = x509_certificate_binding.X509V3ExtensionsType - _namespace = 'http://cybox.mitre.org/objects#X509CertificateObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/x509-certificate-2' basic_constraints = fields.TypedField("Basic_Constraints", String) name_constraints = fields.TypedField("Name_Constraints", String) @@ -59,7 +59,7 @@ class X509V3Extensions(entities.Entity): class X509NonStandardExtensions(entities.Entity): _binding = x509_certificate_binding _binding_class = x509_certificate_binding.X509NonStandardExtensionsType - _namespace = 'http://cybox.mitre.org/objects#X509CertificateObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/x509-certificate-2' netscape_comment = fields.TypedField("Netscape_Comment", String) netscape_certificate_type = fields.TypedField("Netscape_Certificate_Type", String) @@ -70,7 +70,7 @@ class X509NonStandardExtensions(entities.Entity): class X509Cert(entities.Entity): _binding = x509_certificate_binding _binding_class = x509_certificate_binding.X509CertificateContentsType - _namespace = 'http://cybox.mitre.org/objects#X509CertificateObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/x509-certificate-2' version = fields.TypedField("Version", Integer) serial_number = fields.TypedField("Serial_Number", String) @@ -86,7 +86,7 @@ class X509Cert(entities.Entity): class X509CertificateSignature(entities.Entity): _binding = x509_certificate_binding _binding_class = x509_certificate_binding.X509CertificateSignatureType - _namespace = 'http://cybox.mitre.org/objects#X509CertificateObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/x509-certificate-2' signature_algorithm = fields.TypedField("Signature_Algorithm", String) signature = fields.TypedField("Signature", String) @@ -95,7 +95,7 @@ class X509CertificateSignature(entities.Entity): class X509Certificate(ObjectProperties): _binding = x509_certificate_binding _binding_class = x509_certificate_binding.X509CertificateObjectType - _namespace = 'http://cybox.mitre.org/objects#X509CertificateObject-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/objects/x509-certificate-2' _XSI_NS = "X509CertificateObj" _XSI_TYPE = "X509CertificateObjectType" diff --git a/cybox/test/common/vocab_test.py b/cybox/test/common/vocab_test.py index e6d14b07..3f35204f 100644 --- a/cybox/test/common/vocab_test.py +++ b/cybox/test/common/vocab_test.py @@ -18,7 +18,7 @@ class MultipleHash(entities.Entity): """Fake entity class to test multiple on VocabField.""" _binding = common_binding _binding_class = common_binding.HashType - _namespace = 'http://cybox.mitre.org/common-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/cybox/common-2' type_ = VocabField("Type", HashName, multiple=True) diff --git a/cybox/test/extensions/location/ciq_test.py b/cybox/test/extensions/location/ciq_test.py index 2c7184a3..1300a60e 100644 --- a/cybox/test/extensions/location/ciq_test.py +++ b/cybox/test/extensions/location/ciq_test.py @@ -7,6 +7,7 @@ from mixbox.vendor.six import StringIO + class CIQAddressTests(unittest.TestCase): def test_can_load_ciq_extension(self): @@ -17,7 +18,7 @@ def test_can_load_ciq_extension(self): s = StringIO() addr.export(s.write, 0) xml = s.getvalue() - self.assertEqual(165, len(xml)) + self.assertEqual(173, len(xml)) if __name__ == "__main__": diff --git a/cybox/utils/nsparser.py b/cybox/utils/nsparser.py index a61f34a9..a8a5bae0 100644 --- a/cybox/utils/nsparser.py +++ b/cybox/utils/nsparser.py @@ -3,96 +3,96 @@ from mixbox.namespaces import Namespace, NamespaceSet, register_namespace -NS_CYBOX_CORE = Namespace('http://cybox.mitre.org/cybox-2', 'cybox', 'http://cybox.mitre.org/XMLSchema/core/2.1/cybox_core.xsd') -NS_CYBOX_COMMON = Namespace('http://cybox.mitre.org/common-2', 'cyboxCommon', 'http://cybox.mitre.org/XMLSchema/common/2.1/cybox_common.xsd') -NS_CYBOX_VOCABS = Namespace('http://cybox.mitre.org/default_vocabularies-2', 'cyboxVocabs', 'http://cybox.mitre.org/XMLSchema/default_vocabularies/2.1/cybox_default_vocabularies.xsd') -NS_ACCOUNT_OBJECT = Namespace('http://cybox.mitre.org/objects#AccountObject-2', 'AccountObj', 'http://cybox.mitre.org/XMLSchema/objects/Account/2.1/Account_Object.xsd') -NS_ADDRESS_OBJECT = Namespace('http://cybox.mitre.org/objects#AddressObject-2', 'AddressObj', 'http://cybox.mitre.org/XMLSchema/objects/Address/2.1/Address_Object.xsd') -NS_API_OBJECT = Namespace('http://cybox.mitre.org/objects#APIObject-2', 'APIObj', 'http://cybox.mitre.org/XMLSchema/objects/API/2.1/API_Object.xsd') -NS_ARCHIVEFILE_OBJECT = Namespace('http://cybox.mitre.org/objects#ArchiveFileObject-1', 'ArchiveFileObj', 'http://cybox.mitre.org/XMLSchema/objects/Archive_File/1.0/Archive_File_Object.xsd') -NS_ARPCACHE_OBJECT = Namespace('http://cybox.mitre.org/objects#ARPCacheObject-1', 'ARPCacheObj', 'http://cybox.mitre.org/XMLSchema/objects/ARP_Cache/1.0/ARP_Cache_Object.xsd') -NS_ARTIFACT_OBJECT = Namespace('http://cybox.mitre.org/objects#ArtifactObject-2', 'ArtifactObj', 'http://cybox.mitre.org/XMLSchema/objects/Artifact/2.1/Artifact_Object.xsd') -NS_AS_OBJECT = Namespace('http://cybox.mitre.org/objects#ASObject-1', 'ASObj', 'http://cybox.mitre.org/XMLSchema/objects/AS/1.0/AS_Object.xsd') -NS_CODE_OBJECT = Namespace('http://cybox.mitre.org/objects#CodeObject-2', 'CodeObj', 'http://cybox.mitre.org/XMLSchema/objects/Code/2.1/Code_Object.xsd') -NS_CUSTOM_OBJECT = Namespace('http://cybox.mitre.org/objects#CustomObject-1', 'CustomObj', 'http://cybox.mitre.org/XMLSchema/objects/Custom/1.1/Custom_Object.xsd') -NS_DEVICE_OBJECT = Namespace('http://cybox.mitre.org/objects#DeviceObject-2', 'DeviceObj', 'http://cybox.mitre.org/XMLSchema/objects/Device/2.1/Device_Object.xsd') -NS_DISK_OBJECT = Namespace('http://cybox.mitre.org/objects#DiskObject-2', 'DiskObj', 'http://cybox.mitre.org/XMLSchema/objects/Disk/2.1/Disk_Object.xsd') -NS_DISKPARTITION_OBJECT = Namespace('http://cybox.mitre.org/objects#DiskPartitionObject-2', 'DiskPartitionObj', 'http://cybox.mitre.org/XMLSchema/objects/Disk_Partition/2.1/Disk_Partition_Object.xsd') -NS_DNSCACHE_OBJECT = Namespace('http://cybox.mitre.org/objects#DNSCacheObject-2', 'DNSCacheObj', 'http://cybox.mitre.org/XMLSchema/objects/DNS_Cache/2.1/DNS_Cache_Object.xsd') -NS_DNSQUERY_OBJECT = Namespace('http://cybox.mitre.org/objects#DNSQueryObject-2', 'DNSQueryObj', 'http://cybox.mitre.org/XMLSchema/objects/DNS_Query/2.1/DNS_Query_Object.xsd') -NS_DNSRECORD_OBJECT = Namespace('http://cybox.mitre.org/objects#DNSRecordObject-2', 'DNSRecordObj', 'http://cybox.mitre.org/XMLSchema/objects/DNS_Record/2.1/DNS_Record_Object.xsd') -NS_DOMAINNAME_OBJECT = Namespace('http://cybox.mitre.org/objects#DomainNameObject-1', 'DomainNameObj', 'http://cybox.mitre.org/XMLSchema/objects/Domain_Name/1.0/Domain_Name_Object.xsd') -NS_EMAILMESSAGE_OBJECT = Namespace('http://cybox.mitre.org/objects#EmailMessageObject-2', 'EmailMessageObj', 'http://cybox.mitre.org/XMLSchema/objects/Email_Message/2.1/Email_Message_Object.xsd') -NS_FILE_OBJECT = Namespace('http://cybox.mitre.org/objects#FileObject-2', 'FileObj', 'http://cybox.mitre.org/XMLSchema/objects/File/2.1/File_Object.xsd') -NS_GUIDIALOGBOX_OBJECT = Namespace('http://cybox.mitre.org/objects#GUIDialogboxObject-2', 'GUIDialogboxObj', 'http://cybox.mitre.org/XMLSchema/objects/GUI_Dialogbox/2.1/GUI_Dialogbox_Object.xsd') -NS_GUI_OBJECT = Namespace('http://cybox.mitre.org/objects#GUIObject-2', 'GUIObj', 'http://cybox.mitre.org/XMLSchema/objects/GUI/2.1/GUI_Object.xsd') -NS_GUIWINDOW_OBJECT = Namespace('http://cybox.mitre.org/objects#GUIWindowObject-2', 'GUIWindowObj', 'http://cybox.mitre.org/XMLSchema/objects/GUI_Window/2.1/GUI_Window_Object.xsd') -NS_HOSTNAME_OBJECT = Namespace('http://cybox.mitre.org/objects#HostnameObject-1', 'HostnameObj', 'http://cybox.mitre.org/XMLSchema/objects/Hostname/1.0/Hostname_Object.xsd') -NS_HTTPSESSION_OBJECT = Namespace('http://cybox.mitre.org/objects#HTTPSessionObject-2', 'HTTPSessionObj', 'http://cybox.mitre.org/XMLSchema/objects/HTTP_Session/2.1/HTTP_Session_Object.xsd') -NS_IMAGEFILE_OBJECT = Namespace('http://cybox.mitre.org/objects#ImageFileObject-1', 'ImageFileObj', 'http://cybox.mitre.org/XMLSchema/objects/Image_File/1.0/Image_File_Object.xsd') -NS_LIBRARY_OBJECT = Namespace('http://cybox.mitre.org/objects#LibraryObject-2', 'LibraryObj', 'http://cybox.mitre.org/XMLSchema/objects/Library/2.1/Library_Object.xsd') -NS_LINK_OBJECT = Namespace('http://cybox.mitre.org/objects#LinkObject-1', 'LinkObj', 'http://cybox.mitre.org/XMLSchema/objects/Link/1.1/Link_Object.xsd') -NS_LINUXPACKAGE_OBJECT = Namespace('http://cybox.mitre.org/objects#LinuxPackageObject-2', 'LinuxPackageObj', 'http://cybox.mitre.org/XMLSchema/objects/Linux_Package/2.1/Linux_Package_Object.xsd') -NS_MEMORY_OBJECT = Namespace('http://cybox.mitre.org/objects#MemoryObject-2', 'MemoryObj', 'http://cybox.mitre.org/XMLSchema/objects/Memory/2.1/Memory_Object.xsd') -NS_MUTEX_OBJECT = Namespace('http://cybox.mitre.org/objects#MutexObject-2', 'MutexObj', 'http://cybox.mitre.org/XMLSchema/objects/Mutex/2.1/Mutex_Object.xsd') -NS_NETWORKCONNECTION_OBJECT = Namespace('http://cybox.mitre.org/objects#NetworkConnectionObject-2', 'NetworkConnectionObj', 'http://cybox.mitre.org/XMLSchema/objects/Network_Connection/2.1/Network_Connection_Object.xsd') -NS_NETWORKFLOW_OBJECT = Namespace('http://cybox.mitre.org/objects#NetworkFlowObject-2', 'NetFlowObj', 'http://cybox.mitre.org/XMLSchema/objects/Network_Flow/2.1/Network_Flow_Object.xsd') -NS_NETWORKROUTEENTRY_OBJECT = Namespace('http://cybox.mitre.org/objects#NetworkRouteEntryObject-2', 'NetworkRouteEntryObj', 'http://cybox.mitre.org/XMLSchema/objects/Network_Route_Entry/2.1/Network_Route_Entry_Object.xsd') -NS_NETWORKROUTE_OBJECT = Namespace('http://cybox.mitre.org/objects#NetworkRouteObject-2', 'NetworkRouteObj', 'http://cybox.mitre.org/XMLSchema/objects/Network_Route/2.1/Network_Route_Object.xsd') -NS_NETWORKSOCKET_OBJECT = Namespace('http://cybox.mitre.org/objects#NetworkSocketObject-2', 'NetworkSocketObj', 'http://cybox.mitre.org/XMLSchema/objects/Network_Socket/2.1/Network_Socket_Object.xsd') -NS_NETWORKSUBNET_OBJECT = Namespace('http://cybox.mitre.org/objects#NetworkSubnetObject-2', 'NetworkSubnetObj', 'http://cybox.mitre.org/XMLSchema/objects/Network_Subnet/2.1/Network_Subnet_Object.xsd') -NS_PACKET_OBJECT = Namespace('http://cybox.mitre.org/objects#PacketObject-2', 'PacketObj', 'http://cybox.mitre.org/XMLSchema/objects/Network_Packet/2.1/Network_Packet_Object.xsd') -NS_PDFFILE_OBJECT = Namespace('http://cybox.mitre.org/objects#PDFFileObject-1', 'PDFFileObj', 'http://cybox.mitre.org/XMLSchema/objects/PDF_File/1.1/PDF_File_Object.xsd') -NS_PIPE_OBJECT = Namespace('http://cybox.mitre.org/objects#PipeObject-2', 'PipeObj', 'http://cybox.mitre.org/XMLSchema/objects/Pipe/2.1/Pipe_Object.xsd') -NS_PORT_OBJECT = Namespace('http://cybox.mitre.org/objects#PortObject-2', 'PortObj', 'http://cybox.mitre.org/XMLSchema/objects/Port/2.1/Port_Object.xsd') -NS_PROCESS_OBJECT = Namespace('http://cybox.mitre.org/objects#ProcessObject-2', 'ProcessObj', 'http://cybox.mitre.org/XMLSchema/objects/Process/2.1/Process_Object.xsd') -NS_PRODUCT_OBJECT = Namespace('http://cybox.mitre.org/objects#ProductObject-2', 'ProductObj', 'http://cybox.mitre.org/XMLSchema/objects/Product/2.1/Product_Object.xsd') -NS_SEMAPHORE_OBJECT = Namespace('http://cybox.mitre.org/objects#SemaphoreObject-2', 'SemaphoreObj', 'http://cybox.mitre.org/XMLSchema/objects/Semaphore/2.1/Semaphore_Object.xsd') -NS_SMSMESSAGE_OBJECT = Namespace('http://cybox.mitre.org/objects#SMSMessageObject-1', 'SMSMessageObj', 'http://cybox.mitre.org/XMLSchema/objects/SMS_Message/1.0/SMS_Message_Object.xsd') -NS_SOCKETADDRESS_OBJECT = Namespace('http://cybox.mitre.org/objects#SocketAddressObject-1', 'SocketAddressObj', 'http://cybox.mitre.org/XMLSchema/objects/Socket_Address/1.1/Socket_Address_Object.xsd') -NS_SYSTEM_OBJECT = Namespace('http://cybox.mitre.org/objects#SystemObject-2', 'SystemObj', 'http://cybox.mitre.org/XMLSchema/objects/System/2.1/System_Object.xsd') -NS_UNIXFILE_OBJECT = Namespace('http://cybox.mitre.org/objects#UnixFileObject-2', 'UnixFileObj', 'http://cybox.mitre.org/XMLSchema/objects/Unix_File/2.1/Unix_File_Object.xsd') -NS_UNIXNETWORKROUTEENTRY_OBJECT = Namespace('http://cybox.mitre.org/objects#UnixNetworkRouteEntryObject-2', 'UnixNetworkRouteEntryObj', 'http://cybox.mitre.org/XMLSchema/objects/Unix_Network_Route_Entry/2.1/Unix_Network_Route_Entry_Object.xsd') -NS_UNIXPIPE_OBJECT = Namespace('http://cybox.mitre.org/objects#UnixPipeObject', 'UnixPipeObj', 'http://cybox.mitre.org/XMLSchema/objects/Unix_Pipe/2.1/Unix_Pipe_Object.xsd') -NS_UNIXPROCESS_OBJECT = Namespace('http://cybox.mitre.org/objects#UnixProcessObject-2', 'UnixProcessObj', 'http://cybox.mitre.org/XMLSchema/objects/Unix_Process/2.1/Unix_Process_Object.xsd') -NS_UNIXUSERACCOUNT_OBJECT = Namespace('http://cybox.mitre.org/objects#UnixUserAccountObject-2', 'UnixUserAccountObj', 'http://cybox.mitre.org/XMLSchema/objects/Unix_User_Account/2.1/Unix_User_Account_Object.xsd') -NS_UNIXVOLUME_OBJECT = Namespace('http://cybox.mitre.org/objects#UnixVolumeObject-2', 'UnixVolumeObj', 'http://cybox.mitre.org/XMLSchema/objects/Unix_Volume/2.1/Unix_Volume_Object.xsd') -NS_URI_OBJECT = Namespace('http://cybox.mitre.org/objects#URIObject-2', 'URIObj', 'http://cybox.mitre.org/XMLSchema/objects/URI/2.1/URI_Object.xsd') -NS_URLHISTORY_OBJECT = Namespace('http://cybox.mitre.org/objects#URLHistoryObject-1', 'URLHistoryObj', 'http://cybox.mitre.org/XMLSchema/objects/URL_History/1.0/URL_History_Object.xsd') -NS_USERACCOUNT_OBJECT = Namespace('http://cybox.mitre.org/objects#UserAccountObject-2', 'UserAccountObj', 'http://cybox.mitre.org/XMLSchema/objects/User_Account/2.1/User_Account_Object.xsd') -NS_VOLUME_OBJECT = Namespace('http://cybox.mitre.org/objects#VolumeObject-2', 'VolumeObj', 'http://cybox.mitre.org/XMLSchema/objects/Volume/2.1/Volume_Object.xsd') -NS_WHOIS_OBJECT = Namespace('http://cybox.mitre.org/objects#WhoisObject-2', 'WhoisObj', 'http://cybox.mitre.org/XMLSchema/objects/Whois/2.1/Whois_Object.xsd') -NS_WINCOMPUTERACCOUNT_OBJECT = Namespace('http://cybox.mitre.org/objects#WinComputerAccountObject-2', 'WinComputerAccountObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Computer_Account/2.1/Win_Computer_Account_Object.xsd') -NS_WINCRITICALSECTION_OBJECT = Namespace('http://cybox.mitre.org/objects#WinCriticalSectionObject-2', 'WinCriticalSectionObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Critical_Section/2.1/Win_Critical_Section_Object.xsd') -NS_WINDRIVER_OBJECT = Namespace('http://cybox.mitre.org/objects#WinDriverObject-3', 'WinDriverObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Driver/3.0/Win_Driver_Object.xsd') -NS_WINEVENTLOG_OBJECT = Namespace('http://cybox.mitre.org/objects#WinEventLogObject-2', 'WinEventLogObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Event_Log/2.1/Win_Event_Log_Object.xsd') -NS_WINEVENT_OBJECT = Namespace('http://cybox.mitre.org/objects#WinEventObject-2', 'WinEventObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Event/2.1/Win_Event_Object.xsd') -NS_WINEXECUTABLEFILE_OBJECT = Namespace('http://cybox.mitre.org/objects#WinExecutableFileObject-2', 'WinExecutableFileObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Executable_File/2.1/Win_Executable_File_Object.xsd') -NS_WINFILE_OBJECT = Namespace('http://cybox.mitre.org/objects#WinFileObject-2', 'WinFileObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_File/2.1/Win_File_Object.xsd') -NS_WINFILEMAPPING_OBJECT = Namespace('http://cybox.mitre.org/objects#WinFilemappingObject-1', 'WinFilemappingObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Filemapping/1.0/Win_Filemapping_Object.xsd') -NS_WINHANDLE_OBJECT = Namespace('http://cybox.mitre.org/objects#WinHandleObject-2', 'WinHandleObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Handle/2.1/Win_Handle_Object.xsd') -NS_WINHOOK_OBJECT = Namespace('http://cybox.mitre.org/objects#WinHookObject-1', 'WinHookObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Hook/1.0/Win_Hook_Object.xsd') -NS_WINKERNELHOOK_OBJECT = Namespace('http://cybox.mitre.org/objects#WinKernelHookObject-2', 'WinKernelHookObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Kernel_Hook/2.1/Win_Kernel_Hook_Object.xsd') -NS_WINKERNEL_OBJECT = Namespace('http://cybox.mitre.org/objects#WinKernelObject-2', 'WinKernelObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Kernel/2.1/Win_Kernel_Object.xsd') -NS_WINMAILSLOT_OBJECT = Namespace('http://cybox.mitre.org/objects#WinMailslotObject-2', 'WinMailslotObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Mailslot/2.1/Win_Mailslot_Object.xsd') -NS_WINMEMORYPAGEREGION_OBJECT = Namespace('http://cybox.mitre.org/objects#WinMemoryPageRegionObject-2', 'WinMemoryPageRegionObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Memory_Page_Region/2.1/Win_Memory_Page_Region_Object.xsd') -NS_WINMUTEX_OBJECT = Namespace('http://cybox.mitre.org/objects#WinMutexObject-2', 'WinMutexObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Mutex/2.1/Win_Mutex_Object.xsd') -NS_WINNETWORKROUTEENTRY_OBJECT = Namespace('http://cybox.mitre.org/objects#WinNetworkRouteEntryObject-2', 'WinNetworkRouteEntryObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Network_Route_Entry/2.1/Win_Network_Route_Entry_Object.xsd') -NS_WINNETWORKSHARE_OBJECT = Namespace('http://cybox.mitre.org/objects#WinNetworkShareObject-2', 'WinNetworkShareObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Network_Share/2.1/Win_Network_Share_Object.xsd') -NS_WINPIPE_OBJECT = Namespace('http://cybox.mitre.org/objects#WinPipeObject-2', 'WinPipeObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Pipe/2.1/Win_Pipe_Object.xsd') -NS_WINPREFETCH_OBJECT = Namespace('http://cybox.mitre.org/objects#WinPrefetchObject-2', 'WinPrefetchObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Prefetch/2.1/Win_Prefetch_Object.xsd') -NS_WINPROCESS_OBJECT = Namespace('http://cybox.mitre.org/objects#WinProcessObject-2', 'WinProcessObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Process/2.1/Win_Process_Object.xsd') -NS_WINREGISTRYKEY_OBJECT = Namespace('http://cybox.mitre.org/objects#WinRegistryKeyObject-2', 'WinRegistryKeyObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Registry_Key/2.1/Win_Registry_Key_Object.xsd') -NS_WINSEMAPHORE_OBJECT = Namespace('http://cybox.mitre.org/objects#WinSemaphoreObject-2', 'WinSemaphoreObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Semaphore/2.1/Win_Semaphore_Object.xsd') -NS_WINSERVICE_OBJECT = Namespace('http://cybox.mitre.org/objects#WinServiceObject-2', 'WinServiceObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Service/2.1/Win_Service_Object.xsd') -NS_WINSYSTEM_OBJECT = Namespace('http://cybox.mitre.org/objects#WinSystemObject-2', 'WinSystemObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_System/2.1/Win_System_Object.xsd') -NS_WINSYSTEMRESTORE_OBJECT = Namespace('http://cybox.mitre.org/objects#WinSystemRestoreObject-2', 'WinSystemRestoreObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_System_Restore/2.1/Win_System_Restore_Object.xsd') -NS_WINTASK_OBJECT = Namespace('http://cybox.mitre.org/objects#WinTaskObject-2', 'WinTaskObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Task/2.1/Win_Task_Object.xsd') -NS_WINTHREAD_OBJECT = Namespace('http://cybox.mitre.org/objects#WinThreadObject-2', 'WinThreadObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Thread/2.1/Win_Thread_Object.xsd') -NS_WINUSERACCOUNT_OBJECT = Namespace('http://cybox.mitre.org/objects#WinUserAccountObject-2', 'WinUserAccountObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_User_Account/2.1/Win_User_Account_Object.xsd') -NS_WINVOLUME_OBJECT = Namespace('http://cybox.mitre.org/objects#WinVolumeObject-2', 'WinVolumeObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Volume/2.1/Win_Volume_Object.xsd') -NS_WINWAITABLETIMER_OBJECT = Namespace('http://cybox.mitre.org/objects#WinWaitableTimerObject-2', 'WinWaitableTimerObj', 'http://cybox.mitre.org/XMLSchema/objects/Win_Waitable_Timer/2.1/Win_Waitable_Timer_Object.xsd') -NS_X509CERTIFICATE_OBJECT = Namespace('http://cybox.mitre.org/objects#X509CertificateObject-2', 'X509CertificateObj', 'http://cybox.mitre.org/XMLSchema/objects/X509_Certificate/2.1/X509_Certificate_Object.xsd') +NS_CYBOX_CORE = Namespace('http://docs.oasis-open.org/cti/ns/cybox/core-2', 'cybox', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/core.xsd') +NS_CYBOX_COMMON = Namespace('http://docs.oasis-open.org/cti/ns/cybox/common-2', 'cyboxCommon', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/common.xsd') +NS_CYBOX_VOCABS = Namespace('http://docs.oasis-open.org/cti/ns/cybox/vocabularies-2', 'cyboxVocabs', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/default-vocabularies.xsd') +NS_ACCOUNT_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/account-2', 'AccountObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Account-Object.xsd') +NS_ADDRESS_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/address-2', 'AddressObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Address-Object.xsd') +NS_API_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/api-2', 'APIObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/API-Object.xsd') +NS_ARCHIVEFILE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/archive-file-1', 'ArchiveFileObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Archive-File-Object.xsd') +NS_ARPCACHE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/arp-cache-1', 'ARPCacheObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/ARP-Cache-Object.xsd') +NS_ARTIFACT_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/artifact-2', 'ArtifactObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Artifact-Object.xsd') +NS_AS_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/as-1', 'ASObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/AS-Object.xsd') +NS_CODE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/code-2', 'CodeObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Code-Object.xsd') +NS_CUSTOM_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/custom-1', 'CustomObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Custom-Object.xsd') +NS_DEVICE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/device-2', 'DeviceObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Device-Object.xsd') +NS_DISK_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/disk-2', 'DiskObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Disk-Object.xsd') +NS_DISKPARTITION_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/disk-partition-2', 'DiskPartitionObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Disk-Partition-Object.xsd') +NS_DNSCACHE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/dns-cache-2', 'DNSCacheObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/DNS-Cache-Object.xsd') +NS_DNSQUERY_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/dns-query-2', 'DNSQueryObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/DNS-Query-Object.xsd') +NS_DNSRECORD_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/dns-record-2', 'DNSRecordObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/DNS-Record-Object.xsd') +NS_DOMAINNAME_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/domain-name-1', 'DomainNameObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Domain-Name-Object.xsd') +NS_EMAILMESSAGE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/email-message-2', 'EmailMessageObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Email-Message-Object.xsd') +NS_FILE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/file-2', 'FileObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/File-Object.xsd') +NS_GUIDIALOGBOX_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/gui-dialogbox-2', 'GUIDialogboxObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/GUI-Dialogbox-Object.xsd') +NS_GUI_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/gui-2', 'GUIObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/GUI-Object.xsd') +NS_GUIWINDOW_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/gui-window-2', 'GUIWindowObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/GUI-Window-Object.xsd') +NS_HOSTNAME_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/hostname-1', 'HostnameObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Hostname-Object.xsd') +NS_HTTPSESSION_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/http-session-2', 'HTTPSessionObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/HTTP-Session-Object.xsd') +NS_IMAGEFILE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/image-file-1', 'ImageFileObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Image-File-Object.xsd') +NS_LIBRARY_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/library-2', 'LibraryObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Library-Object.xsd') +NS_LINK_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/link-1', 'LinkObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Link-Object.xsd') +NS_LINUXPACKAGE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/linux-package-2', 'LinuxPackageObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Linux-Package-Object.xsd') +NS_MEMORY_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/memory-2', 'MemoryObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Memory-Object.xsd') +NS_MUTEX_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/mutex-2', 'MutexObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Mutex-Object.xsd') +NS_NETWORKCONNECTION_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/network-connection-2', 'NetworkConnectionObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Network-Connection-Object.xsd') +NS_NETWORKFLOW_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/network-flow-2', 'NetFlowObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Network-Flow-Object.xsd') +NS_NETWORKROUTEENTRY_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/network-route-entry-2', 'NetworkRouteEntryObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Network-Route-Entry-Object.xsd') +NS_NETWORKROUTE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/network-route-2', 'NetworkRouteObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Network-Route-Object.xsd') +NS_NETWORKSOCKET_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/network-socket-2', 'NetworkSocketObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Network-Socket-Object.xsd') +NS_NETWORKSUBNET_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/network-subnet-2', 'NetworkSubnetObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Network-Subnet-Object.xsd') +NS_PACKET_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/network-packet-2', 'PacketObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Network-Packet-Object.xsd') +NS_PDFFILE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/pdf-file-1', 'PDFFileObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/PDF-File-Object.xsd') +NS_PIPE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/pipe-2', 'PipeObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Pipe-Object.xsd') +NS_PORT_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/port-2', 'PortObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Port-Object.xsd') +NS_PROCESS_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/process-2', 'ProcessObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Process-Object.xsd') +NS_PRODUCT_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/product-2', 'ProductObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Product-Object.xsd') +NS_SEMAPHORE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/semaphore-2', 'SemaphoreObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Semaphore-Object.xsd') +NS_SMSMESSAGE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/sms-message-1', 'SMSMessageObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/SMS-Message-Object.xsd') +NS_SOCKETADDRESS_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/socket-address-1', 'SocketAddressObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Socket-Address-Object.xsd') +NS_SYSTEM_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/system-2', 'SystemObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/System-Object.xsd') +NS_UNIXFILE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/unix-file-2', 'UnixFileObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Unix-File-Object.xsd') +NS_UNIXNETWORKROUTEENTRY_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/unix-network-route-entry-2', 'UnixNetworkRouteEntryObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Unix-Network-Route-Entry-Object.xsd') +NS_UNIXPIPE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/unix-pipe-2', 'UnixPipeObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Unix-Pipe-Object.xsd') +NS_UNIXPROCESS_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/unix-process-2', 'UnixProcessObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Unix-Process-Object.xsd') +NS_UNIXUSERACCOUNT_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/unix-user-account-2', 'UnixUserAccountObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Unix-User-Account-Object.xsd') +NS_UNIXVOLUME_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/unix-volume-2', 'UnixVolumeObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Unix-Volume-Object.xsd') +NS_URI_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/uri-2', 'URIObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/URI-Object.xsd') +NS_URLHISTORY_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/url-history-1', 'URLHistoryObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/URL-History-Object.xsd') +NS_USERACCOUNT_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/user-account-2', 'UserAccountObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/User-Account-Object.xsd') +NS_VOLUME_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/volume-2', 'VolumeObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Volume-Object.xsd') +NS_WHOIS_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/whois-2', 'WhoisObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Whois-Object.xsd') +NS_WINCOMPUTERACCOUNT_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-computer-account-2', 'WinComputerAccountObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Computer-Account-Object.xsd') +NS_WINCRITICALSECTION_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-critical-section-2', 'WinCriticalSectionObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Critical-Section-Object.xsd') +NS_WINDRIVER_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-driver-3', 'WinDriverObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Driver-Object.xsd') +NS_WINEVENTLOG_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-event-log-2', 'WinEventLogObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Event-Log-Object.xsd') +NS_WINEVENT_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-event-2', 'WinEventObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Event-Object.xsd') +NS_WINEXECUTABLEFILE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-executable-file-2', 'WinExecutableFileObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Executable-File-Object.xsd') +NS_WINFILE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-file-2', 'WinFileObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-File-Object.xsd') +NS_WINFILEMAPPING_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-filemapping-1', 'WinFilemappingObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Filemapping-Object.xsd') +NS_WINHANDLE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-handle-2', 'WinHandleObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Handle-Object.xsd') +NS_WINHOOK_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-hook-1', 'WinHookObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Hook-Object.xsd') +NS_WINKERNELHOOK_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-kernel-hook-2', 'WinKernelHookObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Kernel-Hook-Object.xsd') +NS_WINKERNEL_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-kernel-2', 'WinKernelObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Kernel-Object.xsd') +NS_WINMAILSLOT_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-mailslot-2', 'WinMailslotObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Mailslot-Object.xsd') +NS_WINMEMORYPAGEREGION_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-memory-page-region-2', 'WinMemoryPageRegionObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Memory-Page-Region-Object.xsd') +NS_WINMUTEX_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-mutex-2', 'WinMutexObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Mutex-Object.xsd') +NS_WINNETWORKROUTEENTRY_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-network-route-entry-2', 'WinNetworkRouteEntryObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Network-Route-Entry-Object.xsd') +NS_WINNETWORKSHARE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-network-share-2', 'WinNetworkShareObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Network-Share-Object.xsd') +NS_WINPIPE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-pipe-2', 'WinPipeObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Pipe-Object.xsd') +NS_WINPREFETCH_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-prefetch-2', 'WinPrefetchObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Prefetch-Object.xsd') +NS_WINPROCESS_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-process-2', 'WinProcessObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Process-Object.xsd') +NS_WINREGISTRYKEY_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-registry-key-2', 'WinRegistryKeyObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Registry-Key-Object.xsd') +NS_WINSEMAPHORE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-semaphore-2', 'WinSemaphoreObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Semaphore-Object.xsd') +NS_WINSERVICE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-service-2', 'WinServiceObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Service-Object.xsd') +NS_WINSYSTEM_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-system-2', 'WinSystemObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-System-Object.xsd') +NS_WINSYSTEMRESTORE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-system-restore-2', 'WinSystemRestoreObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-System-Restore-Object.xsd') +NS_WINTASK_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-task-2', 'WinTaskObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Task-Object.xsd') +NS_WINTHREAD_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-thread-2', 'WinThreadObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Thread-Object.xsd') +NS_WINUSERACCOUNT_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-user-account-2', 'WinUserAccountObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-User-Account-Object.xsd') +NS_WINVOLUME_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-volume-2', 'WinVolumeObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Volume-Object.xsd') +NS_WINWAITABLETIMER_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/win-waitable-timer-2', 'WinWaitableTimerObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/Win-Waitable-Timer-Object.xsd') +NS_X509CERTIFICATE_OBJECT = Namespace('http://docs.oasis-open.org/cti/ns/cybox/objects/x509-certificate-2', 'X509CertificateObj', 'http://docs.oasis-open.org/cti/cybox/v2.1.1/csd01/xml-schemas/objects/X509-Certificate-Object.xsd') CYBOX_NAMESPACES = NamespaceSet() diff --git a/docs/examples.rst b/docs/examples.rst index a3e50973..2b8e5435 100644 --- a/docs/examples.rst +++ b/docs/examples.rst @@ -469,7 +469,7 @@ to parse an XML string. >>> a = """ ... ... bad.exe ... From 71f916ef129e8a2130c8f088c08c9c8575e88baa Mon Sep 17 00:00:00 2001 From: Greg Back Date: Thu, 17 Nov 2016 09:27:56 -0600 Subject: [PATCH 2/3] Create separate cybox211 package --- cybox/version.py | 2 +- docs/conf.py | 4 ++-- setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cybox/version.py b/cybox/version.py index d3ae41a7..d04be188 100644 --- a/cybox/version.py +++ b/cybox/version.py @@ -1,4 +1,4 @@ # Copyright (c) 2015, The MITRE Corporation. All rights reserved. # See LICENSE.txt for complete terms. -__version__ = "2.1.0.13" +__version__ = "1.0.0a1" diff --git a/docs/conf.py b/docs/conf.py index 4be69ca4..6029eba8 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -2,8 +2,8 @@ import cybox -project = 'python-cybox' -copyright = '2015, The MITRE Corporation' +project = 'cybox211' +copyright = '2016, The MITRE Corporation' version = cybox.__version__ release = version diff --git a/setup.py b/setup.py index dc335894..839b7735 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ def get_version(): } setup( - name="cybox", + name="cybox211", version=get_version(), author="CybOX Project, MITRE Corporation", author_email="cybox@mitre.org", From f56c9489bcf74a6484588ceb8b5dbee0a45c3e43 Mon Sep 17 00:00:00 2001 From: Greg Back Date: Thu, 17 Nov 2016 09:31:41 -0600 Subject: [PATCH 3/3] Also build cybox211 branch --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7e74d834..be965297 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,7 @@ cache: branches: only: - master + - cybox211 notifications: email: