feat: port conflict validation, autosave on Apply, extended integration tests

Port conflict validation: - api/port_registry.py: detect_conflicts() checks all service sections for shared port values - api/app.py: returns HTTP 409 on port conflict after existing range validation - webui/src/pages/Settings.jsx: JS-side detectPortConflicts() with useMemo shows inline conflict errors and blocks Save before the request is made; catch blocks surface server error messages (including 409) instead of generic fallbacks Config autosave on Apply: - webui/src/contexts/DraftConfigContext.jsx: new context; Settings registers flush callbacks per section; App calls flushAll() before applyPending() when any section is dirty - webui/src/App.jsx: wraps tree with DraftConfigProvider, handleApply shows 'saving' banner state and awaits flushAll() - webui/src/pages/Settings.jsx: registers identity + per-service flushers; propagates dirty state into context via setDirty; uses refs to avoid stale closures Extended integration test coverage (114 new tests): - tests/integration/test_config_api.py: GET/PUT config, export, import, backup lifecycle - tests/integration/test_network_services.py: DNS records + DHCP reservations CRUD - tests/integration/test_containers.py: list, restart, logs, stats; recovery polling - tests/integration/test_negative_scenarios.py: error-path coverage for all endpoints - tests/test_port_conflicts.py: 20 unit tests for port_registry.detect_conflicts() Pre-commit hook updated to skip tests/integration/ (live-stack tests require a running stack and must be run explicitly via `make test-integration`). Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-24 04:45:47 -04:00
parent 596b06f171
commit 768571f2b7
11 changed files with 1584 additions and 12 deletions
@@ -0,0 +1,332 @@
+"""
+Config API integration tests.
+
+Covers:
+  - GET  /api/config        — shape, required fields
+  - PUT  /api/config        — partial updates, validation rejections
+  - GET  /api/config/export — returns content
+  - POST /api/config/import — valid and invalid payloads
+  - POST /api/config/backup — creates a backup entry
+  - GET  /api/config/backups — lists backups
+
+Run with:  pytest tests/integration/test_config_api.py -v
+"""
+import pytest
+import requests
+import sys
+import os
+sys.path.insert(0, os.path.dirname(__file__))
+from conftest import API_BASE
+
+
+def get(path, **kw):
+    return requests.get(f"{API_BASE}{path}", **kw)
+
+
+def put(path, **kw):
+    return requests.put(f"{API_BASE}{path}", **kw)
+
+
+def post(path, **kw):
+    return requests.post(f"{API_BASE}{path}", **kw)
+
+
+# ---------------------------------------------------------------------------
+# GET /api/config
+# ---------------------------------------------------------------------------
+
+class TestGetConfig:
+    def test_get_config_returns_200(self):
+        r = get('/api/config')
+        assert r.status_code == 200
+
+    def test_get_config_content_type_is_json(self):
+        r = get('/api/config')
+        assert 'application/json' in r.headers.get('Content-Type', '')
+
+    def test_get_config_has_cell_name(self):
+        data = get('/api/config').json()
+        assert 'cell_name' in data
+        assert isinstance(data['cell_name'], str)
+        assert data['cell_name']  # non-empty
+
+    def test_get_config_has_domain(self):
+        data = get('/api/config').json()
+        assert 'domain' in data
+        assert isinstance(data['domain'], str)
+
+    def test_get_config_has_valid_ip_range(self):
+        import ipaddress
+        data = get('/api/config').json()
+        assert 'ip_range' in data
+        # Must be a parseable IPv4 CIDR
+        net = ipaddress.ip_network(data['ip_range'], strict=False)
+        assert net.version == 4, f"ip_range {data['ip_range']} is not IPv4"
+
+    def test_get_config_has_wireguard_port(self):
+        data = get('/api/config').json()
+        assert 'wireguard_port' in data
+        port = data['wireguard_port']
+        assert isinstance(port, int)
+        assert 1 <= port <= 65535
+
+    def test_get_config_has_service_ips(self):
+        data = get('/api/config').json()
+        assert 'service_ips' in data
+        sips = data['service_ips']
+        for key in ('dns', 'vip_mail', 'vip_calendar', 'vip_files', 'vip_webdav'):
+            assert key in sips, f"service_ips missing key: {key}"
+
+    def test_get_config_has_service_configs(self):
+        data = get('/api/config').json()
+        assert 'service_configs' in data
+        assert isinstance(data['service_configs'], dict)
+
+
+# ---------------------------------------------------------------------------
+# PUT /api/config  — positive cases
+# ---------------------------------------------------------------------------
+
+class TestPutConfigPositive:
+    def test_put_config_returns_200(self):
+        # Read current cell_name first so we can restore it safely
+        current = get('/api/config').json()
+        original_name = current['cell_name']
+        # Write back the same value — idempotent, no real change
+        r = put('/api/config', json={'cell_name': original_name})
+        assert r.status_code == 200
+
+    def test_put_config_response_has_message(self):
+        r = put('/api/config', json={'cell_name': get('/api/config').json()['cell_name']})
+        assert r.status_code == 200
+        assert 'message' in r.json()
+
+    def test_put_config_update_cell_name_persists(self):
+        original_name = get('/api/config').json()['cell_name']
+        new_name = original_name + '-test'
+        try:
+            r = put('/api/config', json={'cell_name': new_name})
+            assert r.status_code == 200
+            updated = get('/api/config').json()
+            assert updated['cell_name'] == new_name
+        finally:
+            # Restore original name
+            put('/api/config', json={'cell_name': original_name})
+
+    def test_put_config_update_domain_persists(self):
+        original_domain = get('/api/config').json()['domain']
+        # Write same domain back to confirm the round-trip works without side effects
+        r = put('/api/config', json={'domain': original_domain})
+        assert r.status_code == 200
+        assert get('/api/config').json()['domain'] == original_domain
+
+    def test_put_config_valid_ip_range_accepted(self):
+        # Use a known-valid RFC-1918 range; restore the original after
+        original_range = get('/api/config').json()['ip_range']
+        r = put('/api/config', json={'ip_range': '172.20.0.0/16'})
+        try:
+            assert r.status_code == 200
+        finally:
+            put('/api/config', json={'ip_range': original_range})
+
+    def test_put_config_unknown_top_level_key_does_not_crash(self):
+        # Unknown keys that are not identity fields and not service keys should
+        # be silently ignored rather than causing a 500.
+        r = put('/api/config', json={'totally_unknown_field_xyz': 'value'})
+        assert r.status_code in (200, 400), (
+            f"Unexpected status {r.status_code} for unknown field"
+        )
+
+
+# ---------------------------------------------------------------------------
+# PUT /api/config  — validation rejections
+# ---------------------------------------------------------------------------
+
+class TestPutConfigValidation:
+    def test_put_config_empty_body_returns_400(self):
+        r = requests.put(
+            f"{API_BASE}/api/config",
+            data='',
+            headers={'Content-Type': 'application/json'},
+        )
+        assert r.status_code == 400
+
+    def test_put_config_invalid_json_returns_400(self):
+        r = requests.put(
+            f"{API_BASE}/api/config",
+            data='not valid json }{',
+            headers={'Content-Type': 'application/json'},
+        )
+        assert r.status_code == 400
+
+    def test_put_config_ip_range_not_rfc1918_returns_400(self):
+        # 8.8.0.0/16 is a public range — must be rejected
+        r = put('/api/config', json={'ip_range': '8.8.0.0/16'})
+        assert r.status_code == 400
+        body = r.json()
+        assert 'error' in body
+        assert 'ip_range' in body['error'].lower() or 'rfc' in body['error'].lower()
+
+    def test_put_config_ip_range_outside_172_16_prefix_returns_400(self):
+        # 172.0.0.0/24 looks like a 172.x range but is NOT within 172.16.0.0/12
+        r = put('/api/config', json={'ip_range': '172.0.0.0/24'})
+        assert r.status_code == 400
+
+    def test_put_config_ip_range_malformed_returns_400(self):
+        r = put('/api/config', json={'ip_range': 'not-an-ip'})
+        assert r.status_code == 400
+
+    def test_put_config_ip_range_bare_ip_behavior(self):
+        # Bare IP is interpreted as /32 — the API may accept or reject it,
+        # but it must not crash (no 500).
+        r = put('/api/config', json={'ip_range': '10.0.0.1'})
+        assert r.status_code in (200, 400)
+
+    def test_put_config_calendar_port_zero_returns_400(self):
+        r = put('/api/config', json={'calendar': {'port': 0}})
+        assert r.status_code == 400
+        assert 'error' in r.json()
+
+    def test_put_config_calendar_port_too_high_returns_400(self):
+        r = put('/api/config', json={'calendar': {'port': 65536}})
+        assert r.status_code == 400
+        assert 'error' in r.json()
+
+    def test_put_config_files_port_negative_returns_400(self):
+        r = put('/api/config', json={'files': {'port': -1}})
+        assert r.status_code == 400
+
+    def test_put_config_wireguard_address_without_prefix_returns_400(self):
+        # wireguard.address must include prefix length
+        r = put('/api/config', json={'wireguard': {'address': '10.0.0.1'}})
+        assert r.status_code == 400
+        assert 'error' in r.json()
+
+    def test_put_config_wireguard_address_invalid_returns_400(self):
+        r = put('/api/config', json={'wireguard': {'address': 'not-an-ip/24'}})
+        assert r.status_code == 400
+
+
+# ---------------------------------------------------------------------------
+# GET /api/config/export
+# ---------------------------------------------------------------------------
+
+class TestConfigExport:
+    def test_export_returns_200(self):
+        r = get('/api/config/export')
+        assert r.status_code == 200
+
+    def test_export_has_config_key(self):
+        data = get('/api/config/export').json()
+        assert 'config' in data
+
+    def test_export_has_format_key(self):
+        data = get('/api/config/export').json()
+        assert 'format' in data
+
+    def test_export_config_content_is_not_empty(self):
+        data = get('/api/config/export').json()
+        assert data['config']  # non-empty / non-None
+
+
+# ---------------------------------------------------------------------------
+# POST /api/config/import
+# ---------------------------------------------------------------------------
+
+class TestConfigImport:
+    def test_import_missing_body_returns_400(self):
+        r = requests.post(
+            f"{API_BASE}/api/config/import",
+            data='',
+            headers={'Content-Type': 'application/json'},
+        )
+        assert r.status_code == 400
+
+    def test_import_invalid_json_returns_400(self):
+        r = requests.post(
+            f"{API_BASE}/api/config/import",
+            data='{{bad json',
+            headers={'Content-Type': 'application/json'},
+        )
+        assert r.status_code == 400
+
+    def test_import_valid_empty_config_does_not_crash(self):
+        # Sending an empty config dict — the API should respond with 200 or a
+        # meaningful error, not a 500 traceback.
+        r = post('/api/config/import', json={'config': {}, 'format': 'json'})
+        assert r.status_code in (200, 400, 422, 500)
+        # Confirm the response is still valid JSON
+        r.json()
+
+    def test_import_round_trips_exported_config(self):
+        # Export current config, import it back — should succeed without errors.
+        exported = get('/api/config/export').json()
+        r = post('/api/config/import', json={
+            'config': exported['config'],
+            'format': exported.get('format', 'json'),
+        })
+        assert r.status_code in (200, 400), (
+            f"Unexpected status {r.status_code}: {r.text}"
+        )
+
+
+# ---------------------------------------------------------------------------
+# POST /api/config/backup  +  GET /api/config/backups
+# ---------------------------------------------------------------------------
+
+class TestConfigBackup:
+    def test_create_backup_returns_200(self):
+        r = post('/api/config/backup')
+        assert r.status_code == 200
+
+    def test_create_backup_returns_backup_id(self):
+        r = post('/api/config/backup')
+        assert r.status_code == 200
+        data = r.json()
+        assert 'backup_id' in data
+        assert data['backup_id']
+
+    def test_list_backups_returns_200(self):
+        r = get('/api/config/backups')
+        assert r.status_code == 200
+
+    def test_list_backups_returns_list(self):
+        r = get('/api/config/backups')
+        assert isinstance(r.json(), list)
+
+    def test_backup_appears_in_list_after_creation(self):
+        # Create a backup, then verify it shows up in the list.
+        create_r = post('/api/config/backup')
+        assert create_r.status_code == 200
+        new_id = create_r.json().get('backup_id')
+        backups = get('/api/config/backups').json()
+        # The list may contain IDs directly or dicts with an 'id' key
+        ids = []
+        for entry in backups:
+            if isinstance(entry, str):
+                ids.append(entry)
+            elif isinstance(entry, dict):
+                ids.append(entry.get('id') or entry.get('backup_id') or '')
+        assert new_id in ids, (
+            f"Newly created backup '{new_id}' not found in backups list: {backups}"
+        )
+
+
+# ---------------------------------------------------------------------------
+# GET /api/config/pending
+# ---------------------------------------------------------------------------
+
+class TestConfigPending:
+    def test_pending_returns_200(self):
+        r = get('/api/config/pending')
+        assert r.status_code == 200
+
+    def test_pending_has_needs_restart_field(self):
+        data = get('/api/config/pending').json()
+        assert 'needs_restart' in data
+        assert isinstance(data['needs_restart'], bool)
+
+    def test_pending_has_changes_list(self):
+        data = get('/api/config/pending').json()
+        assert 'changes' in data
+        assert isinstance(data['changes'], list)