Merge pull request #15 from mitre-attack/local-cti-fix

Local CTI patch

Author: ArtificialErmine

CHANGELOG.md

@@ -1,3 +1,8 @@
+# v1.2.1 - 16 June 2021
+This bug fix patches the ability to use the library with local data sources
+## Fixes
+- Addressed issue with matrixGen initialization failing for local data sources
+
 # v1.2.0 - 2 June 2021
 This update adds some convenience features to make it easier to create layers programmatically, as well
 as documentation on how to do so.

mitreattack/navlayers/exporters/matrix_gen.py

@@ -102,25 +102,26 @@ def __init__(self, source='taxii', local=None):
             :param local: string path to local cache of stix data
         """
         self.convert_data = {}
+        self.collections = dict()
         if source.lower() not in ['taxii', 'local']:
             print('[MatrixGen] - Unable to generate matrix, source {} is not one of "taxii" or "local"'.format(source))
             raise ValueError
 
         if source.lower() == 'taxii':
             self.server = Server('https://cti-taxii.mitre.org/taxii')
             self.api_root = self.server.api_roots[0]
-            self.collections = dict()
             for collection in self.api_root.collections:
                 if collection.title != "PRE-ATT&CK":
                     tc = Collection('https://cti-taxii.mitre.org/stix/collections/' + collection.id)
                     self.collections[collection.title.split(' ')[0].lower()] = TAXIICollectionSource(tc)
         elif source.lower() == 'local':
             if local is not None:
                 hd = MemoryStore()
+                hd.load_from_file(local)
                 if 'mobile' in local.lower():
-                    self.collections['mobile'] = hd.load_from_file(local)
+                    self.collections['mobile'] = hd
                 else:
-                    self.collections['enterprise'] = hd.load_from_file(local)
+                    self.collections['enterprise'] = hd
             else:
                 print('[MatrixGen] - "local" source specified, but path to local source not provided')
                 raise ValueError

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="mitreattack-python",
-    version="1.2.0",
+    version="1.2.1",
     author="MITRE ATT&CK, MITRE Corporation",
     author_email="attack@mitre.org",
     description="MITRE ATT&CK python library",