Skip to content

Commit

Permalink
Fix list bug
Browse files Browse the repository at this point in the history
  • Loading branch information
jtschladen committed Sep 18, 2024
1 parent 88a5156 commit 25c8e5f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
17 changes: 11 additions & 6 deletions lemur/certificates/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ def print_certificate_details(details):
"\t[+] Subject Alternate Names: {sans}\n"
"\t[+] Authority: {authority_name}\n"
"\t[+] Validity Start: {validity_start}\n"
"\t[+] Validity End: {validity_end}\n".format(
"\t[+] Validity End: {validity_end}\n"
"\t[+] Serial Number:{serial_number}".format(
common_name=details["commonName"],
sans=",".join(
x["value"] for x in details["extensions"]["subAltNames"]["names"]
Expand All @@ -76,6 +77,7 @@ def print_certificate_details(details):
authority_name=details["authority"]["name"],
validity_start=details["validityStart"],
validity_end=details["validityEnd"],
serial_number=details["serialNumber"]
)
)

Expand Down Expand Up @@ -103,16 +105,16 @@ def validate_certificates_by_serial_numbers(serial_numbers):
:return:
"""
if serial_numbers:
certs = []
all_certs = []
for serial_number in serial_numbers:
cert = get_by_serial(serial_number)
certs = get_by_serial(serial_number)

if not cert:
if not certs:
click.echo(f"[-] No certificate found with serial number: {serial_number}")
sys.exit(1)
certs.append(cert)
all_certs.extend(certs)

return certs
return all_certs


def validate_endpoint(endpoint_name):
Expand Down Expand Up @@ -608,6 +610,9 @@ def reissue(old_certificate_name, serial_numbers, notify, commit):
if old_certs_by_serial_numbers:
click.echo(
f"[+] Reissuing certificates by serial numbers: {serial_numbers} => {old_certs_by_serial_numbers}") # TODO remove
for old_cert_by_serial_number in old_certs_by_serial_numbers:
click.echo(
f"[+] Reissuing certificate by serial number: {old_cert_by_serial_number}: {old_cert_by_serial_number.serial}") # TODO remove
certs_to_reissue.extend(old_certs_by_serial_numbers)

# if neither name nor serial numbers were specified, reissue all pending reissues
Expand Down
2 changes: 2 additions & 0 deletions lemur/certificates/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -956,6 +956,8 @@ def get_certificate_primitives(certificate):
data["not_after"] = end
data["validity_start"] = start
data["validity_end"] = end

data["serial_number"] = certificate.serial
return data


Expand Down

0 comments on commit 25c8e5f

Please sign in to comment.