diff --git a/docs/examples/index.rst b/docs/examples/index.rst index d050bfe9..a82b9f4e 100644 --- a/docs/examples/index.rst +++ b/docs/examples/index.rst @@ -41,14 +41,14 @@ Which outputs: .. code-block:: xml diff --git a/docs/overview/controlled_vocabularies.rst b/docs/overview/controlled_vocabularies.rst index a1642022..790d8ae3 100644 --- a/docs/overview/controlled_vocabularies.rst +++ b/docs/overview/controlled_vocabularies.rst @@ -131,13 +131,13 @@ used wherever a ``ControlledVocabularyStringType`` instance is expected - + @@ -170,11 +170,11 @@ field. @@ -254,11 +254,11 @@ XML Schema definition, but in Python! """ diff --git a/docs/overview/id_namespaces.rst b/docs/overview/id_namespaces.rst index 62de6ad2..e9c55394 100644 --- a/docs/overview/id_namespaces.rst +++ b/docs/overview/id_namespaces.rst @@ -28,7 +28,7 @@ Which outputs: diff --git a/stix/__init__.py b/stix/__init__.py index 786f95e4..209f6864 100644 --- a/stix/__init__.py +++ b/stix/__init__.py @@ -48,7 +48,7 @@ def _lookup_extension(xsi_type): """ import stix.extensions.malware.maec_4_1_malware - + if xsi_type in _EXTENSION_MAP: return _EXTENSION_MAP[xsi_type] @@ -89,7 +89,7 @@ def lookup_extension(typeinfo, default=None): error = "Input %s is missing xml_type attribute. Cannot lookup class." raise ValueError(error % type(typeinfo)) - + # Extension binding classes usually (always?) have an `xmlns_prefix` # class attribute. if hasattr(typeinfo, 'xmlns_prefix'): @@ -134,5 +134,4 @@ def supported_stix_version(): supports (i.e., can parse). """ - return ('1.1.1', '1.2') - + return ('1.1.1', '1.2', '1.2.1') diff --git a/stix/bindings/campaign.py b/stix/bindings/campaign.py index c10cadd3..59c46b32 100644 --- a/stix/bindings/campaign.py +++ b/stix/bindings/campaign.py @@ -17,7 +17,7 @@ import stix.bindings.data_marking as data_marking_binding -XML_NS = "http://stix.mitre.org/Campaign-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/campaign-1" # # Data representation classes. @@ -450,7 +450,7 @@ class CampaignType(stix_common_binding.CampaignBaseType): subclass = None superclass = stix_common_binding.CampaignBaseType - xmlns = "http://stix.mitre.org/Campaign-1" + xmlns = "http://docs.oasis-open.org/cti/ns/stix/campaign-1" xmlns_prefix = "campaign" xml_type = "CampaignType" xsi_type = "%s:%s" % (xmlns_prefix, xml_type) diff --git a/stix/bindings/course_of_action.py b/stix/bindings/course_of_action.py index 9c3ab8d6..3c134785 100644 --- a/stix/bindings/course_of_action.py +++ b/stix/bindings/course_of_action.py @@ -17,7 +17,7 @@ import stix.bindings.stix_common as stix_common_binding import stix.bindings.data_marking as data_marking_binding -XML_NS = "http://stix.mitre.org/CourseOfAction-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/course-of-action-1" # # Data representation classes. @@ -36,11 +36,11 @@ class StructuredCOAType(GeneratedsSuper): externally defined structured courses of action in a CDATA block. This implementation is captured in the Generic Structured COA extension, which provides the GenericStructuredCOAType in - the http://stix.mitre.org/extensions/StructuredCOA#Generic-1 + the http://docs.oasis-open.org/cti/ns/stix/extensions/structured-coa/generic-1 namespace. The extension is defined in the extensions/structured_coa/generic.xsd file or at the URL http:// - stix.mitre.org/XMLSchema/extensions/structured_coa/generic/1.0/g - eneric.xsd. Specifies a unique ID for this + docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/structured + -coa/generic-structured-coa.xsd. Specifies a unique ID for this StructuredCOA.Specifies a reference to the ID for this StructuredCOA specified elsewhere.""" subclass = None @@ -224,7 +224,7 @@ class CourseOfActionType(stix_common_binding.CourseOfActionBaseType): subclass = None superclass = stix_common_binding.CourseOfActionBaseType - xmlns = "http://stix.mitre.org/CourseOfAction-1" + xmlns = "http://docs.oasis-open.org/cti/ns/stix/course-of-action-1" xmlns_prefix = "coa" xml_type = "CourseOfActionType" xsi_type = "%s:%s" % (xmlns_prefix, xml_type) diff --git a/stix/bindings/data_marking.py b/stix/bindings/data_marking.py index 94ddd6d7..ce349378 100644 --- a/stix/bindings/data_marking.py +++ b/stix/bindings/data_marking.py @@ -15,7 +15,7 @@ from stix.bindings import lookup_extension from . import stix_common as stix_common_binding -XML_NS = "http://data-marking.mitre.org/Marking-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/data-marking-1" # # Data representation classes. @@ -117,19 +117,18 @@ class MarkingStructureType(GeneratedsSuper): Simple: The Simple marking structures allows for the specification of unstructured statements through the use of a string field. The type is named SimpleMarkingStructureType and - is in the http://data- - marking.mitre.org/extensions/MarkingStructure#Simple-1 - namespace. The extension is defined in the file - extensions/marking/simple_marking.xsd or at the URL http://stix. - mitre.org/XMLSchema/extensions/marking/simple_marking/1.1/simple - _marking.xsd.2. TLP: The TLP marking structure allows for the + is in the http://docs.oasis-open.org/cti/ns/stix/extensions/ + data-marking/simple-1 namespace. The extension is defined in the file + extensions/marking/simple_marking.xsd or at the URL http://docs.oasis-open + .org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/marking/ + simple-marking.xsd. TLP: The TLP marking structure allows for the expression of Traffic Light Protocol statements through the use of a simple enumeration. The type is named - TLPMarkingStructureType and is in the http://data- - marking.mitre.org/extensions/MarkingStructure#TLP-1 namespace. + TLPMarkingStructureType and is in the http://docs.oasis-open.org/cti/ns/ + stix/extensions/data-marking/tlp-1 namespace. The extension is defined in the file - extensions/marking/tlp_marking.xsd or at the URL http://stix.mit - re.org/XMLSchema/extensions/marking/tlp/1.1/tlp_marking.xsd.This + extensions/marking/tlp_marking.xsd or at the URL http://docs.oasis-open.org + /cti/stix/v1.2.1/csd01/xml-schemas/extensions/marking/tlp-marking.xsd. This field specifies the name of the marking model to be applied within this Marking_Structure.This field contains a reference to an authoritative source on the marking model to be applied diff --git a/stix/bindings/exploit_target.py b/stix/bindings/exploit_target.py index 78735ac2..31dab1ff 100644 --- a/stix/bindings/exploit_target.py +++ b/stix/bindings/exploit_target.py @@ -16,7 +16,7 @@ import stix.bindings.stix_common as stix_common_binding import stix.bindings.data_marking as data_marking_binding -XML_NS = "http://stix.mitre.org/ExploitTarget-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/exploit-target-1" # # Data representation classes. @@ -31,11 +31,11 @@ class VulnerabilityType(GeneratedsSuper): Vulnerability Reporting Format (CVRF) schema to do so. The extension that defines this is captured in the CVRF1.1InstanceType in the - http://stix.mitre.org/extensions/Vulnerability#CVRF1.1-1 + http://docs.oasis-open.org/cti/ns/stix/extensions/vulnerability/cvrf-1 namespace. This type is defined in the extensions/vulnerability/cvrf_1.1_vulnerability.xsd file or at - the URL http://stix.mitre.org/XMLSchema/extensions/vulnerability - /cvrf_1.1/1.1/cvrf_1.1_vulnerability.xsd.The @is_known field + the URL http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/ + extensions/vulnerability/cvrf-1.1-vulnerability.xsd. The @is_known field captures whether or not the vulnerability is known (i.e. not a 0-day) at the time of characterization.The @is_publicly_acknowledged field captures whether or not the @@ -772,7 +772,7 @@ class ExploitTargetType(stix_common_binding.ExploitTargetBaseType): subclass = None superclass = stix_common_binding.ExploitTargetBaseType - xmlns = "http://stix.mitre.org/ExploitTarget-1" + xmlns = "http://docs.oasis-open.org/cti/ns/stix/exploit-target-1" xmlns_prefix = "et" xml_type = "ExploitTargetType" xsi_type = "%s:%s" % (xmlns_prefix, xml_type) diff --git a/stix/bindings/extensions/address/ciq_address_3_0.py b/stix/bindings/extensions/address/ciq_address_3_0.py index 2684cf1f..1add4b1d 100644 --- a/stix/bindings/extensions/address/ciq_address_3_0.py +++ b/stix/bindings/extensions/address/ciq_address_3_0.py @@ -15,7 +15,7 @@ from stix.bindings import register_extension import stix.bindings.stix_common as stix_common_binding -XML_NS = "http://stix.mitre.org/extensions/Address#CIQAddress3.0-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/extensions/address/ciq-address-3.0-1" # # Data representation classes. diff --git a/stix/bindings/extensions/attack_pattern/capec_2_7.py b/stix/bindings/extensions/attack_pattern/capec_2_7.py index 762bd3df..dac6260a 100644 --- a/stix/bindings/extensions/attack_pattern/capec_2_7.py +++ b/stix/bindings/extensions/attack_pattern/capec_2_7.py @@ -15,7 +15,7 @@ from stix.bindings import register_extension import stix.bindings.ttp as ttp_binding -XML_NS = "http://stix.mitre.org/extensions/AP#CAPEC2.7-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/extensions/attack-pattern/capec-2.7-1" # # Data representation classes. diff --git a/stix/bindings/extensions/identity/ciq_identity_3_0.py b/stix/bindings/extensions/identity/ciq_identity_3_0.py index a4ea469c..f65210f8 100644 --- a/stix/bindings/extensions/identity/ciq_identity_3_0.py +++ b/stix/bindings/extensions/identity/ciq_identity_3_0.py @@ -15,7 +15,7 @@ from stix.bindings import register_extension import stix.bindings.stix_common as stix_common_binding -XML_NS = "http://stix.mitre.org/extensions/Identity#CIQIdentity3.0-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/extensions/identity/ciq-3.0-identity-1" # # Data representation classes. diff --git a/stix/bindings/extensions/malware/maec_4_1.py b/stix/bindings/extensions/malware/maec_4_1.py index 696738ff..6458f08f 100644 --- a/stix/bindings/extensions/malware/maec_4_1.py +++ b/stix/bindings/extensions/malware/maec_4_1.py @@ -22,7 +22,7 @@ PackageType = None maec_installed = False -XML_NS = "http://stix.mitre.org/extensions/Malware#MAEC4.1-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/extensions/malware/maec-4.1-1" # # Data representation classes. diff --git a/stix/bindings/extensions/marking/simple_marking.py b/stix/bindings/extensions/marking/simple_marking.py index 95a01e8e..d09c1616 100644 --- a/stix/bindings/extensions/marking/simple_marking.py +++ b/stix/bindings/extensions/marking/simple_marking.py @@ -15,7 +15,7 @@ from stix.bindings import register_extension import stix.bindings.data_marking as data_marking_binding -XML_NS = "http://data-marking.mitre.org/extensions/MarkingStructure#Simple-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/extensions/data-marking/simple-1" # # Data representation classes. diff --git a/stix/bindings/extensions/marking/terms_of_use_marking.py b/stix/bindings/extensions/marking/terms_of_use_marking.py index b564bf53..01581ab0 100644 --- a/stix/bindings/extensions/marking/terms_of_use_marking.py +++ b/stix/bindings/extensions/marking/terms_of_use_marking.py @@ -15,7 +15,7 @@ from stix.bindings import register_extension import stix.bindings.data_marking as data_marking_binding -XML_NS = "http://data-marking.mitre.org/extensions/MarkingStructure#Terms_Of_Use-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/extensions/data-marking/terms-of-use-1" # # Data representation classes. diff --git a/stix/bindings/extensions/marking/tlp.py b/stix/bindings/extensions/marking/tlp.py index 0b537183..78581ae2 100644 --- a/stix/bindings/extensions/marking/tlp.py +++ b/stix/bindings/extensions/marking/tlp.py @@ -15,7 +15,7 @@ from stix.bindings import register_extension import stix.bindings.data_marking as data_marking_binding -XML_NS = "http://data-marking.mitre.org/extensions/MarkingStructure#TLP-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/extensions/data-marking/tlp-1" # # Data representation classes. diff --git a/stix/bindings/extensions/structured_coa/generic.py b/stix/bindings/extensions/structured_coa/generic.py index e3776580..093ce614 100644 --- a/stix/bindings/extensions/structured_coa/generic.py +++ b/stix/bindings/extensions/structured_coa/generic.py @@ -16,7 +16,7 @@ from stix.bindings.course_of_action import StructuredCOAType import stix.bindings.stix_common as stix_common_binding -XML_NS = "http://stix.mitre.org/extensions/StructuredCOA#Generic-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/extensions/structured-coa/generic-1" # # Data representation classes. diff --git a/stix/bindings/extensions/test_mechanism/generic.py b/stix/bindings/extensions/test_mechanism/generic.py index 8ae609bc..ce634a55 100644 --- a/stix/bindings/extensions/test_mechanism/generic.py +++ b/stix/bindings/extensions/test_mechanism/generic.py @@ -16,7 +16,7 @@ import stix.bindings.indicator as indicator_binding import stix.bindings.stix_common as stix_common_binding -XML_NS = "http://stix.mitre.org/extensions/TestMechanism#Generic-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/extensions/test-mechanism/generic-1" # # Data representation classes. diff --git a/stix/bindings/extensions/test_mechanism/open_ioc_2010.py b/stix/bindings/extensions/test_mechanism/open_ioc_2010.py index 338fc94a..b6943016 100644 --- a/stix/bindings/extensions/test_mechanism/open_ioc_2010.py +++ b/stix/bindings/extensions/test_mechanism/open_ioc_2010.py @@ -15,7 +15,7 @@ from stix.bindings import register_extension import stix.bindings.indicator as indicator_binding -XML_NS = "http://stix.mitre.org/extensions/TestMechanism#OpenIOC2010-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/extensions/test-mechanism/openioc-2010-1" # # Data representation classes. diff --git a/stix/bindings/extensions/test_mechanism/oval_5_10.py b/stix/bindings/extensions/test_mechanism/oval_5_10.py index f4868424..08659be8 100644 --- a/stix/bindings/extensions/test_mechanism/oval_5_10.py +++ b/stix/bindings/extensions/test_mechanism/oval_5_10.py @@ -15,7 +15,7 @@ from stix.bindings import register_extension import stix.bindings.indicator as indicator_binding -XML_NS = "http://stix.mitre.org/extensions/TestMechanism#OVAL5.10-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/extensions/test-mechanism/oval-5.10-1" # # Data representation classes. diff --git a/stix/bindings/extensions/test_mechanism/snort.py b/stix/bindings/extensions/test_mechanism/snort.py index c1143aa0..778bfb26 100644 --- a/stix/bindings/extensions/test_mechanism/snort.py +++ b/stix/bindings/extensions/test_mechanism/snort.py @@ -16,7 +16,7 @@ import stix.bindings.indicator as indicator_binding import stix.bindings.stix_common as stix_common_binding -XML_NS = "http://stix.mitre.org/extensions/TestMechanism#Snort-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/extensions/test-mechanism/snort-1" # # Data representation classes. diff --git a/stix/bindings/extensions/test_mechanism/yara.py b/stix/bindings/extensions/test_mechanism/yara.py index ed3efea0..a8aec298 100644 --- a/stix/bindings/extensions/test_mechanism/yara.py +++ b/stix/bindings/extensions/test_mechanism/yara.py @@ -16,7 +16,7 @@ import stix.bindings.indicator as indicator_binding import stix.bindings.stix_common as stix_common_binding -XML_NS = "http://stix.mitre.org/extensions/TestMechanism#YARA-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/extensions/test-mechanism/yara-1" # # Data representation classes. diff --git a/stix/bindings/extensions/vulnerability/cvrf_1_1.py b/stix/bindings/extensions/vulnerability/cvrf_1_1.py index 7423a00a..556d26bb 100644 --- a/stix/bindings/extensions/vulnerability/cvrf_1_1.py +++ b/stix/bindings/extensions/vulnerability/cvrf_1_1.py @@ -15,7 +15,7 @@ from stix.bindings import register_extension import stix.bindings.exploit_target as exploit_target_binding -XML_NS = "http://stix.mitre.org/extensions/Vulnerability#CVRF-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/extensions/vulnerability/cvrf-1" # # Data representation classes. diff --git a/stix/bindings/incident.py b/stix/bindings/incident.py index 4ba796f4..62da2722 100644 --- a/stix/bindings/incident.py +++ b/stix/bindings/incident.py @@ -17,7 +17,7 @@ import stix.bindings.stix_common as stix_common_binding import stix.bindings.data_marking as data_marking_binding -XML_NS = "http://stix.mitre.org/Incident-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/incident-1" # # Data representation classes. @@ -2090,10 +2090,10 @@ class AssetTypeType(stix_common_binding.ControlledVocabularyStringType): This field is implemented through the xsi:type controlled vocabulary extension mechanism. The default vocabulary type is AssetTypeVocab-1.0 in the - http://stix.mitre.org/default_vocabularies-1 namespace. This + http://docs.oasis-open.org/cti/ns/stix/vocabularies-1 namespace. This type is defined in the stix_default_vocabularies.xsd file or at - the URL http://stix.mitre.org/XMLSchema/default_vocabularies/1.0 - .0/stix_default_vocabularies.xsd . Users may also define their + the URL http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/ + vocabularies.xsd. Users may also define their own vocabulary using the type extension mechanism, specify a vocabulary name and reference using the attributes, or simply use this as a string field.""" @@ -2173,7 +2173,7 @@ class IncidentType(stix_common_binding.IncidentBaseType): subclass = None superclass = stix_common_binding.IncidentBaseType - xmlns = "http://stix.mitre.org/Incident-1" + xmlns = "http://docs.oasis-open.org/cti/ns/stix/incident-1" xmlns_prefix = "incident" xml_type = "IncidentType" xsi_type = "%s:%s" % (xmlns_prefix, xml_type) diff --git a/stix/bindings/indicator.py b/stix/bindings/indicator.py index 701ad239..3fd25477 100644 --- a/stix/bindings/indicator.py +++ b/stix/bindings/indicator.py @@ -17,7 +17,7 @@ import stix.bindings.stix_common as stix_common_binding import stix.bindings.data_marking as data_marking_binding -XML_NS = "http://stix.mitre.org/Indicator-2" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/indicator-1" # # Data representation classes. @@ -189,39 +189,39 @@ class TestMechanismType(GeneratedsSuper): the specification of any generic test mechanism through the use of a raw CDATA section. The type is named GenericTestMechanismType and is in the - http://stix.mitre.org/extensions/TestMechanism#Generic-1 + http://docs.oasis-open.org/cti/ns/stix/extensions/test-mechanism/generic-1 namespace. The extension is defined in the file - extensions/test_mechanism/generic.xsd or at the URL http://stix. - mitre.org/XMLSchema/extensions/test_mechanism/generic/1.0/generi - c.xsd. 2. OpenIOC: The OpenIOC test mechanism allows for the + extensions/test_mechanism/generic.xsd or at the URL http://docs.oasis-open + .org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/test-mechanism/generic- + test-mechanism.xsd. 2. OpenIOC: The OpenIOC test mechanism allows for the specification of an OpenIOC test by importing the OpenIOC schema. The type is named IOCTestMechanismType and is in the - http://stix.mitre.org/extensions/TestMechanism#OpenIOC-1 - namespace. The extension is defined in the file - extensions/test_mechanism/openioc-1.0.xsd or at the URL http://s - tix.mitre.org/XMLSchema/extensions/test_mechanism/openioc-1.0/1. - 0/openioc-1.0.xsd. 3. OVAL: The OVAL test mechanism allows for - the specification of an OVAL definition through importing the + http://docs.oasis-open.org/cti/ns/stix/extensions/test-mechanism/openioc- + 2010-1 namespace. The extension is defined in the file extensions/ + test_mechanism/openioc-1.0.xsd or at the URL http://docs.oasis- + open.org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/test-mechanism/ + openioc-2010-test-mechanism.xsd. 3. OVAL: The OVAL test mechanism allows + for the specification of an OVAL definition through importing the OVAL schemas. The type is named OVALTestMechanismType and is in - the http://stix.mitre.org/extensions/TestMechanism#OVAL-1 - namespace. The extension is defined in the file - extensions/test_mechanism/oval-5.10.1.xsd or at the URL http://s - tix.mitre.org/XMLSchema/extensions/test_mechanism/oval-5.10.1/1. - 0/oval-5.10.1.xsd. 4. Snort: The Snort test mechanism allows for + the http://docs.oasis-open.org/cti/ns/stix/extensions/test-mechanism/ + oval-5.10-1 namespace. The extension is defined in the file + extensions/test_mechanism/oval-5.10.1.xsd or at the URL http://docs.oasis- + open.org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/test-mechanism/ + oval-5.10-test-mechanism.xsd. 4. Snort: The Snort test mechanism allows for the specification of a snort signature through the use of a raw CDATA section. The type is named SnortTestMechanismType and is - in the http://stix.mitre.org/extensions/TestMechanism#Snort-1 + in the http://docs.oasis-open.org/cti/ns/stix/extensions/test-mechanism/ + snort-1 namespace. The extension is defined in the file + extensions/test_mechanism/snort.xsd or at the URL http://docs.oasis-open + .org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/test-mechanism/snort-test + -mechanism.xsd. 5. YARA: The YARA test mechanism allows for the + specification of a YARA test through the use of a raw CDATA section. The + type is named YaraTestMechanismType and is in the + http://docs.oasis-open.org/cti/ns/stix/extensions/test-mechanism/yara-1 namespace. The extension is defined in the file - extensions/test_mechanism/snort.xsd or at the URL http://stix.mi - tre.org/XMLSchema/extensions/test_mechanism/snort/1.0/snort.xsd. - 5. YARA: The YARA test mechanism allows for the specification of - a YARA test through the use of a raw CDATA section. The type is - named YaraTestMechanismType and is in the - http://stix.mitre.org/extensions/TestMechanism#YARA-1 namespace. - The extension is defined in the file - extensions/test_mechanism/yara.xsd or at the URL http://stix.mit - re.org/XMLSchema/extensions/test_mechanism/yara/1.0/yara.xsd. - Specifies a unique ID for this Test Mechanism.Specifies a + extensions/test_mechanism/yara.xsd or at the URL http://docs.oasis-open.org + /cti/stix/v1.2.1/csd01/xml-schemas/extensions/test-mechanism/yara-test- + mechanism.xsd. Specifies a unique ID for this Test Mechanism.Specifies a reference to the ID of a Test Mechanism specified elsewhere.""" subclass = None superclass = None diff --git a/stix/bindings/report.py b/stix/bindings/report.py index 7faa0bae..1a16d24b 100644 --- a/stix/bindings/report.py +++ b/stix/bindings/report.py @@ -15,7 +15,7 @@ import stix.bindings.stix_common as common_binding import stix.bindings.data_marking as data_marking_binding -XML_NS = "http://stix.mitre.org/Report-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/report-1" # # Data representation classes. diff --git a/stix/bindings/stix_common.py b/stix/bindings/stix_common.py index c5c9c0b3..49e7424f 100644 --- a/stix/bindings/stix_common.py +++ b/stix/bindings/stix_common.py @@ -15,7 +15,7 @@ from stix.bindings import get_type_info, lookup_extension -XML_NS = "http://stix.mitre.org/common-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/common-1" # # Data representation classes. @@ -1268,11 +1268,11 @@ class IdentityType(GeneratedsSuper): individuals and organizations. This type is extended through the xsi:type mechanism. The default type is CIQIdentity3.0InstanceType in the - http://stix.mitre.org/extensions/Identity#CIQIdentity3.0-1 - namespace. This type is defined in the - extensions/identity/ciq_identity_3.0.xsd file or at the URL http - ://stix.mitre.org/XMLSchema/extensions/identity/ciq_identity_3.0 - /1.0/ciq_identity_3.0.xsd. Those who wish to express a simple + http://docs.oasis-open.org/cti/ns/stix/extensions/identity/ + ciq-3.0-identity-1 namespace. This type is defined in the + extensions/identity/ciq_identity_3.0.xsd file or at the URL http://docs. + oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/identity/ciq- + 3.0-identity.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 Identity.Specifies a reference to a unique ID defined elsewhere.""" @@ -2042,9 +2042,9 @@ class IndicatorBaseType(GeneratedsSuper): type itself. Users of this type who wish to express a full indicator using STIX must do so using the xsi:type extension feature. The STIX-defined Indicator type is IndicatorType in the - http://stix.mitre.org/Indicator-1 namespace. This type is + http://docs.oasis-open.org/cti/ns/stix/indicator-1 namespace. This type is defined in the indicator.xsd file or at the URL - http://stix.mitre.org/XMLSchema/indicator/1.2/indicator.xsd. + http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/indicator.xsd. Alternatively, uses that require simply specifying an idref as a reference to an indicator defined elsewhere can do so without specifying an xsi:type. Specifies a unique ID for this @@ -2135,9 +2135,9 @@ class IncidentBaseType(GeneratedsSuper): itself. Users of this type who wish to express a full incident using STIX must do so using the xsi:type extension feature. The STIX-defined Incident type is IncidentType in the - http://stix.mitre.org/Incident-1 namespace. This type is defined - in the incident.xsd file or at the URL http://stix.mitre.org/XML - Schema/incident/1.1/incident.xsd.Alternatively, uses that + http://docs.oasis-open.org/cti/ns/stix/incident-1 namespace. This type is + defined in the incident.xsd file or at the URL http://docs.oasis-open.org/ + cti/stix/v1.2.1/csd01/xml-schemas/indicator.xsd. Alternatively, uses that require simply specifying an idref as a reference to an incident defined elsewhere can do so without specifying an xsi:type.Specifies a globally unique identifier for this cyber @@ -2237,12 +2237,11 @@ class TTPBaseType(GeneratedsSuper): the XML Schema Extension feature by the STIX TTP type itself. Users of this type who wish to express a full TTP using STIX must do so using the xsi:type extension feature. The STIX- - defined TTP type is TTPType in the http://stix.mitre.org/TTP-1 - namespace. This type is defined in the ttp.xsd file or at the - URL - http://stix.mitre.org/XMLSchema/ttp/1.1/ttp.xsd.Alternatively, - uses that require simply specifying an idref as a reference to a - TTP defined elsewhere can do so without specifying an + defined TTP type is TTPType in the http://docs.oasis-open.org/cti/ns/stix/ + ttp-1 namespace. This type is defined in the ttp.xsd file or at the URL + http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/ttp.xsd. + Alternatively, uses that require simply specifying an idref as a reference + to a TTP defined elsewhere can do so without specifying an xsi:type.Specifies a globally unique identifier for this TTP item. Specifies a globally unique identifier of a TTP item specified elsewhere.When idref is specified, the id attribute @@ -2339,11 +2338,11 @@ class ExploitTargetBaseType(GeneratedsSuper): Exploit Target type itself. Users of this type who wish to express a full exploit target using STIX must do so using the xsi:type extension feature. The STIX-defined Exploit Target type - is ExploitTargetType in the - http://stix.mitre.org/ExploitTarget-1 namespace. This type is - defined in the exploit_target.xsd file or at the URL http://stix - .mitre.org/XMLSchema/exploit_target/1.1/exploit_target.xsd.Alter - natively, uses that require simply specifying an idref as a + is ExploitTargetType in the http://docs.oasis-open.org/cti/ns/stix/ + exploit-target-1 namespace. This type is defined in the exploit_target.xsd + file or at the URL http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/ + xml-schemas/exploit-target.xsd. + Alternatively, uses that require simply specifying an idref as a reference to an exploit target defined elsewhere can do so without specifying an xsi:type.Specifies a globally unique identifier for this ExploitTarget. Specifies a globally unique @@ -2443,10 +2442,10 @@ class CourseOfActionBaseType(GeneratedsSuper): express a full course of action using STIX must do so using the xsi:type extension feature. The STIX-defined Course of Action type is CourseOfActionType in the - http://stix.mitre.org/CourseOfAction-1 namespace. This type is - defined in the course_of_action.xsd file or at the URL http://st - ix.mitre.org/XMLSchema/course_of_action/1.1/course_of_action.xsd - .Alternatively, uses that require simply specifying an idref as + http://docs.oasis-open.org/cti/ns/stix/course-of-action-1 namespace. This + type is defined in the course_of_action.xsd file or at the URL http://docs. + oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/course-of-action.xsd. + Alternatively, uses that require simply specifying an idref as a reference to a course of action defined elsewhere can do so without specifying an xsi:type.Specifies a globally unique identifier for this COA. Specifies a globally unique identifier @@ -2766,10 +2765,10 @@ class CampaignBaseType(GeneratedsSuper): using the XML Schema Extension feature by the STIX Campaign type itself. Users of this type who wish to express a full campaign using STIX must do so using the xsi:type extension feature. The - STIX-defined Campaign type is CampaignType in the - http://stix.mitre.org/Campaign-1 namespace. This type is defined - in the campaign.xsd file or at the URL http://stix.mitre.org/XML - Schema/campaign/1.1/campaign.xsd.Alternatively, uses that + STIX-defined Campaign type is CampaignType in the http://docs.oasis-open. + org/cti/ns/stix/campaign-1 namespace. This type is defined in the + campaign.xsd file or at the URL http://docs.oasis-open.org/cti/stix/v1.2.1/ + csd01/xml-schemas/campaign.xsd. Alternatively, uses that require simply specifying an idref as a reference to a campaign defined elsewhere can do so without specifying an xsi:type.Specifies a globally unique identifier for this cyber @@ -2870,14 +2869,14 @@ class ThreatActorBaseType(GeneratedsSuper): type itself. Users of this type who wish to express a full threat actor using STIX must do so using the xsi:type extension feature. The STIX-defined Threat Actor type is ThreatActorType - in the http://stix.mitre.org/ThreatActor-1 namespace. This type - is defined in the threat_actor.xsd file or at the URL http://sti - x.mitre.org/XMLSchema/threat_actor/1.1/threat_actor.xsd.Alternat - ively, uses that require simply specifying an idref as a + in the http://docs.oasis-open.org/cti/ns/stix/threat-actor-1 namespace. + This type is defined in the threat_actor.xsd file or at the URL http:// + docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/threat-actor.xsd. + Alternatively, uses that require simply specifying an idref as a reference to a threat actor defined elsewhere can do so without - specifying an xsi:type.Specifies a globally unique identifier + specifying an xsi:type. Specifies a globally unique identifier for this ThreatActor. Specifies a globally unique identifier of - a ThreatActor specified elsewhere.When idref is specified, the + a ThreatActor specified elsewhere. When idref is specified, the id attribute must not be specified, and any instance of this ThreatActor should not hold content.In conjunction with the idref, this field may be used to reference a specific version of @@ -3040,11 +3039,10 @@ class AddressAbstractType(GeneratedsSuper): information. This type is intended to be extended through the xsi:type mechanism. The default type is CIQAddress3.0InstanceType in the - http://stix.mitre.org/extensions/Address#CIQAddress3.0-1 - namespace. This type is defined in the - extensions/identity/ciq_address_3.0.xsd file or at the URL http: - //stix.mitre.org/XMLSchema/extensions/address/ciq_address_3.0/1. - 0/ciq_address_3.0.xsd.""" + http://docs.oasis-open.org/cti/ns/stix/extensions/address/ciq-address-3.0-1 + namespace. This type is defined in the extensions/identity/ + ciq_address_3.0.xsd file or at the URL http://docs.oasis-open.org/cti/stix/ + v1.2.1/csd01/xml-schemas/extensions/address/ciq-3.0-address.xsd.""" subclass = None superclass = None def __init__(self): @@ -3769,14 +3767,13 @@ class ReportBaseType(GeneratedsSuper): the XML Schema Extension feature by the STIX Report type itself. Users of this type who wish to express a full report using STIX must do so using the xsi:type extension feature. The STIX- - defined Report type is ReportType in the - http://stix.mitre.org/Report-1 namespace. This type is defined - in the report.xsd file or at the URL http://stix.mitre.org/XMLSc - hema/report/1.2/report.xsd.Alternatively, uses that require - simply specifying an idref as a reference to a report defined - elsewhere can do so without specifying an xsi:type.Specifies a - globally unique identifier for this Report. Specifies a globally - unique identifier of a Report specified elsewhere.When idref is + defined Report type is ReportType in the http://docs.oasis-open.org/cti/ns/ + stix/report-1 namespace. This type is defined in the report.xsd file or at + the URL http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/ + report.xsd. Alternatively, uses that require simply specifying an idref as + a reference to a report defined elsewhere can do so without specifying an + xsi:type.Specifies a globally unique identifier for this Report. Specifies + a globally unique identifier of a Report specified elsewhere. When idref is specified, the id attribute must not be specified, and any instance of this Report should not hold content.Specifies a timestamp for the definition of a specific version of a Report. diff --git a/stix/bindings/stix_core.py b/stix/bindings/stix_core.py index f1ebcaae..2d6fc491 100644 --- a/stix/bindings/stix_core.py +++ b/stix/bindings/stix_core.py @@ -17,7 +17,7 @@ import stix.bindings.stix_common as stix_common_binding import stix.bindings.data_marking as data_marking_binding -XML_NS = "http://stix.mitre.org/stix-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/core-1" # # Data representation classes. diff --git a/stix/bindings/threat_actor.py b/stix/bindings/threat_actor.py index 352e4eae..4ecd5a85 100644 --- a/stix/bindings/threat_actor.py +++ b/stix/bindings/threat_actor.py @@ -16,7 +16,7 @@ import stix.bindings.stix_common as stix_common_binding import stix.bindings.data_marking as data_marking_binding -XML_NS = "http://stix.mitre.org/ThreatActor-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/threat-actor-1" # @@ -240,7 +240,7 @@ class ThreatActorType(stix_common_binding.ThreatActorBaseType): subclass = None superclass = stix_common_binding.ThreatActorBaseType - xmlns = "http://stix.mitre.org/ThreatActor-1" + xmlns = "http://docs.oasis-open.org/cti/ns/stix/threat-actor-1" xmlns_prefix = "ta" xml_type = "ThreatActorType" xsi_type = "%s:%s" % (xmlns_prefix, xml_type) diff --git a/stix/bindings/ttp.py b/stix/bindings/ttp.py index cb454b31..7dc875b8 100644 --- a/stix/bindings/ttp.py +++ b/stix/bindings/ttp.py @@ -16,7 +16,7 @@ import stix.bindings.stix_common as stix_common_binding import stix.bindings.data_marking as data_marking_binding -XML_NS = "http://stix.mitre.org/TTP-1" +XML_NS = "http://docs.oasis-open.org/cti/ns/stix/ttp-1" # # Data representation classes. @@ -30,17 +30,16 @@ class AttackPatternType(GeneratedsSuper): XML Schema extension feature. The STIX default extension uses the Common Attack Pattern Enumeration and Classification (CAPEC) schema to do so. The extension that defines this is captured in - the CAPEC2.7InstanceType in the - http://stix.mitre.org/extensions/AP#CAPEC2.7-1 namespace. This - type is defined in the - extensions/attack_pattern/capec_2.7_attack_pattern.xsd file or - at the URL http://stix.mitre.org/XMLSchema/extensions/attack_pat - tern/capec_2.7/1.0/capec_2.7_attack_pattern.xsd.Specifies a - unique ID for this Attack Pattern.Specifies a reference to the + the CAPEC2.7InstanceType in the http://docs.oasis-open.org/cti/ns/stix/ + extensions/attack-pattern/capec-2.7-1 namespace. This type is defined in + the extensions/attack_pattern/capec_2.7_attack_pattern.xsd file or + at the URL http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/ + extensions/attack-pattern/capec-2.7-attack-pattern.xsd. Specifies a + unique ID for this Attack Pattern. Specifies a reference to the ID for this Attack Pattern specified elsewhere.This field specifies a reference to a particular entry within the Common Attack Pattern Enumeration and Classification (CAPEC)""" - subclass = None + subclass = None superclass = None def __init__(self, idref=None, capec_id=None, id=None, Title=None, Description=None, Short_Description=None): self.idref = _cast(None, idref) @@ -168,12 +167,12 @@ class MalwareInstanceType(GeneratedsSuper): default extension uses the Malware Attribute Enumeration and Classification (MAEC) schema to do so. The extension that defines this is captured in the MAEC4.1InstanceType in the - http://stix.mitre.org/extensions/Malware#MAEC4.1-1 namespace. - This type is defined in the - extensions/malware/maec_4.1_malware.xsd file or at the URL http: - //stix.mitre.org/XMLSchema/extensions/malware/maec_4.1/1.0/maec_ - 4.1_malware.xsd.Specifies a unique ID for this Malware - Instance.Specifies a reference to the ID for this Malware + http://docs.oasis-open.org/cti/ns/stix/extensions/malware/maec-4.1-1 + namespace. This type is defined in the extensions/malware/ + maec_4.1_malware.xsd file or at the URL http://docs.oasis-open.org/cti/ + stix/v1.2.1/csd01/xml-schemas/extensions/malware/maec-4.1-malware.xsd. + Specifies a unique ID for this Malware + Instance. Specifies a reference to the ID for this Malware Instance specified elsewhere.""" subclass = None superclass = None @@ -1258,7 +1257,7 @@ class TTPType(stix_common_binding.TTPBaseType): subclass = None superclass = stix_common_binding.TTPBaseType - xmlns = "http://stix.mitre.org/TTP-1" + xmlns = "http://docs.oasis-open.org/cti/ns/stix/ttp-1" xmlns_prefix = "ttp" xml_type = "TTPType" xsi_type = "%s:%s" % (xmlns_prefix, xml_type) diff --git a/stix/campaign/__init__.py b/stix/campaign/__init__.py index 5ef089e9..d8790cef 100644 --- a/stix/campaign/__init__.py +++ b/stix/campaign/__init__.py @@ -20,7 +20,7 @@ class AssociatedCampaigns(GenericRelationshipList): - _namespace = "http://stix.mitre.org/Campaign-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/campaign-1" _binding = campaign_binding _binding_class = campaign_binding.AssociatedCampaignsType @@ -28,7 +28,7 @@ class AssociatedCampaigns(GenericRelationshipList): class Attribution(GenericRelationshipList): - _namespace = "http://stix.mitre.org/Campaign-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/campaign-1" _binding = campaign_binding _binding_class = campaign_binding.AttributionType @@ -36,7 +36,7 @@ class Attribution(GenericRelationshipList): class RelatedIncidents(GenericRelationshipList): - _namespace = "http://stix.mitre.org/Campaign-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/campaign-1" _binding = campaign_binding _binding_class = campaign_binding.RelatedIncidentsType @@ -44,7 +44,7 @@ class RelatedIncidents(GenericRelationshipList): class RelatedIndicators(GenericRelationshipList): - _namespace = "http://stix.mitre.org/Campaign-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/campaign-1" _binding = campaign_binding _binding_class = campaign_binding.RelatedIndicatorsType @@ -58,7 +58,7 @@ class RelatedIndicators(GenericRelationshipList): class RelatedTTPs(GenericRelationshipList): - _namespace = "http://stix.mitre.org/Campaign-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/campaign-1" _binding = campaign_binding _binding_class = campaign_binding.RelatedTTPsType @@ -66,7 +66,7 @@ class RelatedTTPs(GenericRelationshipList): class Names(stix.EntityList): - _namespace = "http://stix.mitre.org/Campaign-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/campaign-1" _binding = campaign_binding _binding_class = campaign_binding.NamesType @@ -96,9 +96,9 @@ class Campaign(stix.BaseCoreComponent): """ _binding = campaign_binding _binding_class = _binding.CampaignType - _namespace = "http://stix.mitre.org/Campaign-1" - _version = "1.2" - _ALL_VERSIONS = ("1.0", "1.0.1", "1.1", "1.1.1", "1.2") + _namespace = "http://docs.oasis-open.org/cti/ns/stix/campaign-1" + _version = "1.2.1" + _ALL_VERSIONS = ("1.0", "1.0.1", "1.1", "1.1.1", "1.2", "1.2.1") _ID_PREFIX = 'campaign' descriptions = fields.TypedField("Description", StructuredTextList) diff --git a/stix/coa/__init__.py b/stix/coa/__init__.py index 9a70f896..aed092f7 100644 --- a/stix/coa/__init__.py +++ b/stix/coa/__init__.py @@ -24,7 +24,7 @@ class RelatedCOAs(GenericRelationshipList): - _namespace = "http://stix.mitre.org/CourseOfAction-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/course-of-action-1" _binding = coa_binding _binding_class = coa_binding.RelatedCOAsType @@ -55,9 +55,9 @@ class CourseOfAction(stix.BaseCoreComponent): """ _binding = coa_binding _binding_class = coa_binding.CourseOfActionType - _namespace = "http://stix.mitre.org/CourseOfAction-1" - _version = "1.2" - _ALL_VERSIONS = ("1.0", "1.0.1", "1.1", "1.1.1", "1.2") + _namespace = "http://docs.oasis-open.org/cti/ns/stix/course-of-action-1" + _version = "1.2.1" + _ALL_VERSIONS = ("1.0", "1.0.1", "1.1", "1.1.1", "1.2", "1.2.1") _ID_PREFIX = 'coa' stage = VocabField("Stage", Stage) diff --git a/stix/coa/objective.py b/stix/coa/objective.py index 09c708a6..c954705b 100644 --- a/stix/coa/objective.py +++ b/stix/coa/objective.py @@ -11,7 +11,7 @@ class Objective(stix.Entity): _binding = coa_binding _binding_class = coa_binding.ObjectiveType - _namespace = "http://stix.mitre.org/CourseOfAction-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/course-of-action-1" applicability_confidence = fields.TypedField("Applicability_Confidence", type_=Confidence) descriptions = fields.TypedField("Description", type_=StructuredTextList) diff --git a/stix/coa/structured_coa.py b/stix/coa/structured_coa.py index c0aebf57..5282981a 100644 --- a/stix/coa/structured_coa.py +++ b/stix/coa/structured_coa.py @@ -18,7 +18,7 @@ def entity_class(cls, key): class _BaseStructuredCOA(stix.Entity): - _namespace = "http://stix.mitre.org/CourseOfAction-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/course-of-action-1" _binding = coa_binding _binding_class = coa_binding.StructuredCOAType diff --git a/stix/common/__init__.py b/stix/common/__init__.py index 2854ef2e..6b77eb91 100644 --- a/stix/common/__init__.py +++ b/stix/common/__init__.py @@ -34,7 +34,7 @@ from mixbox.vendor.six import text_type class EncodedCDATA(stix.Entity): - _namespace = "http://stix.mitre.org/common-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/common-1" _binding = common_binding _binding_class = _binding.EncodedCDATAType diff --git a/stix/common/activity.py b/stix/common/activity.py index 7d82741d..03316eae 100644 --- a/stix/common/activity.py +++ b/stix/common/activity.py @@ -14,7 +14,7 @@ class Activity(stix.Entity): _binding = common_binding _binding_class = common_binding.ActivityType - _namespace = 'http://stix.mitre.org/common-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/common-1' date_time = fields.TypedField("Date_Time", DateTimeWithPrecision) descriptions = fields.TypedField("Description", StructuredTextList) diff --git a/stix/common/campaign_reference.py b/stix/common/campaign_reference.py index 3a9e7a38..7004bae4 100644 --- a/stix/common/campaign_reference.py +++ b/stix/common/campaign_reference.py @@ -13,7 +13,7 @@ class CampaignRef(stix.Entity): - _namespace = "http://stix.mitre.org/common-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/common-1" _binding = common_binding _binding_class = common_binding.CampaignReferenceType diff --git a/stix/common/confidence.py b/stix/common/confidence.py index d5c1d946..a05795d9 100644 --- a/stix/common/confidence.py +++ b/stix/common/confidence.py @@ -15,7 +15,7 @@ class Confidence(stix.Entity): - _namespace = 'http://stix.mitre.org/common-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/common-1' _binding = common_binding _binding_class = common_binding.ConfidenceType @@ -71,7 +71,7 @@ def add_description(self, description): # class ConfidenceAssertionChain(stix.Entity): -# _namespace = 'http://stix.mitre.org/common-2' +# _namespace = 'http://docs.oasis-open.org/cti/ns/stix/common-1' # _binding = common_binding # # def __init__(self): diff --git a/stix/common/datetimewithprecision.py b/stix/common/datetimewithprecision.py index 5775a099..212069a1 100644 --- a/stix/common/datetimewithprecision.py +++ b/stix/common/datetimewithprecision.py @@ -27,7 +27,7 @@ def validate_precision(instance, value): class DateTimeWithPrecision(stix.Entity): _binding = common_binding _binding_class = _binding.DateTimeWithPrecisionType - _namespace = 'http://stix.mitre.org/common-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/common-1' value = fields.DateTimeField("valueOf_", key_name="value") precision = fields.TypedField("precision", preset_hook=validate_precision) diff --git a/stix/common/identity.py b/stix/common/identity.py index 35fea9db..9c3a9d0f 100644 --- a/stix/common/identity.py +++ b/stix/common/identity.py @@ -21,7 +21,7 @@ def entity_class(cls, key): class Identity(stix.Entity): _binding = common_binding _binding_class = IdentityType - _namespace = 'http://stix.mitre.org/common-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/common-1' id_ = fields.IdField("id") idref = fields.IdrefField("idref") @@ -53,7 +53,7 @@ def lookup_class(xsi_type): class RelatedIdentities(stix.EntityList): - _namespace = 'http://stix.mitre.org/common-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/common-1' _binding = common_binding _binding_class = common_binding.RelatedIdentitiesType diff --git a/stix/common/information_source.py b/stix/common/information_source.py index 006ca08b..7e97e4b1 100644 --- a/stix/common/information_source.py +++ b/stix/common/information_source.py @@ -20,7 +20,7 @@ class InformationSource(stix.Entity): _binding = stix_common_binding _binding_class = stix_common_binding.InformationSourceType - _namespace = 'http://stix.mitre.org/common-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/common-1' identity = fields.TypedField("Identity", type_=Identity, factory=IdentityFactory) descriptions = fields.TypedField("Description", StructuredTextList) @@ -86,7 +86,7 @@ def add_role(self, value): class ContributingSources(stix.EntityList): - _namespace = "http://stix.mitre.org/common-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/common-1" _binding = stix_common_binding _binding_class = stix_common_binding.ContributingSourcesType diff --git a/stix/common/kill_chains/__init__.py b/stix/common/kill_chains/__init__.py index 5bfd8c83..451c0d48 100644 --- a/stix/common/kill_chains/__init__.py +++ b/stix/common/kill_chains/__init__.py @@ -13,7 +13,7 @@ class KillChain(stix.Entity): _binding = common_binding - _namespace = 'http://stix.mitre.org/common-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/common-1' _binding_class = _binding.KillChainType id_ = fields.TypedField("id") @@ -50,7 +50,7 @@ def __ne__(self, other): class KillChains(stix.EntityList): _binding = common_binding - _namespace = 'http://stix.mitre.org/common-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/common-1' _binding_class = _binding.KillChainsType kill_chain = fields.TypedField("Kill_Chain", KillChain, multiple=True, key_name="kill_chains") @@ -62,7 +62,7 @@ def _dict_as_list(cls): class KillChainPhase(stix.Entity): _binding = common_binding - _namespace = 'http://stix.mitre.org/common-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/common-1' _binding_class = _binding.KillChainPhaseType phase_id = fields.TypedField("phase_id") @@ -95,7 +95,7 @@ def __hash__(self): class KillChainPhaseReference(KillChainPhase): _binding = common_binding - _namespace = 'http://stix.mitre.org/common-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/common-1' _binding_class = _binding.KillChainPhaseReferenceType kill_chain_id = fields.TypedField("kill_chain_id") @@ -123,7 +123,7 @@ def _fix_value(self, value): class KillChainPhasesReference(stix.EntityList): _binding = common_binding - _namespace = 'http://stix.mitre.org/common-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/common-1' _binding_class = _binding.KillChainPhasesReferenceType kill_chain_phase = fields.TypedField( diff --git a/stix/common/names.py b/stix/common/names.py index 47296864..fc0b2798 100644 --- a/stix/common/names.py +++ b/stix/common/names.py @@ -13,7 +13,7 @@ class Names(stix.EntityList): - _namespace = 'http://stix.mitre.org/common-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/common-1' _binding = common_binding _binding_class = _binding.NamesType diff --git a/stix/common/profiles.py b/stix/common/profiles.py index 1a4311e2..d0dde8e6 100644 --- a/stix/common/profiles.py +++ b/stix/common/profiles.py @@ -12,7 +12,7 @@ class Profiles(collections.MutableSequence, stix.Entity): _binding = stix_common_binding _binding_class = stix_common_binding.ProfilesType - _namespace = 'http://stix.mitre.org/common-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/common-1' # Fields profile = fields.TypedField("Profile", multiple=True) diff --git a/stix/common/references.py b/stix/common/references.py index 2bb4d5be..40268ed0 100644 --- a/stix/common/references.py +++ b/stix/common/references.py @@ -11,7 +11,7 @@ class References(collections.MutableSequence, stix.Entity): _binding = stix_common_binding _binding_class = stix_common_binding.ReferencesType - _namespace = 'http://stix.mitre.org/common-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/common-1' # Fields reference = fields.TypedField("Reference", multiple=True) diff --git a/stix/common/related.py b/stix/common/related.py index bb8f1ffe..4bbb4df4 100644 --- a/stix/common/related.py +++ b/stix/common/related.py @@ -41,7 +41,7 @@ def validate_scope(instance, value): class GenericRelationship(stix.Entity): - _namespace = "http://stix.mitre.org/common-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/common-1" _binding = common_binding _binding_class = common_binding.GenericRelationshipType @@ -58,7 +58,7 @@ def __init__(self, confidence=None, information_source=None, relationship=None): class RelatedPackageRef(GenericRelationship): - _namespace = "http://stix.mitre.org/common-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/common-1" _binding = common_binding _binding_class = common_binding.RelatedPackageRefType @@ -79,7 +79,7 @@ def __init__(self, idref=None, timestamp=None, confidence=None, class GenericRelationshipEntity(stix.Entity): - _namespace = "http://stix.mitre.org/common-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/common-1" _binding = common_binding _binding_class = _binding.GenericRelationshipListType @@ -106,7 +106,7 @@ class GenericRelationshipList(stix.EntityList): Subclasses must supply exactly one multiple TypedField. """ - _namespace = "http://stix.mitre.org/common-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/common-1" _binding = common_binding _binding_class = _binding.GenericRelationshipListType @@ -146,7 +146,7 @@ def _is_valid(self, value): class RelatedPackageRefs(stix.EntityList): - _namespace = 'http://stix.mitre.org/common-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/common-1' _binding = common_binding _binding_class = common_binding.RelatedPackageRefsType @@ -187,7 +187,7 @@ def __init__(self, item=None, confidence=None, class RelatedCampaign(_BaseRelated): - _namespace = "http://stix.mitre.org/common-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/common-1" _binding = common_binding _binding_class = common_binding.RelatedCampaignType @@ -196,7 +196,7 @@ class RelatedCampaign(_BaseRelated): class RelatedCOA(_BaseRelated): - _namespace = "http://stix.mitre.org/common-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/common-1" _binding = common_binding _binding_class = common_binding.RelatedCourseOfActionType @@ -205,7 +205,7 @@ class RelatedCOA(_BaseRelated): class RelatedExploitTarget(_BaseRelated): - _namespace = "http://stix.mitre.org/common-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/common-1" _binding = common_binding _binding_class = common_binding.RelatedExploitTargetType @@ -214,7 +214,7 @@ class RelatedExploitTarget(_BaseRelated): class RelatedIdentity(_BaseRelated): - _namespace = 'http://stix.mitre.org/common-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/common-1' _binding = common_binding _binding_class = common_binding.RelatedIdentityType @@ -223,7 +223,7 @@ class RelatedIdentity(_BaseRelated): class RelatedIncident(_BaseRelated): - _namespace = "http://stix.mitre.org/common-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/common-1" _binding = common_binding _binding_class = common_binding.RelatedIncidentType @@ -231,7 +231,7 @@ class RelatedIncident(_BaseRelated): item = fields.TypedField("Incident", type_="stix.incident.Incident") class RelatedIndicator(_BaseRelated): - _namespace = "http://stix.mitre.org/common-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/common-1" _binding = common_binding _binding_class = common_binding.RelatedIndicatorType @@ -240,7 +240,7 @@ class RelatedIndicator(_BaseRelated): class RelatedObservable(_BaseRelated): - _namespace = "http://stix.mitre.org/common-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/common-1" _binding = common_binding _binding_class = common_binding.RelatedObservableType @@ -248,7 +248,7 @@ class RelatedObservable(_BaseRelated): item = fields.TypedField("Observable", type_=Observable) class RelatedThreatActor(_BaseRelated): - _namespace = "http://stix.mitre.org/common-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/common-1" _binding = common_binding _binding_class = common_binding.RelatedThreatActorType @@ -257,7 +257,7 @@ class RelatedThreatActor(_BaseRelated): class RelatedTTP(_BaseRelated): - _namespace = "http://stix.mitre.org/common-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/common-1" _binding = common_binding _binding_class = common_binding.RelatedTTPType @@ -266,7 +266,7 @@ class RelatedTTP(_BaseRelated): class RelatedPackage(_BaseRelated): - _namespace = "http://stix.mitre.org/stix-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/core-1" _binding = core_binding _binding_class = core_binding.RelatedPackageType @@ -275,7 +275,7 @@ class RelatedPackage(_BaseRelated): class RelatedReport(_BaseRelated): - _namespace = "http://stix.mitre.org/common-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/common-1" _binding = common_binding _binding_class = common_binding.RelatedReportType @@ -284,7 +284,7 @@ class RelatedReport(_BaseRelated): class RelatedCampaignRef(_BaseRelated): - _namespace = "http://stix.mitre.org/common-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/common-1" _binding = common_binding _binding_class = _binding.RelatedCampaignReferenceType @@ -293,7 +293,7 @@ class RelatedCampaignRef(_BaseRelated): class RelatedPackages(GenericRelationshipList): - _namespace = 'http://stix.mitre.org/stix-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/core-1' _binding = core_binding _binding_class = core_binding.RelatedPackagesType @@ -301,7 +301,7 @@ class RelatedPackages(GenericRelationshipList): class RelatedReports(GenericRelationshipList): - _namespace = 'http://stix.mitre.org/Report-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/report-1' _binding = report_binding _binding_class = report_binding.RelatedReportsType diff --git a/stix/common/statement.py b/stix/common/statement.py index 241d7b66..b3b25c7a 100644 --- a/stix/common/statement.py +++ b/stix/common/statement.py @@ -17,7 +17,7 @@ from stix.common.vocabs import VocabString class Statement(stix.Entity): - _namespace = 'http://stix.mitre.org/common-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/common-1' _binding = common_binding _binding_class = common_binding.StatementType diff --git a/stix/common/structured_text.py b/stix/common/structured_text.py index 02ef1491..edb64229 100644 --- a/stix/common/structured_text.py +++ b/stix/common/structured_text.py @@ -29,7 +29,7 @@ class StructuredText(stix.Entity): _binding = stix_common_binding _binding_class = _binding.StructuredTextType - _namespace = 'http://stix.mitre.org/common-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/common-1' id_ = fields.IdField("id") ordinality = fields.TypedField("ordinality") diff --git a/stix/common/tools.py b/stix/common/tools.py index 2865098c..1542d828 100644 --- a/stix/common/tools.py +++ b/stix/common/tools.py @@ -14,7 +14,7 @@ class ToolInformation(stix.Entity, cybox.common.ToolInformation): - _namespace = 'http://stix.mitre.org/common-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/common-1' _binding = common_binding _binding_class = common_binding.ToolInformationType diff --git a/stix/common/vocabs.py b/stix/common/vocabs.py index d0ed3bff..8c48fb37 100644 --- a/stix/common/vocabs.py +++ b/stix/common/vocabs.py @@ -82,7 +82,7 @@ def entity_class(cls, key): class VocabString(stix.Entity): _binding = stix_common_binding _binding_class = stix_common_binding.ControlledVocabularyStringType - _namespace = 'http://stix.mitre.org/common-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/common-1' # All subclasses should override these _XSI_TYPE = None @@ -168,7 +168,7 @@ def register_vocab(cls): @register_vocab class AvailabilityLossType_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:AvailabilityLossTypeVocab-1.0' _VOCAB_VERSION = '1.0' @@ -183,7 +183,7 @@ class AvailabilityLossType_1_0(VocabString): @register_vocab class AvailabilityLossType_1_1_1(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:AvailabilityLossTypeVocab-1.1.1' _VOCAB_VERSION = '1.1.1' @@ -198,7 +198,7 @@ class AvailabilityLossType_1_1_1(VocabString): @register_vocab class ThreatActorType_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:ThreatActorTypeVocab-1.0' _VOCAB_VERSION = '1.0' @@ -223,7 +223,7 @@ class ThreatActorType_1_0(VocabString): @register_vocab class AttackerInfrastructureType_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:AttackerInfrastructureTypeVocab-1.0' _VOCAB_VERSION = '1.0' @@ -255,7 +255,7 @@ class AttackerInfrastructureType_1_0(VocabString): @register_vocab class DiscoveryMethod_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:DiscoveryMethodVocab-1.0' _VOCAB_VERSION = '1.0' @@ -279,7 +279,7 @@ class DiscoveryMethod_1_0(VocabString): @register_vocab class DiscoveryMethod_2_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:DiscoveryMethodVocab-2.0' _VOCAB_VERSION = '2.0' @@ -305,7 +305,7 @@ class DiscoveryMethod_2_0(VocabString): @register_vocab class AttackerToolType_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:AttackerToolTypeVocab-1.0' _VOCAB_VERSION = '1.0' @@ -320,7 +320,7 @@ class AttackerToolType_1_0(VocabString): @register_vocab class IndicatorType_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:IndicatorTypeVocab-1.0' _VOCAB_VERSION = '1.0' @@ -338,7 +338,7 @@ class IndicatorType_1_0(VocabString): @register_vocab class IndicatorType_1_1(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:IndicatorTypeVocab-1.1' _VOCAB_VERSION = '1.1' @@ -360,7 +360,7 @@ class IndicatorType_1_1(VocabString): @register_vocab class SystemType_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:SystemTypeVocab-1.0' _VOCAB_VERSION = '1.0' @@ -395,7 +395,7 @@ class SystemType_1_0(VocabString): @register_vocab class CampaignStatus_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:CampaignStatusVocab-1.0' _VOCAB_VERSION = '1.0' @@ -406,7 +406,7 @@ class CampaignStatus_1_0(VocabString): @register_vocab class IncidentStatus_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:IncidentStatusVocab-1.0' _VOCAB_VERSION = '1.0' @@ -423,7 +423,7 @@ class IncidentStatus_1_0(VocabString): @register_vocab class ManagementClass_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:ManagementClassVocab-1.0' _VOCAB_VERSION = '1.0' @@ -435,7 +435,7 @@ class ManagementClass_1_0(VocabString): @register_vocab class Motivation_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:MotivationVocab-1.0' _VOCAB_VERSION = '1.0' @@ -457,7 +457,7 @@ class Motivation_1_0(VocabString): @register_vocab class Motivation_1_0_1(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:MotivationVocab-1.0.1' _VOCAB_VERSION = '1.0.1' @@ -479,7 +479,7 @@ class Motivation_1_0_1(VocabString): @register_vocab class Motivation_1_1(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:MotivationVocab-1.1' _VOCAB_VERSION = '1.1' @@ -501,7 +501,7 @@ class Motivation_1_1(VocabString): @register_vocab class IncidentCategory_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:IncidentCategoryVocab-1.0' _VOCAB_VERSION = '1.0' @@ -516,7 +516,7 @@ class IncidentCategory_1_0(VocabString): @register_vocab class ImpactQualification_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:ImpactQualificationVocab-1.0' _VOCAB_VERSION = '1.0' @@ -530,7 +530,7 @@ class ImpactQualification_1_0(VocabString): @register_vocab class PlanningAndOperationalSupport_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:PlanningAndOperationalSupportVocab-1.0' _VOCAB_VERSION = '1.0' @@ -560,7 +560,7 @@ class PlanningAndOperationalSupport_1_0(VocabString): @register_vocab class PlanningAndOperationalSupport_1_0_1(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:PlanningAndOperationalSupportVocab-1.0.1' _VOCAB_VERSION = '1.0.1' @@ -590,7 +590,7 @@ class PlanningAndOperationalSupport_1_0_1(VocabString): @register_vocab class CourseOfActionType_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:CourseOfActionTypeVocab-1.0' _VOCAB_VERSION = '1.0' @@ -614,7 +614,7 @@ class CourseOfActionType_1_0(VocabString): @register_vocab class SecurityCompromise_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:SecurityCompromiseVocab-1.0' _VOCAB_VERSION = '1.0' @@ -626,7 +626,7 @@ class SecurityCompromise_1_0(VocabString): @register_vocab class ImpactRating_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:ImpactRatingVocab-1.0' _VOCAB_VERSION = '1.0' @@ -639,7 +639,7 @@ class ImpactRating_1_0(VocabString): @register_vocab class AssetType_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:AssetTypeVocab-1.0' _VOCAB_VERSION = '1.0' @@ -722,7 +722,7 @@ class AssetType_1_0(VocabString): @register_vocab class COAStage_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:COAStageVocab-1.0' _VOCAB_VERSION = '1.0' @@ -732,7 +732,7 @@ class COAStage_1_0(VocabString): @register_vocab class LocationClass_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:LocationClassVocab-1.0' _VOCAB_VERSION = '1.0' @@ -745,7 +745,7 @@ class LocationClass_1_0(VocabString): @register_vocab class InformationType_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:InformationTypeVocab-1.0' _VOCAB_VERSION = '1.0' @@ -762,7 +762,7 @@ class InformationType_1_0(VocabString): @register_vocab class ThreatActorSophistication_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:ThreatActorSophisticationVocab-1.0' _VOCAB_VERSION = '1.0' @@ -775,7 +775,7 @@ class ThreatActorSophistication_1_0(VocabString): @register_vocab class HighMediumLow_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:HighMediumLowVocab-1.0' _VOCAB_VERSION = '1.0' @@ -788,7 +788,7 @@ class HighMediumLow_1_0(VocabString): @register_vocab class LossProperty_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:LossPropertyVocab-1.0' _VOCAB_VERSION = '1.0' @@ -801,7 +801,7 @@ class LossProperty_1_0(VocabString): @register_vocab class IntendedEffect_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:IntendedEffectVocab-1.0' _VOCAB_VERSION = '1.0' @@ -833,7 +833,7 @@ class IntendedEffect_1_0(VocabString): @register_vocab class PackageIntent_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:PackageIntentVocab-1.0' _VOCAB_VERSION = '1.0' @@ -861,7 +861,7 @@ class PackageIntent_1_0(VocabString): @register_vocab class ReportIntent_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:ReportIntentVocab-1.0' _VOCAB_VERSION = '1.0' @@ -889,7 +889,7 @@ class ReportIntent_1_0(VocabString): @register_vocab class LossDuration_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:LossDurationVocab-1.0' _VOCAB_VERSION = '1.0' @@ -904,7 +904,7 @@ class LossDuration_1_0(VocabString): @register_vocab class OwnershipClass_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:OwnershipClassVocab-1.0' _VOCAB_VERSION = '1.0' @@ -917,7 +917,7 @@ class OwnershipClass_1_0(VocabString): @register_vocab class MalwareType_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:MalwareTypeVocab-1.0' _VOCAB_VERSION = '1.0' @@ -943,7 +943,7 @@ class MalwareType_1_0(VocabString): @register_vocab class IncidentEffect_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:IncidentEffectVocab-1.0' _VOCAB_VERSION = '1.0' @@ -965,7 +965,7 @@ class IncidentEffect_1_0(VocabString): @register_vocab class InformationSourceRole_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:InformationSourceRoleVocab-1.0' _VOCAB_VERSION = '1.0' @@ -977,7 +977,7 @@ class InformationSourceRole_1_0(VocabString): @register_vocab class Versioning_1_0(VocabString): - _namespace = 'http://stix.mitre.org/default_vocabularies-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/vocabularies-1' _XSI_TYPE = 'stixVocabs:VersioningVocab-1.0' _VOCAB_VERSION = '1.0' diff --git a/stix/core/__init__.py b/stix/core/__init__.py index e6d4b9dc..9fb644ff 100644 --- a/stix/core/__init__.py +++ b/stix/core/__init__.py @@ -29,7 +29,7 @@ class Campaigns(stix.EntityList): _binding = stix_core_binding - _namespace = 'http://stix.mitre.org/stix-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/core-1' _binding_class = _binding.CampaignsType campaign = fields.TypedField( @@ -42,7 +42,7 @@ class Campaigns(stix.EntityList): class CoursesOfAction(stix.EntityList): _binding = stix_core_binding - _namespace = 'http://stix.mitre.org/stix-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/core-1' _binding_class = _binding.CoursesOfActionType course_of_action = fields.TypedField( @@ -55,7 +55,7 @@ class CoursesOfAction(stix.EntityList): class ExploitTargets(stix.EntityList): _binding = stix_common_binding - _namespace = 'http://stix.mitre.org/common-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/common-1' _binding_class = _binding.ExploitTargetsType exploit_target = fields.TypedField( @@ -68,7 +68,7 @@ class ExploitTargets(stix.EntityList): class Incidents(stix.EntityList): _binding = stix_core_binding - _namespace = 'http://stix.mitre.org/stix-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/core-1' _binding_class = _binding.IncidentsType incident = fields.TypedField( @@ -81,7 +81,7 @@ class Incidents(stix.EntityList): class Indicators(stix.EntityList): _binding = stix_core_binding - _namespace = 'http://stix.mitre.org/stix-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/core-1' _binding_class = _binding.IndicatorsType indicator = fields.TypedField( @@ -94,7 +94,7 @@ class Indicators(stix.EntityList): class ThreatActors(stix.EntityList): _binding = stix_core_binding - _namespace = 'http://stix.mitre.org/stix-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/core-1' _binding_class = _binding.ThreatActorsType threat_actor = fields.TypedField( @@ -107,7 +107,7 @@ class ThreatActors(stix.EntityList): class Reports(stix.EntityList): _binding = stix_core_binding - _namespace = 'http://stix.mitre.org/stix-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/core-1' _binding_class = _binding.ReportsType report = fields.TypedField( diff --git a/stix/core/stix_header.py b/stix/core/stix_header.py index fb4c2917..0cffddbc 100644 --- a/stix/core/stix_header.py +++ b/stix/core/stix_header.py @@ -34,7 +34,7 @@ class STIXHeader(stix.Entity): """ _binding = stix_core_binding _binding_class = _binding.STIXHeaderType - _namespace = 'http://stix.mitre.org/stix-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/core-1' title = fields.TypedField("Title", preset_hook=deprecated.field) package_intents = VocabField("Package_Intent", PackageIntent, multiple=True, preset_hook=deprecated.field) diff --git a/stix/core/stix_package.py b/stix/core/stix_package.py index f25810f1..0612e3f5 100644 --- a/stix/core/stix_package.py +++ b/stix/core/stix_package.py @@ -65,9 +65,9 @@ class STIXPackage(stix.Entity): """ _binding = stix_core_binding _binding_class = _binding.STIXType - _namespace = 'http://stix.mitre.org/stix-1' - _version = "1.2" - _ALL_VERSIONS = ("1.0", "1.0.1", "1.1", "1.1.1", "1.2") + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/core-1' + _version = "1.2.1" + _ALL_VERSIONS = ("1.0", "1.0.1", "1.1", "1.1.1", "1.2", "1.2.1") id_ = fields.IdField("id") idref = fields.IdrefField("idref", preset_hook=deprecated.field) diff --git a/stix/core/ttps.py b/stix/core/ttps.py index 82832e40..4aaa1ba6 100644 --- a/stix/core/ttps.py +++ b/stix/core/ttps.py @@ -22,7 +22,7 @@ class TTPs(stix.EntityList): _binding = core_binding _binding_class = _binding.TTPsType - _namespace = 'http://stix.mitre.org/stix-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/core-1' ttps = fields.TypedField( name="TTP", diff --git a/stix/data_marking.py b/stix/data_marking.py index 57c61eab..7bcae063 100644 --- a/stix/data_marking.py +++ b/stix/data_marking.py @@ -25,7 +25,7 @@ def entity_class(cls, key): class MarkingStructure(stix.Entity): _binding = stix_data_marking_binding _binding_class = stix_data_marking_binding.MarkingStructureType - _namespace = 'http://data-marking.mitre.org/Marking-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/data-marking-1' _XSI_TYPE = None # overridden by subclasses id_ = fields.IdField("id") @@ -57,7 +57,7 @@ def lookup_class(xsi_type): class MarkingSpecification(stix.Entity): _binding = stix_data_marking_binding _binding_class = stix_data_marking_binding.MarkingSpecificationType - _namespace = 'http://data-marking.mitre.org/Marking-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/data-marking-1' id_ = fields.IdField("id") idref = fields.IdrefField("idref") @@ -80,7 +80,7 @@ def __init__(self, controlled_structure=None, marking_structures=None): class Marking(stix.EntityList): _binding = stix_data_marking_binding _binding_class = stix_data_marking_binding.MarkingType - _namespace = 'http://data-marking.mitre.org/Marking-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/data-marking-1' marking = fields.TypedField("Marking", MarkingSpecification, multiple=True) def __init__(self, markings=None): diff --git a/stix/exploit_target/__init__.py b/stix/exploit_target/__init__.py index 9d27d0b6..c1d37f28 100644 --- a/stix/exploit_target/__init__.py +++ b/stix/exploit_target/__init__.py @@ -36,9 +36,9 @@ class ExploitTarget(stix.BaseCoreComponent): """ _binding = exploit_target_binding _binding_class = _binding.ExploitTargetType - _namespace = "http://stix.mitre.org/ExploitTarget-1" - _version = "1.2" - _ALL_VERSIONS = ("1.0", "1.0.1", "1.1", "1.1.1", "1.2") + _namespace = "http://docs.oasis-open.org/cti/ns/stix/exploit-target-1" + _version = "1.2.1" + _ALL_VERSIONS = ("1.0", "1.0.1", "1.1", "1.1.1", "1.2", "1.2.1") _ID_PREFIX = 'et' potential_coas = fields.TypedField("Potential_COAs", type_="stix.exploit_target.PotentialCOAs") @@ -114,7 +114,7 @@ class PotentialCOAs(GenericRelationshipList): """ A list of ``Potential_COA`` objects, defaults to empty array """ - _namespace = "http://stix.mitre.org/ExploitTarget-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/exploit-target-1" _binding = exploit_target_binding _binding_class = exploit_target_binding.PotentialCOAsType @@ -128,7 +128,7 @@ class RelatedExploitTargets(GenericRelationshipList): """ A list of ``RelatedExploitTargets`` objects, defaults to empty array """ - _namespace = "http://stix.mitre.org/ExploitTarget-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/exploit-target-1" _binding = exploit_target_binding _binding_class = exploit_target_binding.RelatedExploitTargetsType diff --git a/stix/exploit_target/configuration.py b/stix/exploit_target/configuration.py index 44c0e867..42d5d6f0 100644 --- a/stix/exploit_target/configuration.py +++ b/stix/exploit_target/configuration.py @@ -17,7 +17,7 @@ class Configuration(stix.Entity): """ _binding = exploit_target_binding _binding_class = _binding.ConfigurationType - _namespace = "http://stix.mitre.org/ExploitTarget-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/exploit-target-1" descriptions = fields.TypedField("Description", type_="stix.common.StructuredTextList") short_descriptions = fields.TypedField("Short_Description", type_="stix.common.StructuredTextList") diff --git a/stix/exploit_target/vulnerability.py b/stix/exploit_target/vulnerability.py index 7691716d..13aeea74 100644 --- a/stix/exploit_target/vulnerability.py +++ b/stix/exploit_target/vulnerability.py @@ -23,7 +23,7 @@ class Vulnerability(stix.Entity): """ _binding = exploit_target_binding _binding_class = _binding.VulnerabilityType - _namespace = "http://stix.mitre.org/ExploitTarget-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/exploit-target-1" is_known = fields.BooleanField("is_known") is_publicly_acknowledged = fields.BooleanField("is_publicly_acknowledged") @@ -112,7 +112,7 @@ class CVSSVector(stix.Entity): """ _binding = exploit_target_binding _binding_class = exploit_target_binding.CVSSVectorType - _namespace = "http://stix.mitre.org/ExploitTarget-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/exploit-target-1" overall_score = fields.TypedField("Overall_Score") base_score = fields.TypedField("Base_Score") @@ -129,7 +129,7 @@ def __init__(self): class AffectedSoftware(GenericRelationshipList): _binding = exploit_target_binding _binding_class = exploit_target_binding.AffectedSoftwareType - _namespace = "http://stix.mitre.org/ExploitTarget-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/exploit-target-1" affected_software = fields.TypedField("Affected_Software", RelatedObservable, multiple=True, key_name="affected_software") diff --git a/stix/exploit_target/weakness.py b/stix/exploit_target/weakness.py index db9f4ecc..ec1267cc 100644 --- a/stix/exploit_target/weakness.py +++ b/stix/exploit_target/weakness.py @@ -16,7 +16,7 @@ class Weakness(stix.Entity): """ _binding = exploit_target_binding _binding_class = _binding.WeaknessType - _namespace = "http://stix.mitre.org/ExploitTarget-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/exploit-target-1" descriptions = fields.TypedField("Description", type_="stix.common.StructuredTextList") cwe_id = fields.TypedField("CWE_ID") diff --git a/stix/extensions/identity/ciq_identity_3_0.py b/stix/extensions/identity/ciq_identity_3_0.py index 78fb58f8..ca641397 100644 --- a/stix/extensions/identity/ciq_identity_3_0.py +++ b/stix/extensions/identity/ciq_identity_3_0.py @@ -14,7 +14,7 @@ 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_STIX_EXT = "http://stix.mitre.org/extensions/Identity#CIQIdentity3.0-1" +XML_NS_STIX_EXT = "http://docs.oasis-open.org/cti/ns/stix/extensions/identity/ciq-3.0-identity-1" et.register_namespace('xpil', XML_NS_XPIL) et.register_namespace('xnl', XML_NS_XNL) @@ -26,7 +26,7 @@ class CIQIdentity3_0Instance(common.Identity): _binding = ciq_identity_binding _binding_class = _binding.CIQIdentity3_0InstanceType - _namespace = "http://stix.mitre.org/extensions/Identity#CIQIdentity3.0-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/extensions/identity/ciq-3.0-identity-1" _XML_NS_PREFIX = "ciqIdentity" _XML_TYPE = "CIQIdentity3.0InstanceType" _XSI_TYPE = "ciqIdentity:CIQIdentity3.0InstanceType" @@ -126,7 +126,7 @@ def from_dict(cls, cls_dict): class STIXCIQIdentity3_0(stix.Entity): - _namespace = "http://stix.mitre.org/extensions/Identity#CIQIdentity3.0-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/extensions/identity/ciq-3.0-identity-1" XML_TAG = "{%s}Specification" % _namespace def __init__(self, party_name=None, languages=None, addresses=None, diff --git a/stix/extensions/malware/maec_4_1_malware.py b/stix/extensions/malware/maec_4_1_malware.py index e45dbebf..eb05e454 100644 --- a/stix/extensions/malware/maec_4_1_malware.py +++ b/stix/extensions/malware/maec_4_1_malware.py @@ -102,7 +102,7 @@ def validate_maec_input(instance, value): class MAECInstance(MalwareInstance): _binding = ext_binding _binding_class = _binding.MAEC4_1InstanceType - _namespace = 'http://stix.mitre.org/extensions/Malware#MAEC4.1-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/extensions/malware/maec-4.1-1' _xml_ns_prefix = "stix-maec" _XSI_TYPE = "stix-maec:MAEC4.1InstanceType" _TAG_MAEC = "{%s}MAEC" % _namespace diff --git a/stix/extensions/marking/simple_marking.py b/stix/extensions/marking/simple_marking.py index bcf41193..090ab5a4 100644 --- a/stix/extensions/marking/simple_marking.py +++ b/stix/extensions/marking/simple_marking.py @@ -12,7 +12,7 @@ class SimpleMarkingStructure(MarkingStructure): _binding = simple_marking_binding _binding_class = simple_marking_binding.SimpleMarkingStructureType - _namespace = 'http://data-marking.mitre.org/extensions/MarkingStructure#Simple-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/extensions/data-marking/simple-1' _XSI_TYPE = "simpleMarking:SimpleMarkingStructureType" statement = fields.TypedField("Statement") diff --git a/stix/extensions/marking/terms_of_use_marking.py b/stix/extensions/marking/terms_of_use_marking.py index 2df6ea1d..39a81877 100644 --- a/stix/extensions/marking/terms_of_use_marking.py +++ b/stix/extensions/marking/terms_of_use_marking.py @@ -12,7 +12,7 @@ class TermsOfUseMarkingStructure(MarkingStructure): _binding = tou_marking_binding _binding_class = tou_marking_binding.TermsOfUseMarkingStructureType - _namespace = 'http://data-marking.mitre.org/extensions/MarkingStructure#Terms_Of_Use-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/extensions/data-marking/terms-of-use-1' _XSI_TYPE = "TOUMarking:TermsOfUseMarkingStructureType" terms_of_use = fields.TypedField("Terms_Of_Use") diff --git a/stix/extensions/marking/tlp.py b/stix/extensions/marking/tlp.py index 5b8b732c..0b9922e6 100644 --- a/stix/extensions/marking/tlp.py +++ b/stix/extensions/marking/tlp.py @@ -11,7 +11,7 @@ class TLPMarkingStructure(MarkingStructure): _binding = tlp_binding _binding_class = tlp_binding.TLPMarkingStructureType - _namespace = 'http://data-marking.mitre.org/extensions/MarkingStructure#TLP-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/extensions/data-marking/tlp-1' _XSI_TYPE = "tlpMarking:TLPMarkingStructureType" color = fields.TypedField("color") diff --git a/stix/extensions/structured_coa/generic_structured_coa.py b/stix/extensions/structured_coa/generic_structured_coa.py index 83c2b8a1..84ef0600 100644 --- a/stix/extensions/structured_coa/generic_structured_coa.py +++ b/stix/extensions/structured_coa/generic_structured_coa.py @@ -16,7 +16,7 @@ @stix.register_extension class GenericStructuredCOA(_BaseStructuredCOA): - _namespace = "http://stix.mitre.org/extensions/StructuredCOA#Generic-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/extensions/structured-coa/generic-1" _binding = generic_structured_coa_binding _binding_class = _binding.GenericStructuredCOAType _XSI_TYPE = "genericStructuredCOA:GenericStructuredCOAType" diff --git a/stix/extensions/test_mechanism/generic_test_mechanism.py b/stix/extensions/test_mechanism/generic_test_mechanism.py index dd3a816b..a96c661a 100644 --- a/stix/extensions/test_mechanism/generic_test_mechanism.py +++ b/stix/extensions/test_mechanism/generic_test_mechanism.py @@ -13,7 +13,7 @@ @stix.register_extension class GenericTestMechanism(_BaseTestMechanism): - _namespace = "http://stix.mitre.org/extensions/TestMechanism#Generic-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/extensions/test-mechanism/generic-1" _binding = generic_tm_binding _binding_class = _binding.GenericTestMechanismType _XSI_TYPE = "genericTM:GenericTestMechanismType" diff --git a/stix/extensions/test_mechanism/open_ioc_2010_test_mechanism.py b/stix/extensions/test_mechanism/open_ioc_2010_test_mechanism.py index 52a2e93c..2191c567 100644 --- a/stix/extensions/test_mechanism/open_ioc_2010_test_mechanism.py +++ b/stix/extensions/test_mechanism/open_ioc_2010_test_mechanism.py @@ -15,7 +15,7 @@ @stix.register_extension class OpenIOCTestMechanism(_BaseTestMechanism): - _namespace = "http://stix.mitre.org/extensions/TestMechanism#OpenIOC2010-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/extensions/test-mechanism/openioc-2010-1" _binding = open_ioc_tm_binding _binding_class = _binding.OpenIOC2010TestMechanismType _xml_ns_prefix = "stix-openioc" diff --git a/stix/extensions/test_mechanism/snort_test_mechanism.py b/stix/extensions/test_mechanism/snort_test_mechanism.py index 8dc58daa..03ed4778 100644 --- a/stix/extensions/test_mechanism/snort_test_mechanism.py +++ b/stix/extensions/test_mechanism/snort_test_mechanism.py @@ -9,7 +9,7 @@ @stix.register_extension class SnortTestMechanism(test_mechanism._BaseTestMechanism): - _namespace = "http://stix.mitre.org/extensions/TestMechanism#Snort-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/extensions/test-mechanism/snort-1" _binding = snort_tm_binding _binding_class = _binding.SnortTestMechanismType _XSI_TYPE = "snortTM:SnortTestMechanismType" diff --git a/stix/extensions/test_mechanism/yara_test_mechanism.py b/stix/extensions/test_mechanism/yara_test_mechanism.py index 6682b67b..67bb97e9 100644 --- a/stix/extensions/test_mechanism/yara_test_mechanism.py +++ b/stix/extensions/test_mechanism/yara_test_mechanism.py @@ -13,7 +13,7 @@ @stix.register_extension class YaraTestMechanism(_BaseTestMechanism): - _namespace = "http://stix.mitre.org/extensions/TestMechanism#YARA-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/extensions/test-mechanism/yara-1" _binding = yara_tm_binding _binding_class = _binding.YaraTestMechanismType _XSI_TYPE = "yaraTM:YaraTestMechanismType" diff --git a/stix/incident/__init__.py b/stix/incident/__init__.py index 49df7e51..d18f1d74 100644 --- a/stix/incident/__init__.py +++ b/stix/incident/__init__.py @@ -42,9 +42,9 @@ class Incident(stix.BaseCoreComponent): """ _binding = incident_binding _binding_class = _binding.IncidentType - _namespace = "http://stix.mitre.org/Incident-1" - _version = "1.2" - _ALL_VERSIONS = ("1.0", "1.0.1", "1.1", "1.1.1", "1.2") + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" + _version = "1.2.1" + _ALL_VERSIONS = ("1.0", "1.0.1", "1.1", "1.1.1", "1.2", "1.2.1") _ID_PREFIX = 'incident' status = vocabs.VocabField("Status", vocabs.IncidentStatus) @@ -248,7 +248,7 @@ def add_related_incidents(self, value): self.related_incidents.append(value) class AttributedThreatActors(GenericRelationshipList): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = incident_binding.AttributedThreatActorsType @@ -261,7 +261,7 @@ class AttributedThreatActors(GenericRelationshipList): class RelatedIndicators(GenericRelationshipList): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = incident_binding.RelatedIndicatorsType @@ -274,7 +274,7 @@ class RelatedIndicators(GenericRelationshipList): class RelatedObservables(GenericRelationshipList): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = incident_binding.RelatedObservablesType @@ -287,7 +287,7 @@ class RelatedObservables(GenericRelationshipList): class LeveragedTTPs(GenericRelationshipList): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = _binding.LeveragedTTPsType @@ -300,7 +300,7 @@ class LeveragedTTPs(GenericRelationshipList): class RelatedIncidents(GenericRelationshipList): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = incident_binding.RelatedIncidentsType @@ -313,7 +313,7 @@ class RelatedIncidents(GenericRelationshipList): class IncidentCategories(stix.EntityList): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = _binding.CategoriesType @@ -326,7 +326,7 @@ class IncidentCategories(stix.EntityList): class AffectedAssets(stix.EntityList): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = _binding.AffectedAssetsType diff --git a/stix/incident/affected_asset.py b/stix/incident/affected_asset.py index 36b882c4..8f274b4a 100644 --- a/stix/incident/affected_asset.py +++ b/stix/incident/affected_asset.py @@ -15,7 +15,7 @@ from mixbox import entities, fields class AffectedAsset(stix.Entity): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = incident_binding.AffectedAssetType @@ -76,7 +76,7 @@ def add_property_affected(self, v): class AssetType(VocabString): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = incident_binding.AssetTypeType @@ -92,7 +92,7 @@ def is_plain(self): class NatureOfSecurityEffect(stix.EntityList): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = _binding.NatureOfSecurityEffectType diff --git a/stix/incident/coa.py b/stix/incident/coa.py index 93a6313a..01997f37 100644 --- a/stix/incident/coa.py +++ b/stix/incident/coa.py @@ -14,7 +14,7 @@ from mixbox import entities, fields class COATaken(stix.Entity): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = _binding.COATakenType @@ -32,7 +32,7 @@ def add_contributor(self, value): class COARequested(COATaken): - namespace = "http://stix.mitre.org/Incident-1" + namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = _binding.COARequestedType @@ -43,7 +43,7 @@ def __init__(self, course_of_action=None): class COATime(stix.Entity): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = _binding.COATimeType diff --git a/stix/incident/contributors.py b/stix/incident/contributors.py index f31dd3a1..4370af2c 100644 --- a/stix/incident/contributors.py +++ b/stix/incident/contributors.py @@ -11,7 +11,7 @@ from mixbox import fields, entities class Contributors(stix.EntityList): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = _binding.ContributorsType diff --git a/stix/incident/direct_impact_summary.py b/stix/incident/direct_impact_summary.py index e7a18471..359b6931 100644 --- a/stix/incident/direct_impact_summary.py +++ b/stix/incident/direct_impact_summary.py @@ -8,7 +8,7 @@ from mixbox import fields, entities class DirectImpactSummary(stix.Entity): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = incident_binding.DirectImpactSummaryType diff --git a/stix/incident/external_id.py b/stix/incident/external_id.py index b9391240..857e9230 100644 --- a/stix/incident/external_id.py +++ b/stix/incident/external_id.py @@ -6,7 +6,7 @@ from mixbox import fields, entities class ExternalID(stix.Entity): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = incident_binding.ExternalIDType diff --git a/stix/incident/history.py b/stix/incident/history.py index 1baf87cf..b33c8ea4 100644 --- a/stix/incident/history.py +++ b/stix/incident/history.py @@ -19,7 +19,7 @@ def validate_precision(instance, value): raise ValueError(error) class JournalEntry(stix.Entity): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = incident_binding.JournalEntryType @@ -35,7 +35,7 @@ def __init__(self, value=None): class HistoryItem(stix.Entity): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = incident_binding.HistoryItemType @@ -47,7 +47,7 @@ def __init__(self): class History(stix.EntityList): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = incident_binding.HistoryType diff --git a/stix/incident/impact_assessment.py b/stix/incident/impact_assessment.py index c6f0f78a..77a54021 100644 --- a/stix/incident/impact_assessment.py +++ b/stix/incident/impact_assessment.py @@ -15,7 +15,7 @@ from stix.common.vocabs import VocabField class ImpactAssessment(stix.Entity): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = incident_binding.ImpactAssessmentType @@ -36,7 +36,7 @@ def __init__(self): class Effects(stix.EntityList): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = _binding.EffectsType diff --git a/stix/incident/indirect_impact_summary.py b/stix/incident/indirect_impact_summary.py index 0e2b0903..ed0c6692 100644 --- a/stix/incident/indirect_impact_summary.py +++ b/stix/incident/indirect_impact_summary.py @@ -7,7 +7,7 @@ from mixbox import entities, fields class IndirectImpactSummary(stix.Entity): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = incident_binding.IndirectImpactSummaryType diff --git a/stix/incident/loss_estimation.py b/stix/incident/loss_estimation.py index 294c027a..3fdbe328 100644 --- a/stix/incident/loss_estimation.py +++ b/stix/incident/loss_estimation.py @@ -6,7 +6,7 @@ from mixbox import entities, fields class LossEstimation(stix.Entity): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = incident_binding.LossEstimationType diff --git a/stix/incident/property_affected.py b/stix/incident/property_affected.py index 50ec2453..97de371a 100644 --- a/stix/incident/property_affected.py +++ b/stix/incident/property_affected.py @@ -8,7 +8,7 @@ from mixbox import fields, entities class NonPublicDataCompromised(VocabString): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = incident_binding.NonPublicDataCompromisedType @@ -23,7 +23,7 @@ def is_plain(self): class PropertyAffected(stix.Entity): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = incident_binding.PropertyAffectedType diff --git a/stix/incident/time.py b/stix/incident/time.py index f566b897..0629589c 100644 --- a/stix/incident/time.py +++ b/stix/incident/time.py @@ -9,7 +9,7 @@ class Time(stix.Entity): _binding = incident_binding _binding_class = _binding.TimeType - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" first_malicious_action = fields.TypedField("First_Malicious_Action", DateTimeWithPrecision) initial_compromise = fields.TypedField("Initial_Compromise", DateTimeWithPrecision) diff --git a/stix/incident/total_loss_estimation.py b/stix/incident/total_loss_estimation.py index d7b73dfe..2e0318bf 100644 --- a/stix/incident/total_loss_estimation.py +++ b/stix/incident/total_loss_estimation.py @@ -11,7 +11,7 @@ from mixbox import entities, fields class TotalLossEstimation(stix.Entity): - _namespace = "http://stix.mitre.org/Incident-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/incident-1" _binding = incident_binding _binding_class = incident_binding.TotalLossEstimationType diff --git a/stix/indicator/indicator.py b/stix/indicator/indicator.py index 1ffc5242..1d6f76bf 100644 --- a/stix/indicator/indicator.py +++ b/stix/indicator/indicator.py @@ -80,7 +80,7 @@ class SuggestedCOAs(GenericRelationshipList): for more information. """ - _namespace = "http://stix.mitre.org/Indicator-2" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/indicator-1" _binding = indicator_binding _binding_class = indicator_binding.SuggestedCOAsType @@ -143,7 +143,7 @@ class RelatedIndicators(GenericRelationshipList): for more information. """ - _namespace = "http://stix.mitre.org/Indicator-2" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/indicator-1" _binding = indicator_binding _binding_class = indicator_binding.RelatedIndicatorsType @@ -171,7 +171,7 @@ class Indicator(stix.BaseCoreComponent): """ _binding = indicator_binding _binding_class = indicator_binding.IndicatorType - _namespace = 'http://stix.mitre.org/Indicator-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/indicator-1' _version = "2.2" _ALL_VERSIONS = ("2.0", "2.0.1", "2.1", "2.1.1", "2.2") _ALLOWED_COMPOSITION_OPERATORS = ('AND', 'OR') @@ -791,7 +791,7 @@ class CompositeIndicatorExpression(entities.EntityList): """ _binding = indicator_binding _binding_class = indicator_binding.CompositeIndicatorExpressionType - _namespace = 'http://stix.mitre.org/Indicator-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/indicator-1' OP_AND = "AND" OP_OR = "OR" @@ -829,7 +829,7 @@ def _fix_value(self, value): class RelatedCampaignRefs(GenericRelationshipList): - _namespace = "http://stix.mitre.org/Indicator-2" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/indicator-1" _binding = indicator_binding _binding_class = _binding.RelatedCampaignReferencesType @@ -883,7 +883,7 @@ class IndicatorTypes(stix.TypedList): :class:`stix.common.vocabs.VocabString` instances. """ - _namespace = "http://stix.mitre.org/Indicator-2" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/indicator-1" _contained_type = VocabString def _fix_value(self, value): diff --git a/stix/indicator/sightings.py b/stix/indicator/sightings.py index 704e9c25..1bbf4ddb 100644 --- a/stix/indicator/sightings.py +++ b/stix/indicator/sightings.py @@ -13,7 +13,7 @@ class Sighting(stix.Entity): - _namespace = "http://stix.mitre.org/Indicator-2" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/indicator-1" _binding = indicator_binding _binding_class = _binding.SightingType @@ -65,7 +65,7 @@ def add_description(self, description): class Sightings(stix.EntityList): - _namespace = "http://stix.mitre.org/Indicator-2" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/indicator-1" _binding = indicator_binding _binding_class = _binding.SightingsType @@ -81,7 +81,7 @@ def __nonzero__(self): class RelatedObservables(GenericRelationshipList): - _namespace = "http://stix.mitre.org/Indicator-2" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/indicator-1" _binding = indicator_binding _binding_class = _binding.RelatedObservablesType diff --git a/stix/indicator/test_mechanism.py b/stix/indicator/test_mechanism.py index db8300ef..acd05982 100644 --- a/stix/indicator/test_mechanism.py +++ b/stix/indicator/test_mechanism.py @@ -13,7 +13,7 @@ class _BaseTestMechanism(stix.Entity): - _namespace = "http://stix.mitre.org/Indicator-2" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/indicator-1" _binding = indicator_binding _binding_class = indicator_binding.TestMechanismType() @@ -54,7 +54,7 @@ def entity_class(self, key): class TestMechanisms(stix.EntityList): _binding = indicator_binding - _namespace = 'http://stix.mitre.org/Indicator-2' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/indicator-1' _binding_class = _binding.TestMechanismsType test_mechanism = fields.TypedField( diff --git a/stix/indicator/valid_time.py b/stix/indicator/valid_time.py index 83c67c22..85004af6 100644 --- a/stix/indicator/valid_time.py +++ b/stix/indicator/valid_time.py @@ -8,7 +8,7 @@ from mixbox.entities import Entity class ValidTime(Entity): - _namespace = "http://stix.mitre.org/Indicator-2" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/indicator-1" _binding = indicator_binding _binding_class = _binding.ValidTimeType diff --git a/stix/report/__init__.py b/stix/report/__init__.py index 34ebd6e9..3d0525e3 100644 --- a/stix/report/__init__.py +++ b/stix/report/__init__.py @@ -54,7 +54,7 @@ class Report(stix.Entity): """ _binding = report_binding _binding_class = _binding.ReportType - _namespace = 'http://stix.mitre.org/Report-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/report-1' _version = "1.0" id_ = fields.IdField("id") @@ -209,7 +209,7 @@ def add(self, entity): class Campaigns(stix.EntityList): _binding = report_binding - _namespace = 'http://stix.mitre.org/Report-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/report-1' _binding_class = _binding.CampaignsType campaign = fields.TypedField("Campaign", Campaign, multiple=True, key_name="campaigns") @@ -217,7 +217,7 @@ class Campaigns(stix.EntityList): class CoursesOfAction(stix.EntityList): _binding = report_binding - _namespace = 'http://stix.mitre.org/Report-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/report-1' _binding_class = _binding.CoursesOfActionType course_of_action = fields.TypedField("Course_Of_Action", CourseOfAction, multiple=True, key_name="courses_of_action") @@ -225,7 +225,7 @@ class CoursesOfAction(stix.EntityList): class ExploitTargets(stix.EntityList): _binding = stix_common_binding - _namespace = 'http://stix.mitre.org/common-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/common-1' _binding_class = _binding.ExploitTargetsType exploit_target = fields.TypedField("Exploit_Target", ExploitTarget, multiple=True, key_name="exploit_targets") @@ -233,7 +233,7 @@ class ExploitTargets(stix.EntityList): class Incidents(stix.EntityList): _binding = report_binding - _namespace = 'http://stix.mitre.org/Report-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/report-1' _binding_class = _binding.IncidentsType incident = fields.TypedField("Incident", Incident, multiple=True, key_name="incidents") @@ -241,7 +241,7 @@ class Incidents(stix.EntityList): class Indicators(stix.EntityList): _binding = report_binding - _namespace = 'http://stix.mitre.org/Report-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/report-1' _binding_class = _binding.IndicatorsType _contained_type = Indicator @@ -250,7 +250,7 @@ class Indicators(stix.EntityList): class ThreatActors(stix.EntityList): _binding = report_binding - _namespace = 'http://stix.mitre.org/Report-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/report-1' _binding_class = _binding.ThreatActorsType threat_actor = fields.TypedField("Threat_Actor", ThreatActor, multiple=True, key_name="threat_actors") diff --git a/stix/report/header.py b/stix/report/header.py index 2506af22..ab633646 100644 --- a/stix/report/header.py +++ b/stix/report/header.py @@ -31,7 +31,7 @@ class Header(stix.Entity): """ _binding = report_binding _binding_class = _binding.HeaderType - _namespace = 'http://stix.mitre.org/Report-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/report-1' title = fields.TypedField("Title") descriptions = fields.TypedField("Description", type_=StructuredTextList) diff --git a/stix/test/encoding_test.py b/stix/test/encoding_test.py index c099b392..9324ab7f 100644 --- a/stix/test/encoding_test.py +++ b/stix/test/encoding_test.py @@ -27,7 +27,7 @@ u""" diff --git a/stix/test/extensions/malware/maec_4_1_malware_test.py b/stix/test/extensions/malware/maec_4_1_malware_test.py index 5cd92523..c372b924 100644 --- a/stix/test/extensions/malware/maec_4_1_malware_test.py +++ b/stix/test/extensions/malware/maec_4_1_malware_test.py @@ -47,18 +47,18 @@ class PythonMAECEtreeTests(unittest.TestCase): XML = ( """ @@ -87,7 +87,7 @@ def _test_xml(self, obj): root = tree.getroot() xpath = "//cyboxCommon:Type" - nodes = root.xpath(xpath, namespaces={'cyboxCommon': 'http://cybox.mitre.org/common-2'}) + nodes = root.xpath(xpath, namespaces={'cyboxCommon': 'http://docs.oasis-open.org/cti/ns/cybox/common-2'}) self.assertTrue(nodes is not None) self.assertEqual(len(nodes), 1) @@ -119,16 +119,16 @@ class PythonMAECInPackageTests(unittest.TestCase): """ Zeus {0} @@ -119,7 +119,7 @@ class OpenIOCEtreeTests(unittest.TestCase): ) def setUp(self): - ioc_ns = Namespace("http://stix.mitre.org/extensions/TestMechanism#OpenIOC2010-1", + ioc_ns = Namespace("http://docs.oasis-open.org/cti/ns/stix/extensions/test-mechanism/openioc-2010-1", "stix-openioc", '') idgen.set_id_namespace(ioc_ns) @@ -133,7 +133,7 @@ def _test_xml(self, obj): root = tree.getroot() xpath = "//stix-openioc:ioc//description" - nodes = root.xpath(xpath, namespaces={'stix-openioc': 'http://stix.mitre.org/extensions/TestMechanism#OpenIOC2010-1'}) + nodes = root.xpath(xpath, namespaces={'stix-openioc': 'http://docs.oasis-open.org/cti/ns/stix/extensions/test-mechanism/openioc-2010-1'}) self.assertTrue(nodes is not None) self.assertEqual(len(nodes), 1) diff --git a/stix/test/incident_test.py b/stix/test/incident_test.py index 62727b12..9fd246ab 100644 --- a/stix/test/incident_test.py +++ b/stix/test/incident_test.py @@ -26,9 +26,9 @@ INCIDENT_CATEGORIES = """ + xsi:schemaLocation="http://docs.oasis-open.org/cti/ns/stix/incident-1 http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/incident.xsd"> Foo Bar @@ -436,7 +436,7 @@ def test_description_output(self): s = StringIO() - incident.export(s.write, 0, {'http://stix.mitre.org/Incident-1': 'incident'}) + incident.export(s.write, 0, {'http://docs.oasis-open.org/cti/ns/stix/incident-1': 'incident'}) xml = s.getvalue() self.assertTrue("A Description" in xml, "Description not exported") diff --git a/stix/test/utils/nsparser_test.py b/stix/test/utils/nsparser_test.py index 12c61f64..fbb7220b 100644 --- a/stix/test/utils/nsparser_test.py +++ b/stix/test/utils/nsparser_test.py @@ -26,7 +26,7 @@ def test_user_provided_ns(self): TEST_PREFIX = 'test' TEST_NS = 'a:unit:test' NEW_STIX_PREFIX = 'newstix' - NEW_STIX_NS = "http://stix.mitre.org/stix-1" + NEW_STIX_NS = "http://docs.oasis-open.org/cti/ns/stix/core-1" test_dict = { TEST_NS: TEST_PREFIX, @@ -59,8 +59,8 @@ def test_duplicate_ns_prefix(self): xml = ( """ @@ -90,13 +90,13 @@ def test_parsed_namespaces(self): xmlns:TEST="a:test" xmlns:FOO="a:foo" xmlns:BAR="a:bar" - xmlns:cybox="http://cybox.mitre.org/cybox-2" - xmlns:cyboxCommon="http://cybox.mitre.org/common-2" - xmlns:cyboxVocabs="http://cybox.mitre.org/default_vocabularies-2" + xmlns:cybox="http://docs.oasis-open.org/cti/ns/cybox/core-2" + xmlns:cyboxCommon="http://docs.oasis-open.org/cti/ns/cybox/common-2" + xmlns:cyboxVocabs="http://docs.oasis-open.org/cti/ns/cybox/vocabularies-2" xmlns:example="http://example.com" - xmlns:stix="http://stix.mitre.org/stix-1" - xmlns:stixCommon="http://stix.mitre.org/common-1" - xmlns:stixVocabs="http://stix.mitre.org/default_vocabularies-1" + xmlns:stix="http://docs.oasis-open.org/cti/ns/stix/core-1" + xmlns:stixCommon="http://docs.oasis-open.org/cti/ns/stix/common-1" + xmlns:stixVocabs="http://docs.oasis-open.org/cti/ns/stix/vocabularies-1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="example:Package-e2454ee8-e59c-43ac-a085-46ae4516fd6e" version="1.2" diff --git a/stix/test/utils/parser_test.py b/stix/test/utils/parser_test.py index 887960c6..f2928e90 100644 --- a/stix/test/utils/parser_test.py +++ b/stix/test/utils/parser_test.py @@ -12,7 +12,7 @@ class ParserTests(unittest.TestCase): def test_valid(self): valid = """ - """ @@ -24,7 +24,7 @@ def test_valid(self): def test_wrong_root_element(self): wrong_root = """ - """ @@ -41,7 +41,7 @@ def test_wrong_root_element(self): def test_wrong_version(self): wrong_version = """ - """ @@ -58,7 +58,7 @@ def test_wrong_version(self): def test_missing_version(self): missing_version = """ - """ diff --git a/stix/threat_actor/__init__.py b/stix/threat_actor/__init__.py index e045b7fc..40ec80a2 100644 --- a/stix/threat_actor/__init__.py +++ b/stix/threat_actor/__init__.py @@ -19,7 +19,7 @@ class ObservedTTPs(GenericRelationshipList): - _namespace = 'http://stix.mitre.org/ThreatActor-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/threat-actor-1' _binding = threat_actor_binding _binding_class = threat_actor_binding.ObservedTTPsType @@ -27,7 +27,7 @@ class ObservedTTPs(GenericRelationshipList): class AssociatedActors(GenericRelationshipList): - _namespace = 'http://stix.mitre.org/ThreatActor-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/threat-actor-1' _binding = threat_actor_binding _binding_class = threat_actor_binding.AssociatedActorsType @@ -35,7 +35,7 @@ class AssociatedActors(GenericRelationshipList): class AssociatedCampaigns(GenericRelationshipList): - _namespace = 'http://stix.mitre.org/ThreatActor-1' + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/threat-actor-1' _binding = threat_actor_binding _binding_class = threat_actor_binding.AssociatedCampaignsType @@ -61,9 +61,9 @@ class ThreatActor(stix.BaseCoreComponent): """ _binding = threat_actor_binding _binding_class = threat_actor_binding.ThreatActorType - _namespace = 'http://stix.mitre.org/ThreatActor-1' - _version = "1.2" - _ALL_VERSIONS = ("1.0", "1.0.1", "1.1", "1.1.1", "1.2") + _namespace = 'http://docs.oasis-open.org/cti/ns/stix/threat-actor-1' + _version = "1.2.1" + _ALL_VERSIONS = ("1.0", "1.0.1", "1.1", "1.1.1", "1.2", "1.2.1") _ID_PREFIX = 'threatactor' identity = fields.TypedField("Identity", Identity, factory=IdentityFactory) diff --git a/stix/ttp/__init__.py b/stix/ttp/__init__.py index 83f6e679..ba0dfb1b 100644 --- a/stix/ttp/__init__.py +++ b/stix/ttp/__init__.py @@ -39,9 +39,9 @@ class TTP(stix.BaseCoreComponent): """ _binding = ttp_binding _binding_class = _binding.TTPType - _namespace = "http://stix.mitre.org/TTP-1" - _version = "1.2" - _ALL_VERSIONS = ("1.0", "1.0.1", "1.1", "1.1.1", "1.2") + _namespace = "http://docs.oasis-open.org/cti/ns/stix/ttp-1" + _version = "1.2.1" + _ALL_VERSIONS = ("1.0", "1.0.1", "1.1", "1.1.1", "1.2", "1.2.1") _ID_PREFIX = "ttp" behavior = fields.TypedField("Behavior", Behavior) diff --git a/stix/ttp/attack_pattern.py b/stix/ttp/attack_pattern.py index db341706..cb30586e 100644 --- a/stix/ttp/attack_pattern.py +++ b/stix/ttp/attack_pattern.py @@ -13,7 +13,7 @@ class AttackPattern(stix.Entity): _binding = ttp_binding _binding_class = _binding.AttackPatternType - _namespace = "http://stix.mitre.org/TTP-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/ttp-1" id_ = fields.IdField("id") idref = fields.IdrefField("idref") diff --git a/stix/ttp/behavior.py b/stix/ttp/behavior.py index 5d53e643..3e8f6b09 100644 --- a/stix/ttp/behavior.py +++ b/stix/ttp/behavior.py @@ -15,7 +15,7 @@ class Behavior(stix.Entity): _binding = ttp_binding _binding_class = _binding.BehaviorType - _namespace = "http://stix.mitre.org/TTP-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/ttp-1" malware_instances = fields.TypedField("Malware", type_="stix.ttp.behavior.MalwareInstances", key_name="malware_instances") attack_patterns = fields.TypedField("Attack_Patterns", type_="stix.ttp.behavior.AttackPatterns") @@ -39,7 +39,7 @@ def add_exploit(self, exploit): class Exploits(stix.EntityList): - _namespace = "http://stix.mitre.org/TTP-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/ttp-1" _contained_type = Exploit _binding = ttp_binding _binding_class = _binding.ExploitsType @@ -48,7 +48,7 @@ class Exploits(stix.EntityList): class MalwareInstances(stix.EntityList): - _namespace = "http://stix.mitre.org/TTP-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/ttp-1" _binding = ttp_binding _binding_class = _binding.MalwareType @@ -56,7 +56,7 @@ class MalwareInstances(stix.EntityList): class AttackPatterns(stix.EntityList): - _namespace = "http://stix.mitre.org/TTP-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/ttp-1" _binding = ttp_binding _binding_class = _binding.AttackPatternsType diff --git a/stix/ttp/exploit.py b/stix/ttp/exploit.py index 241d430e..79cbb63d 100644 --- a/stix/ttp/exploit.py +++ b/stix/ttp/exploit.py @@ -13,7 +13,7 @@ class Exploit(stix.Entity): _binding = ttp_binding _binding_class = _binding.ExploitType - _namespace = "http://stix.mitre.org/TTP-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/ttp-1" id_ = fields.IdField("id") idref = fields.IdrefField("idref") diff --git a/stix/ttp/exploit_targets.py b/stix/ttp/exploit_targets.py index ed7b9fca..61da17f9 100644 --- a/stix/ttp/exploit_targets.py +++ b/stix/ttp/exploit_targets.py @@ -8,7 +8,7 @@ class ExploitTargets(GenericRelationshipList): - _namespace = "http://stix.mitre.org/TTP-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/ttp-1" _binding = ttp_binding _binding_class = _binding.ExploitTargetsType diff --git a/stix/ttp/infrastructure.py b/stix/ttp/infrastructure.py index 33b7d51c..b084b3d5 100644 --- a/stix/ttp/infrastructure.py +++ b/stix/ttp/infrastructure.py @@ -17,7 +17,7 @@ class Infrastructure(stix.Entity): _binding = ttp_binding _binding_class = _binding.InfrastructureType - _namespace = "http://stix.mitre.org/TTP-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/ttp-1" id_ = fields.IdField("id") @@ -100,7 +100,7 @@ def add_type(self, type_): class InfraStructureTypes(stix.EntityList): - _namespace = "http://stix.mitre.org/TTP-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/ttp-1" _contained_type = VocabString @classmethod diff --git a/stix/ttp/malware_instance.py b/stix/ttp/malware_instance.py index 053bdc61..3ff1138c 100644 --- a/stix/ttp/malware_instance.py +++ b/stix/ttp/malware_instance.py @@ -16,7 +16,7 @@ class MalwareInstance(stix.Entity): _binding = ttp_binding _binding_class = _binding.MalwareInstanceType - _namespace = "http://stix.mitre.org/TTP-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/ttp-1" _XSI_TYPE = None # defined by subclasses id_ = fields.IdField("id") diff --git a/stix/ttp/related_ttps.py b/stix/ttp/related_ttps.py index c590ae4f..800168f4 100644 --- a/stix/ttp/related_ttps.py +++ b/stix/ttp/related_ttps.py @@ -8,7 +8,7 @@ class RelatedTTPs(GenericRelationshipList): - _namespace = "http://stix.mitre.org/TTP-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/ttp-1" _binding = ttp_binding _binding_class = _binding.RelatedTTPsType diff --git a/stix/ttp/resource.py b/stix/ttp/resource.py index 4600ebc2..66f553f0 100644 --- a/stix/ttp/resource.py +++ b/stix/ttp/resource.py @@ -25,7 +25,7 @@ def _fix_value(self, value): class Personas(stix.EntityList): - _namespace = "http://stix.mitre.org/TTP-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/ttp-1" _binding = ttp_binding _binding_class = _binding.PersonasType @@ -33,7 +33,7 @@ class Personas(stix.EntityList): class Tools(stix.EntityList): - _namespace = "http://stix.mitre.org/TTP-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/ttp-1" _binding = ttp_binding _binding_class = _binding.ToolsType @@ -47,7 +47,7 @@ def _dict_as_list(cls): class Resource(stix.Entity): _binding = ttp_binding _binding_class = _binding.ResourceType - _namespace = "http://stix.mitre.org/TTP-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/ttp-1" tools = fields.TypedField("Tools", Tools) infrastructure = fields.TypedField("Infrastructure", Infrastructure) diff --git a/stix/ttp/victim_targeting.py b/stix/ttp/victim_targeting.py index 4928bbcc..7a24f1e3 100644 --- a/stix/ttp/victim_targeting.py +++ b/stix/ttp/victim_targeting.py @@ -15,7 +15,7 @@ class VictimTargeting(stix.Entity): _binding = ttp_binding _binding_class = _binding.VictimTargetingType - _namespace = "http://stix.mitre.org/TTP-1" + _namespace = "http://docs.oasis-open.org/cti/ns/stix/ttp-1" identity = fields.TypedField("Identity", Identity, factory=IdentityFactory) diff --git a/stix/utils/nsparser.py b/stix/utils/nsparser.py index e46cb356..4c689cd1 100644 --- a/stix/utils/nsparser.py +++ b/stix/utils/nsparser.py @@ -5,41 +5,41 @@ Namespace = mixbox.namespaces.Namespace -NS_CAMPAIGN_OBJECT = Namespace("http://stix.mitre.org/Campaign-1", "campaign", "http://stix.mitre.org/XMLSchema/campaign/1.2/campaign.xsd") +NS_CAMPAIGN_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/campaign-1", "campaign", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/campaign.xsd") NS_CAPEC_OBJECT = Namespace("http://capec.mitre.org/capec-2", "capec", "") -NS_CIQIDENTITY_OBJECT = Namespace("http://stix.mitre.org/extensions/Identity#CIQIdentity3.0-1", "ciqIdentity", "http://stix.mitre.org/XMLSchema/extensions/identity/ciq_3.0/1.2/ciq_3.0_identity.xsd") -NS_COA_OBJECT = Namespace("http://stix.mitre.org/CourseOfAction-1", "coa", "http://stix.mitre.org/XMLSchema/course_of_action/1.2/course_of_action.xsd") +NS_CIQIDENTITY_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/extensions/identity/ciq-3.0-identity-1", "ciqIdentity", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/identity/ciq-3.0-identity.xsd") +NS_COA_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/course-of-action-1", "coa", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/course-of-action.xsd") NS_CVRF_OBJECT = Namespace("http://www.icasi.org/CVRF/schema/cvrf/1.1", "cvrf", "") -NS_ET_OBJECT = Namespace("http://stix.mitre.org/ExploitTarget-1", "et", "http://stix.mitre.org/XMLSchema/exploit_target/1.2/exploit_target.xsd") -NS_GENERICSTRUCTUREDCOA_OBJECT = Namespace("http://stix.mitre.org/extensions/StructuredCOA#Generic-1", "genericStructuredCOA", "http://stix.mitre.org/XMLSchema/extensions/structured_coa/generic/1.2/generic_structured_coa.xsd") -NS_GENERICTM_OBJECT = Namespace("http://stix.mitre.org/extensions/TestMechanism#Generic-1", "genericTM", "http://stix.mitre.org/XMLSchema/extensions/test_mechanism/generic/1.2/generic_test_mechanism.xsd") -NS_INCIDENT_OBJECT = Namespace("http://stix.mitre.org/Incident-1", "incident", "http://stix.mitre.org/XMLSchema/incident/1.2/incident.xsd") -NS_INDICATOR_OBJECT = Namespace("http://stix.mitre.org/Indicator-2", "indicator", "http://stix.mitre.org/XMLSchema/indicator/2.2/indicator.xsd") +NS_ET_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/exploit-target-1", "et", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/exploit-target.xsd") +NS_GENERICSTRUCTUREDCOA_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/extensions/structured-coa/generic-1", "genericStructuredCOA", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/structured-coa/generic-structured-coa.xsd") +NS_GENERICTM_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/extensions/test-mechanism/generic-1", "genericTM", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/test-mechanism/generic-test-mechanism.xsd") +NS_INCIDENT_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/incident-1", "incident", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/incident.xsd") +NS_INDICATOR_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/indicator-1", "indicator", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/indicator.xsd") NS_IOC_OBJECT = Namespace("http://schemas.mandiant.com/2010/ioc", "ioc", "") NS_IOCTR_OBJECT = Namespace("http://schemas.mandiant.com/2010/ioc/TR/", "ioc-tr", "") -NS_MARKING_OBJECT = Namespace("http://data-marking.mitre.org/Marking-1", "marking", "http://stix.mitre.org/XMLSchema/data_marking/1.2/data_marking.xsd") +NS_MARKING_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/data-marking-1", "marking", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/data-marking.xsd") NS_OVALDEF_OBJECT = Namespace("http://oval.mitre.org/XMLSchema/oval-definitions-5", "oval-def", "") NS_OVALVAR_OBJECT = Namespace("http://oval.mitre.org/XMLSchema/oval-variables-5", "oval-var", "") -NS_REPORT_OBJECT = Namespace("http://stix.mitre.org/Report-1", "report", "http://stix.mitre.org/XMLSchema/report/1.0/report.xsd") -NS_SIMPLEMARKING_OBJECT = Namespace("http://data-marking.mitre.org/extensions/MarkingStructure#Simple-1", "simpleMarking", "http://stix.mitre.org/XMLSchema/extensions/marking/simple/1.2/simple_marking.xsd") -NS_SNORTTM_OBJECT = Namespace("http://stix.mitre.org/extensions/TestMechanism#Snort-1", "snortTM", "http://stix.mitre.org/XMLSchema/extensions/test_mechanism/snort/1.2/snort_test_mechanism.xsd") -NS_STIX_OBJECT = Namespace("http://stix.mitre.org/stix-1", "stix", "http://stix.mitre.org/XMLSchema/core/1.2/stix_core.xsd") -NS_STIXCAPEC_OBJECT = Namespace("http://stix.mitre.org/extensions/AP#CAPEC2.7-1", "stix-capec", "http://stix.mitre.org/XMLSchema/extensions/attack_pattern/capec_2.7/1.1/capec_2.7_attack_pattern.xsd") -NS_STIXCIQADDRESS_OBJECT = Namespace("http://stix.mitre.org/extensions/Address#CIQAddress3.0-1", "stix-ciqaddress", "http://stix.mitre.org/XMLSchema/extensions/address/ciq_3.0/1.2/ciq_3.0_address.xsd") -NS_STIXCVRF_OBJECT = Namespace("http://stix.mitre.org/extensions/Vulnerability#CVRF-1", "stix-cvrf", "http://stix.mitre.org/XMLSchema/extensions/vulnerability/cvrf_1.1/1.2/cvrf_1.1_vulnerability.xsd") -NS_STIXMAEC_OBJECT = Namespace("http://stix.mitre.org/extensions/Malware#MAEC4.1-1", "stix-maec", "http://stix.mitre.org/XMLSchema/extensions/malware/maec_4.1/1.1/maec_4.1_malware.xsd") -NS_STIXOPENIOC_OBJECT = Namespace("http://stix.mitre.org/extensions/TestMechanism#OpenIOC2010-1", "stix-openioc", "http://stix.mitre.org/XMLSchema/extensions/test_mechanism/open_ioc_2010/1.2/open_ioc_2010_test_mechanism.xsd") -NS_STIXOVAL_OBJECT = Namespace("http://stix.mitre.org/extensions/TestMechanism#OVAL5.10-1", "stix-oval", "http://stix.mitre.org/XMLSchema/extensions/test_mechanism/oval_5.10/1.2/oval_5.10_test_mechanism.xsd") -NS_STIXCOMMON_OBJECT = Namespace("http://stix.mitre.org/common-1", "stixCommon", "http://stix.mitre.org/XMLSchema/common/1.2/stix_common.xsd") -NS_STIXVOCABS_OBJECT = Namespace("http://stix.mitre.org/default_vocabularies-1", "stixVocabs", "http://stix.mitre.org/XMLSchema/default_vocabularies/1.2.0/stix_default_vocabularies.xsd") -NS_TA_OBJECT = Namespace("http://stix.mitre.org/ThreatActor-1", "ta", "http://stix.mitre.org/XMLSchema/threat_actor/1.2/threat_actor.xsd") -NS_TLPMARKING_OBJECT = Namespace("http://data-marking.mitre.org/extensions/MarkingStructure#TLP-1", "tlpMarking", "http://stix.mitre.org/XMLSchema/extensions/marking/tlp/1.2/tlp_marking.xsd") -NS_TOUMARKING_OBJECT = Namespace("http://data-marking.mitre.org/extensions/MarkingStructure#Terms_Of_Use-1", "TOUMarking", "http://stix.mitre.org/XMLSchema/extensions/marking/terms_of_use/1.1/terms_of_use_marking.xsd") -NS_TTP_OBJECT = Namespace("http://stix.mitre.org/TTP-1", "ttp", "http://stix.mitre.org/XMLSchema/ttp/1.2/ttp.xsd") -NS_XAL_OBJECT = Namespace("urn:oasis:names:tc:ciq:xal:3", "xal", "http://stix.mitre.org/XMLSchema/external/oasis_ciq_3.0/xAL.xsd") -NS_XNL_OBJECT = Namespace("urn:oasis:names:tc:ciq:xnl:3", "xnl", "http://stix.mitre.org/XMLSchema/external/oasis_ciq_3.0/xNL.xsd") -NS_XPIL_OBJECT = Namespace("urn:oasis:names:tc:ciq:xpil:3", "xpil", "http://stix.mitre.org/XMLSchema/external/oasis_ciq_3.0/xPIL.xsd") -NS_YARATM_OBJECT = Namespace("http://stix.mitre.org/extensions/TestMechanism#YARA-1", "yaraTM", "http://stix.mitre.org/XMLSchema/extensions/test_mechanism/yara/1.2/yara_test_mechanism.xsd") +NS_REPORT_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/report-1", "report", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/report.xsd") +NS_SIMPLEMARKING_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/extensions/data-marking/simple-1", "simpleMarking", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/marking/simple-marking.xsd") +NS_SNORTTM_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/extensions/test-mechanism/snort-1", "snortTM", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/test-mechanism/snort-test-mechanism.xsd") +NS_STIX_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/core-1", "stix", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/core.xsd") +NS_STIXCAPEC_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/extensions/attack-pattern/capec-2.7-1", "stix-capec", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/attack-pattern/capec-2.7-attack-pattern.xsd") +NS_STIXCIQADDRESS_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/extensions/address/ciq-address-3.0-1", "stix-ciqaddress", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/address/ciq-3.0-address.xsd") +NS_STIXCVRF_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/extensions/vulnerability/cvrf-1", "stix-cvrf", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/vulnerability/cvrf-1.1-vulnerability.xsd") +NS_STIXMAEC_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/extensions/malware/maec-4.1-1", "stix-maec", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/malware/maec-4.1-malware.xsd") +NS_STIXOPENIOC_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/extensions/test-mechanism/openioc-2010-1", "stix-openioc", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/test-mechanism/openioc-2010-test-mechanism.xsd") +NS_STIXOVAL_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/extensions/test-mechanism/oval-5.10-1", "stix-oval", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/test-mechanism/oval-5.10-test-mechanism.xsd") +NS_STIXCOMMON_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/common-1", "stixCommon", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/common.xsd") +NS_STIXVOCABS_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/vocabularies-1", "stixVocabs", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/vocabularies.xsd") +NS_TA_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/threat-actor-1", "ta", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/threat-actor.xsd") +NS_TLPMARKING_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/extensions/data-marking/tlp-1", "tlpMarking", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/marking/tlp-marking.xsd") +NS_TOUMARKING_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/extensions/data-marking/terms-of-use-1", "TOUMarking", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/marking/terms-of-use-marking.xsd") +NS_TTP_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/ttp-1", "ttp", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/ttp.xsd") +NS_XAL_OBJECT = Namespace("urn:oasis:names:tc:ciq:xal:3", "xal", "http://docs.oasis-open.org/ciq/v3.0/prd03/xsd/default/xsd/xAL.xsd") +NS_XNL_OBJECT = Namespace("urn:oasis:names:tc:ciq:xnl:3", "xnl", "http://docs.oasis-open.org/ciq/v3.0/prd03/xsd/default/xsd/xNL.xsd") +NS_XPIL_OBJECT = Namespace("urn:oasis:names:tc:ciq:xpil:3", "xpil", "http://docs.oasis-open.org/ciq/v3.0/prd03/xsd/default/xsd/xPIL.xsd") +NS_YARATM_OBJECT = Namespace("http://docs.oasis-open.org/cti/ns/stix/extensions/test-mechanism/yara-1", "yaraTM", "http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/test-mechanism/yara-test-mechanism.xsd") STIX_NAMESPACES = mixbox.namespaces.NamespaceSet() diff --git a/stix/xmlconst.py b/stix/xmlconst.py index 4acf3d25..97c078a6 100644 --- a/stix/xmlconst.py +++ b/stix/xmlconst.py @@ -2,4 +2,4 @@ # See LICENSE.txt for complete terms. # STIX TAGS -TAG_STIX_PACKAGE = "{http://stix.mitre.org/stix-1}STIX_Package" +TAG_STIX_PACKAGE = "{http://docs.oasis-open.org/cti/ns/stix/core-1}STIX_Package"