stage 1 of doing new cidrs/ site setup

app/web/jobs/scan_job.py

@@ -21,7 +21,7 @@ from web.services.alert_service import AlertService
 logger = logging.getLogger(__name__)
 
 
-def execute_scan(scan_id: int, config_file: str, db_url: str):
+def execute_scan(scan_id: int, config_file: str = None, config_id: int = None, db_url: str = None):
     """
     Execute a scan in the background.
 
@@ -31,9 +31,12 @@ def execute_scan(scan_id: int, config_file: str, db_url: str):
 
     Args:
         scan_id: ID of the scan record in database
-        config_file: Path to YAML configuration file
+        config_file: Path to YAML configuration file (legacy, optional)
+        config_id: Database config ID (preferred, optional)
         db_url: Database connection URL
 
+    Note: Provide exactly one of config_file or config_id
+
     Workflow:
         1. Create new database session for this thread
         2. Update scan status to 'running'
@@ -42,7 +45,8 @@ def execute_scan(scan_id: int, config_file: str, db_url: str):
         5. Save results to database
         6. Update status to 'completed' or 'failed'
     """
-    logger.info(f"Starting background scan execution: scan_id={scan_id}, config={config_file}")
+    config_desc = f"config_id={config_id}" if config_id else f"config_file={config_file}"
+    logger.info(f"Starting background scan execution: scan_id={scan_id}, {config_desc}")
 
     # Create new database session for this thread
     engine = create_engine(db_url, echo=False)
@@ -61,16 +65,21 @@ def execute_scan(scan_id: int, config_file: str, db_url: str):
         scan.started_at = datetime.utcnow()
         session.commit()
 
-        logger.info(f"Scan {scan_id}: Initializing scanner with config {config_file}")
+        logger.info(f"Scan {scan_id}: Initializing scanner with {config_desc}")
 
-        # Convert config_file to full path if it's just a filename
-        if not config_file.startswith('/'):
-            config_path = f'/app/configs/{config_file}'
+        # Initialize scanner based on config type
+        if config_id:
+            # Use database config
+            scanner = SneakyScanner(config_id=config_id)
         else:
-            config_path = config_file
+            # Use YAML config file
+            # Convert config_file to full path if it's just a filename
+            if not config_file.startswith('/'):
+                config_path = f'/app/configs/{config_file}'
+            else:
+                config_path = config_file
 
-        # Initialize scanner
-        scanner = SneakyScanner(config_path)
+            scanner = SneakyScanner(config_path=config_path)
 
         # Execute scan
         logger.info(f"Scan {scan_id}: Running scanner...")