fix: include custom rules in all-language scans

Author: lelia

socket_basics/core/connector/opengrep/__init__.py

@@ -61,6 +61,26 @@ def scan(self) -> Dict[str, Any]:
 			logger.info('No scan targets to analyze (scoped scan matched no existing files); skipping OpenGrep')
 			return {}
 
+		# Locate bundled rules directory for fallback and all-language expansion.
+		module_dir = Path(__file__).resolve().parents[3]
+		bundled_rules_dir = module_dir / 'rules'
+		rules_dir = self.config.get('opengrep_rules_dir') or (str(bundled_rules_dir) if bundled_rules_dir.exists() else None)
+		if not rules_dir:
+			logger.error('No rules directory found')
+			return {}
+
+		if not rule_files and self.config.get('all_languages_enabled', False):
+			try:
+				rule_files = [
+					p.name
+					for p in Path(rules_dir).glob('*.yml')
+					if p.name != 'tests.yml'
+				]
+				logger.info("Expanded all-languages scan to rule files: %s", rule_files)
+			except Exception:
+				logger.debug('Failed expanding all-languages into rule files', exc_info=True)
+				rule_files = []
+
 		# Check if custom rules mode is enabled
 		custom_rules_path = self.config.get_custom_rules_path()
 		custom_rule_files: Dict[str, Path] = {}
@@ -80,14 +100,6 @@ def scan(self) -> Dict[str, Any]:
 				logger.error(f"Failed to build custom rule files: {e}", exc_info=True)
 				custom_rule_files = {}
 
-		# Locate bundled rules directory for fallback
-		module_dir = Path(__file__).resolve().parents[3]
-		bundled_rules_dir = module_dir / 'rules'
-		rules_dir = self.config.get('opengrep_rules_dir') or (str(bundled_rules_dir) if bundled_rules_dir.exists() else None)
-		if not rules_dir:
-			logger.error('No rules directory found')
-			return {}
-
 		# Read filtered rule definitions if available
 		try:
 			filtered = self.config.build_filtered_opengrep_rules() or {}
@@ -788,4 +800,3 @@ def generate_notifications(self, components: List[Dict[str, Any]]) -> Dict[str,
 		notifications_by_notifier['webhook'] = webhook.format_notifications(groups)
 
 		return notifications_by_notifier
-

tests/test_opengrep_custom_rules.py

@@ -76,6 +76,45 @@ def test_scan_uses_custom_rule_file_when_available(tmp_path, monkeypatch):
     assert str(bundled_rules_dir / "javascript_typescript.yml") not in cmd_str
 
 
+def test_all_languages_custom_rules_without_individual_language_flags(tmp_path, monkeypatch):
+    workspace = tmp_path / "workspace"
+    workspace.mkdir(parents=True, exist_ok=True)
+
+    custom_rules_file = workspace / ".socket" / "rules" / "org-rules.yml"
+    _write_custom_rules_file(custom_rules_file, ["org.no-eval"])
+
+    bundled_rules_dir = tmp_path / "bundled-rules"
+    bundled_js_file = bundled_rules_dir / "javascript_typescript.yml"
+    bundled_python_file = bundled_rules_dir / "python.yml"
+    _write_rule_file(bundled_js_file, ["js-default-rule"])
+    _write_rule_file(bundled_python_file, ["py-default-rule"])
+
+    config = Config(
+        {
+            "workspace": str(workspace),
+            "output_dir": str(workspace),
+            "all_languages_enabled": True,
+            "use_custom_sast_rules": True,
+            "custom_sast_rule_path": ".socket/rules",
+            "opengrep_rules_dir": str(bundled_rules_dir),
+            "all_rules_enabled": False,
+            "verbose": False,
+        }
+    )
+    scanner = OpenGrepScanner(config)
+    scanner._convert_to_socket_facts = lambda _: {"components": []}
+    scanner.generate_notifications = lambda _: {}
+
+    captured_cmd: list[str] = []
+    _mock_subprocess_run(monkeypatch, captured_cmd)
+    scanner.scan()
+
+    cmd_str = " ".join(captured_cmd)
+    assert "socket_custom_rules_" in cmd_str
+    assert str(bundled_js_file) not in cmd_str
+    assert str(bundled_python_file) in cmd_str
+
+
 def test_scan_falls_back_to_bundled_file_when_custom_missing(tmp_path, monkeypatch):
     workspace = tmp_path / "workspace"
     workspace.mkdir(parents=True, exist_ok=True)