refactor: introduce two-user daemon architecture with socket-based communication
- Add daemon/ module with aiohttp server, sync client, and handler registry - Add daemon/handlers/ for privileged operations (acme, dnsmasq, firewall, logs, nginx, wireguard) - Add system/acme-deploy.py, vacuum-walld sudoers and systemd service - Update API routes to use daemon client instead of lib/ directly - Update lib/, tests/, and webui/ for new architecture - Update docs and deployment scripts
This commit is contained in:
+380
-204
@@ -1,30 +1,56 @@
|
||||
"""
|
||||
API integration tests — all blueprints tested via a single Flask app fixture.
|
||||
|
||||
Mocks daemon.client in each blueprint's module namespace to avoid needing
|
||||
a running daemon.
|
||||
"""
|
||||
|
||||
from unittest.mock import patch
|
||||
from unittest.mock import patch as _patch
|
||||
|
||||
import pytest
|
||||
|
||||
from webui.api.certs import bp as certs_bp
|
||||
from webui.api.dhcp import bp as dhcp_bp
|
||||
from webui.api.firewall import bp
|
||||
from webui.api.proxy import bp as proxy_bp
|
||||
from webui.api.wireguard import bp as wg_bp
|
||||
|
||||
def _fw(func, **kw):
|
||||
"""Patch daemon.client.{func} in the firewall blueprint namespace."""
|
||||
return _patch(f"webui.api.firewall.{func}", **kw)
|
||||
|
||||
|
||||
def _dh(func, **kw):
|
||||
"""Patch daemon.client.{func} in the dhcp blueprint namespace."""
|
||||
return _patch(f"webui.api.dhcp.{func}", **kw)
|
||||
|
||||
|
||||
def _px(func, **kw):
|
||||
"""Patch daemon.client.{func} in the proxy blueprint namespace."""
|
||||
return _patch(f"webui.api.proxy.{func}", **kw)
|
||||
|
||||
|
||||
def _ce(func, **kw):
|
||||
"""Patch daemon.client.{func} in the certs blueprint namespace."""
|
||||
return _patch(f"webui.api.certs.{func}", **kw)
|
||||
|
||||
|
||||
def _wg(func, **kw):
|
||||
"""Patch daemon.client.{func} in the wireguard blueprint namespace."""
|
||||
return _patch(f"webui.api.wireguard.{func}", **kw)
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def client():
|
||||
from flask import Flask
|
||||
|
||||
app = Flask(__name__)
|
||||
from webui.api.certs import bp as certs_bp
|
||||
from webui.api.dhcp import bp as dhcp_bp
|
||||
from webui.api.firewall import bp as firewall_bp
|
||||
from webui.api.proxy import bp as proxy_bp
|
||||
from webui.api.wireguard import bp as wg_bp
|
||||
|
||||
app.register_blueprint(bp, url_prefix="/api/firewall")
|
||||
app = Flask(__name__)
|
||||
app.register_blueprint(firewall_bp, url_prefix="/api/firewall")
|
||||
app.register_blueprint(dhcp_bp, url_prefix="/api/dhcp")
|
||||
app.register_blueprint(proxy_bp, url_prefix="/api/proxy")
|
||||
app.register_blueprint(certs_bp, url_prefix="/api/certs")
|
||||
app.register_blueprint(wg_bp, url_prefix="/api/wireguard")
|
||||
|
||||
return app.test_client()
|
||||
|
||||
|
||||
@@ -34,20 +60,21 @@ def client():
|
||||
|
||||
|
||||
class TestFirewallListZones:
|
||||
@patch("webui.api.firewall.get_active_zones")
|
||||
@patch("webui.api.firewall.get_available_zones")
|
||||
def test_success(self, mock_available, mock_active, client):
|
||||
mock_active.return_value = {"public": ["eth0"]}
|
||||
mock_available.return_value = ["public", "internal"]
|
||||
@_fw("get")
|
||||
def test_success(self, mock_get, client):
|
||||
mock_get.return_value = {
|
||||
"active": {"public": ["eth0"]},
|
||||
"available": ["public", "internal"],
|
||||
}
|
||||
resp = client.get("/api/firewall/zones")
|
||||
assert resp.status_code == 200
|
||||
data = resp.get_json()
|
||||
assert data["ok"] is True
|
||||
assert "public" in data["data"]["active"]
|
||||
|
||||
@patch("webui.api.firewall.get_active_zones")
|
||||
def test_runtime_error(self, mock_active, client):
|
||||
mock_active.side_effect = RuntimeError("no sudo")
|
||||
@_fw("get")
|
||||
def test_runtime_error(self, mock_get, client):
|
||||
mock_get.side_effect = RuntimeError("no sudo")
|
||||
resp = client.get("/api/firewall/zones")
|
||||
assert resp.status_code == 500
|
||||
data = resp.get_json()
|
||||
@@ -55,11 +82,9 @@ class TestFirewallListZones:
|
||||
|
||||
|
||||
class TestFirewallZoneDetails:
|
||||
@patch("webui.api.firewall.get_zone_info")
|
||||
@patch("webui.api.firewall.get_available_zones")
|
||||
def test_success(self, mock_available, mock_info, client):
|
||||
mock_available.return_value = ["public", "internal"]
|
||||
mock_info.return_value = {"name": "public", "services": ["ssh"]}
|
||||
@_fw("get")
|
||||
def test_success(self, mock_get, client):
|
||||
mock_get.return_value = {"name": "public", "services": ["ssh"]}
|
||||
resp = client.get("/api/firewall/zones/public")
|
||||
assert resp.status_code == 200
|
||||
data = resp.get_json()
|
||||
@@ -67,11 +92,11 @@ class TestFirewallZoneDetails:
|
||||
|
||||
|
||||
class TestFirewallCreateZone:
|
||||
@patch("webui.api.firewall.create_zone")
|
||||
@patch("webui.api.firewall.get_available_zones")
|
||||
def test_success(self, mock_zones, mock_create, client):
|
||||
mock_zones.return_value = ["public", "internal"]
|
||||
mock_create.return_value = None
|
||||
@_fw("post")
|
||||
@_fw("get")
|
||||
def test_success(self, mock_get, mock_post, client):
|
||||
mock_get.return_value = {"active": {}, "available": ["public", "internal"]}
|
||||
mock_post.return_value = {"zone": "dmz"}
|
||||
resp = client.post(
|
||||
"/api/firewall/zones",
|
||||
json={"name": "dmz", "target": "default"},
|
||||
@@ -91,25 +116,29 @@ class TestFirewallCreateZone:
|
||||
|
||||
|
||||
class TestFirewallDeleteZone:
|
||||
@patch("webui.api.firewall.delete_zone")
|
||||
@patch("webui.api.firewall.get_available_zones")
|
||||
def test_success(self, mock_zones, mock_delete, client):
|
||||
mock_zones.return_value = ["public", "dmz"]
|
||||
mock_delete.return_value = None
|
||||
@_fw("delete")
|
||||
def test_success(self, mock_delete, client):
|
||||
mock_delete.return_value = {"zone": "dmz"}
|
||||
resp = client.delete("/api/firewall/zones/dmz")
|
||||
assert resp.status_code == 200
|
||||
|
||||
@patch("webui.api.firewall.get_available_zones")
|
||||
def test_not_found(self, mock_zones, client):
|
||||
mock_zones.return_value = ["public"]
|
||||
@_fw("delete")
|
||||
def test_not_found(self, mock_delete, client):
|
||||
from daemon.client import NotFound
|
||||
|
||||
mock_delete.side_effect = NotFound("Zone does not exist")
|
||||
resp = client.delete("/api/firewall/zones/dmz")
|
||||
assert resp.status_code == 404
|
||||
|
||||
|
||||
class TestFirewallRichRules:
|
||||
@patch("webui.api.firewall.add_rich_rule")
|
||||
def test_add(self, mock_add, client):
|
||||
mock_add.return_value = {"id": "abc123", "rule": "rule accept"}
|
||||
@_fw("post")
|
||||
def test_add(self, mock_post, client):
|
||||
mock_post.return_value = {
|
||||
"id": "abc123",
|
||||
"rule": "rule accept",
|
||||
"zone": "public",
|
||||
}
|
||||
resp = client.post(
|
||||
"/api/firewall/rich-rules",
|
||||
json={
|
||||
@@ -126,55 +155,74 @@ class TestFirewallRichRules:
|
||||
resp = client.post("/api/firewall/rich-rules", json={})
|
||||
assert resp.status_code == 400
|
||||
|
||||
@patch("webui.api.firewall.get_rich_rules")
|
||||
@patch("webui.api.firewall.get_config")
|
||||
def test_list(self, mock_cfg, mock_list, client):
|
||||
mock_list.return_value = ["rule1"]
|
||||
mock_cfg.return_value = {
|
||||
"zones": {"public": {"rich_rules": [{"id": "a1", "rule": "rule1"}]}}
|
||||
}
|
||||
@_fw("get")
|
||||
def test_list(self, mock_get, client):
|
||||
mock_get.return_value = [{"id": "a1", "rule": "rule1"}]
|
||||
resp = client.get("/api/firewall/rich-rules/public")
|
||||
assert resp.status_code == 200
|
||||
data = resp.get_json()
|
||||
assert isinstance(data["data"], list)
|
||||
|
||||
@patch("webui.api.firewall.remove_rich_rule_by_id")
|
||||
def test_remove_by_id(self, mock_remove, client):
|
||||
mock_remove.return_value = None
|
||||
@_fw("delete")
|
||||
def test_remove_by_id(self, mock_delete, client):
|
||||
mock_delete.return_value = {"zone": "public", "id": "abc123"}
|
||||
resp = client.delete("/api/firewall/rich-rules/public/abc123")
|
||||
assert resp.status_code == 200
|
||||
data = resp.get_json()
|
||||
assert data["ok"] is True
|
||||
|
||||
@patch("webui.api.firewall.remove_rich_rule_by_id")
|
||||
def test_remove_not_found(self, mock_remove, client):
|
||||
mock_remove.side_effect = ValueError("not found")
|
||||
@_fw("delete")
|
||||
def test_remove_not_found(self, mock_delete, client):
|
||||
from daemon.client import NotFound
|
||||
|
||||
mock_delete.side_effect = NotFound("not found")
|
||||
resp = client.delete("/api/firewall/rich-rules/public/abc123")
|
||||
assert resp.status_code == 404
|
||||
|
||||
|
||||
class TestFirewallServices:
|
||||
@patch("webui.api.firewall.get_services")
|
||||
def test_list(self, mock_services, client):
|
||||
mock_services.return_value = ["ssh", "http", "dns"]
|
||||
@_fw("get")
|
||||
def test_list(self, mock_get, client):
|
||||
mock_get.return_value = ["ssh", "http", "dns"]
|
||||
resp = client.get("/api/firewall/services")
|
||||
assert resp.status_code == 200
|
||||
assert resp.get_json()["data"] == ["ssh", "http", "dns"]
|
||||
|
||||
|
||||
class TestFirewallInterfaces:
|
||||
@patch("webui.api.firewall.get_interfaces")
|
||||
def test_list(self, mock_ifaces, client):
|
||||
mock_ifaces.return_value = ["eth0", "eth1"]
|
||||
@_fw("get")
|
||||
def test_list(self, mock_get, client):
|
||||
mock_get.return_value = [
|
||||
{
|
||||
"name": "eth0",
|
||||
"mac": "aa:bb:cc:dd:ee:00",
|
||||
"state": "UP",
|
||||
"mtu": 1500,
|
||||
"ips": ["192.168.1.1/24"],
|
||||
"ipv6": [],
|
||||
"zone": "internal",
|
||||
},
|
||||
{
|
||||
"name": "eth1",
|
||||
"mac": "aa:bb:cc:dd:ee:01",
|
||||
"state": "UP",
|
||||
"mtu": 1500,
|
||||
"ips": ["10.0.0.1/24"],
|
||||
"ipv6": [],
|
||||
"zone": "public",
|
||||
},
|
||||
]
|
||||
resp = client.get("/api/firewall/interfaces")
|
||||
assert resp.status_code == 200
|
||||
assert resp.get_json()["data"] == ["eth0", "eth1"]
|
||||
data = resp.get_json()["data"]
|
||||
assert len(data) == 2
|
||||
assert data[0]["name"] == "eth0"
|
||||
|
||||
|
||||
class TestFirewallMasquerade:
|
||||
@patch("webui.api.firewall.set_masquerade")
|
||||
def test_enable(self, mock_set, client):
|
||||
mock_set.return_value = None
|
||||
@_fw("post")
|
||||
def test_enable(self, mock_post, client):
|
||||
mock_post.return_value = {"zone": "internal", "masquerade": True}
|
||||
resp = client.post(
|
||||
"/api/firewall/masquerade",
|
||||
json={"zone": "internal", "enable": True},
|
||||
@@ -187,9 +235,14 @@ class TestFirewallMasquerade:
|
||||
|
||||
|
||||
class TestFirewallForwardPort:
|
||||
@patch("webui.api.firewall.add_forward_port")
|
||||
def test_add(self, mock_add, client):
|
||||
mock_add.return_value = {"id": "fp1", "port": 443, "proto": "tcp"}
|
||||
@_fw("post")
|
||||
def test_add(self, mock_post, client):
|
||||
mock_post.return_value = {
|
||||
"id": "fp1",
|
||||
"port": 443,
|
||||
"proto": "tcp",
|
||||
"zone": "public",
|
||||
}
|
||||
resp = client.post(
|
||||
"/api/firewall/forward-port",
|
||||
json={"zone": "public", "port": 443, "proto": "tcp"},
|
||||
@@ -205,20 +258,52 @@ class TestFirewallForwardPort:
|
||||
)
|
||||
assert resp.status_code == 400
|
||||
|
||||
@patch("webui.api.firewall.remove_forward_port_by_id")
|
||||
def test_remove_by_id(self, mock_remove, client):
|
||||
mock_remove.return_value = None
|
||||
@_fw("delete")
|
||||
def test_remove_by_id(self, mock_delete, client):
|
||||
mock_delete.return_value = {"zone": "public", "port": 443, "proto": "tcp"}
|
||||
resp = client.delete("/api/firewall/forward-port/public/443/tcp")
|
||||
assert resp.status_code == 200
|
||||
data = resp.get_json()
|
||||
assert data["ok"] is True
|
||||
|
||||
@patch("webui.api.firewall.remove_forward_port_by_id")
|
||||
def test_remove_not_found(self, mock_remove, client):
|
||||
mock_remove.side_effect = ValueError("not found")
|
||||
@_fw("delete")
|
||||
def test_remove_not_found(self, mock_delete, client):
|
||||
from daemon.client import NotFound
|
||||
|
||||
mock_delete.side_effect = NotFound("not found")
|
||||
resp = client.delete("/api/firewall/forward-port/public/999/tcp")
|
||||
assert resp.status_code == 404
|
||||
|
||||
def test_add_value_error(self, client):
|
||||
resp = client.post(
|
||||
"/api/firewall/forward-port",
|
||||
json={"zone": "public", "port": "not_a_number", "proto": "tcp"},
|
||||
)
|
||||
assert resp.status_code == 400
|
||||
|
||||
|
||||
class TestFirewallConfigApply:
|
||||
@_fw("post")
|
||||
def test_config_apply_success(self, mock_post, client):
|
||||
mock_post.return_value = {
|
||||
"applied_zones": ["public"],
|
||||
"backup": "/tmp/rules.json",
|
||||
}
|
||||
resp = client.post("/api/firewall/config/apply")
|
||||
assert resp.status_code == 200
|
||||
data = resp.get_json()
|
||||
assert data["ok"] is True
|
||||
assert "public" in data["data"]["applied_zones"]
|
||||
|
||||
@_fw("post")
|
||||
def test_config_apply_error(self, mock_post, client):
|
||||
mock_post.side_effect = RuntimeError("apply failed")
|
||||
resp = client.post("/api/firewall/config/apply")
|
||||
assert resp.status_code == 500
|
||||
data = resp.get_json()
|
||||
assert data["ok"] is False
|
||||
assert data["error"] == "apply failed"
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# DHCP
|
||||
@@ -226,14 +311,15 @@ class TestFirewallForwardPort:
|
||||
|
||||
|
||||
class TestDhcpConfig:
|
||||
@patch("webui.api.dhcp.get_config")
|
||||
@_dh("get")
|
||||
def test_get(self, mock_get, client):
|
||||
mock_get.return_value = {"dhcp": {}, "dns": {}}
|
||||
resp = client.get("/api/dhcp/config")
|
||||
assert resp.status_code == 200
|
||||
assert resp.get_json()["ok"] is True
|
||||
|
||||
def test_post_invalid_body(self, client):
|
||||
@_dh("post")
|
||||
def test_post_invalid_body(self, mock_post, client):
|
||||
resp = client.post(
|
||||
"/api/dhcp/config", data="not json", content_type="text/plain"
|
||||
)
|
||||
@@ -242,9 +328,9 @@ class TestDhcpConfig:
|
||||
|
||||
|
||||
class TestDhcpApply:
|
||||
@patch("webui.api.dhcp.apply_config")
|
||||
def test_apply(self, mock_apply, client):
|
||||
mock_apply.return_value = None
|
||||
@_dh("post")
|
||||
def test_apply(self, mock_post, client):
|
||||
mock_post.return_value = {"applied": True}
|
||||
resp = client.post("/api/dhcp/apply")
|
||||
assert resp.status_code == 200
|
||||
data = resp.get_json()
|
||||
@@ -252,9 +338,9 @@ class TestDhcpApply:
|
||||
|
||||
|
||||
class TestDhcpStatus:
|
||||
@patch("webui.api.dhcp.dnsmasq_status")
|
||||
def test_success(self, mock_status, client):
|
||||
mock_status.return_value = {"service_active": True}
|
||||
@_dh("get")
|
||||
def test_success(self, mock_get, client):
|
||||
mock_get.return_value = {"service_active": True}
|
||||
resp = client.get("/api/dhcp/status")
|
||||
assert resp.status_code == 200
|
||||
data = resp.get_json()
|
||||
@@ -262,9 +348,13 @@ class TestDhcpStatus:
|
||||
|
||||
|
||||
class TestDhcpRanges:
|
||||
@patch("webui.api.dhcp.set_dhcp_range")
|
||||
def test_add_range(self, mock_set, client):
|
||||
mock_set.return_value = None
|
||||
@_dh("post")
|
||||
def test_add_range(self, mock_post, client):
|
||||
mock_post.return_value = {
|
||||
"interface": "eth0",
|
||||
"start": "192.168.1.100",
|
||||
"end": "192.168.1.200",
|
||||
}
|
||||
resp = client.post(
|
||||
"/api/dhcp/ranges",
|
||||
json={
|
||||
@@ -282,9 +372,13 @@ class TestDhcpRanges:
|
||||
resp = client.post("/api/dhcp/ranges", json={"start": "192.168.1.100"})
|
||||
assert resp.status_code == 400
|
||||
|
||||
@patch("webui.api.dhcp.remove_dhcp_range")
|
||||
def test_remove_range(self, mock_remove, client):
|
||||
mock_remove.return_value = None
|
||||
@_dh("delete")
|
||||
def test_remove_range(self, mock_delete, client):
|
||||
mock_delete.return_value = {
|
||||
"interface": "eth0",
|
||||
"start": "192.168.1.100",
|
||||
"end": "192.168.1.200",
|
||||
}
|
||||
resp = client.delete(
|
||||
"/api/dhcp/ranges",
|
||||
json={
|
||||
@@ -303,9 +397,9 @@ class TestDhcpRanges:
|
||||
|
||||
|
||||
class TestDhcpStaticLease:
|
||||
@patch("webui.api.dhcp.add_static_lease")
|
||||
def test_add(self, mock_add, client):
|
||||
mock_add.return_value = None
|
||||
@_dh("post")
|
||||
def test_add(self, mock_post, client):
|
||||
mock_post.return_value = {"mac": "AA:BB:CC", "ip": "10.0.0.5"}
|
||||
resp = client.post(
|
||||
"/api/dhcp/static-lease",
|
||||
json={"mac": "AA:BB:CC", "ip": "10.0.0.5"},
|
||||
@@ -316,27 +410,17 @@ class TestDhcpStaticLease:
|
||||
resp = client.post("/api/dhcp/static-lease", json={"ip": "10.0.0.5"})
|
||||
assert resp.status_code == 400
|
||||
|
||||
@patch("webui.api.dhcp.remove_static_lease")
|
||||
@patch("webui.api.dhcp.get_config")
|
||||
def test_remove(self, mock_get, mock_remove, client):
|
||||
mock_get.return_value = {
|
||||
"dhcp": {"static_leases": [{"mac": "AA:BB:CC", "ip": "10.0.0.5"}]}
|
||||
}
|
||||
mock_remove.return_value = None
|
||||
@_dh("delete")
|
||||
def test_remove(self, mock_delete, client):
|
||||
mock_delete.return_value = {"mac": "AA:BB:CC"}
|
||||
resp = client.delete("/api/dhcp/static-lease/AA:BB:CC")
|
||||
assert resp.status_code == 200
|
||||
|
||||
@patch("webui.api.dhcp.get_config")
|
||||
def test_remove_not_found(self, mock_get, client):
|
||||
mock_get.return_value = {"dhcp": {"static_leases": []}}
|
||||
resp = client.delete("/api/dhcp/static-lease/AA:BB:CC")
|
||||
assert resp.status_code == 404
|
||||
|
||||
|
||||
class TestDhcpDnsRecord:
|
||||
@patch("webui.api.dhcp.add_dns_record")
|
||||
def test_add(self, mock_add, client):
|
||||
mock_add.return_value = None
|
||||
@_dh("post")
|
||||
def test_add(self, mock_post, client):
|
||||
mock_post.return_value = {"name": "host.local", "address": "10.0.0.10"}
|
||||
resp = client.post(
|
||||
"/api/dhcp/dns-record",
|
||||
json={"name": "host.local", "address": "10.0.0.10"},
|
||||
@@ -347,22 +431,12 @@ class TestDhcpDnsRecord:
|
||||
resp = client.post("/api/dhcp/dns-record", json={})
|
||||
assert resp.status_code == 400
|
||||
|
||||
@patch("webui.api.dhcp.remove_dns_record")
|
||||
@patch("webui.api.dhcp.get_config")
|
||||
def test_remove(self, mock_get, mock_remove, client):
|
||||
mock_get.return_value = {
|
||||
"dns": {"custom_records": [{"name": "host.local", "address": "10.0.0.10"}]}
|
||||
}
|
||||
mock_remove.return_value = None
|
||||
@_dh("delete")
|
||||
def test_remove(self, mock_delete, client):
|
||||
mock_delete.return_value = {"name": "host.local"}
|
||||
resp = client.delete("/api/dhcp/dns-record/host.local")
|
||||
assert resp.status_code == 200
|
||||
|
||||
@patch("webui.api.dhcp.get_config")
|
||||
def test_remove_not_found(self, mock_get, client):
|
||||
mock_get.return_value = {"dns": {"custom_records": []}}
|
||||
resp = client.delete("/api/dhcp/dns-record/host.local")
|
||||
assert resp.status_code == 404
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# Proxy
|
||||
@@ -370,15 +444,15 @@ class TestDhcpDnsRecord:
|
||||
|
||||
|
||||
class TestProxyDomains:
|
||||
@patch("webui.api.proxy.get_domains")
|
||||
@_px("get")
|
||||
def test_list(self, mock_get, client):
|
||||
mock_get.return_value = []
|
||||
resp = client.get("/api/proxy/domains")
|
||||
assert resp.status_code == 200
|
||||
|
||||
@patch("webui.api.proxy.add_domain")
|
||||
def test_add(self, mock_add, client):
|
||||
mock_add.return_value = None
|
||||
@_px("post")
|
||||
def test_add(self, mock_post, client):
|
||||
mock_post.return_value = {"domain": "ex.com"}
|
||||
resp = client.post(
|
||||
"/api/proxy/domains",
|
||||
json={"domain": "ex.com", "backend_host": "10.0.0.1", "backend_port": 80},
|
||||
@@ -391,25 +465,25 @@ class TestProxyDomains:
|
||||
|
||||
|
||||
class TestProxyApply:
|
||||
@patch("webui.api.proxy.apply")
|
||||
def test_apply(self, mock_apply, client):
|
||||
mock_apply.return_value = None
|
||||
@_px("post")
|
||||
def test_apply(self, mock_post, client):
|
||||
mock_post.return_value = {"applied": True}
|
||||
resp = client.post("/api/proxy/apply")
|
||||
assert resp.status_code == 200
|
||||
|
||||
|
||||
class TestProxyTest:
|
||||
@patch("webui.api.proxy.test_config")
|
||||
def test_valid(self, mock_test, client):
|
||||
mock_test.return_value = (True, "syntax ok")
|
||||
@_px("post")
|
||||
def test_valid(self, mock_post, client):
|
||||
mock_post.return_value = {"valid": True, "output": "syntax ok"}
|
||||
resp = client.post("/api/proxy/test")
|
||||
assert resp.status_code == 200
|
||||
data = resp.get_json()
|
||||
assert data["data"]["valid"] is True
|
||||
|
||||
@patch("webui.api.proxy.test_config")
|
||||
def test_invalid(self, mock_test, client):
|
||||
mock_test.return_value = (False, "error msg")
|
||||
@_px("post")
|
||||
def test_invalid(self, mock_post, client):
|
||||
mock_post.return_value = {"valid": False, "output": "error msg"}
|
||||
resp = client.post("/api/proxy/test")
|
||||
assert resp.status_code == 400
|
||||
data = resp.get_json()
|
||||
@@ -423,15 +497,17 @@ class TestProxyTest:
|
||||
|
||||
|
||||
class TestCertsList:
|
||||
@patch("webui.api.certs.list_certs")
|
||||
def test_list(self, mock_list, client):
|
||||
mock_list.return_value = []
|
||||
@_ce("get")
|
||||
def test_list(self, mock_get, client):
|
||||
mock_get.return_value = []
|
||||
resp = client.get("/api/certs/list")
|
||||
assert resp.status_code == 200
|
||||
|
||||
@patch("webui.api.certs.get_cert_info")
|
||||
def test_details_not_found(self, mock_info, client):
|
||||
mock_info.side_effect = ValueError("not found")
|
||||
@_ce("get")
|
||||
def test_details_not_found(self, mock_get, client):
|
||||
from daemon.client import NotFound
|
||||
|
||||
mock_get.side_effect = NotFound("not found")
|
||||
resp = client.get("/api/certs/example.com")
|
||||
assert resp.status_code == 404
|
||||
|
||||
@@ -454,10 +530,10 @@ class TestCertsEmail:
|
||||
|
||||
|
||||
class TestWireguardConfig:
|
||||
@patch("webui.api.wireguard.get_config")
|
||||
@_wg("get")
|
||||
def test_get(self, mock_get, client):
|
||||
mock_get.return_value = {
|
||||
"interface": {"name": "wg0", "private_key": "secret"},
|
||||
"interface": {"name": "wg0"},
|
||||
"peers": {},
|
||||
}
|
||||
resp = client.get("/api/wireguard/config")
|
||||
@@ -465,55 +541,32 @@ class TestWireguardConfig:
|
||||
assert data["ok"] is True
|
||||
assert "private_key" not in data["data"]["interface"]
|
||||
|
||||
@patch("webui.api.wireguard.save_config")
|
||||
def test_post(self, mock_save, client):
|
||||
mock_save.return_value = None
|
||||
@_wg("post")
|
||||
def test_post(self, mock_post, client):
|
||||
mock_post.return_value = {"config_saved": True}
|
||||
resp = client.post("/api/wireguard/config", json={"peers": {}})
|
||||
assert resp.status_code == 200
|
||||
|
||||
@patch("webui.api.wireguard.save_config")
|
||||
@patch("webui.api.wireguard.get_config")
|
||||
def test_post_strips_private_key(self, mock_get, mock_save, client):
|
||||
mock_get.return_value = {
|
||||
"interface": {"name": "wg0", "private_key": "existing"},
|
||||
"peers": {},
|
||||
}
|
||||
mock_save.return_value = None
|
||||
resp = client.post(
|
||||
"/api/wireguard/config",
|
||||
json={"interface": {"name": "wg0", "private_key": "secret"}, "peers": {}},
|
||||
)
|
||||
assert resp.status_code == 200
|
||||
saved = mock_save.call_args[0][0]
|
||||
assert saved["interface"]["private_key"] == "existing"
|
||||
|
||||
@patch("webui.api.wireguard.save_config")
|
||||
@patch("webui.api.wireguard.get_config")
|
||||
def test_patch_strips_private_key(self, mock_get, mock_save, client):
|
||||
mock_get.return_value = {
|
||||
"interface": {"name": "wg0", "private_key": "existing"},
|
||||
"peers": {},
|
||||
}
|
||||
mock_save.return_value = None
|
||||
@_wg("patch")
|
||||
def test_patch(self, mock_patch, client):
|
||||
mock_patch.return_value = {"config_saved": True}
|
||||
resp = client.patch(
|
||||
"/api/wireguard/config",
|
||||
json={"interface": {"name": "wg1", "private_key": "injected"}},
|
||||
json={"interface": {"name": "wg0"}},
|
||||
)
|
||||
assert resp.status_code == 200
|
||||
saved = mock_save.call_args[0][0]
|
||||
assert saved.get("interface", {}).get("private_key") == "existing"
|
||||
|
||||
|
||||
class TestWireguardPeers:
|
||||
@patch("webui.api.wireguard.get_peers")
|
||||
@_wg("get")
|
||||
def test_list(self, mock_get, client):
|
||||
mock_get.return_value = []
|
||||
resp = client.get("/api/wireguard/peers")
|
||||
assert resp.status_code == 200
|
||||
|
||||
@patch("webui.api.wireguard.add_peer")
|
||||
def test_add(self, mock_add, client):
|
||||
mock_add.return_value = {
|
||||
@_wg("post")
|
||||
def test_add(self, mock_post, client):
|
||||
mock_post.return_value = {
|
||||
"name": "client1",
|
||||
"public_key": "pub",
|
||||
}
|
||||
@@ -529,25 +582,17 @@ class TestWireguardPeers:
|
||||
resp = client.post("/api/wireguard/peers", json={})
|
||||
assert resp.status_code == 400
|
||||
|
||||
@patch("webui.api.wireguard.remove_peer")
|
||||
@patch("webui.api.wireguard.get_config")
|
||||
def test_remove_by_name(self, mock_get, mock_remove, client):
|
||||
mock_get.return_value = {"peers": {"client1": {}}}
|
||||
mock_remove.return_value = None
|
||||
@_wg("delete")
|
||||
def test_remove_by_name(self, mock_delete, client):
|
||||
mock_delete.return_value = {"name": "client1"}
|
||||
resp = client.delete("/api/wireguard/peers/client1")
|
||||
assert resp.status_code == 200
|
||||
|
||||
@patch("webui.api.wireguard.get_config")
|
||||
def test_remove_not_found(self, mock_get, client):
|
||||
mock_get.return_value = {"peers": {}}
|
||||
resp = client.delete("/api/wireguard/peers/unknown")
|
||||
assert resp.status_code == 404
|
||||
|
||||
|
||||
class TestWireguardInitialize:
|
||||
@patch("webui.api.wireguard.initialize")
|
||||
def test_initialize(self, mock_init, client):
|
||||
mock_init.return_value = None
|
||||
@_wg("post")
|
||||
def test_initialize(self, mock_post, client):
|
||||
mock_post.return_value = {"initialized": True}
|
||||
resp = client.post("/api/wireguard/initialize")
|
||||
data = resp.get_json()
|
||||
assert data["ok"] is True
|
||||
@@ -560,39 +605,39 @@ class TestWireguardGenerateClient:
|
||||
|
||||
|
||||
class TestWireguardStatus:
|
||||
@patch("webui.api.wireguard.status")
|
||||
def test_get(self, mock_status, client):
|
||||
mock_status.return_value = {"up": True, "interface": {}, "peers": []}
|
||||
@_wg("get")
|
||||
def test_get(self, mock_get, client):
|
||||
mock_get.return_value = {"up": True, "interface": {}, "peers": []}
|
||||
resp = client.get("/api/wireguard/status")
|
||||
assert resp.status_code == 200
|
||||
|
||||
|
||||
class TestWireguardUp:
|
||||
@patch("webui.api.wireguard.apply")
|
||||
def test_up_starts_tunnel(self, mock_apply, client):
|
||||
mock_apply.return_value = None
|
||||
@_wg("post")
|
||||
def test_up_starts_tunnel(self, mock_post, client):
|
||||
mock_post.return_value = {"applied": True}
|
||||
resp = client.post("/api/wireguard/up")
|
||||
assert resp.status_code == 200
|
||||
|
||||
@patch("webui.api.wireguard.apply")
|
||||
def test_up_error(self, mock_apply, client):
|
||||
mock_apply.side_effect = RuntimeError("interface down")
|
||||
@_wg("post")
|
||||
def test_up_error(self, mock_post, client):
|
||||
mock_post.side_effect = RuntimeError("interface down")
|
||||
resp = client.post("/api/wireguard/up")
|
||||
assert resp.status_code == 500
|
||||
|
||||
|
||||
class TestWireguardDown:
|
||||
@patch("webui.api.wireguard.down")
|
||||
def test_down_stops_tunnel(self, mock_down, client):
|
||||
mock_down.return_value = None
|
||||
@_wg("post")
|
||||
def test_down_stops_tunnel(self, mock_post, client):
|
||||
mock_post.return_value = {"down": True}
|
||||
resp = client.post("/api/wireguard/down")
|
||||
assert resp.status_code == 200
|
||||
|
||||
|
||||
class TestWireguardApply:
|
||||
@patch("webui.api.wireguard.apply")
|
||||
def test_apply(self, mock_apply, client):
|
||||
mock_apply.return_value = None
|
||||
@_wg("post")
|
||||
def test_apply(self, mock_post, client):
|
||||
mock_post.return_value = {"applied": True}
|
||||
resp = client.post("/api/wireguard/apply")
|
||||
assert resp.status_code == 200
|
||||
|
||||
@@ -603,12 +648,143 @@ class TestWireguardApply:
|
||||
|
||||
|
||||
class TestResponseHelpers:
|
||||
@patch("webui.api.firewall.get_active_zones")
|
||||
@patch("webui.api.firewall.get_available_zones")
|
||||
def test_error_response_format(self, mock_a, mock_b, client):
|
||||
mock_a.side_effect = RuntimeError("fail")
|
||||
@_fw("get")
|
||||
def test_error_response_format(self, mock_get, client):
|
||||
mock_get.side_effect = RuntimeError("fail")
|
||||
resp = client.get("/api/firewall/zones")
|
||||
data = resp.get_json()
|
||||
assert "error" in data
|
||||
assert "ok" in data
|
||||
assert data["ok"] is False
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# Firewall Config CRUD (daemon-backed)
|
||||
# ============================================================================
|
||||
|
||||
|
||||
class TestFirewallConfig:
|
||||
@_fw("get")
|
||||
def test_config_get(self, mock_get, client):
|
||||
mock_get.return_value = {"zones": {"public": {"interfaces": ["eth0"]}}}
|
||||
resp = client.get("/api/firewall/config")
|
||||
assert resp.status_code == 200
|
||||
|
||||
@_fw("post")
|
||||
@_fw("get")
|
||||
def test_config_save(self, mock_get, mock_post, client):
|
||||
mock_post.return_value = {"config_saved": True}
|
||||
mock_get.return_value = {
|
||||
"pending": [],
|
||||
"needs_apply": False,
|
||||
"unmanaged_zones": {},
|
||||
}
|
||||
resp = client.post(
|
||||
"/api/firewall/config", json={"zones": {"public": {"interfaces": ["eth0"]}}}
|
||||
)
|
||||
assert resp.status_code == 200
|
||||
|
||||
def test_config_save_missing_zones(self, client):
|
||||
resp = client.post("/api/firewall/config", json={})
|
||||
assert resp.status_code == 400
|
||||
|
||||
@_fw("patch")
|
||||
@_fw("get")
|
||||
def test_config_patch(self, mock_get, mock_patch, client):
|
||||
mock_patch.return_value = {"config_saved": True}
|
||||
mock_get.return_value = {
|
||||
"pending": [],
|
||||
"needs_apply": False,
|
||||
"unmanaged_zones": {},
|
||||
}
|
||||
resp = client.patch("/api/firewall/config", json={"zones": {}})
|
||||
assert resp.status_code == 200
|
||||
|
||||
@_fw("post")
|
||||
def test_config_apply(self, mock_post, client):
|
||||
mock_post.return_value = {
|
||||
"applied_zones": ["public"],
|
||||
"backup": "/tmp/rules.json",
|
||||
}
|
||||
resp = client.post("/api/firewall/config/apply")
|
||||
assert resp.status_code == 200
|
||||
|
||||
@_fw("get")
|
||||
def test_config_pending(self, mock_get, client):
|
||||
mock_get.return_value = {"pending": [], "needs_apply": False}
|
||||
resp = client.get("/api/firewall/config/pending")
|
||||
assert resp.status_code == 200
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# Proxy config
|
||||
# ============================================================================
|
||||
|
||||
|
||||
class TestProxyConfig:
|
||||
@_px("get")
|
||||
def test_get(self, mock_get, client):
|
||||
mock_get.return_value = {"domains": {}, "ssl": {}}
|
||||
resp = client.get("/api/proxy/config")
|
||||
assert resp.status_code == 200
|
||||
|
||||
@_px("post")
|
||||
def test_post(self, mock_post, client):
|
||||
mock_post.return_value = {"config_saved": True}
|
||||
resp = client.post("/api/proxy/config", json={"domains": {}})
|
||||
assert resp.status_code == 200
|
||||
|
||||
@_px("patch")
|
||||
def test_patch(self, mock_patch, client):
|
||||
mock_patch.return_value = {"config_saved": True}
|
||||
resp = client.patch("/api/proxy/config", json={})
|
||||
assert resp.status_code == 200
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# DHCP config
|
||||
# ============================================================================
|
||||
|
||||
|
||||
class TestDhcpConfigCrud:
|
||||
@_dh("patch")
|
||||
def test_patch(self, mock_patch, client):
|
||||
mock_patch.return_value = {"config_saved": True}
|
||||
resp = client.patch("/api/dhcp/config", json={"dhcp": {}})
|
||||
assert resp.status_code == 200
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# Proxy management
|
||||
# ============================================================================
|
||||
|
||||
|
||||
class TestProxyManagement:
|
||||
@_px("post")
|
||||
def test_set_management(self, mock_post, client):
|
||||
mock_post.return_value = {"domain": "vacuum-wall.local"}
|
||||
resp = client.post(
|
||||
"/api/proxy/management",
|
||||
json={
|
||||
"domain": "vacuum-wall.local",
|
||||
"flask_host": "127.0.0.1",
|
||||
"flask_port": 9090,
|
||||
},
|
||||
)
|
||||
assert resp.status_code == 200
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# Proxy domain update
|
||||
# ============================================================================
|
||||
|
||||
|
||||
class TestProxyDomainUpdate:
|
||||
@_px("post")
|
||||
def test_update(self, mock_post, client):
|
||||
mock_post.return_value = {"domain": "ex.com"}
|
||||
resp = client.put(
|
||||
"/api/proxy/domains/ex.com",
|
||||
json={"backend_host": "10.0.0.2"},
|
||||
)
|
||||
assert resp.status_code == 200
|
||||
|
||||
Reference in New Issue
Block a user