Commit 234a5f32 authored by Adrien Dorsaz's avatar Adrien Dorsaz

fix status code read in debug logs

parent d87cdd84
...@@ -164,7 +164,7 @@ def get_crt(config, log=LOGGER): ...@@ -164,7 +164,7 @@ def get_crt(config, log=LOGGER):
and order["type"] == "urn:ietf:params:acme:error:userActionRequired"): and order["type"] == "urn:ietf:params:acme:error:userActionRequired"):
raise ValueError("Order creation failed ({0}). Read Terms of Service ({1}), then follow your CA instructions: {2}".format(order["detail"], http_response.headers['Link'], order["instance"])) raise ValueError("Order creation failed ({0}). Read Terms of Service ({1}), then follow your CA instructions: {2}".format(order["detail"], http_response.headers['Link'], order["instance"]))
else: else:
raise ValueError("Error getting new Order: {0} {1}".format(code, result)) raise ValueError("Error getting new Order: {0} {1}".format(http_response.status_code, result))
# complete each authorization challenge # complete each authorization challenge
for authz in order["authorizations"]: for authz in order["authorizations"]:
...@@ -238,7 +238,7 @@ def get_crt(config, log=LOGGER): ...@@ -238,7 +238,7 @@ def get_crt(config, log=LOGGER):
csr_der = _b64(_openssl("req", ["-in", config["acmednstiny"]["CSRFile"], "-outform", "DER"])) csr_der = _b64(_openssl("req", ["-in", config["acmednstiny"]["CSRFile"], "-outform", "DER"]))
http_response, result = _send_signed_request(order["finalize"], {"csr": csr_der}) http_response, result = _send_signed_request(order["finalize"], {"csr": csr_der})
if http_response.status_code != 200: if http_response.status_code != 200:
raise ValueError("Error while sending the CSR: {0} {1}".format(code, result)) raise ValueError("Error while sending the CSR: {0} {1}".format(http_response.status_code, result))
while True: while True:
http_response, order = _send_signed_request(order_location, "") http_response, order = _send_signed_request(order_location, "")
...@@ -257,7 +257,7 @@ def get_crt(config, log=LOGGER): ...@@ -257,7 +257,7 @@ def get_crt(config, log=LOGGER):
http_response, result = _send_signed_request(order["certificate"], "") http_response, result = _send_signed_request(order["certificate"], "")
if http_response.status_code != 200: if http_response.status_code != 200:
raise ValueError("Finalizing order {0} got errors: {1}".format(code, result)) raise ValueError("Finalizing order {0} got errors: {1}".format(http_response.status_code, result))
log.info("Certificate signed and chain received: {0}".format(order["certificate"])) log.info("Certificate signed and chain received: {0}".format(order["certificate"]))
return http_response.text return http_response.text
......
...@@ -92,7 +92,7 @@ def account_deactivate(accountkeypath, acme_directory, log=LOGGER): ...@@ -92,7 +92,7 @@ def account_deactivate(accountkeypath, acme_directory, log=LOGGER):
if http_response.status_code == 200: if http_response.status_code == 200:
log.info("Account key deactivated !") log.info("Account key deactivated !")
else: else:
raise ValueError("Error while deactivating the account key: {0} {1}".format(code, result)) raise ValueError("Error while deactivating the account key: {0} {1}".format(http_response.status_code, result))
def main(argv): def main(argv):
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment