From fdf689316f2dbbf9cb595a43a8fb1a839092515b Mon Sep 17 00:00:00 2001 From: Phillip Tarrant Date: Wed, 19 Nov 2025 21:27:05 -0600 Subject: [PATCH 1/2] code cleanup, UI change to menu to make it cleaner --- app/templates/report_mockup.html | 1424 -------------------------- app/tests/test_scan_api.py | 18 +- app/tests/test_schedule_api.py | 22 +- app/web/routes/main.py | 47 - app/web/services/config_service.py | 630 +----------- app/web/services/site_service.py | 1 - app/web/templates/base.html | 18 +- app/web/templates/config_edit.html | 263 ----- app/web/templates/config_upload.html | 415 -------- app/web/utils/validators.py | 263 +---- 10 files changed, 32 insertions(+), 3069 deletions(-) delete mode 100644 app/templates/report_mockup.html delete mode 100644 app/web/templates/config_edit.html delete mode 100644 app/web/templates/config_upload.html diff --git a/app/templates/report_mockup.html b/app/templates/report_mockup.html deleted file mode 100644 index e226a3e..0000000 --- a/app/templates/report_mockup.html +++ /dev/null @@ -1,1424 +0,0 @@ - - - - - - SneakyScanner Report - Production Infrastructure Scan - - - -
- -
-

Production Infrastructure Scan

-
- 📅 Scan Time: 2025-11-14 10:30:00 UTC - ⏱️ Duration: 127.5 seconds - 📄 Config: /app/configs/production.yaml -
-
- - -
-

Scan Summary

-
- -
-

Scan Statistics

-
-
- Total IPs Scanned - 5 -
-
- TCP Ports Found - 47 -
-
- UDP Ports Found - 3 -
-
- Services Identified - 42 -
-
- Web Services - 12 -
-
- Screenshots Captured - 11 -
-
-
- - -
-

Drift Alerts

-
-
- Unexpected TCP Ports - 4 -
-
- Missing Expected Services - 2 -
-
- New Services Detected - 3 -
-
- Unexpected UDP Ports - 1 -
-
-
- - -
-

Security Warnings

-
-
- Certificates Expiring Soon (<30 days) - 2 -
-
- Weak TLS Versions (1.0/1.1) - 1 -
-
- Self-Signed Certificates - 3 -
-
- High Port Services (>10000) - 5 -
-
-
-
-
- - -
-
-

Production Web Servers

-
- 3 IPs - • - 28 Ports - • - 7 Web Services -
-
- - -
-
-

192.168.1.10

-
- Ping: Expected - 2 Unexpected Ports -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PortProtocolServiceProductStatus
22TCPsshOpenSSHExpected
-
-
-
- Product - OpenSSH -
-
- Version - 8.2p1 Ubuntu 4ubuntu0.5 -
-
- OS Type - Linux -
-
- Extra Info - protocol 2.0 -
-
-
-
80TCPhttpnginxExpected
-
-
-
- Product - nginx -
-
- Version - 1.18.0 (Ubuntu) -
-
- Protocol - HTTP -
-
- - 🖼️ View Screenshot - -
-
443TCPhttpsnginxExpected
-
-
-
- Product - nginx -
-
- Version - 1.18.0 -
-
- Protocol - HTTPS -
-
- - 🖼️ View Screenshot - - - -
-
-

🔒 SSL/TLS Details

- Click to expand ▼ -
-
- -
Certificate Information
-
-
- Subject - CN=prod.example.com -
-
- Issuer - CN=Let's Encrypt Authority X3 -
-
- Valid From - 2025-01-01 00:00:00 UTC -
-
- Valid Until - 2025-04-01 23:59:59 UTC -
-
- Days Until Expiry - 138 days -
-
- Serial Number - 03:AB:CD:EF:12:34:56:78 -
-
- -
- Subject Alternative Names (SANs) - prod.example.com, www.prod.example.com, api.example.com -
- - -
-
TLS Version Support
- -
-
- TLS 1.0 - Not Supported -
-
- -
-
- TLS 1.1 - Not Supported -
-
- -
-
- TLS 1.2 - Supported -
-
    -
  • TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
    • -
  • TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
    • -
  • TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
    • -
-
- -
-
- TLS 1.3 - Supported -
-
    -
  • TLS_AES_256_GCM_SHA384
    • -
  • TLS_AES_128_GCM_SHA256
    • -
  • TLS_CHACHA20_POLY1305_SHA256
    • -
-
-
-
-
-
-
3000TCPhttpNode.js ExpressUnexpected
-
-
-
- Product - Node.js Express -
-
- Version - 4.18.2 -
-
- Protocol - HTTP -
-
- ⚠️ Status - Not in expected ports list -
-
- - 🖼️ View Screenshot - -
-
8080TCPhttp-proxyTomcatUnexpected
-
-
-
- Product - Apache Tomcat -
-
- Version - 9.0.65 -
-
- Protocol - HTTP -
-
- ⚠️ Status - Not in expected ports list -
-
- - 🖼️ View Screenshot - -
-
-
- - -
-
-

192.168.1.11

-
- Ping: Expected - All Ports Expected -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PortProtocolServiceProductStatus
22TCPsshOpenSSHExpected
-
-
-
- Product - OpenSSH -
-
- Version - 8.9p1 Ubuntu 3ubuntu0.1 -
-
- OS Type - Linux -
-
-
-
443TCPhttpsApacheExpected
-
-
-
- Product - Apache httpd -
-
- Version - 2.4.52 -
-
- Protocol - HTTPS -
-
- - 🖼️ View Screenshot - - - -
-
-

🔒 SSL/TLS Details Certificate Expiring Soon

- Click to expand ▼ -
-
-
Certificate Information
-
-
- Subject - CN=backup.example.com -
-
- Issuer - CN=DigiCert TLS RSA SHA256 2020 CA1 -
-
- Valid From - 2024-10-15 00:00:00 UTC -
-
- Valid Until - 2025-11-29 23:59:59 UTC -
-
- Days Until Expiry - 15 days ⚠️ -
-
- Serial Number - 09:FE:DC:BA:98:76:54:32 -
-
- -
- Subject Alternative Names (SANs) - backup.example.com -
- -
-
TLS Version Support
- -
-
- TLS 1.0 - Supported (Weak) ⚠️ -
-
    -
  • TLS_RSA_WITH_AES_128_CBC_SHA
    • -
  • TLS_RSA_WITH_AES_256_CBC_SHA
    • -
-
- -
-
- TLS 1.2 - Supported -
-
    -
  • TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
    • -
  • TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
    • -
-
- -
-
- TLS 1.3 - Not Supported -
-
-
-
-
-
-
53UDPdomainISC BINDExpected
-
-
-
- Product - ISC BIND -
-
- Version - 9.16.1-Ubuntu -
-
- Service Type - DNS Server -
-
-
-
-
- - -
-
-

192.168.1.12

-
- Ping: Expected - 1 Missing Service -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PortProtocolServiceProductStatus
22TCPsshOpenSSHExpected
-
-
-
- Product - OpenSSH -
-
- Version - 8.2p1 -
-
-
-
443TCP❌ Expected but not foundMissing
-
-
- - -
-
-

Infrastructure Services

-
- 2 IPs - • - 19 Ports - • - 5 Web Services -
-
- - -
-
-

192.168.1.50

-
- Ping: Expected - All Ports Expected -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PortProtocolServiceProductStatus
22TCPsshOpenSSHExpected
-
-
-
- Product - OpenSSH -
-
- Version - 8.4p1 Debian 5+deb11u1 -
-
-
-
8006TCPhttpsProxmox VEExpected
-
-
-
- Product - Proxmox Virtual Environment -
-
- Version - 7.4-1 -
-
- Protocol - HTTPS -
-
- Service Type - Virtualization Management -
-
- - 🖼️ View Screenshot - - - -
-
-

🔒 SSL/TLS Details Self-Signed Certificate

- Click to expand ▼ -
-
-
Certificate Information
-
-
- Subject - CN=proxmox.local -
-
- Issuer - CN=proxmox.local (Self-Signed) -
-
- Valid From - 2024-01-10 12:00:00 UTC -
-
- Valid Until - 2034-01-08 12:00:00 UTC -
-
- Days Until Expiry - 3342 days -
-
- Serial Number - 01:23:45:67:89:AB:CD:EF -
-
- -
-
TLS Version Support
- -
-
- TLS 1.0 - Not Supported -
-
- -
-
- TLS 1.1 - Not Supported -
-
- -
-
- TLS 1.2 - Supported -
-
    -
  • TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
    • -
  • TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
    • -
-
- -
-
- TLS 1.3 - Supported -
-
    -
  • TLS_AES_256_GCM_SHA384
    • -
  • TLS_CHACHA20_POLY1305_SHA256
    • -
-
-
-
-
-
-
-
- - -
-
-

192.168.1.51

