improve reference URI verification and signature validation test

Author: shunkica

test/signature-object-tests.spec.ts

@@ -367,7 +367,7 @@ describe("Valid signatures with ds:Object elements", function () {
     expect(valid, errorMessage).to.be.true;
   });
 
-  it("should generate Id attribute for ds:Object when not provided", function () {
+  it("should create valid signature and generate Id attribute for ds:Object when not provided", function () {
     const xml = "<root></root>";
     const sig = new SignedXml({
       privateKey,
@@ -393,14 +393,20 @@ describe("Valid signatures with ds:Object elements", function () {
     const signedXml = sig.getSignedXml();
     const doc = new xmldom.DOMParser().parseFromString(signedXml);
 
-    // Verify that Data element got an Id
+    // Find the ds:Object/Data element and get the value of its Id attribute (ensuring it was generated)
     const dataEl = select1Ns("/root/ds:Signature/ds:Object/Data[@Id]", doc);
     isDomNode.assertIsElementNode(dataEl);
+    const idValue = dataEl.getAttribute("Id");
+    expect(idValue).to.be.a("string").that.is.not.empty;
 
-    // Verify Reference URI points to the generated Id
-    const refEl = select1Ns("/root/ds:Signature/ds:SignedInfo/ds:Reference", doc);
+    // Verify that there is a Reference pointing to the generated Id
+    const uri = `#${idValue}`;
+    const refEl = select1Ns(`/root/ds:Signature/ds:SignedInfo/ds:Reference[@URI='${uri}']`, doc);
     isDomNode.assertIsElementNode(refEl);
-    expect(refEl.getAttribute("URI")).to.match(/^#_\d+$/);
+
+    // Verify that the signature is valid
+    const { valid, errorMessage } = checkSignature(signedXml, doc);
+    expect(valid, errorMessage).to.be.true;
   });
 });
 
@@ -466,8 +472,18 @@ describe("Should successfuly sign references to ds:KeyInfo elements", function (
 
     const doc = new xmldom.DOMParser().parseFromString(signedXml);
 
-    // Verify that there is a Reference to KeyInfo
-    const referenceEl = select1Ns("/root/ds:Signature/ds:SignedInfo/ds:Reference[@URI='#_0']", doc);
+    // Find the KeyInfo element and get the value of its Id attribute (ensuring it was generated)
+    const keyInfoEl = select1Ns("/root/ds:Signature/ds:KeyInfo[@Id]", doc);
+    isDomNode.assertIsElementNode(keyInfoEl);
+    const idValue = keyInfoEl.getAttribute("Id");
+    expect(idValue).to.be.a("string").that.is.not.empty;
+
+    // Find a Reference with URI=`#${idValue}`
+    const uri = `#${idValue}`;
+    const referenceEl = select1Ns(
+      `/root/ds:Signature/ds:SignedInfo/ds:Reference[@URI='${uri}']`,
+      doc,
+    );
     isDomNode.assertIsElementNode(referenceEl);
 
     // Verify that the signature is valid