Add UI DNS challenge issuance and automatic home NPM renewal
This commit is contained in:
20
homegate.py
20
homegate.py
@@ -47,6 +47,12 @@ class Error(RuntimeError):
|
||||
pass
|
||||
|
||||
|
||||
class APIError(Error):
|
||||
def __init__(self, message, status=None):
|
||||
super().__init__(message)
|
||||
self.status = status
|
||||
|
||||
|
||||
def require(ok, message):
|
||||
if not ok:
|
||||
raise Error(message)
|
||||
@@ -404,19 +410,20 @@ class API:
|
||||
|
||||
def call(self, method, path, **kwargs):
|
||||
try:
|
||||
response = self.session.request(method, self.base + path, timeout=(5, 30),
|
||||
response = self.session.request(method, self.base + path, timeout=kwargs.pop("timeout", (5, 30)),
|
||||
allow_redirects=False, **kwargs)
|
||||
except requests.RequestException:
|
||||
raise Error(f"{self.label}: connection or TLS error at {path}") from None
|
||||
require(200 <= response.status_code < 300,
|
||||
f"{self.label}: HTTP {response.status_code} at {path}; check credentials, version and permissions")
|
||||
raise APIError(f"{self.label}: connection or TLS error at {path}") from None
|
||||
if not 200 <= response.status_code < 300:
|
||||
raise APIError(f"{self.label}: HTTP {response.status_code} at {path}; check credentials, version and permissions",
|
||||
response.status_code)
|
||||
# Do not log response bodies: NPM upload responses contain the private key.
|
||||
if not response.content:
|
||||
return None
|
||||
try:
|
||||
return response.json()
|
||||
except ValueError:
|
||||
raise Error(f"{self.label}: non-JSON response at {path}; check management URL") from None
|
||||
raise APIError(f"{self.label}: non-JSON response at {path}; check management URL") from None
|
||||
|
||||
def close(self):
|
||||
self.session.close()
|
||||
@@ -517,7 +524,8 @@ def certificate_info(cert):
|
||||
raise Error("NPM certificate has invalid PEM or missing DNS subject alternative names") from None
|
||||
return {"id": cert["id"], "name": cert.get("nice_name", ""), "provider": cert.get("provider"),
|
||||
"domains": domains, "expires": expires, "fingerprint": fingerprint,
|
||||
"modified": cert.get("modified_on")}
|
||||
"modified": cert.get("modified_on"), "dns_challenge": cert.get("meta", {}).get("dns_challenge") is True,
|
||||
"dns_provider": cert.get("meta", {}).get("dns_provider")}
|
||||
|
||||
|
||||
def covers_domain(pattern, hostname):
|
||||
|
||||
Reference in New Issue
Block a user