-
- Ping: Expected - All Ports Expected -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PortProtocolServiceProductStatus
22TCPsshOpenSSHExpected
-
-
-
- Product - OpenSSH -
-
- Version - 8.9p1 Ubuntu 3ubuntu0.6 -
-
-
-
5432TCPpostgresqlPostgreSQLExpected
-
-
-
- Product - PostgreSQL DB -
-
- Version - 14.7 -
-
- Extra Info - Debian 14.7-1.pgdg110+1 -
-
- OS Type - Linux -
-
-
-
6379TCPredisRedisExpected
-
-
-
- Product - Redis key-value store -
-
- Version - 7.0.8 -
-
- Extra Info - 64-bit -
-
-
-
-
-
- -
- - - - diff --git a/app/tests/test_scan_api.py b/app/tests/test_scan_api.py index 648ed29..5927fd5 100644 --- a/app/tests/test_scan_api.py +++ b/app/tests/test_scan_api.py @@ -37,7 +37,7 @@ class TestScanAPIEndpoints: assert len(data['scans']) == 1 assert data['scans'][0]['id'] == sample_scan.id - def test_list_scans_pagination(self, client, db): + def test_list_scans_pagination(self, client, db, sample_db_config): """Test scan list pagination.""" # Create 25 scans for i in range(25): @@ -126,7 +126,7 @@ class TestScanAPIEndpoints: def test_trigger_scan_success(self, client, db, sample_db_config): """Test triggering a new scan.""" response = client.post('/api/scans', - json={'config_file': str(sample_db_config)}, + json={'config_id': sample_db_config.id}, content_type='application/json' ) assert response.status_code == 201 @@ -142,8 +142,8 @@ class TestScanAPIEndpoints: assert scan.status == 'running' assert scan.triggered_by == 'api' - def test_trigger_scan_missing_config_file(self, client, db): - """Test triggering scan without config_file.""" + def test_trigger_scan_missing_config_id(self, client, db): + """Test triggering scan without config_id.""" response = client.post('/api/scans', json={}, content_type='application/json' @@ -152,12 +152,12 @@ class TestScanAPIEndpoints: data = json.loads(response.data) assert 'error' in data - assert 'config_file is required' in data['message'] + assert 'config_id is required' in data['message'] - def test_trigger_scan_invalid_config_file(self, client, db): - """Test triggering scan with non-existent config file.""" + def test_trigger_scan_invalid_config_id(self, client, db): + """Test triggering scan with non-existent config.""" response = client.post('/api/scans', - json={'config_file': '/nonexistent/config.yaml'}, + json={'config_id': 99999}, content_type='application/json' ) assert response.status_code == 400 @@ -231,7 +231,7 @@ class TestScanAPIEndpoints: """ # Step 1: Trigger scan response = client.post('/api/scans', - json={'config_file': str(sample_db_config)}, + json={'config_id': sample_db_config.id}, content_type='application/json' ) assert response.status_code == 201 diff --git a/app/tests/test_schedule_api.py b/app/tests/test_schedule_api.py index 2212f7a..34910cf 100644 --- a/app/tests/test_schedule_api.py +++ b/app/tests/test_schedule_api.py @@ -151,7 +151,7 @@ class TestScheduleAPIEndpoints: data = json.loads(response.data) assert data['id'] == sample_schedule.id assert data['name'] == sample_schedule.name - assert data['config_file'] == sample_schedule.config_file + assert data['config_id'] == sample_schedule.config_id assert data['cron_expression'] == sample_schedule.cron_expression assert data['enabled'] == sample_schedule.enabled assert 'history' in data @@ -169,7 +169,7 @@ class TestScheduleAPIEndpoints: """Test creating a new schedule.""" schedule_data = { 'name': 'New Test Schedule', - 'config_file': sample_db_config, + 'config_id': sample_db_config.id, 'cron_expression': '0 3 * * *', 'enabled': True } @@ -197,7 +197,7 @@ class TestScheduleAPIEndpoints: # Missing cron_expression schedule_data = { 'name': 'Incomplete Schedule', - 'config_file': '/app/configs/test.yaml' + 'config_id': 1 } response = client.post( @@ -215,7 +215,7 @@ class TestScheduleAPIEndpoints: """Test creating schedule with invalid cron expression.""" schedule_data = { 'name': 'Invalid Cron Schedule', - 'config_file': sample_db_config, + 'config_id': sample_db_config.id, 'cron_expression': 'invalid cron' } @@ -231,10 +231,10 @@ class TestScheduleAPIEndpoints: assert 'invalid' in data['error'].lower() or 'cron' in data['error'].lower() def test_create_schedule_invalid_config(self, client, db): - """Test creating schedule with non-existent config file.""" + """Test creating schedule with non-existent config.""" schedule_data = { 'name': 'Invalid Config Schedule', - 'config_file': '/nonexistent/config.yaml', + 'config_id': 99999, 'cron_expression': '0 2 * * *' } @@ -399,7 +399,7 @@ class TestScheduleAPIEndpoints: assert scan is not None assert scan.triggered_by == 'manual' assert scan.schedule_id == sample_schedule.id - assert scan.config_file == sample_schedule.config_file + assert scan.config_id == sample_schedule.config_id def test_trigger_schedule_not_found(self, client, db): """Test triggering non-existent schedule.""" @@ -436,7 +436,7 @@ class TestScheduleAPIEndpoints: # 1. Create schedule schedule_data = { 'name': 'Integration Test Schedule', - 'config_file': sample_db_config, + 'config_id': sample_db_config.id, 'cron_expression': '0 2 * * *', 'enabled': True } @@ -527,7 +527,7 @@ class TestScheduleAPIEndpoints: """Test creating a disabled schedule.""" schedule_data = { 'name': 'Disabled Schedule', - 'config_file': sample_db_config, + 'config_id': sample_db_config.id, 'cron_expression': '0 2 * * *', 'enabled': False } @@ -600,7 +600,7 @@ class TestScheduleAPICronValidation: for cron_expr in valid_expressions: schedule_data = { 'name': f'Schedule for {cron_expr}', - 'config_file': sample_db_config, + 'config_id': sample_db_config.id, 'cron_expression': cron_expr } @@ -626,7 +626,7 @@ class TestScheduleAPICronValidation: for cron_expr in invalid_expressions: schedule_data = { 'name': f'Schedule for {cron_expr}', - 'config_file': sample_db_config, + 'config_id': sample_db_config.id, 'cron_expression': cron_expr } diff --git a/app/web/routes/main.py b/app/web/routes/main.py index 6a55880..ac15a97 100644 --- a/app/web/routes/main.py +++ b/app/web/routes/main.py @@ -128,8 +128,6 @@ def edit_schedule(schedule_id): Returns: Rendered schedule edit template """ - from flask import flash - # Note: Schedule data is loaded via AJAX in the template # This just renders the page with the schedule_id in the URL return render_template('schedule_edit.html', schedule_id=schedule_id) @@ -159,51 +157,6 @@ def configs(): return render_template('configs.html') -@bp.route('/configs/upload') -@login_required -def upload_config(): - """ - Config upload page - allows CIDR/YAML upload. - - Returns: - Rendered config upload template - """ - return render_template('config_upload.html') - - -@bp.route('/configs/edit/') -@login_required -def edit_config(filename): - """ - Config edit page - allows editing YAML configuration. - - Args: - filename: Config filename to edit - - Returns: - Rendered config edit template - """ - from web.services.config_service import ConfigService - from flask import flash, redirect - - try: - config_service = ConfigService() - config_data = config_service.get_config(filename) - - return render_template( - 'config_edit.html', - filename=config_data['filename'], - content=config_data['content'] - ) - except FileNotFoundError: - flash(f"Config file '{filename}' not found", 'error') - return redirect(url_for('main.configs')) - except Exception as e: - logger.error(f"Error loading config for edit: {e}") - flash(f"Error loading config: {str(e)}", 'error') - return redirect(url_for('main.configs')) - - @bp.route('/alerts') @login_required def alerts(): diff --git a/app/web/services/config_service.py b/app/web/services/config_service.py index 6188454..0146c6f 100644 --- a/app/web/services/config_service.py +++ b/app/web/services/config_service.py @@ -6,13 +6,8 @@ both database-stored (primary) and file-based (deprecated). """ import os -import re -import yaml -import ipaddress -from typing import Dict, List, Tuple, Any, Optional +from typing import Dict, List, Any, Optional from datetime import datetime -from pathlib import Path -from werkzeug.utils import secure_filename from sqlalchemy.orm import Session @@ -342,626 +337,3 @@ class ConfigService: self.db.commit() return self.get_config_by_id(config_id) - - # ============================================================================ - # Legacy YAML File Operations (Deprecated) - # ============================================================================ - - def list_configs_file(self) -> List[Dict[str, Any]]: - """ - [DEPRECATED] List all config files with metadata. - - Returns: - List of config metadata dictionaries: - [ - { - "filename": "prod-scan.yaml", - "title": "Prod Scan", - "path": "/app/configs/prod-scan.yaml", - "created_at": "2025-11-15T10:30:00Z", - "size_bytes": 1234, - "used_by_schedules": ["Daily Scan", "Weekly Audit"] - } - ] - """ - configs = [] - - # Get all YAML files in configs directory - if not os.path.exists(self.configs_dir): - return configs - - for filename in os.listdir(self.configs_dir): - if not filename.endswith(('.yaml', '.yml')): - continue - - filepath = os.path.join(self.configs_dir, filename) - - if not os.path.isfile(filepath): - continue - - try: - # Get file metadata - stat_info = os.stat(filepath) - created_at = datetime.fromtimestamp(stat_info.st_mtime).isoformat() + 'Z' - size_bytes = stat_info.st_size - - # Parse YAML to get title - title = None - try: - with open(filepath, 'r') as f: - data = yaml.safe_load(f) - if isinstance(data, dict): - title = data.get('title', filename) - except Exception: - title = filename # Fallback to filename if parsing fails - - # Get schedules using this config - used_by_schedules = self.get_schedules_using_config(filename) - - configs.append({ - 'filename': filename, - 'title': title, - 'path': filepath, - 'created_at': created_at, - 'size_bytes': size_bytes, - 'used_by_schedules': used_by_schedules - }) - except Exception as e: - # Skip files that can't be read - continue - - # Sort by created_at (most recent first) - configs.sort(key=lambda x: x['created_at'], reverse=True) - - return configs - - def get_config(self, filename: str) -> Dict[str, Any]: - """ - Get config file content and parsed data. - - Args: - filename: Config filename - - Returns: - { - "filename": "prod-scan.yaml", - "content": "title: Prod Scan\n...", - "parsed": {"title": "Prod Scan", "sites": [...]} - } - - Raises: - FileNotFoundError: If config doesn't exist - ValueError: If config content is invalid - """ - filepath = os.path.join(self.configs_dir, filename) - - if not os.path.exists(filepath): - raise FileNotFoundError(f"Config file '{filename}' not found") - - # Read file content - with open(filepath, 'r') as f: - content = f.read() - - # Parse YAML - try: - parsed = yaml.safe_load(content) - except yaml.YAMLError as e: - raise ValueError(f"Invalid YAML syntax: {str(e)}") - - return { - 'filename': filename, - 'content': content, - 'parsed': parsed - } - - def create_from_yaml(self, filename: str, content: str) -> str: - """ - Create config from YAML content. - - Args: - filename: Desired filename (will be sanitized) - content: YAML content string - - Returns: - Final filename (sanitized) - - Raises: - ValueError: If content invalid or filename conflict - """ - # Sanitize filename - filename = secure_filename(filename) - - # Ensure .yaml extension - if not filename.endswith(('.yaml', '.yml')): - filename += '.yaml' - - filepath = os.path.join(self.configs_dir, filename) - - # Check for conflicts - if os.path.exists(filepath): - raise ValueError(f"Config file '{filename}' already exists") - - # Parse and validate YAML - try: - parsed = yaml.safe_load(content) - except yaml.YAMLError as e: - raise ValueError(f"Invalid YAML syntax: {str(e)}") - - # Validate config structure - is_valid, error_msg = self.validate_config_content(parsed) - if not is_valid: - raise ValueError(f"Invalid config structure: {error_msg}") - - # Create inline sites in database (if any) - self.create_inline_sites(parsed) - - # Write file - with open(filepath, 'w') as f: - f.write(content) - - return filename - - def create_from_cidr( - self, - title: str, - cidr: str, - site_name: Optional[str] = None, - ping_default: bool = False - ) -> Tuple[str, str]: - """ - Create config from CIDR range. - - Args: - title: Scan configuration title - cidr: CIDR range (e.g., "10.0.0.0/24") - site_name: Optional site name (defaults to "Site 1") - ping_default: Default ping expectation for all IPs - - Returns: - Tuple of (final_filename, yaml_content) - - Raises: - ValueError: If CIDR invalid or other validation errors - """ - # Validate and parse CIDR - try: - network = ipaddress.ip_network(cidr, strict=False) - except ValueError as e: - raise ValueError(f"Invalid CIDR range: {str(e)}") - - # Check if network is too large (prevent expansion of huge ranges) - if network.num_addresses > 10000: - raise ValueError(f"CIDR range too large: {network.num_addresses} addresses. Maximum is 10,000.") - - # Expand CIDR to list of IP addresses - ip_list = [str(ip) for ip in network.hosts()] - - # If network has only 1 address (like /32 or /128), hosts() returns empty - # In that case, use the network address itself - if not ip_list: - ip_list = [str(network.network_address)] - - # Build site name - if not site_name or not site_name.strip(): - site_name = "Site 1" - - # Build IP configurations - ips = [] - for ip_address in ip_list: - ips.append({ - 'address': ip_address, - 'expected': { - 'ping': ping_default, - 'tcp_ports': [], - 'udp_ports': [] - } - }) - - # Build YAML structure - config_data = { - 'title': title.strip(), - 'sites': [ - { - 'name': site_name.strip(), - 'ips': ips - } - ] - } - - # Convert to YAML string - yaml_content = yaml.dump(config_data, sort_keys=False, default_flow_style=False) - - # Generate filename from title - filename = self.generate_filename_from_title(title) - - filepath = os.path.join(self.configs_dir, filename) - - # Check for conflicts - if os.path.exists(filepath): - raise ValueError(f"Config file '{filename}' already exists") - - # Write file - with open(filepath, 'w') as f: - f.write(yaml_content) - - return filename, yaml_content - - def update_config_file(self, filename: str, yaml_content: str) -> None: - """ - [DEPRECATED] Update existing config file with new YAML content. - - Args: - filename: Config filename to update - yaml_content: New YAML content string - - Raises: - FileNotFoundError: If config doesn't exist - ValueError: If YAML content is invalid - """ - filepath = os.path.join(self.configs_dir, filename) - - # Check if file exists - if not os.path.exists(filepath): - raise FileNotFoundError(f"Config file '{filename}' not found") - - # Parse and validate YAML - try: - parsed = yaml.safe_load(yaml_content) - except yaml.YAMLError as e: - raise ValueError(f"Invalid YAML syntax: {str(e)}") - - # Validate config structure - is_valid, error_msg = self.validate_config_content(parsed) - if not is_valid: - raise ValueError(f"Invalid config structure: {error_msg}") - - # Write updated content - with open(filepath, 'w') as f: - f.write(yaml_content) - - def delete_config_file(self, filename: str) -> None: - """ - [DEPRECATED] Delete config file and cascade delete any associated schedules. - - When a config is deleted, all schedules using that config (both enabled - and disabled) are automatically deleted as well, since they would be - invalid without the config file. - - Args: - filename: Config filename to delete - - Raises: - FileNotFoundError: If config doesn't exist - """ - filepath = os.path.join(self.configs_dir, filename) - - if not os.path.exists(filepath): - raise FileNotFoundError(f"Config file '{filename}' not found") - - # Delete any schedules using this config (both enabled and disabled) - try: - from web.services.schedule_service import ScheduleService - from flask import current_app - - # Get database session from Flask app - db = current_app.db_session - - # Get all schedules - schedule_service = ScheduleService(db) - result = schedule_service.list_schedules(page=1, per_page=10000) - schedules = result.get('schedules', []) - - # Build full path for comparison - config_path = os.path.join(self.configs_dir, filename) - - # Note: This function is deprecated. Schedules now use config_id. - # This code path should not be reached for new configs. - deleted_schedules = [] - import logging - logging.getLogger(__name__).warning( - f"delete_config_file called for '{filename}' - this is deprecated. Use database configs with config_id instead." - ) - - if deleted_schedules: - import logging - logging.getLogger(__name__).info( - f"Cascade deleted {len(deleted_schedules)} schedule(s) associated with config '{filename}': {', '.join(deleted_schedules)}" - ) - - except ImportError: - # If ScheduleService doesn't exist yet, skip schedule deletion - pass - except Exception as e: - # Log error but continue with config deletion - import logging - logging.getLogger(__name__).error( - f"Error deleting schedules for config {filename}: {e}", exc_info=True - ) - - # Delete file - os.remove(filepath) - - def validate_config_content(self, content: Dict, check_site_refs: bool = True) -> Tuple[bool, str]: - """ - Validate parsed YAML config structure. - - Supports both legacy format (inline IPs) and new format (site references or CIDRs). - - Args: - content: Parsed YAML config as dict - check_site_refs: If True, validates that referenced sites exist in database - - Returns: - Tuple of (is_valid, error_message) - """ - if not isinstance(content, dict): - return False, "Config must be a dictionary/object" - - # Check required fields - if 'title' not in content: - return False, "Missing required field: 'title'" - - if 'sites' not in content: - return False, "Missing required field: 'sites'" - - # Validate title - if not isinstance(content['title'], str) or not content['title'].strip(): - return False, "Field 'title' must be a non-empty string" - - # Validate sites - sites = content['sites'] - if not isinstance(sites, list): - return False, "Field 'sites' must be a list" - - if len(sites) == 0: - return False, "Must have at least one site defined" - - # Validate each site - for i, site in enumerate(sites): - if not isinstance(site, dict): - return False, f"Site {i+1} must be a dictionary/object" - - # Check if this is a site reference (new format) - if 'site_ref' in site: - # Site reference format - site_ref = site.get('site_ref') - if not isinstance(site_ref, str) or not site_ref.strip(): - return False, f"Site {i+1} field 'site_ref' must be a non-empty string" - - # Validate site reference exists (if check enabled) - if check_site_refs: - try: - from web.services.site_service import SiteService - from flask import current_app - - site_service = SiteService(current_app.db_session) - referenced_site = site_service.get_site_by_name(site_ref) - if not referenced_site: - return False, f"Site {i+1}: Referenced site '{site_ref}' does not exist" - except Exception as e: - # If we can't check (e.g., outside app context), skip validation - pass - - continue # Site reference is valid - - # Check if this is inline site creation with CIDRs (new format) - if 'cidrs' in site: - # Inline site creation with CIDR format - if 'name' not in site: - return False, f"Site {i+1} with inline CIDRs missing required field: 'name'" - - cidrs = site.get('cidrs') - if not isinstance(cidrs, list): - return False, f"Site {i+1} field 'cidrs' must be a list" - - if len(cidrs) == 0: - return False, f"Site {i+1} must have at least one CIDR" - - # Validate each CIDR - for j, cidr_config in enumerate(cidrs): - if not isinstance(cidr_config, dict): - return False, f"Site {i+1} CIDR {j+1} must be a dictionary/object" - - if 'cidr' not in cidr_config: - return False, f"Site {i+1} CIDR {j+1} missing required field: 'cidr'" - - # Validate CIDR format - cidr_str = cidr_config.get('cidr') - try: - ipaddress.ip_network(cidr_str, strict=False) - except ValueError: - return False, f"Site {i+1} CIDR {j+1}: Invalid CIDR notation '{cidr_str}'" - - continue # Inline CIDR site is valid - - # Legacy format: inline IPs - if 'name' not in site: - return False, f"Site {i+1} missing required field: 'name'" - - if 'ips' not in site: - return False, f"Site {i+1} missing required field: 'ips' (or use 'site_ref' or 'cidrs')" - - if not isinstance(site['ips'], list): - return False, f"Site {i+1} field 'ips' must be a list" - - if len(site['ips']) == 0: - return False, f"Site {i+1} must have at least one IP" - - # Validate each IP - for j, ip_config in enumerate(site['ips']): - if not isinstance(ip_config, dict): - return False, f"Site {i+1} IP {j+1} must be a dictionary/object" - - if 'address' not in ip_config: - return False, f"Site {i+1} IP {j+1} missing required field: 'address'" - - if 'expected' not in ip_config: - return False, f"Site {i+1} IP {j+1} missing required field: 'expected'" - - if not isinstance(ip_config['expected'], dict): - return False, f"Site {i+1} IP {j+1} field 'expected' must be a dictionary/object" - - return True, "" - - def get_schedules_using_config(self, filename: str) -> List[str]: - """ - Get list of schedule names using this config. - - Args: - filename: Config filename - - Returns: - List of schedule names (e.g., ["Daily Scan", "Weekly Audit"]) - """ - # Import here to avoid circular dependency - try: - from web.services.schedule_service import ScheduleService - from flask import current_app - - # Get database session from Flask app - db = current_app.db_session - - # Get all schedules (use large per_page to get all) - schedule_service = ScheduleService(db) - result = schedule_service.list_schedules(page=1, per_page=10000) - - # Extract schedules list from paginated result - schedules = result.get('schedules', []) - - # Build full path for comparison - config_path = os.path.join(self.configs_dir, filename) - - # Note: This function is deprecated. Schedules now use config_id. - # Return empty list as schedules no longer use config_file. - return [] - - except ImportError: - # If ScheduleService doesn't exist yet, return empty list - return [] - except Exception as e: - # If any error occurs, return empty list (safer than failing) - # Log the error for debugging - import logging - logging.getLogger(__name__).error(f"Error getting schedules using config {filename}: {e}", exc_info=True) - return [] - - def generate_filename_from_title(self, title: str) -> str: - """ - Generate safe filename from scan title. - - Args: - title: Scan title string - - Returns: - Safe filename (e.g., "Prod Scan 2025" -> "prod-scan-2025.yaml") - """ - # Convert to lowercase - filename = title.lower() - - # Replace spaces with hyphens - filename = filename.replace(' ', '-') - - # Remove special characters (keep only alphanumeric, hyphens, underscores) - filename = re.sub(r'[^a-z0-9\-_]', '', filename) - - # Remove consecutive hyphens - filename = re.sub(r'-+', '-', filename) - - # Remove leading/trailing hyphens - filename = filename.strip('-') - - # Limit length (max 200 chars, reserve 5 for .yaml) - max_length = 195 - if len(filename) > max_length: - filename = filename[:max_length] - - # Ensure not empty - if not filename: - filename = 'config' - - # Add .yaml extension - filename += '.yaml' - - return filename - - def get_config_path(self, filename: str) -> str: - """ - Get absolute path for a config file. - - Args: - filename: Config filename - - Returns: - Absolute path to config file - """ - return os.path.join(self.configs_dir, filename) - - def config_exists(self, filename: str) -> bool: - """ - Check if a config file exists. - - Args: - filename: Config filename - - Returns: - True if file exists, False otherwise - """ - filepath = os.path.join(self.configs_dir, filename) - return os.path.exists(filepath) and os.path.isfile(filepath) - - def create_inline_sites(self, config_content: Dict) -> None: - """ - Create sites in the database for inline site definitions in a config. - - This method scans the config for inline site definitions (with CIDRs) - and creates them as reusable sites in the database if they don't already exist. - - Args: - config_content: Parsed YAML config dictionary - - Raises: - ValueError: If site creation fails - """ - try: - from web.services.site_service import SiteService - from flask import current_app - - site_service = SiteService(current_app.db_session) - - sites = config_content.get('sites', []) - - for site_def in sites: - # Skip site references (they already exist) - if 'site_ref' in site_def: - continue - - # Skip legacy IP-based sites (not creating those as reusable sites) - if 'ips' in site_def and 'cidrs' not in site_def: - continue - - # Process inline CIDR-based sites - if 'cidrs' in site_def: - site_name = site_def.get('name') - - # Check if site already exists - existing_site = site_service.get_site_by_name(site_name) - if existing_site: - # Site already exists, skip creation - continue - - # Create new site - cidrs = site_def.get('cidrs', []) - description = f"Auto-created from config '{config_content.get('title', 'Unknown')}'" - - site_service.create_site( - name=site_name, - description=description, - cidrs=cidrs - ) - - except Exception as e: - # If site creation fails, log but don't block config creation - import logging - logging.getLogger(__name__).warning( - f"Failed to create inline sites from config: {str(e)}" - ) diff --git a/app/web/services/site_service.py b/app/web/services/site_service.py index 646c334..f4a4fb7 100644 --- a/app/web/services/site_service.py +++ b/app/web/services/site_service.py @@ -13,7 +13,6 @@ from typing import Any, Dict, List, Optional from sqlalchemy import func from sqlalchemy.orm import Session, joinedload -from sqlalchemy.exc import IntegrityError from web.models import ( Site, SiteIP, ScanSiteAssociation diff --git a/app/web/templates/base.html b/app/web/templates/base.html index e069617..872f3f1 100644 --- a/app/web/templates/base.html +++ b/app/web/templates/base.html @@ -45,6 +45,16 @@ Dashboard +
  • + + Configs + + +
  • Scans @@ -53,14 +63,6 @@ Schedules
    • -
  • - Sites -
    • -
  • - Configs -
  • diff --git a/app/web/templates/config_edit.html b/app/web/templates/config_edit.html deleted file mode 100644 index e128b69..0000000 --- a/app/web/templates/config_edit.html +++ /dev/null @@ -1,263 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Edit Config - SneakyScanner{% endblock %} - -{% block extra_styles %} - - - - -{% endblock %} - -{% block content %} -
    - - Back to Configs - - -

    Edit Configuration

    -

    Edit the YAML configuration for {{ filename }}

    - -
    -
    -
    - YAML Editor -
    - -
    - - - -
    - -
    - - - - Cancel - -
    -
    -
    - - - -{% endblock %} - -{% block scripts %} - - - - - -{% endblock %} diff --git a/app/web/templates/config_upload.html b/app/web/templates/config_upload.html deleted file mode 100644 index 41c79ab..0000000 --- a/app/web/templates/config_upload.html +++ /dev/null @@ -1,415 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Create Configuration - SneakyScanner{% endblock %} - -{% block extra_styles %} - - -{% endblock %} - -{% block content %} -
    -
    -
    -

    Create New Configuration

    - - Back to Configs - -
    -
    -
    - - -
    -
    - - -
    - -
    -
    -
    -
    -
    -
    - Create Configuration from CIDR Range -
    -
    -
    -

    - - Specify a CIDR range to automatically generate a configuration for all IPs in that range. - You can edit the configuration afterwards to add expected ports and services. -

    - -
    -
    - - -
    A descriptive title for your scan configuration
    -
    - -
    - - -
    - Enter a CIDR range (e.g., 10.0.0.0/24 for 254 hosts). - Maximum 10,000 addresses per range. -
    -
    - -
    - - -
    - Logical grouping name for these IPs (default: "Site 1") -
    -
    - -
    -
    - - -
    -
    - Sets the default expectation for ICMP ping responses from these IPs -
    -
    - - - -
    - -
    -
    - - -
    -
    -
    -
    -
    - - -
    -
    -
    -
    -
    -
    - Upload YAML Configuration -
    -
    -
    -

    - - For advanced users: upload a YAML config file directly. -

    - -
    - -

    Drag & drop YAML file here or click to browse

    - -
    - -
    -
    -
    -
    - -
    - - -
    - - - - -
    -
    -
    -
    -
    -
    -
    -
    - - - - -{% endblock %} - -{% block scripts %} - -{% endblock %} diff --git a/app/web/utils/validators.py b/app/web/utils/validators.py index 78acd92..2123c2a 100644 --- a/app/web/utils/validators.py +++ b/app/web/utils/validators.py @@ -1,91 +1,11 @@ """ Input validation utilities for SneakyScanner web application. -Provides validation functions for API inputs, file paths, and data integrity. +Provides validation functions for API inputs and data integrity. """ -import os -from pathlib import Path from typing import Optional -import yaml - - -def validate_config_file(file_path: str) -> tuple[bool, Optional[str]]: - """ - [DEPRECATED] Validate that a configuration file exists and is valid YAML. - - This function is deprecated. Use config_id with database-stored configs instead. - - Args: - file_path: Path to configuration file (absolute or relative filename) - - Returns: - Tuple of (is_valid, error_message) - If valid, returns (True, None) - If invalid, returns (False, error_message) - - Examples: - >>> validate_config_file('/app/configs/example.yaml') - (True, None) - >>> validate_config_file('example.yaml') - (True, None) - >>> validate_config_file('/nonexistent.yaml') - (False, 'File does not exist: /nonexistent.yaml') - """ - # Check if path is provided - if not file_path: - return False, 'Config file path is required' - - # If file_path is just a filename (not absolute), prepend configs directory - if not file_path.startswith('/'): - file_path = f'/app/configs/{file_path}' - - # Convert to Path object - path = Path(file_path) - - # Check if file exists - if not path.exists(): - return False, f'File does not exist: {file_path}' - - # Check if it's a file (not directory) - if not path.is_file(): - return False, f'Path is not a file: {file_path}' - - # Check file extension - if path.suffix.lower() not in ['.yaml', '.yml']: - return False, f'File must be YAML (.yaml or .yml): {file_path}' - - # Try to parse as YAML - try: - with open(path, 'r') as f: - config = yaml.safe_load(f) - - # Check if it's a dictionary (basic structure validation) - if not isinstance(config, dict): - return False, 'Config file must contain a YAML dictionary' - - # Check for required top-level keys - if 'title' not in config: - return False, 'Config file missing required "title" field' - - if 'sites' not in config: - return False, 'Config file missing required "sites" field' - - # Validate sites structure - if not isinstance(config['sites'], list): - return False, '"sites" must be a list' - - if len(config['sites']) == 0: - return False, '"sites" list cannot be empty' - - except yaml.YAMLError as e: - return False, f'Invalid YAML syntax: {str(e)}' - except Exception as e: - return False, f'Error reading config file: {str(e)}' - - return True, None - def validate_scan_status(status: str) -> tuple[bool, Optional[str]]: """ @@ -109,184 +29,3 @@ def validate_scan_status(status: str) -> tuple[bool, Optional[str]]: return False, f'Invalid status: {status}. Must be one of: {", ".join(valid_statuses)}' return True, None - - -def validate_triggered_by(triggered_by: str) -> tuple[bool, Optional[str]]: - """ - Validate triggered_by value. - - Args: - triggered_by: Source that triggered the scan - - Returns: - Tuple of (is_valid, error_message) - - Examples: - >>> validate_triggered_by('manual') - (True, None) - >>> validate_triggered_by('api') - (True, None) - """ - valid_sources = ['manual', 'scheduled', 'api'] - - if triggered_by not in valid_sources: - return False, f'Invalid triggered_by: {triggered_by}. Must be one of: {", ".join(valid_sources)}' - - return True, None - - -def validate_scan_id(scan_id: any) -> tuple[bool, Optional[str]]: - """ - Validate scan ID is a positive integer. - - Args: - scan_id: Scan ID to validate - - Returns: - Tuple of (is_valid, error_message) - - Examples: - >>> validate_scan_id(42) - (True, None) - >>> validate_scan_id('42') - (True, None) - >>> validate_scan_id(-1) - (False, 'Scan ID must be a positive integer') - """ - try: - scan_id_int = int(scan_id) - if scan_id_int <= 0: - return False, 'Scan ID must be a positive integer' - except (ValueError, TypeError): - return False, f'Invalid scan ID: {scan_id}' - - return True, None - - -def validate_file_path(file_path: str, must_exist: bool = True) -> tuple[bool, Optional[str]]: - """ - Validate a file path. - - Args: - file_path: Path to validate - must_exist: If True, file must exist. If False, only validate format. - - Returns: - Tuple of (is_valid, error_message) - - Examples: - >>> validate_file_path('/app/output/scan.json', must_exist=False) - (True, None) - >>> validate_file_path('', must_exist=False) - (False, 'File path is required') - """ - if not file_path: - return False, 'File path is required' - - # Check for path traversal attempts - if '..' in file_path: - return False, 'Path traversal not allowed' - - if must_exist: - path = Path(file_path) - if not path.exists(): - return False, f'File does not exist: {file_path}' - if not path.is_file(): - return False, f'Path is not a file: {file_path}' - - return True, None - - -def sanitize_filename(filename: str) -> str: - """ - Sanitize a filename by removing/replacing unsafe characters. - - Args: - filename: Original filename - - Returns: - Sanitized filename safe for filesystem - - Examples: - >>> sanitize_filename('my scan.json') - 'my_scan.json' - >>> sanitize_filename('../../etc/passwd') - 'etc_passwd' - """ - # Remove path components - filename = os.path.basename(filename) - - # Replace unsafe characters with underscore - unsafe_chars = ['/', '\\', '..', ' ', ':', '*', '?', '"', '<', '>', '|'] - for char in unsafe_chars: - filename = filename.replace(char, '_') - - # Remove leading/trailing underscores and dots - filename = filename.strip('_.') - - # Ensure filename is not empty - if not filename: - filename = 'unnamed' - - return filename - - -def validate_port(port: any) -> tuple[bool, Optional[str]]: - """ - Validate port number. - - Args: - port: Port number to validate - - Returns: - Tuple of (is_valid, error_message) - - Examples: - >>> validate_port(443) - (True, None) - >>> validate_port(70000) - (False, 'Port must be between 1 and 65535') - """ - try: - port_int = int(port) - if port_int < 1 or port_int > 65535: - return False, 'Port must be between 1 and 65535' - except (ValueError, TypeError): - return False, f'Invalid port: {port}' - - return True, None - - -def validate_ip_address(ip: str) -> tuple[bool, Optional[str]]: - """ - Validate IPv4 address format (basic validation). - - Args: - ip: IP address string - - Returns: - Tuple of (is_valid, error_message) - - Examples: - >>> validate_ip_address('192.168.1.1') - (True, None) - >>> validate_ip_address('256.1.1.1') - (False, 'Invalid IP address format') - """ - if not ip: - return False, 'IP address is required' - - # Basic IPv4 validation - parts = ip.split('.') - if len(parts) != 4: - return False, 'Invalid IP address format' - - try: - for part in parts: - num = int(part) - if num < 0 or num > 255: - return False, 'Invalid IP address format' - except (ValueError, TypeError): - return False, 'Invalid IP address format' - - return True, None -- 2.49.1 From 0fc51eb0327da50b53770c89bebff5358378753c Mon Sep 17 00:00:00 2001 From: Phillip Tarrant Date: Wed, 19 Nov 2025 21:45:36 -0600 Subject: [PATCH 2/2] Improve UI design system and fix notification positioning - Overhaul CSS with comprehensive design tokens (shadows, transitions, radii) - Add hover effects and smooth transitions to cards, buttons, tables - Improve typography hierarchy and color consistency - Remove inline styles from 10 template files for better maintainability - Add global notification container to ensure toasts appear above modals - Update showNotification/showAlert functions to use centralized container - Add accessibility improvements (focus states, reduced motion support) - Improve responsive design and mobile styling - Add print styles --- app/web/static/css/styles.css | 971 ++++++++++++++++++++++--- app/web/templates/alert_rules.html | 10 +- app/web/templates/alerts.html | 8 +- app/web/templates/base.html | 3 + app/web/templates/configs.html | 58 +- app/web/templates/dashboard.html | 18 +- app/web/templates/scans.html | 31 +- app/web/templates/schedule_create.html | 10 +- app/web/templates/schedule_edit.html | 10 +- app/web/templates/schedules.html | 15 +- app/web/templates/setup.html | 145 ++-- app/web/templates/sites.html | 92 +-- app/web/templates/webhooks/list.html | 2 +- 13 files changed, 1004 insertions(+), 369 deletions(-) diff --git a/app/web/static/css/styles.css b/app/web/static/css/styles.css index f94d121..ff3ce6b 100644 --- a/app/web/static/css/styles.css +++ b/app/web/static/css/styles.css @@ -1,15 +1,28 @@ -/* CSS Variables */ +/* ============================================== + CSS Variables - Design System + ============================================== */ :root { - /* Custom Variables */ + /* Primary Colors */ --bg-primary: #0f172a; --bg-secondary: #1e293b; --bg-tertiary: #334155; --bg-quaternary: #475569; - --text-primary: #e2e8f0; + + /* Text Colors */ + --text-primary: #f1f5f9; --text-secondary: #94a3b8; --text-muted: #64748b; - --border-color: #334155; + + /* Accent Colors */ --accent-blue: #60a5fa; + --accent-blue-hover: #3b82f6; + --accent-blue-dark: #2563eb; + + /* Border Colors */ + --border-color: #334155; + --border-color-light: #475569; + + /* Status Colors */ --success-bg: #065f46; --success-text: #6ee7b7; --success-border: #10b981; @@ -23,25 +36,44 @@ --info-text: #93c5fd; --info-border: #3b82f6; + /* Shadows */ + --shadow-sm: 0 1px 2px 0 rgba(0, 0, 0, 0.3); + --shadow-md: 0 4px 6px -1px rgba(0, 0, 0, 0.3), 0 2px 4px -1px rgba(0, 0, 0, 0.2); + --shadow-lg: 0 10px 15px -3px rgba(0, 0, 0, 0.3), 0 4px 6px -2px rgba(0, 0, 0, 0.2); + --shadow-xl: 0 20px 25px -5px rgba(0, 0, 0, 0.3), 0 10px 10px -5px rgba(0, 0, 0, 0.2); + + /* Transitions */ + --transition-fast: 150ms ease; + --transition-base: 200ms ease; + --transition-slow: 300ms ease; + + /* Border Radius */ + --radius-sm: 6px; + --radius-md: 8px; + --radius-lg: 12px; + --radius-xl: 16px; + /* Bootstrap 5 Variable Overrides for Dark Theme */ --bs-body-bg: #0f172a; - --bs-body-color: #e2e8f0; + --bs-body-color: #f1f5f9; --bs-border-color: #334155; --bs-border-color-translucent: rgba(51, 65, 85, 0.5); /* Table Variables */ --bs-table-bg: #1e293b; - --bs-table-color: #e2e8f0; + --bs-table-color: #f1f5f9; --bs-table-border-color: #334155; --bs-table-striped-bg: #1e293b; - --bs-table-striped-color: #e2e8f0; + --bs-table-striped-color: #f1f5f9; --bs-table-active-bg: #334155; - --bs-table-active-color: #e2e8f0; + --bs-table-active-color: #f1f5f9; --bs-table-hover-bg: #334155; - --bs-table-hover-color: #e2e8f0; + --bs-table-hover-color: #f1f5f9; } -/* Global Styles */ +/* ============================================== + Global Styles + ============================================== */ * { margin: 0; padding: 0; @@ -53,67 +85,445 @@ body { background-color: var(--bg-primary); color: var(--text-primary); line-height: 1.6; + min-height: 100vh; } -/* Navbar */ +/* Smooth scrolling */ +html { + scroll-behavior: smooth; +} + +/* Better focus styles for accessibility */ +:focus-visible { + outline: 2px solid var(--accent-blue); + outline-offset: 2px; +} + +/* ============================================== + Typography + ============================================== */ +h1, h2, h3, h4, h5, h6 { + color: var(--accent-blue); + font-weight: 600; + line-height: 1.3; +} + +h1 { font-size: 2rem; } +h2 { font-size: 1.75rem; } +h3 { font-size: 1.5rem; } +h4 { font-size: 1.25rem; } +h5 { font-size: 1.125rem; } +h6 { font-size: 1rem; } + +/* Page titles */ +.page-title { + color: var(--accent-blue); + font-size: 2rem; + font-weight: 600; + margin-bottom: 0; +} + +/* ============================================== + Navbar + ============================================== */ .navbar-custom { background: linear-gradient(135deg, var(--bg-secondary) 0%, var(--bg-tertiary) 100%); - border-bottom: 1px solid var(--bg-quaternary); - padding: 1rem 0; + border-bottom: 1px solid var(--border-color-light); + padding: 0.875rem 0; + box-shadow: var(--shadow-md); } .navbar-brand { font-size: 1.5rem; - font-weight: 600; + font-weight: 700; color: var(--accent-blue) !important; + letter-spacing: -0.5px; + transition: color var(--transition-fast); +} + +.navbar-brand:hover { + color: var(--accent-blue-hover) !important; } .nav-link { color: var(--text-secondary) !important; - transition: color 0.2s; + font-weight: 500; + padding: 0.5rem 1rem !important; + border-radius: var(--radius-sm); + transition: all var(--transition-fast); +} + +.nav-link:hover { + color: var(--text-primary) !important; + background-color: rgba(255, 255, 255, 0.05); } -.nav-link:hover, .nav-link.active { color: var(--accent-blue) !important; + background-color: rgba(96, 165, 250, 0.1); } -/* Container */ +/* Dropdown menus */ +.dropdown-menu { + background-color: var(--bg-secondary); + border: 1px solid var(--border-color); + border-radius: var(--radius-md); + box-shadow: var(--shadow-lg); + padding: 0.5rem; +} + +.dropdown-item { + color: var(--text-secondary); + padding: 0.5rem 1rem; + border-radius: var(--radius-sm); + transition: all var(--transition-fast); +} + +.dropdown-item:hover, +.dropdown-item:focus { + color: var(--text-primary); + background-color: var(--bg-tertiary); +} + +.dropdown-divider { + border-color: var(--border-color); +} + +/* Navbar toggler for mobile */ +.navbar-toggler { + border-color: var(--border-color); + padding: 0.5rem; +} + +.navbar-toggler-icon { + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28148, 163, 184, 1%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e"); +} + +/* ============================================== + Container + ============================================== */ .container-fluid { max-width: 1400px; margin: 0 auto; - padding: 20px; + padding: 1.5rem; } -/* Cards */ +/* ============================================== + Cards + ============================================== */ .card { background-color: var(--bg-secondary); border: 1px solid var(--border-color); - border-radius: 12px; - margin-bottom: 25px; + border-radius: var(--radius-lg); + margin-bottom: 1.5rem; + box-shadow: var(--shadow-sm); + transition: box-shadow var(--transition-base); +} + +.card:hover { + box-shadow: var(--shadow-md); } .card-header { background-color: var(--bg-tertiary); - border-bottom: 1px solid var(--bg-quaternary); - padding: 15px 20px; - border-radius: 12px 12px 0 0 !important; + border-bottom: 1px solid var(--border-color); + padding: 1rem 1.5rem; + border-radius: var(--radius-lg) var(--radius-lg) 0 0 !important; +} + +.card-header h5, +.card-header .card-title { + color: var(--accent-blue); + margin-bottom: 0; + font-weight: 600; } .card-body { - padding: 25px; + padding: 1.5rem; } .card-title { color: var(--accent-blue); - font-size: 1.5rem; - margin-bottom: 15px; + font-size: 1.25rem; + font-weight: 600; + margin-bottom: 1rem; } -/* Badges */ +.card-footer { + background-color: var(--bg-tertiary); + border-top: 1px solid var(--border-color); + padding: 1rem 1.5rem; +} + +/* ============================================== + Stat Cards + ============================================== */ +.stat-card { + background-color: var(--bg-secondary); + padding: 1.5rem; + border-radius: var(--radius-lg); + border: 1px solid var(--border-color); + text-align: center; + transition: all var(--transition-base); + box-shadow: var(--shadow-sm); +} + +.stat-card:hover { + transform: translateY(-2px); + box-shadow: var(--shadow-md); + border-color: var(--accent-blue); +} + +.stat-value { + font-size: 2.5rem; + font-weight: 700; + color: var(--accent-blue); + line-height: 1.2; +} + +.stat-label { + color: var(--text-secondary); + font-size: 0.875rem; + text-transform: uppercase; + letter-spacing: 0.5px; + margin-top: 0.5rem; + font-weight: 500; +} + +/* ============================================== + Buttons + ============================================== */ +.btn { + font-weight: 500; + border-radius: var(--radius-md); + padding: 0.5rem 1rem; + transition: all var(--transition-fast); + border: 1px solid transparent; +} + +.btn:focus { + box-shadow: 0 0 0 0.2rem rgba(96, 165, 250, 0.25); +} + +/* Primary Button */ +.btn-primary { + background-color: var(--accent-blue-hover); + border-color: var(--accent-blue-hover); + color: #ffffff; +} + +.btn-primary:hover, +.btn-primary:focus { + background-color: var(--accent-blue-dark); + border-color: var(--accent-blue-dark); + color: #ffffff; +} + +.btn-primary:active { + background-color: #1d4ed8; + border-color: #1d4ed8; +} + +/* Secondary Button */ +.btn-secondary { + background-color: var(--bg-tertiary); + border-color: var(--border-color); + color: var(--text-primary); +} + +.btn-secondary:hover, +.btn-secondary:focus { + background-color: var(--bg-quaternary); + border-color: var(--border-color-light); + color: var(--text-primary); +} + +/* Success Button */ +.btn-success { + background-color: #22c55e; + border-color: #22c55e; + color: #ffffff; +} + +.btn-success:hover, +.btn-success:focus { + background-color: #16a34a; + border-color: #16a34a; + color: #ffffff; +} + +/* Danger Button */ +.btn-danger { + background-color: #dc2626; + border-color: #dc2626; + color: #ffffff; +} + +.btn-danger:hover, +.btn-danger:focus { + background-color: #b91c1c; + border-color: #b91c1c; + color: #ffffff; +} + +/* Warning Button */ +.btn-warning { + background-color: #f59e0b; + border-color: #f59e0b; + color: #000000; +} + +.btn-warning:hover, +.btn-warning:focus { + background-color: #d97706; + border-color: #d97706; + color: #000000; +} + +/* Info Button */ +.btn-info { + background-color: #0ea5e9; + border-color: #0ea5e9; + color: #ffffff; +} + +.btn-info:hover, +.btn-info:focus { + background-color: #0284c7; + border-color: #0284c7; + color: #ffffff; +} + +/* Outline Buttons */ +.btn-outline-primary { + color: var(--accent-blue); + border-color: var(--accent-blue-hover); +} + +.btn-outline-primary:hover, +.btn-outline-primary:focus { + background-color: var(--accent-blue-hover); + border-color: var(--accent-blue-hover); + color: #ffffff; +} + +.btn-outline-secondary { + color: var(--text-secondary); + border-color: var(--border-color); +} + +.btn-outline-secondary:hover, +.btn-outline-secondary:focus { + background-color: var(--bg-tertiary); + border-color: var(--border-color-light); + color: var(--text-primary); +} + +.btn-outline-success { + color: var(--success-border); + border-color: var(--success-border); +} + +.btn-outline-success:hover, +.btn-outline-success:focus { + background-color: var(--success-border); + border-color: var(--success-border); + color: #ffffff; +} + +.btn-outline-danger { + color: var(--danger-border); + border-color: var(--danger-border); +} + +.btn-outline-danger:hover, +.btn-outline-danger:focus { + background-color: var(--danger-border); + border-color: var(--danger-border); + color: #ffffff; +} + +/* Button Sizes */ +.btn-lg { + padding: 0.75rem 1.5rem; + font-size: 1.125rem; +} + +.btn-sm { + padding: 0.25rem 0.5rem; + font-size: 0.875rem; + border-radius: var(--radius-sm); +} + +/* Button Groups */ +.btn-group .btn { + border-radius: 0; +} + +.btn-group .btn:first-child { + border-top-left-radius: var(--radius-md); + border-bottom-left-radius: var(--radius-md); +} + +.btn-group .btn:last-child { + border-top-right-radius: var(--radius-md); + border-bottom-right-radius: var(--radius-md); +} + +/* ============================================== + Tables + ============================================== */ +.table { + color: var(--text-primary); + border-color: var(--border-color); + margin-bottom: 0; +} + +.table thead { + background-color: var(--bg-tertiary); +} + +.table thead th { + color: var(--text-secondary); + font-weight: 600; + text-transform: uppercase; + font-size: 0.75rem; + letter-spacing: 0.5px; + padding: 1rem; + border-bottom: 2px solid var(--border-color); + white-space: nowrap; +} + +.table tbody tr, +.table tbody tr.scan-row, +.table tbody tr.schedule-row { + background-color: var(--bg-secondary) !important; + border-color: var(--border-color) !important; + transition: background-color var(--transition-fast); +} + +.table tbody tr:hover { + background-color: var(--bg-tertiary) !important; +} + +.table th, +.table td { + padding: 1rem; + border-color: var(--border-color); + vertical-align: middle; +} + +.table-responsive { + border-radius: var(--radius-md); + overflow: hidden; +} + +/* ============================================== + Badges + ============================================== */ .badge { - padding: 4px 12px; - border-radius: 12px; + padding: 0.35rem 0.75rem; + border-radius: 50px; font-size: 0.75rem; font-weight: 600; text-transform: uppercase; @@ -145,72 +555,40 @@ body { color: var(--info-text); } -/* Buttons */ -.btn-primary { - background-color: #3b82f6; - border-color: #3b82f6; - color: #ffffff; +/* Bootstrap badge overrides */ +.bg-success { + background-color: var(--success-border) !important; } -.btn-primary:hover { - background-color: #2563eb; - border-color: #2563eb; +.bg-danger { + background-color: var(--danger-border) !important; } -.btn-secondary { - background-color: var(--bg-tertiary); - border-color: var(--bg-tertiary); - color: var(--text-primary); +.bg-warning { + background-color: var(--warning-border) !important; + color: #000 !important; } -.btn-secondary:hover { - background-color: var(--bg-quaternary); - border-color: var(--bg-quaternary); +.bg-info { + background-color: var(--info-border) !important; } -.btn-danger { - background-color: var(--danger-bg); - border-color: var(--danger-bg); - color: var(--danger-text); +.bg-secondary { + background-color: var(--bg-quaternary) !important; } -.btn-danger:hover { - background-color: #991b1b; - border-color: #991b1b; +.bg-primary { + background-color: var(--accent-blue-hover) !important; } -/* Tables - Fix for dynamically created table rows (white row bug) */ -.table { - color: var(--text-primary); - border-color: var(--border-color); -} - -.table thead { - background-color: var(--bg-tertiary); - color: var(--text-secondary); -} - -.table tbody tr, -.table tbody tr.scan-row { - background-color: var(--bg-secondary) !important; - border-color: var(--border-color) !important; -} - -.table tbody tr:hover { - background-color: var(--bg-tertiary) !important; - cursor: pointer; -} - -.table th, -.table td { - padding: 12px; - border-color: var(--border-color); -} - -/* Alerts */ +/* ============================================== + Alerts + ============================================== */ .alert { - border-radius: 8px; + border-radius: var(--radius-md); border: 1px solid; + padding: 1rem 1.25rem; + margin-bottom: 1rem; } .alert-success { @@ -237,61 +615,217 @@ body { color: var(--info-text); } -/* Form Controls */ +.alert .btn-close { + filter: invert(1) brightness(0.8); +} + +.alert-link { + color: inherit; + text-decoration: underline; + font-weight: 600; +} + +/* ============================================== + Form Controls + ============================================== */ .form-control, .form-select { background-color: var(--bg-secondary); - border-color: var(--border-color); + border: 1px solid var(--border-color); color: var(--text-primary); + border-radius: var(--radius-md); + padding: 0.625rem 0.875rem; + transition: all var(--transition-fast); } .form-control:focus, .form-select:focus { - background-color: var(--bg-secondary); + background-color: var(--bg-primary); border-color: var(--accent-blue); color: var(--text-primary); box-shadow: 0 0 0 0.2rem rgba(96, 165, 250, 0.25); } +.form-control::placeholder { + color: var(--text-muted); +} + +.form-control:disabled, +.form-select:disabled { + background-color: var(--bg-tertiary); + opacity: 0.6; +} + +.form-control-lg { + padding: 0.75rem 1rem; + font-size: 1.125rem; +} + .form-label { color: var(--text-secondary); font-weight: 500; + margin-bottom: 0.5rem; } -/* Stats Cards */ -.stat-card { - background-color: var(--bg-primary); - padding: 20px; - border-radius: 8px; - border: 1px solid var(--border-color); - text-align: center; +.form-text { + color: var(--text-muted); + font-size: 0.875rem; } -.stat-value { - font-size: 2rem; - font-weight: 600; - color: var(--accent-blue); +.form-check-input { + background-color: var(--bg-secondary); + border-color: var(--border-color); } -.stat-label { +.form-check-input:checked { + background-color: var(--accent-blue-hover); + border-color: var(--accent-blue-hover); +} + +.form-check-input:focus { + box-shadow: 0 0 0 0.2rem rgba(96, 165, 250, 0.25); + border-color: var(--accent-blue); +} + +.form-check-label { color: var(--text-secondary); - font-size: 0.9rem; - text-transform: uppercase; - letter-spacing: 0.5px; - margin-top: 5px; } -/* Footer */ +/* Form switches */ +.form-switch .form-check-input { + width: 2.5rem; + height: 1.25rem; + margin-top: 0.125rem; +} + +/* Required field indicator */ +.text-danger { + color: var(--danger-border) !important; +} + +/* ============================================== + Modals + ============================================== */ +.modal-content { + background-color: var(--bg-secondary); + border: 1px solid var(--border-color); + border-radius: var(--radius-lg); + box-shadow: var(--shadow-xl); +} + +.modal-header { + border-bottom: 1px solid var(--border-color); + padding: 1.25rem 1.5rem; +} + +.modal-title { + color: var(--accent-blue); + font-weight: 600; +} + +.modal-body { + padding: 1.5rem; +} + +.modal-footer { + border-top: 1px solid var(--border-color); + padding: 1rem 1.5rem; + gap: 0.5rem; +} + +.btn-close { + filter: invert(1) brightness(0.8); + opacity: 0.5; + transition: opacity var(--transition-fast); +} + +.btn-close:hover { + opacity: 1; +} + +.modal-backdrop { + background-color: rgba(0, 0, 0, 0.7); +} + +/* ============================================== + Pagination + ============================================== */ +.pagination { + --bs-pagination-bg: var(--bg-secondary); + --bs-pagination-border-color: var(--border-color); + --bs-pagination-hover-bg: var(--bg-tertiary); + --bs-pagination-hover-border-color: var(--border-color-light); + --bs-pagination-focus-bg: var(--bg-tertiary); + --bs-pagination-active-bg: var(--accent-blue-hover); + --bs-pagination-active-border-color: var(--accent-blue-hover); + --bs-pagination-disabled-bg: var(--bg-primary); + --bs-pagination-disabled-border-color: var(--border-color); + --bs-pagination-color: var(--text-secondary); + --bs-pagination-hover-color: var(--text-primary); + --bs-pagination-disabled-color: var(--text-muted); +} + +.page-link { + border-radius: var(--radius-sm); + margin: 0 0.125rem; + transition: all var(--transition-fast); +} + +.page-item.active .page-link { + color: #ffffff; +} + +/* ============================================== + Login Page + ============================================== */ +.login-card { + max-width: 420px; + margin: 5rem auto; + padding: 2.5rem; + background-color: var(--bg-secondary); + border-radius: var(--radius-xl); + border: 1px solid var(--border-color); + box-shadow: var(--shadow-xl); +} + +.brand-title { + font-size: 2.5rem; + font-weight: 700; + color: var(--accent-blue); + margin-bottom: 0.5rem; +} + +.brand-subtitle { + color: var(--text-muted); + font-size: 1rem; + margin-bottom: 0; +} + +/* ============================================== + Footer + ============================================== */ .footer { - margin-top: 40px; - padding: 20px 0; + margin-top: 3rem; + padding: 1.5rem 0; border-top: 1px solid var(--border-color); text-align: center; color: var(--text-muted); - font-size: 0.9rem; + font-size: 0.875rem; } -/* Utilities */ +.footer a { + color: var(--accent-blue); + text-decoration: none; + transition: color var(--transition-fast); +} + +.footer a:hover { + color: var(--accent-blue-hover); +} + +/* ============================================== + Utility Classes + ============================================== */ .text-muted { color: var(--text-secondary) !important; } @@ -313,22 +847,237 @@ body { } .mono { - font-family: 'Courier New', monospace; + font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Courier New', monospace; + font-size: 0.9em; } -/* Spinner for loading states */ -.spinner-border-sm { +code { + background-color: var(--bg-primary); + color: var(--accent-blue); + padding: 0.125rem 0.375rem; + border-radius: var(--radius-sm); + font-size: 0.875em; +} + +/* Border utilities */ +.border-bottom { + border-bottom: 1px solid var(--border-color) !important; +} + +/* ============================================== + Spinners / Loading States + ============================================== */ +.spinner-border { color: var(--accent-blue); } -/* Chart.js Dark Theme Styles */ +.spinner-border-sm { + width: 1rem; + height: 1rem; +} + +/* ============================================== + Charts + ============================================== */ .chart-container { position: relative; height: 300px; - margin: 20px 0; + margin: 1rem 0; } canvas { max-width: 100%; height: auto; } + +/* ============================================== + Empty States + ============================================== */ +.empty-state { + text-align: center; + padding: 3rem 1rem; +} + +.empty-state i { + font-size: 3rem; + color: var(--text-muted); + opacity: 0.5; + margin-bottom: 1rem; +} + +.empty-state h5 { + color: var(--text-secondary); +} + +.empty-state p { + color: var(--text-muted); +} + +/* ============================================== + Notifications (Toast-like) + ============================================== */ +.notification { + position: fixed; + top: 1.25rem; + right: 1.25rem; + z-index: 9999; + min-width: 300px; + animation: slideIn 0.3s ease; +} + +@keyframes slideIn { + from { + transform: translateX(100%); + opacity: 0; + } + to { + transform: translateX(0); + opacity: 1; + } +} + +/* ============================================== + Responsive Design + ============================================== */ +@media (max-width: 991.98px) { + .navbar-collapse { + background-color: var(--bg-secondary); + padding: 1rem; + border-radius: var(--radius-md); + margin-top: 1rem; + border: 1px solid var(--border-color); + } + + .navbar-nav { + gap: 0.25rem; + } +} + +@media (max-width: 767.98px) { + .container-fluid { + padding: 1rem; + } + + h1 { + font-size: 1.75rem; + } + + .stat-value { + font-size: 2rem; + } + + .card-body { + padding: 1rem; + } + + .card-header { + padding: 0.875rem 1rem; + } + + .table th, + .table td { + padding: 0.75rem; + } + + .btn-lg { + padding: 0.625rem 1.25rem; + font-size: 1rem; + } + + .login-card { + margin: 2rem 1rem; + padding: 1.5rem; + } + + .modal-dialog { + margin: 0.5rem; + } +} + +@media (max-width: 575.98px) { + .stat-card { + padding: 1rem; + } + + .stat-value { + font-size: 1.75rem; + } + + .stat-label { + font-size: 0.75rem; + } + + /* Stack action buttons on small screens */ + .btn-group { + flex-direction: column; + } + + .btn-group .btn { + border-radius: var(--radius-sm) !important; + margin-bottom: 0.25rem; + } +} + +/* ============================================== + Print Styles + ============================================== */ +@media print { + .navbar-custom, + .footer, + .btn, + .pagination { + display: none !important; + } + + body { + background: white; + color: black; + } + + .card { + border: 1px solid #ddd; + break-inside: avoid; + } +} + +/* ============================================== + Accessibility Improvements + ============================================== */ +/* Ensure sufficient contrast for links */ +a { + color: var(--accent-blue); + text-decoration: none; + transition: color var(--transition-fast); +} + +a:hover { + color: var(--accent-blue-hover); +} + +/* Skip to main content link (hidden by default) */ +.skip-link { + position: absolute; + top: -40px; + left: 0; + background: var(--accent-blue); + color: white; + padding: 0.5rem 1rem; + z-index: 100; + transition: top 0.3s; +} + +.skip-link:focus { + top: 0; +} + +/* Reduced motion preference */ +@media (prefers-reduced-motion: reduce) { + *, + *::before, + *::after { + animation-duration: 0.01ms !important; + animation-iteration-count: 1 !important; + transition-duration: 0.01ms !important; + scroll-behavior: auto !important; + } +} diff --git a/app/web/templates/alert_rules.html b/app/web/templates/alert_rules.html index 4b15c31..eaa9e8c 100644 --- a/app/web/templates/alert_rules.html +++ b/app/web/templates/alert_rules.html @@ -5,7 +5,7 @@ {% block content %}
    -

    Alert Rules

    +

    Alert Rules

    @@ -42,7 +42,7 @@
    -
    Alert Rules Configuration
    +
    Alert Rules Configuration
    {% if rules %} @@ -121,9 +121,9 @@ onchange="toggleRule({{ rule.id }}, this.checked)">
    diff --git a/app/web/templates/alerts.html b/app/web/templates/alerts.html index 6ed1ee3..4d71640 100644 --- a/app/web/templates/alerts.html +++ b/app/web/templates/alerts.html @@ -5,7 +5,7 @@ {% block content %}
    -

    Alert History

    +

    Alert History

     Manage Alert Rules @@ -18,7 +18,7 @@
    Total Alerts
    -

    {{ pagination.total }}

    +

    {{ pagination.total }}

    @@ -46,7 +46,7 @@
    Unacknowledged
    -

    +

    {{ alerts | rejectattr('acknowledged') | list | length }}

    @@ -104,7 +104,7 @@
    -
    Alerts
    +
    Alerts
    {% if alerts %} diff --git a/app/web/templates/base.html b/app/web/templates/base.html index 872f3f1..b811060 100644 --- a/app/web/templates/base.html +++ b/app/web/templates/base.html @@ -107,6 +107,9 @@
    + +
    + {% block scripts %}{% endblock %} diff --git a/app/web/templates/configs.html b/app/web/templates/configs.html index 81a3683..8e842bc 100644 --- a/app/web/templates/configs.html +++ b/app/web/templates/configs.html @@ -6,7 +6,7 @@
    -

    Scan Configurations

    +

    Scan Configurations

    +
    @@ -133,10 +133,10 @@
    -
    +
    @@ -146,12 +146,12 @@