Merge pull request #1 from FreddyKaiser/master

Additional comments for on demand / Update in MIDSN parsing

Author: JanSlabon

examples/demo-on-demand.php

@@ -85,12 +85,17 @@
 
     // get information about the signing certificate:
     // $signatureData = SetaPDF_Signer_SwisscomAIS_Helper::getSignatureData($module);
+    // echo("Signed by: " . $signatureData['subject'] . PHP_EOL);
+    // echo("Unique Mobile ID serial number: " . $signatureData['MIDSN'] . PHP_EOL);
+
 
 } catch (SetaPDF_Signer_SwisscomAIS_Exception $e) {
     echo 'Error in SwisscomAIS: ' . $e->getMessage() . ' with code ' . $e->getCode() . '<br />';
     /* Get the AIS Error details */
     echo "<pre>";
     var_dump($e->getResultMajor());
     var_dump($e->getResultMinor());
+    // Mobile ID user assistance URL in case online help is available
+    var_dump($e->getMobileIdUserAssistanceUrl());
     echo "</pre>";
 }

src/SetaPDF/Signer/SwisscomAIS/Helper.php

@@ -88,16 +88,9 @@ static private function _getSignatureData($signature)
         if (isset($data['signerCertificate']['extensions']['subjectAltName'])) {
             $subjectAltName = $data['signerCertificate']['extensions']['subjectAltName'];
             // Format: 'DirName: serialNumber = ID-16981fa2-8998-4125-9a93-5fecbff74515, name = "+41798...", description = test.ch: Signer le document?, pseudonym = MIDCHEGU8GSH6K83'
-            $subjectAltNameArray = explode(', ', $subjectAltName);
-            foreach ($subjectAltNameArray as $value) {
-                if (preg_match("/pseudonym = (.*)/", $value, $match))
-                    $data['MIDSN'] = $match[1];
+            if (preg_match("/pseudonym = ([^,]*)/", $subjectAltName, $match)) {
+                $data['MIDSN'] = $match[1];
             }
-
-            // isn't this the same?
-            // if (preg_match("/pseudonym = (.*)/", $subjectAltName, $match)) {
-            //    $data['MIDSN'] = $match[1];
-            // }
         }
 
         return $data;