libsast 3.1.2__tar.gz → 3.1.4__tar.gz

{libsast-3.1.2 → libsast-3.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: libsast
-Version: 3.1.2
+Version: 3.1.4
 Summary: A generic SAST library built on top of semgrep and regex
 Home-page: https://github.com/ajinabraham/libsast
 License: LGPL-3.0-or-later
@@ -23,7 +23,6 @@ Classifier: Topic :: Software Development :: Quality Assurance
 Requires-Dist: billiard (>=4.2.1,<5.0.0)
 Requires-Dist: pyyaml (>=6.0)
 Requires-Dist: requests
-Requires-Dist: semgrep (==1.86.0) ; sys_platform != "win32"
 Project-URL: Bug Tracker, https://github.com/ajinabraham/libsast/issues
 Project-URL: Documentation, https://github.com/ajinabraham/libsast/blob/master/README.md
 Project-URL: Repository, https://github.com/ajinabraham/libsast
@@ -48,7 +47,10 @@ Made with ![Love](https://cloud.githubusercontent.com/assets/4301109/16754758/82
 
 ## Install
 
-`pip install libsast`
+```bash
+pip install semgrep==1.86.0 #For semgrep support
+pip install libsast
+```
 
 Pattern Matcher is cross-platform, but Semgrep supports only Mac and Linux.
 

{libsast-3.1.2 → libsast-3.1.4}/README.md

@@ -17,7 +17,10 @@ Made with ![Love](https://cloud.githubusercontent.com/assets/4301109/16754758/82
 
 ## Install
 
-`pip install libsast`
+```bash
+pip install semgrep==1.86.0 #For semgrep support
+pip install libsast
+```
 
 Pattern Matcher is cross-platform, but Semgrep supports only Mac and Linux.
 

{libsast-3.1.2 → libsast-3.1.4}/libsast/__init__.py

@@ -12,7 +12,7 @@ year = str(datetime.now().year)
 __title__ = 'libsast'
 __authors__ = 'Ajin Abraham'
 __copyright__ = f'Copyright {year} Ajin Abraham, opensecurity.in'
-__version__ = '3.1.2'
+__version__ = '3.1.4'
 __version_info__ = tuple(int(i) for i in __version__.split('.'))
 __all__ = [
     'Scanner',

{libsast-3.1.2 → libsast-3.1.4}/libsast/core_matcher/choice_matcher.py

@@ -41,9 +41,9 @@ class ChoiceMatcher:
 
     def read_file_contents(self, paths: list) -> list:
         """Load file(s) content."""
-        if not (self.scan_rules and paths):
-            return
-        self.validate_rules()
+        if not paths:
+            return []
+
         choice_args = []
         for rule in self.scan_rules:
             scan_paths = paths
@@ -64,8 +64,14 @@ class ChoiceMatcher:
                 futures.append(future)
             return [future.result() for future in futures]
 
-    def regex_scan(self, file_contents) -> list:
+    def regex_scan(self, file_contents: list, rules=None) -> dict:
         """Process regex matches on the file contents."""
+        if rules:
+            self.scan_rules = get_rules(rules)
+        if not (self.scan_rules and file_contents):
+            return {}
+        self.validate_rules()
+
         if self.queue:
             # Use billiard's pool for regex (support queues)
             from billiard import Pool

{libsast-3.1.2 → libsast-3.1.4}/libsast/core_matcher/pattern_matcher.py

@@ -41,9 +41,8 @@ class PatternMatcher:
 
     def read_file_contents(self, paths: list) -> list:
         """Load file(s) content."""
-        if not (self.scan_rules and paths):
-            return
-        self.validate_rules()
+        if not paths:
+            return []
 
         # Filter files by extension and size, prepare list for processing
         files_to_scan = {
@@ -61,8 +60,14 @@ class PatternMatcher:
                 self._read_file_content, files_to_scan))
             return file_contents
 
-    def regex_scan(self, file_contents: list) -> dict:
+    def regex_scan(self, file_contents: list, rules=None) -> dict:
         """Scan file(s) content."""
+        if rules:
+            self.scan_rules = get_rules(rules)
+        if not (self.scan_rules and file_contents):
+            return {}
+        self.validate_rules()
+
         if self.queue:
             # Use billiard's pool for CPU-bound regex (support queues)
             from billiard import Pool

{libsast-3.1.2 → libsast-3.1.4}/libsast/scanner.py

@@ -54,7 +54,7 @@ class Scanner:
     def scan(self) -> dict:
         """Start Scan."""
         results = {}
-        valid_paths = self.get_scan_files(self.paths)
+        valid_paths = self.get_scan_files()
 
         if not valid_paths:
             return {}
@@ -68,13 +68,13 @@ class Scanner:
 
         return results
 
-    def get_scan_files(self, paths):
+    def get_scan_files(self):
         """Get files valid for scanning."""
-        if not isinstance(paths, list):
+        if not isinstance(self.paths, list):
             raise InvalidPathError('Path should be a list')
 
         all_files = set()
-        for path in paths:
+        for path in self.paths:
             pobj = Path(path)
             if pobj.is_dir():
                 all_files.update({

{libsast-3.1.2 → libsast-3.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "libsast"
-version = "3.1.2"
+version = "3.1.4"
 description = "A generic SAST library built on top of semgrep and regex"
 keywords = ["libsast", "SAST", "Python SAST", "SAST API", "Regex SAST", "Pattern Matcher"]
 authors = ["Ajin Abraham <ajin@opensecurity.in>"]
@@ -26,9 +26,14 @@ libsast = "libsast.__main__:main"
 python = "^3.8"
 requests = "*"
 pyyaml = ">=6.0"
-semgrep = {version = "1.86.0", markers = "sys_platform != 'win32'"}
 billiard = "^4.2.1"
 
+[tool.poetry.group.semgrep]
+optional = true
+
+[tool.poetry.group.semgrep.dependencies]
+semgrep = {version = "1.86.0", markers = "sys_platform != 'win32'"}
+
 [tool.poetry.group.dev.dependencies]
 bandit = "*"
 pytest = "*"