Fixed bug with Idp initiatied entityid

catalyst · Mar 11, 2020 · ca34393 · ca34393 · danmarsden · Mar 18, 2020
1 parent 262ab0a
commit ca34393
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/extlib/simplesamlphp/modules/saml/lib/Auth/Source/SP.php b/extlib/simplesamlphp/modules/saml/lib/Auth/Source/SP.php
@@ -274,13 +274,10 @@ public function getIdPMetadata($entityId)
         global $saml2auth;
         if ($this->idp !== null && $this->idp !== $entityId) {
             foreach ($saml2auth->metadataentities as $metadataurl => $idpentities) {
-                if ($metadataurl == $entityId) {
-                    foreach ($idpentities as $key => $val) {
-                        if ($key == $this->idp) {
-                            $this->idp = null;
-                        }
+                foreach ($idpentities as $key => $val) {
+                    if ($entityId == $val->entityid) {
+                        $this->idp = null;
                         break 2;
-
                     }
                 }
             }

diff --git a/version.php b/version.php
@@ -24,8 +24,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2020030600;    // The current plugin version (Date: YYYYMMDDXX).
-$plugin->release   = 2020030600;    // Match release exactly to version.
+$plugin->version   = 2020031100;    // The current plugin version (Date: YYYYMMDDXX).
+$plugin->release   = 2020031100;    // Match release exactly to version.
 $plugin->requires  = 2017051509;    // Requires PHP 7, 2017051509 = T12. M3.3
                                     // Strictly we require either Moodle 3.5 OR
                                     // we require Totara 3.3, but the version number