addresses active reported issues as reported by CodeQL

modelscan/cli.py

@@ -115,6 +115,7 @@ def scan(
         with open(settings_file_path, encoding="utf-8") as sf:
             settings = parse(sf.read()).unwrap()
             click.echo(f"Detected settings file. Using {settings_file_path}. \n")
+            sf.close()
     else:
         click.echo(
             f"No settings file detected at {settings_file_path}. Using defaults. \n"
@@ -178,17 +179,21 @@ def create_settings(force: bool, location: Optional[str]) -> None:
         if force:
             with open(settings_path, mode="w", encoding="utf-8") as settings_file:
                 settings_file.write(SettingsUtils.get_default_settings_as_toml())
+                settings_file.close()
         else:
             logger.warning(
                 "%s file already exists. Please use `--force` flag if you intend to overwrite it.",
                 settings_path,
             )
+
     except FileNotFoundError:
         with open(settings_path, mode="w", encoding="utf-8") as settings_file:
             settings_file.write(SettingsUtils.get_default_settings_as_toml())
+            settings_file.close()
 
 
 def main() -> None:
+    result = 0
     try:
         result = cli.main(standalone_mode=False)
 

modelscan/issues.py

@@ -132,6 +132,7 @@ def __init__(
         source: Union[Path, str],
         scanner: str = "",
     ) -> None:
+        super().__init__(scanner)
         self.module = module
         self.operator = operator
         self.source = source

modelscan/model.py

@@ -9,13 +9,13 @@ class ModelDataEmpty(ValueError):
 class Model:
     _source: Path
     _stream: Optional[IO[bytes]]
-    _source_file_used: bool
+    _should_close_stream: bool # Flag to control closing of file
     _context: Dict[str, Any]
 
     def __init__(self, source: Union[str, Path], stream: Optional[IO[bytes]] = None):
         self._source = Path(source)
         self._stream = stream
-        self._source_file_used = False
+        self._should_close_stream = stream is None # Only close if opened
         self._context = {"formats": []}
 
     def set_context(self, key: str, value: Any) -> None:
@@ -29,14 +29,16 @@ def open(self) -> "Model":
             return self
 
         self._stream = open(self._source, "rb")
-        self._source_file_used = True
+        self._should_close_stream = True
 
         return self
 
     def close(self) -> None:
         # Only close the stream if we opened a file (not for IO[bytes] objects passed in)
-        if self._stream and self._source_file_used:
+        if self._stream and self._should_close_stream:
             self._stream.close()
+            self._stream = None # Avoid double-closing
+            self._should_close_stream = False # Reset the flag
 
     def __enter__(self) -> "Model":
         return self.open()

modelscan/skip.py

@@ -1,5 +1,4 @@
 import logging
-from enum import Enum
 
 from modelscan.settings import Property
 

modelscan/tools/picklescanner.py

@@ -5,7 +5,7 @@
 
 import numpy as np
 
-from modelscan.error import ModelScanError, PickleGenopsError
+from modelscan.error import PickleGenopsError
 from modelscan.skip import ModelScanSkipped, SkipCategories
 from modelscan.issues import Issue, IssueCode, IssueSeverity, OperatorIssueDetails
 from modelscan.scanners.scan import ScanResults