Upgrade xml-ws libraries

Author: tvdijen

src/Controller/Adfs.php

@@ -15,7 +15,7 @@
 use SimpleSAML\Module\adfs\IdP\PassiveIdP;
 use SimpleSAML\Module\adfs\MetadataExchange;
 use SimpleSAML\Session;
-use SimpleSAML\SOAP\XML\env_200305\Envelope;
+use SimpleSAML\SOAP12\XML\Envelope;
 use SimpleSAML\Utils;
 use SimpleSAML\XML\DOMDocumentFactory;
 use Symfony\Component\HttpFoundation\Request;

src/IdP/ADFS.php

@@ -29,36 +29,36 @@
 use SimpleSAML\SAML11\XML\saml\Subject;
 use SimpleSAML\SAML11\XML\saml\SubjectConfirmation;
 use SimpleSAML\SAML2\Constants as SAML2_C;
-use SimpleSAML\SOAP\Constants as SOAP_C;
-use SimpleSAML\SOAP\XML\env_200305\Body;
-use SimpleSAML\SOAP\XML\env_200305\Envelope;
-use SimpleSAML\SOAP\XML\env_200305\Header;
+use SimpleSAML\SOAP12\Constants as SOAP_C;
+use SimpleSAML\SOAP12\XML\Body;
+use SimpleSAML\SOAP12\XML\Envelope;
+use SimpleSAML\SOAP12\XML\Header;
 use SimpleSAML\Utils;
-use SimpleSAML\WSSecurity\XML\wsa_200508\Action;
-use SimpleSAML\WSSecurity\XML\wsa_200508\Address;
-use SimpleSAML\WSSecurity\XML\wsa_200508\EndpointReference;
-use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID;
-use SimpleSAML\WSSecurity\XML\wsa_200508\RelatesTo;
-use SimpleSAML\WSSecurity\XML\wsa_200508\To;
-use SimpleSAML\WSSecurity\XML\wsp\AppliesTo;
-use SimpleSAML\WSSecurity\XML\wsse\KeyIdentifier;
-use SimpleSAML\WSSecurity\XML\wsse\Password;
-use SimpleSAML\WSSecurity\XML\wsse\Security;
-use SimpleSAML\WSSecurity\XML\wsse\SecurityTokenReference;
-use SimpleSAML\WSSecurity\XML\wsse\UsernameToken;
-use SimpleSAML\WSSecurity\XML\wst_200502\KeyType;
-use SimpleSAML\WSSecurity\XML\wst_200502\Lifetime;
-use SimpleSAML\WSSecurity\XML\wst_200502\RequestedAttachedReference;
-use SimpleSAML\WSSecurity\XML\wst_200502\RequestedSecurityToken;
-use SimpleSAML\WSSecurity\XML\wst_200502\RequestedUnattachedReference;
-use SimpleSAML\WSSecurity\XML\wst_200502\RequestSecurityToken;
-use SimpleSAML\WSSecurity\XML\wst_200502\RequestSecurityTokenResponse;
-use SimpleSAML\WSSecurity\XML\wst_200502\RequestType;
-use SimpleSAML\WSSecurity\XML\wst_200502\RequestTypeEnum;
-use SimpleSAML\WSSecurity\XML\wst_200502\TokenType;
-use SimpleSAML\WSSecurity\XML\wsu\Created;
-use SimpleSAML\WSSecurity\XML\wsu\Expires;
-use SimpleSAML\WSSecurity\XML\wsu\Timestamp;
+use SimpleSAML\WebServices\Addressing\XML\wsa_200508\Action;
+use SimpleSAML\WebServices\Addressing\XML\wsa_200508\Address;
+use SimpleSAML\WebServices\Addressing\XML\wsa_200508\EndpointReference;
+use SimpleSAML\WebServices\Addressing\XML\wsa_200508\MessageID;
+use SimpleSAML\WebServices\Addressing\XML\wsa_200508\RelatesTo;
+use SimpleSAML\WebServices\Addressing\XML\wsa_200508\To;
+use SimpleSAML\WebServices\Policy\XML\wsp_200409\AppliesTo;
+use SimpleSAML\WebServices\Security\XML\wsse\KeyIdentifier;
+use SimpleSAML\WebServices\Security\XML\wsse\Password;
+use SimpleSAML\WebServices\Security\XML\wsse\Security;
+use SimpleSAML\WebServices\Security\XML\wsse\SecurityTokenReference;
+use SimpleSAML\WebServices\Security\XML\wsse\UsernameToken;
+use SimpleSAML\WebServices\Security\XML\wsu\Created;
+use SimpleSAML\WebServices\Security\XML\wsu\Expires;
+use SimpleSAML\WebServices\Security\XML\wsu\Timestamp;
+use SimpleSAML\WebServices\Trust\XML\wst_200502\KeyType;
+use SimpleSAML\WebServices\Trust\XML\wst_200502\Lifetime;
+use SimpleSAML\WebServices\Trust\XML\wst_200502\RequestedAttachedReference;
+use SimpleSAML\WebServices\Trust\XML\wst_200502\RequestedSecurityToken;
+use SimpleSAML\WebServices\Trust\XML\wst_200502\RequestedUnattachedReference;
+use SimpleSAML\WebServices\Trust\XML\wst_200502\RequestSecurityToken;
+use SimpleSAML\WebServices\Trust\XML\wst_200502\RequestSecurityTokenResponse;
+use SimpleSAML\WebServices\Trust\XML\wst_200502\RequestType;
+use SimpleSAML\WebServices\Trust\XML\wst_200502\RequestTypeEnum;
+use SimpleSAML\WebServices\Trust\XML\wst_200502\TokenType;
 use SimpleSAML\XHTML\Template;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmFactory;

