Restrict which version of STIX package this library supports.

gtback · gtback · commit cda1c8013bb1 · 2016-11-17T10:57:42.000-06:00
diff --git a/docs/examples/index.rst b/docs/examples/index.rst
@@ -49,7 +49,7 @@ Which outputs:
             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-1" version="1.2">
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="example:Package-1" version="1.2.1">
         <stix:Reports>
             <stix:Report timestamp="2016-07-15T15:27:43.847000+00:00" id="example:Report-2" xsi:type='report:ReportType' version="1.0">
                 <report:Header>
diff --git a/docs/overview/id_namespaces.rst b/docs/overview/id_namespaces.rst
@@ -32,7 +32,7 @@ Which outputs:
         xmlns:xs="http://www.w3.org/2001/XMLSchema"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns:xlink="http://www.w3.org/1999/xlink"
-        id="myNS:Package-b2039368-9476-4a5b-8c1d-0ef5d1b37e06" version="1.2"/>
+        id="myNS:Package-b2039368-9476-4a5b-8c1d-0ef5d1b37e06" version="1.2.1"/>
 
 Success! The ``xmlns:myNS="http://MY-NAMESPACE.com"`` matches our ``NAMESPACE``
 dictionary and the ``id`` attribute includes the ``myNS`` namespace alias.
diff --git a/stix/__init__.py b/stix/__init__.py
@@ -134,4 +134,4 @@ def supported_stix_version():
     supports (i.e., can parse).
 
     """
-    return ('1.1.1', '1.2', '1.2.1')
+    return ('1.2.1',)
diff --git a/stix/test/encoding_test.py b/stix/test/encoding_test.py
@@ -29,7 +29,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:stix="http://docs.oasis-open.org/cti/ns/stix/core-1"
     xmlns:example="http://example.com/"
-    id="example:Indicator-ba1d406e-937c-414f-9231-6e1dbe64fe8b" version="1.2" timestamp="2014-05-08T09:00:00.000000Z">
+    id="example:Indicator-ba1d406e-937c-414f-9231-6e1dbe64fe8b" version="1.2.1" timestamp="2014-05-08T09:00:00.000000Z">
     <stix:STIX_Header>
         <stix:Title>{0}</stix:Title>
     </stix:STIX_Header>
diff --git a/stix/test/extensions/malware/maec_4_1_malware_test.py b/stix/test/extensions/malware/maec_4_1_malware_test.py
@@ -130,7 +130,7 @@ class PythonMAECInPackageTests(unittest.TestCase):
             http://docs.oasis-open.org/cti/ns/stix/vocabularies-1 http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/vocabularies.xsd
             http://docs.oasis-open.org/cti/ns/stix/core-1 http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/core.xsd"
             id="example:Package-2b8fb66f-b6b3-4d40-865a-33e4a5ee1246" 
-            version="1.2"
+            version="1.2.1"
             >
           <stix:TTPs>
             <stix:TTP xsi:type="ttp:TTPType" id="example:ttp-7d9fe1f7-429d-077e-db51-92c70b8da45a">
@@ -167,7 +167,7 @@ class PythonMAECInPackageTests(unittest.TestCase):
             http://docs.oasis-open.org/cti/ns/stix/extensions/malware/maec-4.1-1 http://docs.oasis-open.org/cti/stix/v1.2.1/csd01/xml-schemas/extensions/malware/maec-4.1-malware.xsd
             http://maec.mitre.org/XMLSchema/maec-package-2 http://maec.mitre.org/language/version4.1/maec_package_schema.xsd"
             id="example:Package-2b8fb66f-b6b3-4d40-865a-33e4a5ee1246" 
-            version="1.2"
+            version="1.2.1"
             >
           <stix:TTPs>
             <stix:TTP xsi:type="ttp:TTPType" id="example:ttp-7d9fe1f7-429d-077e-db51-92c70b8da45a">
diff --git a/stix/test/utils/nsparser_test.py b/stix/test/utils/nsparser_test.py
@@ -61,7 +61,7 @@ def test_duplicate_ns_prefix(self):
                     xmlns:stixCommon="THISISGONNABEPROBLEM"
                     xmlns:stix="http://docs.oasis-open.org/cti/ns/stix/core-1"
                     xmlns:stixVocabs="http://docs.oasis-open.org/cti/ns/stix/vocabularies-1"
-                    version="1.2"
+                    version="1.2.1"
                     timestamp="2015-04-09T14:22:25.620831+00:00">
                 <stix:STIX_Header>
                     <stix:Description>A unit test</stix:Description>
@@ -99,7 +99,7 @@ def test_parsed_namespaces(self):
                     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"
+                    version="1.2.1"
                     timestamp="2015-04-09T14:22:25.620831+00:00"/>"""
         )
 
@@ -114,4 +114,4 @@ def test_parsed_namespaces(self):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()
diff --git a/stix/test/utils/parser_test.py b/stix/test/utils/parser_test.py
@@ -13,7 +13,7 @@ class ParserTests(unittest.TestCase):
     def test_valid(self):
         valid = """
         <stix:STIX_Package xmlns:stix="http://docs.oasis-open.org/cti/ns/stix/core-1"
-            version="1.2" id="example:Package-1">
+            version="1.2.1" id="example:Package-1">
         </stix:STIX_Package>
         """
 
@@ -25,7 +25,7 @@ def test_valid(self):
     def test_wrong_root_element(self):
         wrong_root = """
         <stix:NotAPackage xmlns:stix="http://docs.oasis-open.org/cti/ns/stix/core-1"
-            version="1.2" id="example:Package-1">
+            version="1.2.1" id="example:Package-1">
         </stix:NotAPackage>
         """
 
@@ -37,7 +37,7 @@ def test_wrong_root_element(self):
                                    check_root=False)
 
         self.assertEqual("example:Package-1", package.id_)
-        self.assertEqual("1.2", package.version)
+        self.assertEqual("1.2.1", package.version)
 
     def test_wrong_version(self):
         wrong_version = """
