Offload wsse/wsu elements to new xml-wss-core library

Author: tvdijen

classes/element.registry.php

@@ -304,18 +304,6 @@
         'PolicyAttachment' => '\SimpleSAML\WSSecurity\XML\wsp\PolicyAttachment',
         'PolicyReference' => '\SimpleSAML\WSSecurity\XML\wsp\PolicyReference',
     ],
-    'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd' => [
-        'BinarySecurityToken' => '\SimpleSAML\WSSecurity\XML\wsse\BinarySecurityToken',
-        'Embedded' => '\SimpleSAML\WSSecurity\XML\wsse\Embedded',
-        'KeyIdentifier' => '\SimpleSAML\WSSecurity\XML\wsse\KeyIdentifier',
-        'Nonce' => '\SimpleSAML\WSSecurity\XML\wsse\Nonce',
-        'Password' => '\SimpleSAML\WSSecurity\XML\wsse\Password',
-        'Reference' => '\SimpleSAML\WSSecurity\XML\wsse\Reference',
-        'Security' => '\SimpleSAML\WSSecurity\XML\wsse\Security',
-        'SecurityTokenReference' => '\SimpleSAML\WSSecurity\XML\wsse\SecurityTokenReference',
-        'TransformationParameters' => '\SimpleSAML\WSSecurity\XML\wsse\TransformationParameters',
-        'UsernameToken' => '\SimpleSAML\WSSecurity\XML\wsse\UsernameToken',
-    ],
     'http://schemas.xmlsoap.org/ws/2005/02/trust' => [
         'AllowPostdating' => '\SimpleSAML\WSSecurity\XML\wst_200502\AllowPostdating',
         'AuthenticationType' => '\SimpleSAML\WSSecurity\XML\wst_200502\AuthenticationType',
@@ -417,11 +405,6 @@
         'UseKey' => '\SimpleSAML\WSSecurity\XML\wst_200512\UseKey',
         'ValidateTarget' => '\SimpleSAML\WSSecurity\XML\wst_200512\ValidateTarget',
     ],
-    'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd' => [
-        'Created' => '\SimpleSAML\WSSecurity\XML\wsu\Created',
-        'Expires' => '\SimpleSAML\WSSecurity\XML\wsu\Expires',
-        'Timestamp' => '\SimpleSAML\WSSecurity\XML\wsu\Timestamp',
-    ],
     'http://schemas.xmlsoap.org/ws/2004/09/mex' => [
         'Dialect' => '\SimpleSAML\WSSecurity\XML\wsx\Dialect',
         'GetMetadata' => '\SimpleSAML\WSSecurity\XML\wsx\GetMetadata',

composer.json

@@ -19,7 +19,8 @@
         "simplesamlphp/xml-common": "~2.4",
         "simplesamlphp/xml-security": "~2.0",
         "simplesamlphp/xml-soap": "~2.0",
-        "simplesamlphp/xml-ws-addressing": "~1.0"
+        "simplesamlphp/xml-ws-addressing": "~1.0",
+        "simplesamlphp/xml-wss-core": "~1.0"
     },
     "require-dev": {
         "simplesamlphp/simplesamlphp-test-framework": "~1.10"

src/Assert/Assert.php

@@ -8,12 +8,7 @@
 
 /**
  * @package simplesamlphp/ws-security
- *
- * @method static void validWSUDateTime(mixed $value, string $message = '', string $exception = '')
- * @method static void allWSUDateTime(mixed $value, string $message = '', string $exception = '')
- * @method static void nullOrValueWSUDateTime(mixed $value, string $message = '', string $exception = '')
  */
 class Assert extends BaseAssert
 {
-    use WSUDateTimeTrait;
 }

src/Assert/WSUDateTimeTrait.php

@@ -35,8 +35,6 @@ public static function getXPath(DOMNode $node, bool $autoregister = false): DOMX
         $xp->registerNamespace('policy', C::NS_POLICY);
         $xp->registerNamespace('sp11', C::NS_SEC_POLICY_11);
         $xp->registerNamespace('sp12', C::NS_SEC_POLICY_12);
-        $xp->registerNamespace('wsse', C::NS_SEC_EXT);
-        $xp->registerNamespace('wsu', C::NS_SEC_UTIL);
 
         return $xp;
     }

src/Utils/XPath.php

@@ -5,9 +5,9 @@
 namespace SimpleSAML\WSSecurity\XML\wsp;
 
 use DOMElement;
+use SimpleSAML\WebServices\Security\Type\IDValue;
 use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
-use SimpleSAML\WSSecurity\XML\wsu\Type\IDValue;
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\SchemaValidatableElementInterface;
@@ -40,7 +40,7 @@ final class Policy extends AbstractOperatorContentType implements SchemaValidata
      *         \SimpleSAML\WSSecurity\XML\wsp\PolicyReference)[] $operatorContent
      * @param \SimpleSAML\XML\SerializableElementInterface[] $children
      * @param \SimpleSAML\XMLSchema\Type\AnyURIValue|null $Name
-     * @param \SimpleSAML\WSSecurity\XML\wsu\Type\IDValue|null $Id
+     * @param \SimpleSAML\WebServices\Security\Type\IDValue|null $Id
      * @param \SimpleSAML\XML\Attribute[] $namespacedAttributes
      */
     public function __construct(
@@ -57,7 +57,7 @@ public function __construct(
 
 
     /**
-     * @return \SimpleSAML\WSSecurity\XML\wsu\Type\IDValue|null
+     * @return \SimpleSAML\WebServices\Security\Type\IDValue|null
      */
     public function getId(): ?IDValue
     {