src/IdP/MetadataBuilder.php

@@ -11,6 +11,7 @@
 use SimpleSAML\Configuration;
 use SimpleSAML\Logger;
 use SimpleSAML\Module;
+use SimpleSAML\SAML2\Constants as C_SAML2;
 use SimpleSAML\SAML2\Exception\ArrayValidationException;
 use SimpleSAML\SAML2\XML\md\AbstractMetadataDocument;
 use SimpleSAML\SAML2\XML\md\ContactPerson;
@@ -26,15 +27,17 @@
 use SimpleSAML\SAML2\XML\saml\AttributeValue;
 use SimpleSAML\SAML2\XML\shibmd\Scope;
 use SimpleSAML\Utils;
-use SimpleSAML\WSSecurity\Constants as C;
-use SimpleSAML\WSSecurity\XML\fed\PassiveRequestorEndpoint;
-use SimpleSAML\WSSecurity\XML\fed\SecurityTokenServiceEndpoint;
-use SimpleSAML\WSSecurity\XML\fed\SecurityTokenServiceType;
-use SimpleSAML\WSSecurity\XML\fed\TokenType;
-use SimpleSAML\WSSecurity\XML\fed\TokenTypesOffered;
-use SimpleSAML\WSSecurity\XML\wsa_200508\Address;
-use SimpleSAML\WSSecurity\XML\wsa_200508\EndpointReference;
+use SimpleSAML\WebServices\Addressing\XML\wsa_200508\Address;
+use SimpleSAML\WebServices\Addressing\XML\wsa_200508\EndpointReference;
+use SimpleSAML\WebServices\Federation\Constants as C_FED;
+use SimpleSAML\WebServices\Federation\XML\fed\PassiveRequestorEndpoint;
+use SimpleSAML\WebServices\Federation\XML\fed\SecurityTokenServiceEndpoint;
+use SimpleSAML\WebServices\Federation\XML\fed\SecurityTokenServiceType;
+use SimpleSAML\WebServices\Federation\XML\fed\TokenType;
+use SimpleSAML\WebServices\Federation\XML\fed\TokenTypesOffered;
+use SimpleSAML\WebServices\Trust\Constants as C_TRUST;
 use SimpleSAML\XML\Chunk;
+use SimpleSAML\XMLSecurity\Constants as C_XMLSEC;
 use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmFactory;
 use SimpleSAML\XMLSecurity\Key\PrivateKey;
 use SimpleSAML\XMLSecurity\XML\ds\KeyInfo;
@@ -110,7 +113,7 @@ protected function signDocument(AbstractMetadataDocument $document): AbstractMet
         /** @var array<mixed> $keyArray */
         $keyArray = $cryptoUtils->loadPrivateKey($this->config, true, 'metadata.sign.');
         $certArray = $cryptoUtils->loadPublicKey($this->config, false, 'metadata.sign.');
