refactor: update all API blueprints (certs, dhcp, firewall, logs, network, proxy, wireguard)
This commit is contained in:
+18
-8
@@ -8,6 +8,16 @@ import logging
|
||||
from flask import Blueprint, request
|
||||
|
||||
from daemon.client import BadRequest, NotFound, delete, get, post
|
||||
from daemon.iface import (
|
||||
DELETE_ACME_REMOVE,
|
||||
GET_ACME_INFO,
|
||||
GET_ACME_ISSUE_STATUS,
|
||||
GET_ACME_LIST,
|
||||
POST_ACME_EMAIL,
|
||||
POST_ACME_ISSUE,
|
||||
POST_ACME_RENEW,
|
||||
POST_ACME_VALIDATE,
|
||||
)
|
||||
from webui.api.common import _error, _ok
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
@@ -22,7 +32,7 @@ def list_certs_bp():
|
||||
Response containing the list of certificates or an error message.
|
||||
"""
|
||||
try:
|
||||
return _ok(get("/acme/list"))
|
||||
return _ok(get(GET_ACME_LIST))
|
||||
except RuntimeError as exc:
|
||||
logger.error("Failed to list certificates: %s", exc)
|
||||
return _error(str(exc), 500)
|
||||
@@ -39,7 +49,7 @@ def cert_details(domain: str):
|
||||
Response containing certificate info or an error message.
|
||||
"""
|
||||
try:
|
||||
return _ok(get("/acme/info", {"domain": domain}))
|
||||
return _ok(get(GET_ACME_INFO, {"domain": domain}))
|
||||
except NotFound as exc:
|
||||
logger.info("Cert for '%s' not found: %s", domain, exc)
|
||||
return _error(str(exc), 404)
|
||||
@@ -62,7 +72,7 @@ def validate():
|
||||
if not domain:
|
||||
return _error("'domain' is required", 400)
|
||||
try:
|
||||
result = post("/acme/validate", {"domain": domain})
|
||||
result = post(POST_ACME_VALIDATE, {"domain": domain})
|
||||
return _ok(result)
|
||||
except BadRequest as exc:
|
||||
logger.info("Validation rejected: %s", exc)
|
||||
@@ -90,7 +100,7 @@ def issue_start():
|
||||
try:
|
||||
logger.info("Certificate issuance requested for '%s' via API", domain)
|
||||
result = post(
|
||||
"/acme/issue", {"domain": domain, "webroot": webroot, "email": email}
|
||||
POST_ACME_ISSUE, {"domain": domain, "webroot": webroot, "email": email}
|
||||
)
|
||||
logger.info(
|
||||
"Certificate issuance started for '%s' (id=%s)",
|
||||
@@ -117,7 +127,7 @@ def issue_status(request_id: str):
|
||||
Response containing issuance status or an error message.
|
||||
"""
|
||||
try:
|
||||
result = get("/acme/issue/status", {"id": request_id})
|
||||
result = get(GET_ACME_ISSUE_STATUS, {"id": request_id})
|
||||
return _ok(result)
|
||||
except NotFound as exc:
|
||||
logger.info("Issuance request '%s' not found: %s", request_id, exc)
|
||||
@@ -139,7 +149,7 @@ def renew_bp(domain: str):
|
||||
"""
|
||||
try:
|
||||
logger.info("Certificate renewal requested for '%s' via API", domain)
|
||||
post("/acme/renew", {"domain": domain})
|
||||
post(POST_ACME_RENEW, {"domain": domain})
|
||||
logger.info("Certificate renewed for '%s'", domain)
|
||||
return _ok(None)
|
||||
except BadRequest as exc:
|
||||
@@ -161,7 +171,7 @@ def remove_bp(domain: str):
|
||||
Response confirming removal or an error message.
|
||||
"""
|
||||
try:
|
||||
delete("/acme/remove", {"domain": domain})
|
||||
delete(DELETE_ACME_REMOVE, {"domain": domain})
|
||||
logger.info("Certificate removed for '%s' via API", domain)
|
||||
return _ok(None)
|
||||
except NotFound as exc:
|
||||
@@ -186,7 +196,7 @@ def set_email_bp():
|
||||
if not email:
|
||||
return _error("'email' is required", 400)
|
||||
try:
|
||||
post("/acme/email", {"email": email})
|
||||
post(POST_ACME_EMAIL, {"email": email})
|
||||
logger.info("ACME email set via API: %s", email)
|
||||
return _ok({"email": email})
|
||||
except BadRequest as exc:
|
||||
|
||||
Reference in New Issue
Block a user