Use SOAP XPath from lib

tvdijen · tvdijen · commit 50057abebe87 · 2023-05-06T18:57:22.000+02:00
diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
         "psr/log": "^2.0 || ^3.0",
         "simplesamlphp/xml-common": "^1.7.0",
         "simplesamlphp/xml-security": "^1.6.0",
-        "simplesamlphp/xml-soap": "^1.0.2",
+        "simplesamlphp/xml-soap": "^1.1.0",
         "simplesamlphp/assert": "^1.0.3"
     },
     "require-dev": {
diff --git a/src/SAML2/SOAP.php b/src/SAML2/SOAP.php
@@ -11,7 +11,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use SimpleSAML\SAML2\Exception\Protocol\UnsupportedBindingException;
 use SimpleSAML\SAML2\Utils;
-use SimpleSAML\SAML2\Utils\XPath;
+use SimpleSAML\SOAP11\Utils\XPath;
 use SimpleSAML\SAML2\XML\ecp\Response as ECPResponse;
 use SimpleSAML\SAML2\XML\ecp\RequestAuthenticated;
 use SimpleSAML\SAML2\XML\samlp\AbstractMessage;
@@ -103,7 +103,7 @@ public function receive(/** @scrutinizer ignore-unused */ServerRequestInterface
 
         $xpCache = XPath::getXPath($document->documentElement);
         /** @var \DOMElement[] $results */
-        $results = XPath::xpQuery($xml, '/soap-env:Envelope/soap-env:Body/*[1]', $xpCache);
+        $results = XPath::xpQuery($xml, '/env:Envelope/env:Body/*[1]', $xpCache);
 
         return MessageFactory::fromXML($results[0]);
     }
diff --git a/src/SAML2/SOAPClient.php b/src/SAML2/SOAPClient.php
@@ -10,9 +10,9 @@
 use SimpleSAML\SAML2\Compat\ContainerSingleton;
 use SimpleSAML\SAML2\Exception\InvalidArgumentException;
 use SimpleSAML\SAML2\Exception\RuntimeException;
-use SimpleSAML\SAML2\Utils\XPath;
 use SimpleSAML\SAML2\XML\samlp\AbstractMessage;
 use SimpleSAML\SAML2\XML\samlp\MessageFactory;
+use SimpleSAML\SOAP11\Utils\XPath;
 use SimpleSAML\SOAP11\XML\env\Body;
 use SimpleSAML\SOAP11\XML\env\Envelope;
 use SimpleSAML\SOAP11\XML\env\Fault;
@@ -263,7 +263,7 @@ private function getSOAPFault(DOMDocument $soapMessage): ?Fault
         /** @psalm-suppress PossiblyNullArgument */
         $soapFault = XPath::xpQuery(
             $soapMessage->firstChild,
-            '/soap-env:Envelope/soap-env:Body/soap-env:Fault',
+            '/env:Envelope/env:Body/env:Fault',
             XPath::getXPath($soapMessage->firstChild),
         );
 
diff --git a/src/SAML2/Utils/XPath.php b/src/SAML2/Utils/XPath.php
@@ -26,7 +26,6 @@ class XPath extends \SimpleSAML\XMLSecurity\Utils\XPath
     public static function getXPath(DOMNode $node): DOMXPath
     {
         $xp = parent::getXPath($node);
-        $xp->registerNamespace('soap-env', C::NS_SOAP);
         $xp->registerNamespace('saml_protocol', C::NS_SAMLP);
         $xp->registerNamespace('saml_assertion', C::NS_SAML);
         $xp->registerNamespace('saml_metadata', C::NS_MD);

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ class XPath extends \SimpleSAML\XMLSecurity\Utils\XPath`
`26`	`26`	`public static function getXPath(DOMNode $node): DOMXPath`
`27`	`27`	`{`
`28`	`28`	`$xp = parent::getXPath($node);`
`29`		`- $xp->registerNamespace('soap-env', C::NS_SOAP);`
`30`	`29`	`$xp->registerNamespace('saml_protocol', C::NS_SAMLP);`
`31`	`30`	`$xp->registerNamespace('saml_assertion', C::NS_SAML);`
`32`	`31`	`$xp->registerNamespace('saml_metadata', C::NS_MD);`