feat: add issuer field to CertificateInfo (#4)

* add issuer field to CertificateInfo

* format fix

---------

Co-authored-by: aver <froloff92@mail.ru>

Author: AverPower

README.md

@@ -101,7 +101,7 @@ for signature in signatures:
     match signature:
         case Signature.V1() | Signature.V2() | Signature.V3() | Signature.V31():
             for cert in signature.certificates:
-                print(f"{cert.subject=} {cert.valid_from=} {cert.valid_until=}")
+                print(f"{cert.subject=} {cert.issuer=} {cert.valid_from=} {cert.valid_until=}")
         case Signature.ApkChannelBlock():
             print(f"got apk channel block: {signature.value}")
         case _:

cli/src/commands/show.rs

@@ -132,6 +132,7 @@ fn show(path: &Path, show_signatures: &bool) -> Result<()> {
 fn print_certificate(certificate: &CertificateInfo) {
     println!("  Serial Number: {}", certificate.serial_number.green());
     println!("  Subject: {}", certificate.subject.green());
+    println!("  Issuer: {}", certificate.issuer.green());
     println!("  Valid from: {}", certificate.valid_from.green());
     println!("  Valid until: {}", certificate.valid_until.green());
     println!("  Signature type: {}", certificate.signature_type.green());

crates/zip/src/entry.rs

@@ -293,7 +293,7 @@ impl ZipEntry {
 
     /// Converts an OpenSSL [`X509Ref`] into a [`CertificateInfo`] struct.
     ///
-    /// Extracts common certificate metadata such as serial number, subject,
+    /// Extracts common certificate metadata such as serial number, subject, issuer,
     /// validity period, signature algorithm, and cryptographic fingerprints.
     fn get_certificate_info(
         &self,
@@ -327,6 +327,20 @@ impl ZipEntry {
             }
         }
 
+        let mut issuer = String::with_capacity(128);
+
+        for entry in certificate.issuer_name().entries() {
+            if let Ok(value) = entry.data().as_utf8() {
+                if !issuer.is_empty() {
+                    issuer.push(' ');
+                }
+                let name = entry.object().nid().short_name().unwrap_or_default();
+                issuer.push_str(name);
+                issuer.push('=');
+                issuer.push_str(value.as_ref());
+            }
+        }
+
         let valid_from = certificate.not_before().to_string();
         let valid_until = certificate.not_after().to_string();
 
@@ -345,6 +359,7 @@ impl ZipEntry {
         Ok(CertificateInfo {
             serial_number,
             subject,
+            issuer,
             valid_from,
             valid_until,
             signature_type,

crates/zip/src/signature.rs

@@ -103,6 +103,9 @@ pub struct CertificateInfo {
     /// The subject of the certificate (typically the entity that signed the APK).
     pub subject: String,
 
+    /// The issuer of the certificate
+    pub issuer: String,
+
     /// The date and time when the certificate becomes valid.
     pub valid_from: String,
 

examples/signatures.py

@@ -14,7 +14,7 @@
     match signature:
         case Signature.V1() | Signature.V2() | Signature.V3() | Signature.V31():
             for cert in signature.certificates:
-                print(f"{cert.subject=} {cert.valid_from=} {cert.valid_until=}")
+                print(f"{cert.subject=} {cert.issuer=} {cert.valid_from=} {cert.valid_until=}")
         case Signature.ApkChannelBlock():
             print(f"got apk channel block: {signature.value}")
         case _:

python/README.md

@@ -72,7 +72,7 @@ for signature in signatures:
     match signature:
         case Signature.V1() | Signature.V2() | Signature.V3() | Signature.V31():
             for cert in signature.certificates:
-                print(f"{cert.subject=} {cert.valid_from=} {cert.valid_until=}")
+                print(f"{cert.subject=} {cert.issuer} {cert.valid_from=} {cert.valid_until=}")
         case Signature.ApkChannelBlock():
             print(f"got apk channel block: {signature.value}")
         case _:

python/apk_info.pyi

@@ -828,6 +828,11 @@ class CertificateInfo:
     The subject of the certificate
     """
 
+    issuer: str
+    """
+    The issuer of the certificate
+    """
+
     valid_from: str
     """
     The date and time when the certificate becomes valid

python/src/lib.rs

@@ -27,6 +27,9 @@ pub struct CertificateInfo {
     #[pyo3(get)]
     pub subject: String,
 
+    #[pyo3(get)]
+    pub issuer: String,
+
     #[pyo3(get)]
     pub valid_from: String,
 
@@ -51,6 +54,7 @@ impl From<ZipCertificateInfo> for CertificateInfo {
         Self {
             serial_number: certificate.serial_number,
             subject: certificate.subject,
+            issuer: certificate.issuer,
             valid_from: certificate.valid_from,
             valid_until: certificate.valid_until,
             signature_type: certificate.signature_type,
@@ -65,9 +69,10 @@ impl From<ZipCertificateInfo> for CertificateInfo {
 impl CertificateInfo {
     fn __repr__(&self) -> String {
         format!(
-            "CertificateInfo(serial_number='{}', subject='{}', valid_from='{}', valid_until='{}', signature_type='{}', md5_fingerprint='{}', sha1_fingerprint='{}', sha256_fingerprint='{}')",
+            "CertificateInfo(serial_number='{}', subject='{}', issuer='{}' valid_from='{}', valid_until='{}', signature_type='{}', md5_fingerprint='{}', sha1_fingerprint='{}', sha256_fingerprint='{}')",
             self.serial_number,
             self.subject,
+            self.issuer,
             self.valid_from,
             self.valid_until,
             self.signature_type,