Allow id-card authentication when Extended Key Usage is not present in certificate

WE2-1028

Signed-off-by: Sven Mitt <[email protected]>

Author: svenzik

src/validator/certvalidators/SubjectCertificatePurposeValidator.php

@@ -32,6 +32,9 @@
 final class SubjectCertificatePurposeValidator implements SubjectCertificateValidator
 {
 
+    private const KEY_USAGE = 'id-ce-keyUsage';
+    private const KEY_USAGE_DIGITAL_SIGNATURE = 0;
+    private const EXTENDED_KEY_USAGE = 'id-ce-extKeyUsage';
     // oid 1.3.6.1.5.5.7.3.2
     private const EXTENDED_KEY_USAGE_CLIENT_AUTHENTICATION = "id-kp-clientAuth";
     private $logger;
@@ -51,15 +54,32 @@ public function __construct(LoggerInterface $logger = null)
      */
     public function validate(X509 $subjectCertificate): void
     {
-        $usages = $subjectCertificate->getExtension('id-ce-extKeyUsage');
-        if (!$usages || empty($usages)) {
+        $keyUsage = $subjectCertificate->getExtension(self::KEY_USAGE);
+        if (!$keyUsage || empty($keyUsage)) {
             throw new UserCertificateMissingPurposeException();
         }
+        if (!$keyUsage[self::KEY_USAGE_DIGITAL_SIGNATURE] ) {
+            throw new UserCertificateWrongPurposeException();
+        }
+        $usages = $subjectCertificate->getExtension(self::EXTENDED_KEY_USAGE);
+        if ($this->isExtendedKeyUsageAllowAllPurposes($usages)) {
+            return;
+        }
         // Extended usages must contain TLS Web Client Authentication
-        if (!in_array(self::EXTENDED_KEY_USAGE_CLIENT_AUTHENTICATION, $usages)) {
+        if (!$this->isExtendedKeyUsageAllowClientAuthentication($usages)) {
             throw new UserCertificateWrongPurposeException();
         }
 
         $this->logger?->debug("User certificate can be used for client authentication.");
     }
+
+    private function isExtendedKeyUsageAllowAllPurposes(mixed $usages): bool
+    {
+        return !$usages || empty($usages);
+    }
+
+    private function isExtendedKeyUsageAllowClientAuthentication(mixed $usages): bool
+    {
+        return in_array(self::EXTENDED_KEY_USAGE_CLIENT_AUTHENTICATION, $usages);
+    }
 }