Fix old use of comparison-enumeration

Author: tvdijen

modules/saml/src/Auth/Source/SP.php

@@ -26,6 +26,9 @@
 use SimpleSAML\Store;
 use SimpleSAML\Store\StoreFactory;
 use SimpleSAML\Utils;
+use SimpleSAML\SAML2\XML\samlp\AuthnContextComparisonTypeEnum;
+
+use function array_column;
 
 class SP extends Auth\Source
 {
@@ -507,17 +510,16 @@ private function startSSO2(Configuration $idpMetadata, array $state): void
         }
 
         if ($accr !== null) {
-            $comp = Constants::COMPARISON_EXACT;
+            $comp = AuthnContextComparisonTypeEnum::Exact;
             if ($idpMetadata->getOptionalString('AuthnContextComparison', null) !== null) {
                 $comp = $idpMetadata->getString('AuthnContextComparison');
             } elseif (
                 isset($state['saml:AuthnContextComparison'])
-                && in_array($state['saml:AuthnContextComparison'], [
-                    Constants::COMPARISON_EXACT,
-                    Constants::COMPARISON_MINIMUM,
-                    Constants::COMPARISON_MAXIMUM,
-                    Constants::COMPARISON_BETTER,
-                ], true)
+                && in_array(
+                    $state['saml:AuthnContextComparison'],
+                    array_column(AuthnContextComparisonTypeEnum::cases(), 'value'),
+                    true,
+                )
             ) {
                 $comp = $state['saml:AuthnContextComparison'];
             }
@@ -531,12 +533,7 @@ private function startSSO2(Configuration $idpMetadata, array $state): void
                 isset($state['saml:RequestedAuthnContext']['Comparison'])
                 && in_array(
                     $state['saml:RequestedAuthnContext']['Comparison'],
-                    [
-                        Constants::COMPARISON_EXACT,
-                        Constants::COMPARISON_MINIMUM,
-                        Constants::COMPARISON_MAXIMUM,
-                        Constants::COMPARISON_BETTER,
-                    ],
+                    array_column(AuthnContextComparisonTypeEnum::cases(), 'value'),
                     true,
                 )
             ) {
@@ -911,7 +908,7 @@ public function reauthenticate(array &$state): void
         if (
             $this->passAuthnContextClassRef
             && isset($state['saml:RequestedAuthnContext'])
-            && $state['saml:RequestedAuthnContext']['Comparison'] === Constants::COMPARISON_EXACT
+            && $state['saml:RequestedAuthnContext']['Comparison'] === AuthnContextComparisonTypeEnum::Exact->value
             && isset($data['saml:sp:AuthnContext'])
             && $state['saml:RequestedAuthnContext']['AuthnContextClassRef'][0] !== $data['saml:sp:AuthnContext']
         ) {

modules/saml/src/Message.php

@@ -25,9 +25,11 @@
 use SimpleSAML\Logger;
 use SimpleSAML\Module\saml\Error as SAMLError;
 use SimpleSAML\SAML2\Constants;
-use SimpleSAML\SAML2\XML\Comparison;
+use SimpleSAML\SAML2\XML\samlp\AuthnContextComparisonTypeEnum;
 use SimpleSAML\Utils;
 
+use function array_column;
+
 /**
  * Common code for building SAML 2 messages based on the available metadata.
  *
@@ -522,8 +524,8 @@ public static function buildAuthnRequest(
             $accr = $spMetadata->getArrayizeString('AuthnContextClassRef');
             $comp = $spMetadata->getOptionalValueValidate(
                 'AuthnContextComparison',
-                array_column(Comparison::cases(), 'value'),
-                Comparison::EXACT->value,
+                array_column(AuthnContextComparisonTypeEnum::cases(), 'value'),
+                AuthnContextComparisonTypeEnum::Exact->value,
             );
             $ar->setRequestedAuthnContext(['AuthnContextClassRef' => $accr, 'Comparison' => $comp]);
         }