webinterface.git

@@ -210,20 +210,14 @@ function validate_certificate($cert, $key)

 function parse_cert_details($cert)

 {

     $certdata = openssl_x509_parse($cert, true);

-    /*

-name => /CN=*.bwurst.org

-validFrom_time_t => 1204118790

-validTo_time_t => 1267190790

-

-

-    */

     DEBUG($certdata);

-    DEBUG("SAN: ".$certdata['extensions']['subjectAltName']);

-    //return array('subject' => $certdata['name'], 'cn' => $certdata['subject']['CN'], 'valid_from' => date('Y-m-d', $certdata['validFrom_time_t']), 'valid_until' => date('Y-m-d', $certdata['validTo_time_t']));

+

     $issuer = $certdata['issuer']['CN'];

     if (isset($certdata['issuer']['O'])) {

         $issuer = $certdata['issuer']['O'];

     }

+    if (isset($certdata['extensions']['subjectAltName'])) {

+        DEBUG("SAN: ".$certdata['extensions']['subjectAltName']);

         $san = [];

         $raw_san = explode(', ', $certdata['extensions']['subjectAltName']);

         foreach ($raw_san as $name) {

@@ -234,6 +228,9 @@ validTo_time_t => 1267190790

             $san[] = str_replace('DNS:', '', $name);

         }

         $san = implode("\n", $san);

+    } else {

+        $san = "\n";

+    }

     DEBUG("SAN: <pre>".$san."</pre>");

     return ['subject' => $certdata['subject']['CN'].' / '.$issuer, 'cn' => $certdata['subject']['CN'], 'valid_from' => date('Y-m-d', $certdata['validFrom_time_t']), 'valid_until' => date('Y-m-d', $certdata['validTo_time_t']), 'issuer' => $certdata['issuer']['CN'], 'san' => $san];

 }