From 25c8e5f7f667556c81c7a2fd120cd09c17122657 Mon Sep 17 00:00:00 2001
From: Jasmine Schladen <jschladen@netflix.com>
Date: Wed, 18 Sep 2024 09:51:14 -0700
Subject: [PATCH] Fix list bug

---
 lemur/certificates/cli.py     | 17 +++++++++++------
 lemur/certificates/service.py |  2 ++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/lemur/certificates/cli.py b/lemur/certificates/cli.py
index 331274804e..ff101d0f40 100644
--- a/lemur/certificates/cli.py
+++ b/lemur/certificates/cli.py
@@ -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"]
@@ -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"]
         )
     )
 
@@ -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):
@@ -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
diff --git a/lemur/certificates/service.py b/lemur/certificates/service.py
index 9337e356f7..074fc48af0 100644
--- a/lemur/certificates/service.py
+++ b/lemur/certificates/service.py
@@ -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