fix: type errors

Author: elucchesileon

examples/analytic_extractor.py

@@ -11,7 +11,7 @@
 
 # Prune an input string to remove any non-analytic text
 # This assumes that all analytics start the <h4> html block
-STRING_RE = "Analytic(\s|.)*"
+STRING_RE = r"Analytic(\s|.)*"
 
 
 def pruneString(in_string):

mitreattack/navlayers/core/layerobj.py

@@ -52,14 +52,14 @@ def __init__(self, name, domain):
     @property
     def version(self):
         """Getter for version."""
-        if self.__versions != UNSETVALUE:
+        if self.__versions != UNSETVALUE and not isinstance(self.__versions, str):
             return self.__versions.layer
 
     @version.setter
     def version(self, version):
         typeChecker(type(self).__name__, version, str, "version")
         categoryChecker(type(self).__name__, version, ["3.0", "4.0", "4.1", "4.2", "4.3"], "version")
-        if self.__versions is UNSETVALUE:
+        if self.__versions is UNSETVALUE or isinstance(self.__versions, str):
             self.__versions = Versions()
         self.__versions.layer = version
 
@@ -350,7 +350,7 @@ def links(self):
     @links.setter
     def links(self, links):
         typeChecker(type(self).__name__, links, list, "links")
-        if not handle_object_placement(self.__links, links, Link):
+        if not handle_object_placement(self.__links, links, Link) or isinstance(self.__links, str):
             self.__links = []
         entry = ""
         try:
@@ -418,21 +418,21 @@ def get_dict(self):
 
         if self.description:
             temp["description"] = self.description
-        if self.versions:
+        if self.versions and not isinstance(self.versions, str):
             temp["versions"] = self.versions.get_dict()
-        if self.filters:
+        if self.filters and not isinstance(self.filters, str):
             temp["filters"] = self.filters.get_dict()
         if self.sorting:
             temp["sorting"] = self.sorting
-        if self.layout:
+        if self.layout and not isinstance(self.layout, str):
             temp["layout"] = self.layout.get_dict()
         if self.hideDisabled is not None:
             temp["hideDisabled"] = self.hideDisabled
-        if self.techniques:
+        if self.techniques and isinstance(self.techniques, list):
             temp["techniques"] = [x.get_dict() for x in self.techniques]
-        if self.gradient:
+        if self.gradient and not isinstance(self.gradient, str):
             temp["gradient"] = self.gradient.get_dict()
-        if self.legendItems:
+        if self.legendItems and isinstance(self.legendItems, list):
             temp["legendItems"] = [x.get_dict() for x in self.legendItems]
         if self.showTacticRowBackground is not None:
             temp["showTacticRowBackground"] = self.showTacticRowBackground
@@ -444,7 +444,7 @@ def get_dict(self):
             temp["selectSubtechniquesWithParent"] = self.selectSubtechniquesWithParent
         if self.selectVisibleTechniques is not None:
             temp["selectVisibleTechniques"] = self.selectVisibleTechniques
-        if self.metadata:
+        if self.metadata and isinstance(self.metadata, list):
             temp["metadata"] = [x.get_dict() for x in self.metadata]
         return temp
 

mitreattack/navlayers/generators/usage_generator.py

@@ -2,6 +2,7 @@
 
 import copy
 from itertools import chain
+from typing import Any
 
 from stix2 import Filter
 
@@ -149,7 +150,9 @@ def generate_layer(self, match):
             raise StixObjectIsNotValid
         a_id = get_attack_id(matched_obj)
         processed_listing = self.generate_technique_data(raw_data)
-        raw_layer = dict(name=f"{matched_obj['name']} ({matched_obj['id']})", domain=self.domain + "-attack")
+        raw_layer: dict[str, Any] = dict(
+            name=f"{matched_obj['name']} ({matched_obj['id']})", domain=self.domain + "-attack"
+        )
         raw_layer["techniques"] = processed_listing
         output_layer = Layer(raw_layer)
         if matched_obj["type"] != "x-mitre-data-component":

mitreattack/release_info.py

@@ -231,7 +231,7 @@
 
 
 def get_attack_version(
-    domain: str, stix_version: str = "2.0", stix_file: str = None, stix_content: bytes = None
+    domain: str, stix_version: str = "2.0", stix_file: Optional[str] = None, stix_content: Optional[bytes] = None
 ) -> Optional[str]:
     """Determine the version of ATT&CK based on either a file or contents of a file.
 
@@ -277,6 +277,9 @@ def get_attack_version(
         stix_hash_data = STIX20
     elif stix_version == "2.1":
         stix_hash_data = STIX21
+    else:
+        logger.error(f"Invalid stix_version given: {stix_version}")
+        return None
 
     releases = {}
     if domain == "enterprise-attack":

tests/changelog/test_utils.py

@@ -5,6 +5,7 @@
 """
 
 import json
+from collections.abc import Callable
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Union
 
@@ -184,7 +185,7 @@ def assert_diffstix_data_structure_valid(diffstix_instance) -> None:
 
 
 def create_test_files_and_validate(
-    file_paths: Dict[str, Union[str, Path]], validation_funcs: Dict[str, callable]
+    file_paths: Dict[str, Union[str, Path]], validation_funcs: Dict[str, Callable]
 ) -> None:
     """Create test files and validate their contents.