Fix changed capitalization of entityID

modules/admin/src/Controller/Federation.php

@@ -199,10 +199,10 @@ class Federation
                 $metadataBase = Module::getModuleURL('saml/idp/metadata');
                 if (count($idps) > 1) {
                     foreach ($idps as $index => $idp) {
-                        $idp['url'] = $metadataBase . '?idpentityid=' . urlencode($idp['entityid']);
+                        $idp['url'] = $metadataBase . '?idpentityid=' . urlencode($idp['entityID']);
                         $idp['metadata-set'] = 'saml20-idp-hosted';
                         $idp['metadata-index'] = $index;
-                        $idp['metadata_array'] = SAML2_IdP::getHostedMetadata($idp['entityid']);
+                        $idp['metadata_array'] = SAML2_IdP::getHostedMetadata($idp['entityID']);
                         $saml2entities[] = $idp;
                     }
                 } else {
@@ -214,14 +214,14 @@ class Federation
                 }
 
                 foreach ($saml2entities as $index => $entity) {
-                    Assert::validURI($entity['entityid']);
+                    Assert::validURI($entity['entityID']);
                     Assert::maxLength(
-                        $entity['entityid'],
+                        $entity['entityID'],
                         C::SAML2INT_ENTITYID_MAX_LENGTH,
                         sprintf('The entityID cannot be longer than %d characters.', C::SAML2INT_ENTITYID_MAX_LENGTH)
                     );
 
-                    $builder = new SAMLBuilder($entity['entityid']);
+                    $builder = new SAMLBuilder($entity['entityID']);
                     $builder->addMetadataIdP20($entity['metadata_array']);
                     $builder->addOrganizationInfo($entity['metadata_array']);
 
@@ -245,10 +245,10 @@ class Federation
                 if (count($idps) > 1) {
                     foreach ($idps as $index => $idp) {
                         $idp['url'] = Module::getModuleURL('adfs/idp/metadata/?idpentityid=' .
-                            urlencode($idp['entityid']));
+                            urlencode($idp['entityID']));
                         $idp['metadata-set'] = 'adfs-idp-hosted';
                         $idp['metadata-index'] = $index;
-                        $idp['metadata_array'] = ADFS_IdP::getHostedMetadata($idp['entityid']);
+                        $idp['metadata_array'] = ADFS_IdP::getHostedMetadata($idp['entityID']);
                         $adfsentities[] = $idp;
                     }
                 } else {
@@ -260,14 +260,14 @@ class Federation
                 }
 
                 foreach ($adfsentities as $index => $entity) {
-                    Assert::validURI($entity['entityid']);
+                    Assert::validURI($entity['entityID']);
                     Assert::maxLength(
-                        $entity['entityid'],
+                        $entity['entityID'],
                         C::SAML2INT_ENTITYID_MAX_LENGTH,
                         sprintf('The entityID cannot be longer than %d characters.', C::SAML2INT_ENTITYID_MAX_LENGTH)
                     );
 
-                    $builder = new SAMLBuilder($entity['entityid']);
+                    $builder = new SAMLBuilder($entity['entityID']);
                     $builder->addSecurityTokenServiceType($entity['metadata_array']);
                     $builder->addOrganizationInfo($entity['metadata_array']);
                     if (isset($entity['metadata_array']['contacts'])) {
@@ -360,7 +360,7 @@ class Federation
             // sanitize the resulting array
             unset($metadata['UIInfo']);
             unset($metadata['metadata-set']);
-            unset($metadata['entityid']);
+            unset($metadata['entityID']);
 
             // sanitize the attributes array to remove friendly names
             if (isset($metadata['attributes']) && is_array($metadata['attributes'])) {
@@ -372,7 +372,7 @@ class Federation
 
             $entities[] = [
                 'authid' => $source->getAuthId(),
-                'entityid' => $source->getEntityId(),
+                'entityID' => $source->getEntityId(),
                 'type' => 'saml20-sp-hosted',
                 'url' => $source->getMetadataURL(),
                 'name' => $name,
@@ -424,7 +424,7 @@ class Federation
                     ];
                 }
 
-                // transpose from $entities[entityid][type] to $output[type][entityid]
+                // transpose from $entities[entityID][type] to $output[type][entityID]
                 $arrayUtils = new Utils\Arrays();
                 $output = $arrayUtils->transpose($entities);
 
@@ -527,13 +527,13 @@ class Federation
     {
         $this->authUtils->requireAdmin();
 
-        $entityId = $request->query->get('entityid');
+        $entityId = $request->query->get('entityID');
         $set = $request->query->get('set');
 
         $metadata = $this->mdHandler->getMetaData($entityId, $set);
 
         $t = new Template($this->config, 'admin:show_metadata.twig');
-        $t->data['entityid'] = $entityId;
+        $t->data['entityID'] = $entityId;
         $t->data['metadata'] = VarExporter::export($metadata);
         return $t;
     }

modules/admin/templates/federation.twig

@@ -22,13 +22,13 @@
           <dl>
             <dt>{{ set|entityDisplayName }}</dt>
 
-            <dd>EntityID: <code>{{ set.entityid }}</code></dd>
+            <dd>EntityID: <code>{{ set.entityID }}</code></dd>
             {%- if set.deprecated is defined and set.deprecated %}
 
               <dd><span class="entity-deprecated">{{ 'Deprecated'|trans }}</span></dd>
             {%- endif %}
             {% set index = attribute(set, 'metadata-index')|default(false) %}
-            {%- if index and set.entityid != index %}
+            {%- if index and set.entityID != index %}
 
               <dd>Index: <code>{{ index }}</code></dd>
             {%- endif %}
@@ -67,7 +67,7 @@
                    title="{% trans %}Copy to clipboard{% endtrans %}"><span class="fa fa-copy"></span></a>
               </div>
               <div id="php-{{ key }}" class="code-box-content php">
-                {#- #}$metadata['{{ set.entityid }}'] = {{ set.metadata_array }};{# -#}
+                {#- #}$metadata['{{ set.entityID }}'] = {{ set.metadata_array }};{# -#}
               </div>
             </dd>
             {%- for cert in set.certificates %}
@@ -102,9 +102,9 @@
     <fieldset class="fancyfieldset">
       <legend>{{ mdtype[key]|trans }}</legend>
       <ul>
-      {% for entityid, entity in set %}
+      {% for entityID, entity in set %}
 
-        <li><a href="{{ moduleURL('admin/federation/show?entityid=' ~ (entity.entityid|url_encode) ~ '&set=' ~ key) }}">
+        <li><a href="{{ moduleURL('admin/federation/show?entityid=' ~ (entity.entityID|url_encode) ~ '&set=' ~ key) }}">
             {{- entity | entityDisplayName -}}
           </a>
           {% if entity.expire is defined %}

modules/admin/templates/show_metadata.twig

@@ -9,7 +9,7 @@
                 title="{% trans %}Copy to clipboard{% endtrans %}"><span class="fa fa-copy"></span></a>
         </div>
         <div id="metadata" class="code-box-content php">
-            {#- #}$metadata["{{ entityid }}"] => {{ metadata|escape }};{# -#}
+            {#- #}$metadata["{{ entityID }}"] => {{ metadata|escape }};{# -#}
         </div>
     </div>
     <div class="center">

modules/core/src/Auth/Process/StatisticsWithAttribute.php

@@ -111,7 +111,7 @@ class StatisticsWithAttribute extends Auth\ProcessingFilter
             if (isset($state[$direction]['core:statistics-id'])) {
                 return $state[$direction]['core:statistics-id'];
             } else {
-                return $state[$direction]['entityid'];
+                return $state[$direction]['entityID'];
             }
         }
         return 'NA';

modules/saml/src/IdP/SAML2.php

@@ -58,7 +58,7 @@ class SAML2
         Assert::notNull($state['saml:ConsumerURL']);
 
         $spMetadata = $state["SPMetadata"];
-        $spEntityId = $spMetadata['entityid'];
+        $spEntityId = $spMetadata['entityID'];
         $spMetadata = Configuration::loadFromArray(
             $spMetadata,
             '$metadata[' . var_export($spEntityId, true) . ']'
@@ -105,7 +105,7 @@ class SAML2
 
         $statsData = [
             'spEntityID'  => $spEntityId,
-            'idpEntityID' => $idpMetadata->getString('entityid'),
+            'idpEntityID' => $idpMetadata->getString('entityID'),
             'protocol'    => 'saml2',
         ];
         if (isset($state['saml:AuthnRequestReceivedAt'])) {
@@ -134,7 +134,7 @@ class SAML2
         Assert::notNull($state['saml:ConsumerURL']);
 
         $spMetadata = $state["SPMetadata"];
-        $spEntityId = $spMetadata['entityid'];
+        $spEntityId = $spMetadata['entityID'];
         $spMetadata = Configuration::loadFromArray(
             $spMetadata,
             '$metadata[' . var_export($spEntityId, true) . ']'
@@ -168,7 +168,7 @@ class SAML2
 
         $statsData = [
             'spEntityID'  => $spEntityId,
-            'idpEntityID' => $idpMetadata->getString('entityid'),
+            'idpEntityID' => $idpMetadata->getString('entityID'),
             'protocol'    => 'saml2',
             'error'       => $status,
         ];
@@ -440,7 +440,7 @@ class SAML2
 
         Stats::log('saml:idp:AuthnRequest', [
             'spEntityID'  => $spEntityId,
-            'idpEntityID' => $idpMetadata->getString('entityid'),
+            'idpEntityID' => $idpMetadata->getString('entityID'),
             'forceAuthn'  => $forceAuthn,
             'isPassive'   => $isPassive,
             'protocol'    => 'saml2',
@@ -531,7 +531,7 @@ class SAML2
 
         Stats::log('saml:idp:LogoutRequest:sent', [
             'spEntityID'  => $association['saml:entityID'],
-            'idpEntityID' => $idpMetadata->getString('entityid'),
+            'idpEntityID' => $idpMetadata->getString('entityID'),
         ]);
 
         /** @var array $dst */
@@ -586,7 +586,7 @@ class SAML2
 
         Stats::log('saml:idp:LogoutResponse:sent', [
             'spEntityID'  => $spEntityId,
-            'idpEntityID' => $idpMetadata->getString('entityid'),
+            'idpEntityID' => $idpMetadata->getString('entityID'),
             'partial'     => $partial
         ]);
 
@@ -639,7 +639,7 @@ class SAML2
             Logger::info('Received SAML 2.0 LogoutResponse from: ' . var_export($spEntityId, true));
             $statsData = [
                 'spEntityID'  => $spEntityId,
-                'idpEntityID' => $idpMetadata->getString('entityid'),
+                'idpEntityID' => $idpMetadata->getString('entityID'),
             ];
             if (!$message->isSuccess()) {
                 $statsData['error'] = $message->getStatus();
@@ -662,11 +662,11 @@ class SAML2
             Logger::info('Received SAML 2.0 LogoutRequest from: ' . var_export($spEntityId, true));
             Stats::log('saml:idp:LogoutRequest:recv', [
                 'spEntityID'  => $spEntityId,
-                'idpEntityID' => $idpMetadata->getString('entityid'),
+                'idpEntityID' => $idpMetadata->getString('entityID'),
             ]);
 
             $spStatsId = $spMetadata->getOptionalString('core:statistics-id', $spEntityId);
-            Logger::stats('saml20-idp-SLO spinit ' . $spStatsId . ' ' . $idpMetadata->getString('entityid'));
+            Logger::stats('saml20-idp-SLO spinit ' . $spStatsId . ' ' . $idpMetadata->getString('entityID'));
 
             $state = [
                 'Responder'       => ['\SimpleSAML\Module\saml\IdP\SAML2', 'sendLogoutResponse'],
@@ -796,7 +796,7 @@ class SAML2
 
         $metadata = [
             'metadata-set' => 'saml20-idp-hosted',
-            'entityid' => $entityid,
+            'entityID' => $entityid,
             'SingleSignOnService' => $sso,
             'SingleLogoutService' => $slo,
             'NameIDFormat' => $config->getOptionalArrayizeString('NameIDFormat', [Constants::NAMEID_TRANSIENT]),
@@ -1111,11 +1111,11 @@ class SAML2
         }
 
         $issuer = new Issuer();
-        $issuer->setValue($idpMetadata->getString('entityid'));
+        $issuer->setValue($idpMetadata->getString('entityID'));
         $issuer->setFormat(Constants::NAMEID_ENTITY);
         $a->setIssuer($issuer);
 
-        $audience = array_merge([$spMetadata->getString('entityid')], $spMetadata->getOptionalArray('audience', []));
+        $audience = array_merge([$spMetadata->getString('entityID')], $spMetadata->getOptionalArray('audience', []));
         $a->setValidAudiences($audience);
 
         $a->setNotBefore($now - 30);
@@ -1241,7 +1241,7 @@ class SAML2
 
             $spNameQualifier = $spMetadata->getOptionalString('SPNameQualifier', null);
             if ($spNameQualifier === null) {
-                $spNameQualifier = $spMetadata->getString('entityid');
+                $spNameQualifier = $spMetadata->getString('entityID');
             }
 
             $nameId = new NameID();
@@ -1324,7 +1324,7 @@ class SAML2
                 $key->loadKey($pemKey);
             } else {
                 throw new Error\ConfigurationError(
-                    'Missing encryption key for entity `' . $spMetadata->getString('entityid') . '`',
+                    'Missing encryption key for entity `' . $spMetadata->getString('entityID') . '`',
                     $spMetadata->getString('metadata-set') . '.php',
                     null
                 );
@@ -1397,7 +1397,7 @@ class SAML2
 
         $r = new Response();
         $issuer = new Issuer();
-        $issuer->setValue($idpMetadata->getString('entityid'));
+        $issuer->setValue($idpMetadata->getString('entityID'));
         $issuer->setFormat(Constants::NAMEID_ENTITY);
         $r->setIssuer($issuer);
         $r->setDestination($consumerURL);

src/SimpleSAML/Metadata/MetaDataStorageHandler.php

@@ -328,7 +328,7 @@ class MetaDataStorageHandler implements ClearableState
 
                 $metadata['metadata-index'] = $entityId;
                 $metadata['metadata-set'] = $set;
-                Assert::keyExists($metadata, 'entityid');
+                Assert::keyExists($metadata, 'entityID');
                 return $metadata;
             }
         }
@@ -377,12 +377,12 @@ class MetaDataStorageHandler implements ClearableState
             $result = array_merge($srcList, $result);
         }
         foreach ($result as $remote_provider) {
-            if (sha1($remote_provider['entityid']) == $sha1) {
+            if (sha1($remote_provider['entityID']) == $sha1) {
                 $remote_provider['metadata-set'] = $set;
 
                 return Configuration::loadFromArray(
                     $remote_provider,
-                    $set . '/' . var_export($remote_provider['entityid'], true)
+                    $set . '/' . var_export($remote_provider['entityID'], true)
                 );
             }
         }

src/SimpleSAML/Metadata/MetaDataStorageSource.php

@@ -159,7 +159,7 @@ abstract class MetaDataStorageSource
 
             if ($hostPath === $entry['host']) {
                 if ($type === 'entityid') {
-                    return $entry['entityid'];
+                    return $entry['entityID'];
                 } else {
                     return $index;
                 }
@@ -214,7 +214,7 @@ abstract class MetaDataStorageSource
             foreach ($cidrHints as $hint_entry) {
                 if ($netUtils->ipCIDRcheck($hint_entry, $ip)) {
                     if ($type === 'entityid') {
-                        return $entry['entityid'];
+                        return $entry['entityID'];
                     } else {
                         return $index;
                     }
@@ -314,7 +314,7 @@ abstract class MetaDataStorageSource
                 return $index;
             }
 
-            if ($entry['entityid'] === $entityId) {
+            if ($entry['entityID'] === $entityId) {
                 if ($entry['host'] === '__DEFAULT__' || $entry['host'] === $currentHost) {
                     return $index;
                 }

src/SimpleSAML/XHTML/Template.php

@@ -661,7 +661,7 @@ class Template extends Response
                 return $data['OrganizationName'][$language];
             }
         }
-        return $data['entityid'];
+        return $data['entityID'];
     }
 
     /**