Skip to content

Commit dd13cc4

Browse files
clenkclenk
committed
Update namespaces to OASIS for v1.2.1
1 parent 007b190 commit dd13cc4

File tree

107 files changed

+439
-444
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+439
-444
lines changed

‎docs/examples/index.rst‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ Which outputs:
4141
.. code-block:: xml
4242
4343
<stix:STIX_Package
44-
xmlns:cybox="http://cybox.mitre.org/cybox-2"
45-
xmlns:cyboxCommon="http://cybox.mitre.org/common-2"
46-
xmlns:cyboxVocabs="http://cybox.mitre.org/default_vocabularies-2"
44+
xmlns:cybox="http://docs.oasis-open.org/cti/ns/cybox/core-2"
45+
xmlns:cyboxCommon="http://docs.oasis-open.org/cti/ns/cybox/common-2"
46+
xmlns:cyboxVocabs="http://docs.oasis-open.org/cti/ns/cybox/vocabularies-2"
4747
xmlns:example="http://example.com"
48-
xmlns:report="http://stix.mitre.org/Report-1"
49-
xmlns:stix="http://stix.mitre.org/stix-1"
50-
xmlns:stixCommon="http://stix.mitre.org/common-1"
51-
xmlns:stixVocabs="http://stix.mitre.org/default_vocabularies-1"
48+
xmlns:report="http://docs.oasis-open.org/cti/ns/stix/report-1"
49+
xmlns:stix="http://docs.oasis-open.org/cti/ns/stix/core-1"
50+
xmlns:stixCommon="http://docs.oasis-open.org/cti/ns/stix/common-1"
51+
xmlns:stixVocabs="http://docs.oasis-open.org/cti/ns/stix/vocabularies-1"
5252
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="example:Package-1" version="1.2">
5353
<stix:Reports>
5454
<stix:Report timestamp="2016-07-15T15:27:43.847000+00:00" id="example:Report-2" xsi:type='report:ReportType' version="1.0">

