Release / verify (push) Canceled after 0s
CI / checks (push) Canceled after 0s
CI / frontend (push) Canceled after 0s
CI / backend (push) Canceled after 0s
Release / test (push) Canceled after 0s
Release / publish (backend) (push) Canceled after 0s
Release / publish (frontend) (push) Canceled after 0s
Release / publish (proxy) (push) Canceled after 0s
Release / publish (updater) (push) Canceled after 0s
- **Standort-Variablen**: `{{NAME}}`-Platzhalter in Regeln, Aliasen, Portweiterleitungen, 1:1- und Outbound-NAT, je Host mit eigenem Wert
(Host-Seite › Standort-Variablen, listet die verwendeten Platzhalter automatisch). Je Host aufgelöst in Vorschau, Ausrollen, Zählern und
Audit; fehlt ein Wert, wird nichts gesendet (Vorschau „Variable fehlt“, Ausrollen wird vor jedem Schreiben abgelehnt, zusätzlich eine
Sperre im API-Client). Neue Tabelle `host_variables` (Migration `0016`).
183 lines
7.4 KiB
Python
183 lines
7.4 KiB
Python
"""Independent 1:1 NAT deploy / confirm / rollback state machine."""
|
|
from datetime import datetime, timedelta, timezone
|
|
|
|
from sqlalchemy import select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.config import settings
|
|
from app.models.host import OpnsenseHost
|
|
from app.models.one_to_one import OneToOneRule
|
|
from app.models.one_to_one_deployment import OneToOneDeployment
|
|
from app.services.audit_service import tracked_rollback
|
|
from app.services import opnsense_client, variables_service
|
|
from app.services.deploy_flow import push_to_host
|
|
from app.services.opnsense_client import OpnsenseAmbiguousError, OpnsenseAPIError
|
|
|
|
|
|
def _now() -> datetime:
|
|
return datetime.now(timezone.utc)
|
|
|
|
|
|
def _build_payload(rule: OneToOneRule, host: OpnsenseHost | None = None) -> dict:
|
|
payload = _base_payload(rule)
|
|
return variables_service.resolve(payload, host) if host is not None else payload
|
|
|
|
|
|
def _base_payload(rule: OneToOneRule) -> dict:
|
|
return {
|
|
"description": rule.description,
|
|
"interface": rule.interface,
|
|
"source_net": rule.source_net,
|
|
"destination_net": rule.destination_net,
|
|
"source_not": "1" if rule.source_not else "0",
|
|
"destination_not": "1" if rule.destination_not else "0",
|
|
"enabled": "1" if rule.enabled else "0",
|
|
"type": rule.type,
|
|
"external": rule.external,
|
|
"natreflection": rule.natreflection,
|
|
"log": "1" if rule.log else "0",
|
|
}
|
|
|
|
|
|
async def _deploy_to_host(db: AsyncSession, rule: OneToOneRule, host: OpnsenseHost) -> OneToOneDeployment:
|
|
payload = _build_payload(rule, host)
|
|
existing = await db.scalar(
|
|
select(OneToOneDeployment).where(
|
|
OneToOneDeployment.one_to_one_id == rule.id, OneToOneDeployment.host_id == host.id
|
|
)
|
|
)
|
|
|
|
if existing and existing.status in ("success", "reverted") and existing.last_payload == payload:
|
|
existing.status = "success"
|
|
existing.message = None
|
|
existing.revert_deadline = None
|
|
existing.deployed_at = _now()
|
|
return existing
|
|
|
|
if existing and existing.status in ("pending", "revert_failed"):
|
|
return existing
|
|
|
|
prior_uuid = existing.opnsense_one_to_one_uuid if existing else None
|
|
prior_live_payload = existing.last_payload if existing else None
|
|
|
|
async def write(uuid_):
|
|
if uuid_:
|
|
await opnsense_client.set_one_to_one_rule(host, uuid_, payload)
|
|
return uuid_
|
|
result = await opnsense_client.add_one_to_one_rule(host, payload)
|
|
new_uuid = result.get("uuid") if isinstance(result, dict) else None
|
|
if not new_uuid:
|
|
raise OpnsenseAmbiguousError("Firewall hat keine Regel-UUID zurückgegeben; Stand manuell prüfen")
|
|
return new_uuid
|
|
|
|
deployment = await push_to_host(
|
|
db, existing=existing, uuid_attr="opnsense_one_to_one_uuid",
|
|
make=lambda **fields: OneToOneDeployment(one_to_one_id=rule.id, host_id=host.id, **fields),
|
|
prior_uuid=prior_uuid, prior_live_payload=prior_live_payload, payload=payload,
|
|
write=write, apply=lambda: opnsense_client.apply_one_to_one(host),
|
|
)
|
|
return deployment
|
|
|
|
|
|
async def deploy_one_to_one(db: AsyncSession, rule: OneToOneRule, hosts: list[OpnsenseHost]) -> list[OneToOneDeployment]:
|
|
from app.services.host_maintenance_service import ensure_no_maintenance
|
|
from app.services.policy_hierarchy_deploy_service import reassert_after_managed_change
|
|
await ensure_no_maintenance(db, hosts)
|
|
variables_service.ensure_resolvable(_build_payload, rule, hosts) # before anything is written
|
|
deployments = [await _deploy_to_host(db, rule, host) for host in hosts]
|
|
await db.flush()
|
|
for host, deployment in zip(hosts, deployments):
|
|
if deployment.status != "pending":
|
|
continue
|
|
try:
|
|
await reassert_after_managed_change(db, host, {rule.interface})
|
|
except OpnsenseAPIError as exc:
|
|
deployment.status = "error"
|
|
deployment.message = f"1:1 NAT wurde übernommen, Hierarchie-Reihenfolge aber nicht bestätigt: {exc}"
|
|
# The change is live: keep the revert deadline so an unconfirmed result is still undone.
|
|
await db.commit()
|
|
return deployments
|
|
|
|
|
|
async def confirm_one_to_one(db: AsyncSession, rule: OneToOneRule) -> list[OneToOneDeployment]:
|
|
result = await db.execute(
|
|
select(OneToOneDeployment).where(
|
|
OneToOneDeployment.one_to_one_id == rule.id,
|
|
OneToOneDeployment.status == "pending",
|
|
OneToOneDeployment.revert_deadline > _now(),
|
|
)
|
|
)
|
|
deployments = list(result.scalars().all())
|
|
for deployment in deployments:
|
|
deployment.status = "success"
|
|
deployment.revert_deadline = None
|
|
await db.commit()
|
|
return deployments
|
|
|
|
|
|
async def sweep_expired_one_to_one_deployments(db: AsyncSession) -> list[OneToOneDeployment]:
|
|
from app.services.policy_service import policy_lock
|
|
await policy_lock(db)
|
|
result = await db.execute(
|
|
select(OneToOneDeployment).where(
|
|
OneToOneDeployment.status.in_(("pending", "error")), OneToOneDeployment.revert_deadline <= _now()
|
|
)
|
|
)
|
|
expired = list(result.scalars().all())
|
|
touched: list[OneToOneDeployment] = []
|
|
|
|
for deployment in expired:
|
|
await revert_deployment(db, deployment)
|
|
touched.append(deployment)
|
|
|
|
await db.commit()
|
|
return touched
|
|
|
|
|
|
async def undeploy_one_to_one(db: AsyncSession, rule: OneToOneRule) -> None:
|
|
failures = []
|
|
result = await db.execute(select(OneToOneDeployment).where(OneToOneDeployment.one_to_one_id == rule.id))
|
|
for deployment in result.scalars().all():
|
|
host = await db.get(OpnsenseHost, deployment.host_id)
|
|
if host and deployment.opnsense_one_to_one_uuid:
|
|
try:
|
|
await opnsense_client.del_one_to_one_rule(host, deployment.opnsense_one_to_one_uuid)
|
|
await opnsense_client.apply_one_to_one(host)
|
|
except OpnsenseAPIError as exc:
|
|
deployment.status = "error"
|
|
deployment.message = str(exc)
|
|
failures.append(f"{host.name} ({str(exc)[:200]})")
|
|
continue
|
|
await db.delete(deployment)
|
|
await db.flush()
|
|
if failures:
|
|
await db.commit()
|
|
raise OpnsenseAPIError("1:1 NAT-Regel konnte nicht von allen Hosts entfernt werden: " + ", ".join(failures))
|
|
|
|
|
|
@tracked_rollback("one_to_one")
|
|
async def revert_deployment(db: AsyncSession, deployment: OneToOneDeployment) -> bool:
|
|
host = await db.get(OpnsenseHost, deployment.host_id)
|
|
if host is None:
|
|
await db.delete(deployment)
|
|
return True
|
|
try:
|
|
if deployment.previous_payload is None:
|
|
if deployment.opnsense_one_to_one_uuid:
|
|
await opnsense_client.del_one_to_one_rule(host, deployment.opnsense_one_to_one_uuid)
|
|
await opnsense_client.apply_one_to_one(host)
|
|
await db.delete(deployment)
|
|
else:
|
|
await opnsense_client.set_one_to_one_rule(host, deployment.opnsense_one_to_one_uuid, deployment.previous_payload)
|
|
await opnsense_client.apply_one_to_one(host)
|
|
deployment.last_payload = deployment.previous_payload
|
|
deployment.status = "reverted"
|
|
deployment.message = None
|
|
deployment.revert_deadline = None
|
|
return True
|
|
except OpnsenseAPIError as exc:
|
|
deployment.status = "revert_failed"
|
|
deployment.message = str(exc)
|
|
deployment.revert_deadline = None
|
|
return False
|