-        $algo = $this->config->getOptionalString('metadata.sign.algorithm', C::SIG_RSA_SHA256);
+        $algo = $this->config->getOptionalString('metadata.sign.algorithm', C_XMLSEC::SIG_RSA_SHA256);
 
         $key = PrivateKey::fromFile($keyArray['PEM'], $keyArray['password'] ?? '');
         $signer = (new SignatureAlgorithmFactory())->getAlgorithm($algo, $key);
@@ -124,7 +127,7 @@ protected function signDocument(AbstractMetadataDocument $document): AbstractMet
             ]);
         }
 
-        $document->sign($signer, C::C14N_EXCLUSIVE_WITHOUT_COMMENTS, $keyInfo);
+        $document->sign($signer, C_XMLSEC::C14N_EXCLUSIVE_WITHOUT_COMMENTS, $keyInfo);
         return $document;
     }
 
@@ -197,7 +200,7 @@ public function getSecurityTokenService(): SecurityTokenServiceType
         $defaultEndpoint = Module::getModuleURL('adfs') . '/idp/prp.php';
 
         return new SecurityTokenServiceType(
-            protocolSupportEnumeration: [C::NS_TRUST_200512, C::NS_TRUST_200502, C::NS_FED],
+            protocolSupportEnumeration: [C_TRUST::NS_TRUST_200512, C_TRUST::NS_TRUST_200502, C_FED::NS_FED],
             keyDescriptors: $this->getKeyDescriptor(),
             tokenTypesOffered: new TokenTypesOffered([new TokenType('urn:oasis:names:tc:SAML:1.0:assertion')]),
             securityTokenServiceEndpoint: [
@@ -299,13 +302,13 @@ private function getExtensions(): ?Extensions
                 if (preg_match('/^\{(.*?)\}(.*)$/', $attributeName, $matches)) {
                     $attr[] = new Attribute(
                         name: $matches[2],
-                        nameFormat: $matches[1] === C::NAMEFORMAT_UNSPECIFIED ? null : $matches[1],
+                        nameFormat: $matches[1] === C_SAML2::NAMEFORMAT_UNSPECIFIED ? null : $matches[1],
                         attributeValue: $attrValues,
                     );
                 } else {
                     $attr[] = new Attribute(
                         name: $attributeName,
-                        nameFormat: C::NAMEFORMAT_UNSPECIFIED,
+                        nameFormat: C_SAML2::NAMEFORMAT_UNSPECIFIED,
                         attributeValue: $attrValues,
                     );
                 }

src/MetadataExchange.php

@@ -23,14 +23,14 @@
 use SimpleSAML\WSDL\XML\wsdl\PortType;
 use SimpleSAML\WSDL\XML\wsdl\PortTypeOperation;
 use SimpleSAML\WSDL\XML\wsdl\Service;
-use SimpleSAML\WSSecurity\Constants as C;
-use SimpleSAML\WSSecurity\XML\wsa_200508\Address;
-use SimpleSAML\WSSecurity\XML\wsa_200508\EndpointReference;
-use SimpleSAML\WSSecurity\XML\wsp\PolicyReference;
-use SimpleSAML\WSSecurity\XML\wst_200502\RequestSecurityToken as RequestSecurityToken2005;
-use SimpleSAML\WSSecurity\XML\wst_200502\RequestSecurityTokenResponse as RequestSecurityTokenResponse2005;
-//use SimpleSAML\WSSecurity\XML\wst_200512\RequestSecurityToken as RequestSecurityToken13;
-//use SimpleSAML\WSSecurity\XML\wst_200512\RequestSecurityTokenResponseCollection as \
+use SimpleSAML\WebServices\Addressing\Constants as C;
+use SimpleSAML\WebServices\Addressing\XML\wsa_200508\Address;
+use SimpleSAML\WebServices\Addressing\XML\wsa_200508\EndpointReference;
+use SimpleSAML\WebServices\Addressing\XML\wsp_200409\PolicyReference;
+use SimpleSAML\WebServices\Trust\XML\wst_200502\RequestSecurityToken as RequestSecurityToken2005;
+use SimpleSAML\WebServices\Trust\XML\wst_200502\RequestSecurityTokenResponse as RequestSecurityTokenResponse2005;
+//use SimpleSAML\WebServices\Trust\XML\wst_200512\RequestSecurityToken as RequestSecurityToken13;
+//use SimpleSAML\WebServices\Trust\XML\wst_200512\RequestSecurityTokenResponseCollection as \
 //RequestSecurityTokenResponseCollection13;
 use SimpleSAML\XML\Attribute as XMLAttribute;