‎docs/overview/controlled_vocabularies.rst‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,13 @@ used wherever a ``ControlledVocabularyStringType`` instance is expected
131131
<xs:schema
132132
xmlns:xs="http://www.w3.org/2001/XMLSchema"
133133
xmlns:customVocabs="http://customvocabs.com/vocabs-1"
134-
xmlns:stixVocabs="http://stix.mitre.org/default_vocabularies-1"
135-
xmlns:stixCommon="http://stix.mitre.org/common-1"
134+
xmlns:stixVocabs="http://docs.oasis-open.org/cti/ns/stix/vocabularies-1"
135+
xmlns:stixCommon="http://docs.oasis-open.org/cti/ns/stix/common-1"
136136
targetNamespace="http://customvocabs.com/vocabs-1"
137137
elementFormDefault="qualified"
138138
version="1.2"
139139
xml:lang="English">
140-
<xs:import namespace="http://stix.mitre.org/common-1" schemaLocation="http://stix.mitre.org/XMLSchema/common/1.2/stix_common.xsd"/>
140+
<xs:import namespace="http://docs.oasis-open.org/cti/ns/stix/common-1" schemaLocation="http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/common.xsd"/>
141141
<xs:complexType name="CustomVocab-1.0">
142142
<xs:simpleContent>
143143
<xs:restriction base="stixCommon:ControlledVocabularyStringType">
@@ -170,11 +170,11 @@ field.
170170
171171
<stix:STIX_Package
172172
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
173-
xmlns:stixExample="http://stix.mitre.org/example"
174-
xmlns:stix="http://stix.mitre.org/stix-1"
173+
xmlns:stixExample="http://docs.oasis-open.org/cti/ns/stix/example"
174+
xmlns:stix="http://docs.oasis-open.org/cti/ns/stix/core-1"
175175
xmlns:customVocabs="http://customvocabs.com/vocabs-1"
176176
xsi:schemaLocation="
177-
http://stix.mitre.org/stix-1 /path/to/stix_core.xsd
177+
http://docs.oasis-open.org/cti/ns/stix/core-1 /path/to/stix_core.xsd
178178
http://customvocabs.com/vocabs-1 /path/to/customVocabs.xsd"
179179
id="stixExample:STIXPackage-33fe3b22-0201-47cf-85d0-97c02164528d"
180180
version="1.2">
@@ -254,11 +254,11 @@ XML Schema definition, but in Python!
254254
"""
255255
<stix:STIX_Package
256256
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
257-
xmlns:stix="http://stix.mitre.org/stix-1"
257+
xmlns:stix="http://docs.oasis-open.org/cti/ns/stix/core-1"
258258
xmlns:customVocabs="http://customvocabs.com/vocabs-1"
259259
xmlns:example="http://example.com/"
260260
xsi:schemaLocation="
261-
http://stix.mitre.org/stix-1 /path/to/stix_core.xsd
261+
http://docs.oasis-open.org/cti/ns/stix/core-1 /path/to/stix_core.xsd
262262
http://customvocabs.com/vocabs-1 /path/to/customVocabs.xsd"
263263
id="example:STIXPackage-33fe3b22-0201-47cf-85d0-97c02164528d"
264264
version="1.2">

‎docs/overview/id_namespaces.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Which outputs:
2828
<stix:STIX_Package
2929
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
3030
xmlns:myNS="http://MY-NAMESPACE.com"
31-
xmlns:stix="http://stix.mitre.org/stix-1"
31+
xmlns:stix="http://docs.oasis-open.org/cti/ns/stix/core-1"
3232
xmlns:xs="http://www.w3.org/2001/XMLSchema"
3333
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3434
xmlns:xlink="http://www.w3.org/1999/xlink"

‎examples/custom_vocabstring.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
"""
2020
<stix:STIX_Package
2121
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22-
xmlns:stix="http://stix.mitre.org/stix-1"
22+
xmlns:stix="http://docs.oasis-open.org/cti/ns/stix/core-1"
2323
xmlns:customVocabs="http://customvocabs.com/vocabs-1"
2424
xmlns:example="http://example.com/"
2525
xsi:schemaLocation="
26-
http://stix.mitre.org/stix-1 ../stix_core.xsd
26+
http://docs.oasis-open.org/cti/ns/stix/core-1 ../stix_core.xsd
2727
http://customvocabs.com/vocabs-1 ../my_vocabs.xsd"
2828
id="example:STIXPackage-33fe3b22-0201-47cf-85d0-97c02164528d"
2929
timestamp="2014-05-08T09:00:00.000000Z"

‎examples/sample.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
-->
88
<stix:STIX_Package
99
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xmlns:stix="http://stix.mitre.org/stix-1"
11-
xmlns:indicator="http://stix.mitre.org/Indicator-2"
12-
xmlns:cybox="http://cybox.mitre.org/cybox-2"
13-
xmlns:AddressObject="http://cybox.mitre.org/objects#AddressObject-2"
14-
xmlns:cyboxVocabs="http://cybox.mitre.org/default_vocabularies-2"
15-
xmlns:stixVocabs="http://stix.mitre.org/default_vocabularies-1"
16-
xmlns:report="http://stix.mitre.org/Report-1"
10+
xmlns:stix="http://docs.oasis-open.org/cti/ns/stix/core-1"
11+
xmlns:indicator="http://docs.oasis-open.org/cti/ns/stix/indicator-1"
12+
xmlns:cybox="http://docs.oasis-open.org/cti/ns/cybox/core-2"
13+
xmlns:AddressObject="http://docs.oasis-open.org/cti/ns/cybox/objects/address-2"
14+
xmlns:cyboxVocabs="http://docs.oasis-open.org/cti/ns/cybox/vocabularies-2"
15+
xmlns:stixVocabs="http://docs.oasis-open.org/cti/ns/stix/vocabularies-1"
16+
xmlns:report="http://docs.oasis-open.org/cti/ns/stix/report-1"
1717
xmlns:example="http://example.com/"
1818
id="example:STIXPackage-33fe3b22-0201-47cf-85d0-97c02164528d"
1919
version="1.2">

