Use xml/xpath.dart instead of xpath_selector.

Also, update the tests to reflect the changes in the API and fix some
issues with the test assertions.
Thankfully, namespace-uri is now supported in xpath, so we can remove
some of the workarounds we had to do before.

Author: scribetw

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 5.0.0
+
+* Upgrade dependencies (Now Dart >= 3.11 is needed)
+* Use `xml/xpath.dart` instead of `xpath_selector`
+
 ## 4.0.0
 
 * Upgrade dependencies (Now Dart >= 3.8 is needed)

lib/src/enveloped_signature.dart

@@ -3,7 +3,6 @@
 // Author: rudyhuang
 
 import 'package:xml/xml.dart';
-import 'package:xpath_selector_xml_parser/xpath_selector_xml_parser.dart';
 
 import 'signed_xml.dart';
 import 'utils.dart';
@@ -17,31 +16,31 @@ class EnvelopedSignature implements CanonicalizationAlgorithm<XmlNode> {
   XmlNode process(XmlNode node, [Map<String, dynamic> options = const {}]) {
     final signatureNode = options['signatureNode'];
     if (signatureNode == null) {
-      // leave this for the moment...
-      final signature = XmlXPath.node(node).query(
-          './*[local-name()="Signature""]'); // FIXME: namespace-uri() not supported
-      // .query('./*[local-name()="Signature" and namespace-uri()="http://www.w3.org/2000/09/xmldsig#"]');
-      final signatureNode = signature.node;
-      if (signatureNode != null) {
-        final child = signatureNode.node;
-        child.parent?.children.remove(child);
+      final signatures = findChilds(node, 'Signature', xmlDsigNamespace);
+      if (signatures.isNotEmpty) {
+        final signature = signatures.first;
+        signature.parent?.children.remove(signature);
       }
       return node;
     }
 
     assert(signatureNode is XmlElement);
-    final expectedSignatureValue = findFirst(signatureNode as XmlElement,
-            ".//*[local-name()='SignatureValue']/text()")
-        .innerText;
-    final signatures = XmlXPath.node(node).query(
-        './/*[local-name()="Signature"]'); // FIXME: namespace-uri() not supported
-    // .query('.//*[local-name()="Signature" and namespace-uri()="http://www.w3.org/2000/09/xmldsig#"]');
-    for (final sig in signatures.nodes) {
-      final child = sig.node;
-      assert(child is XmlElement);
-      final signatureValue = findFirst(
-              child as XmlElement, ".//*[local-name()='SignatureValue']/text()")
-          .innerText;
+    final expectedSignatureValue = findChilds(
+      signatureNode as XmlElement,
+      'SignatureValue',
+      xmlDsigNamespace,
+    ).first.innerText;
+    final signatures = node.descendants.whereType<XmlElement>().where(
+      (element) =>
+          element.name.local == 'Signature' &&
+          element.name.namespaceUri == xmlDsigNamespace,
+    );
+    for (final child in signatures) {
+      final signatureValue = findChilds(
+        child,
+        'SignatureValue',
+        xmlDsigNamespace,
+      ).first.innerText;
       if (expectedSignatureValue == signatureValue) {
         child.parent?.children.remove(child);
       }

lib/src/exclusive_canonicalization.dart

@@ -2,7 +2,7 @@
 //History: Wed Feb 09 16:08:31 CST 2022
 // Author: rudyhuang
 
-import 'package:xml/xml.dart';
+import 'package:xml/xml.dart' hide XmlNamespace;
 
 import 'c14n_canonicalization.dart';
 import 'utils.dart';
@@ -27,11 +27,12 @@ class ExclusiveCanonicalization extends C14nCanonicalization {
   }
 
   RenderNsResult _renderNs(
-      XmlElement node,
-      List<XmlNamespace> prefixesInScope,
-      String defaultNs,
-      Map<String, String> defaultNsForPrefix,
-      List<String> inclusiveNamespacesPrefixList) {
+    XmlElement node,
+    List<XmlNamespace> prefixesInScope,
+    String defaultNs,
+    Map<String, String> defaultNsForPrefix,
+    List<String> inclusiveNamespacesPrefixList,
+  ) {
     final res = <String>[];
     var newDefaultNs = defaultNs;
     final currNs = node.name.namespaceUri ?? '';
@@ -89,11 +90,12 @@ class ExclusiveCanonicalization extends C14nCanonicalization {
   }
 
   String _processInner(
-      XmlNode node,
-      List<XmlNamespace> prefixesInScope,
-      String defaultNs,
-      Map<String, String> defaultNsForPrefix,
-      List<String> inclusiveNamespacesPrefixList) {
+    XmlNode node,
+    List<XmlNamespace> prefixesInScope,
+    String defaultNs,
+    Map<String, String> defaultNsForPrefix,
+    List<String> inclusiveNamespacesPrefixList,
+  ) {
     if (node.nodeType == XmlNodeType.COMMENT) {
       return renderComment(node);
     }
@@ -111,7 +113,7 @@ class ExclusiveCanonicalization extends C14nCanonicalization {
             tagName,
             ns.rendered,
             renderAttrs(node, ns.newDefaultNs),
-            '>'
+            '>',
           ];
 
       for (final child in node.children) {
@@ -164,8 +166,11 @@ class ExclusiveCanonicalization extends C14nCanonicalization {
       for (String prefix in prefixList) {
         for (final ancestorNamespace in ancestorNamespaces) {
           if (prefix == ancestorNamespace.prefix) {
-            node.setAttribute('xmlns:$prefix', ancestorNamespace.namespaceURI,
-                namespace: 'http://www.w3.org/2000/xmlns/');
+            node.setAttribute(
+              'xmlns:$prefix',
+              ancestorNamespace.namespaceURI,
+              namespaceUri: 'http://www.w3.org/2000/xmlns/',
+            );
           }
         }
       }