Fix bug on parseRemoteXML and parseFileXML. Internal calls to parseXML missed the desiredNameIdFormat parameter

pitbulk · pitbulk · commit 157a8771ad99 · 2017-12-02T22:45:05.000+01:00
diff --git a/lib/Saml2/IdPMetadataParser.php b/lib/Saml2/IdPMetadataParser.php
@@ -35,7 +35,7 @@ public static function parseRemoteXML($url, $entityId = null, $desiredNameIdForm
 
             $xml = curl_exec($ch);
             if ($xml !== false) {
-                $metadataInfo = self::parseXML($xml, $entityId, $desiredSSOBinding, $desiredSLOBinding);
+                $metadataInfo = self::parseXML($xml, $entityId, $desiredNameIdFormat, $desiredSSOBinding, $desiredSLOBinding);
             } else {
                 throw new Exception(curl_error($ch), curl_errno($ch));
             }
@@ -65,7 +65,7 @@ public static function parseFileXML($filepath, $entityId = null, $desiredNameIdF
         try {
             if (file_exists($filepath)) {
                 $data = file_get_contents($filepath);
-                $metadataInfo = self::parseXML($data, $entityId, $desiredSSOBinding, $desiredSLOBinding);
+                $metadataInfo = self::parseXML($data, $entityId, $desiredNameIdFormat, $desiredSSOBinding, $desiredSLOBinding);
             }
         } catch (Exception $e) {
         }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public static function parseRemoteXML($url, $entityId = null, $desiredNameIdForm`
`35`	`35`
`36`	`36`	`$xml = curl_exec($ch);`
`37`	`37`	`if ($xml !== false) {`
`38`		`- $metadataInfo = self::parseXML($xml, $entityId, $desiredSSOBinding, $desiredSLOBinding);`
	`38`	`+ $metadataInfo = self::parseXML($xml, $entityId, $desiredNameIdFormat, $desiredSSOBinding, $desiredSLOBinding);`
`39`	`39`	`} else {`
`40`	`40`	`throw new Exception(curl_error($ch), curl_errno($ch));`
`41`	`41`	`}`
`@@ -65,7 +65,7 @@ public static function parseFileXML($filepath, $entityId = null, $desiredNameIdF`
`65`	`65`	`try {`
`66`	`66`	`if (file_exists($filepath)) {`
`67`	`67`	`$data = file_get_contents($filepath);`
`68`		`- $metadataInfo = self::parseXML($data, $entityId, $desiredSSOBinding, $desiredSLOBinding);`
	`68`	`+ $metadataInfo = self::parseXML($data, $entityId, $desiredNameIdFormat, $desiredSSOBinding, $desiredSLOBinding);`
`69`	`69`	`}`
`70`	`70`	`} catch (Exception $e) {`
`71`	`71`	`}`