‎stix/bindings/campaign.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import stix.bindings.data_marking as data_marking_binding
1818

1919

20-
XML_NS = "http://stix.mitre.org/Campaign-1"
20+
XML_NS = "http://docs.oasis-open.org/cti/ns/stix/campaign-1"
2121

2222
#
2323
# Data representation classes.
@@ -450,7 +450,7 @@ class CampaignType(stix_common_binding.CampaignBaseType):
450450
subclass = None
451451
superclass = stix_common_binding.CampaignBaseType
452452

453-
xmlns = "http://stix.mitre.org/Campaign-1"
453+
xmlns = "http://docs.oasis-open.org/cti/ns/stix/campaign-1"
454454
xmlns_prefix = "campaign"
455455
xml_type = "CampaignType"
456456
xsi_type = "%s:%s" % (xmlns_prefix, xml_type)

‎stix/bindings/course_of_action.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import stix.bindings.stix_common as stix_common_binding
1818
import stix.bindings.data_marking as data_marking_binding
1919

20-
XML_NS = "http://stix.mitre.org/CourseOfAction-1"
20+
XML_NS = "http://docs.oasis-open.org/cti/ns/stix/course-of-action-1"
2121

2222
#
2323
# Data representation classes.
@@ -36,11 +36,11 @@ class StructuredCOAType(GeneratedsSuper):
3636
externally defined structured courses of action in a CDATA
3737
block. This implementation is captured in the Generic Structured
3838
COA extension, which provides the GenericStructuredCOAType in
39-
the http://stix.mitre.org/extensions/StructuredCOA#Generic-1
39+
the http://docs.oasis-open.org/cti/ns/stix/extensions/structured-coa/generic-1
4040
namespace. The extension is defined in the
4141
extensions/structured_coa/generic.xsd file or at the URL http://
42-
stix.mitre.org/XMLSchema/extensions/structured_coa/generic/1.0/g
43-
eneric.xsd. Specifies a unique ID for this
42+
docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/structured
43+
-coa/generic-structured-coa.xsd. Specifies a unique ID for this
4444
StructuredCOA.Specifies a reference to the ID for this
4545
StructuredCOA specified elsewhere."""
4646
subclass = None
@@ -224,7 +224,7 @@ class CourseOfActionType(stix_common_binding.CourseOfActionBaseType):
224224
subclass = None
225225
superclass = stix_common_binding.CourseOfActionBaseType
226226

227-
xmlns = "http://stix.mitre.org/CourseOfAction-1"
227+
xmlns = "http://docs.oasis-open.org/cti/ns/stix/course-of-action-1"
228228
xmlns_prefix = "coa"
229229
xml_type = "CourseOfActionType"
230230
xsi_type = "%s:%s" % (xmlns_prefix, xml_type)

‎stix/bindings/data_marking.py‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from stix.bindings import lookup_extension
1616
from . import stix_common as stix_common_binding
1717

18-
XML_NS = "http://data-marking.mitre.org/Marking-1"
18+
XML_NS = "http://docs.oasis-open.org/cti/ns/stix/data-marking-1"
1919

2020
#
2121
# Data representation classes.
@@ -117,19 +117,18 @@ class MarkingStructureType(GeneratedsSuper):
117117
Simple: The Simple marking structures allows for the
118118
specification of unstructured statements through the use of a
119119
string field. The type is named SimpleMarkingStructureType and
120-
is in the http://data-
121-
marking.mitre.org/extensions/MarkingStructure#Simple-1
122-
namespace. The extension is defined in the file
123-
extensions/marking/simple_marking.xsd or at the URL http://stix.
124-
mitre.org/XMLSchema/extensions/marking/simple_marking/1.1/simple
125-
_marking.xsd.2. TLP: The TLP marking structure allows for the
120+
is in the http://docs.oasis-open.org/cti/ns/stix/extensions/
121+
data-marking/simple-1 namespace. The extension is defined in the file
122+
extensions/marking/simple_marking.xsd or at the URL http://docs.oasis-open
123+
.org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/marking/
124+
simple-marking.xsd. TLP: The TLP marking structure allows for the
126125
expression of Traffic Light Protocol statements through the use
127126
of a simple enumeration. The type is named
128-
TLPMarkingStructureType and is in the http://data-
129-
marking.mitre.org/extensions/MarkingStructure#TLP-1 namespace.
127+
TLPMarkingStructureType and is in the http://docs.oasis-open.org/cti/ns/
128+
stix/extensions/data-marking/tlp-1 namespace.
130129
The extension is defined in the file
131-
extensions/marking/tlp_marking.xsd or at the URL http://stix.mit
132-
re.org/XMLSchema/extensions/marking/tlp/1.1/tlp_marking.xsd.This
130+
extensions/marking/tlp_marking.xsd or at the URL http://docs.oasis-open.org
131+
/cti/stix/v1.2.1/csd01/xml-schemas/extensions/marking/tlp-marking.xsd. This
133132
field specifies the name of the marking model to be applied
134133
within this Marking_Structure.This field contains a reference to
135134
an authoritative source on the marking model to be applied

‎stix/bindings/exploit_target.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import stix.bindings.stix_common as stix_common_binding
1717
import stix.bindings.data_marking as data_marking_binding
1818

19-
XML_NS = "http://stix.mitre.org/ExploitTarget-1"
19+
XML_NS = "http://docs.oasis-open.org/cti/ns/stix/exploit-target-1"
2020

2121
#
2222
# Data representation classes.
@@ -31,11 +31,11 @@ class VulnerabilityType(GeneratedsSuper):
3131
Vulnerability Reporting Format (CVRF) schema to do so. The
3232
extension that defines this is captured in the
3333
CVRF1.1InstanceType in the
34-
http://stix.mitre.org/extensions/Vulnerability#CVRF1.1-1
34+
http://docs.oasis-open.org/cti/ns/stix/extensions/vulnerability/cvrf-1
3535
namespace. This type is defined in the
3636
extensions/vulnerability/cvrf_1.1_vulnerability.xsd file or at
37-
the URL http://stix.mitre.org/XMLSchema/extensions/vulnerability
38-
/cvrf_1.1/1.1/cvrf_1.1_vulnerability.xsd.The @is_known field
37+
the URL http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/
38+
extensions/vulnerability/cvrf-1.1-vulnerability.xsd. The @is_known field
3939
captures whether or not the vulnerability is known (i.e. not a
4040
0-day) at the time of characterization.The
4141
@is_publicly_acknowledged field captures whether or not the
@@ -772,7 +772,7 @@ class ExploitTargetType(stix_common_binding.ExploitTargetBaseType):
772772
subclass = None
773773
superclass = stix_common_binding.ExploitTargetBaseType
774774

775-
xmlns = "http://stix.mitre.org/ExploitTarget-1"
775+
xmlns = "http://docs.oasis-open.org/cti/ns/stix/exploit-target-1"
776776
xmlns_prefix = "et"
777777
xml_type = "ExploitTargetType"
778778
xsi_type = "%s:%s" % (xmlns_prefix, xml_type)

‎stix/bindings/extensions/address/ciq_address_3_0.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from stix.bindings import register_extension
1616
import stix.bindings.stix_common as stix_common_binding
1717

18-
XML_NS = "http://stix.mitre.org/extensions/Address#CIQAddress3.0-1"
18+
XML_NS = "http://docs.oasis-open.org/cti/ns/stix/extensions/address/ciq-address-3.0-1"
1919

2020
#
2121
# Data representation classes.

0 commit comments

Comments
 (0)