Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use stricter typing in tests #366

Merged
merged 1 commit into from
Jul 27, 2023
+165 −141
Merged

Use stricter typing in tests #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions test/c14n-non-exclusive-unit-tests.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,17 @@ import * as utils from "../src/utils";

const test_C14nCanonicalization = function (xml, xpathArg, expected) {
const doc = new xmldom.DOMParser().parseFromString(xml);
const elem = xpath.select1(xpathArg, doc);
const node = xpath.select1(xpathArg, doc);
const can = new C14nCanonicalization();
const result = can
// @ts-expect-error FIXME
.process(elem, {
ancestorNamespaces: utils.findAncestorNs(doc, xpathArg),
})
.toString();
let result = "";

if (xpath.isNodeLike(node)) {
result = can
.process(node, {
ancestorNamespaces: utils.findAncestorNs(doc, xpathArg),
})
.toString();
}

expect(result).to.equal(expected);
};
Expand Down
51 changes: 30 additions & 21 deletions test/hmac-tests.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,17 @@ describe("HMAC tests", function () {
"/*/*[local-name(.)='Signature' and namespace-uri(.)='http://www.w3.org/2000/09/xmldsig#']",
doc,
);
const sig = new SignedXml();
sig.enableHMAC();
sig.publicCert = fs.readFileSync("./test/static/hmac.key");
// @ts-expect-error FIXME
sig.loadSignature(signature);
const result = sig.checkSignature(xml);
if (xpath.isNodeLike(signature)) {
const sig = new SignedXml();
sig.enableHMAC();
sig.publicCert = fs.readFileSync("./test/static/hmac.key");
sig.loadSignature(signature);
const result = sig.checkSignature(xml);

expect(result).to.be.true;
expect(result).to.be.true;
} else {
expect(xpath.isNodeLike(signature)).to.be.true;
}
});

it("test HMAC signature with incorrect key", function () {
Expand All @@ -29,14 +32,17 @@ describe("HMAC tests", function () {
"/*/*[local-name(.)='Signature' and namespace-uri(.)='http://www.w3.org/2000/09/xmldsig#']",
doc,
);
const sig = new SignedXml();
sig.enableHMAC();
sig.publicCert = fs.readFileSync("./test/static/hmac-foobar.key");
// @ts-expect-error FIXME
sig.loadSignature(signature);
const result = sig.checkSignature(xml);
if (xpath.isNodeLike(signature)) {
const sig = new SignedXml();
sig.enableHMAC();
sig.publicCert = fs.readFileSync("./test/static/hmac-foobar.key");
sig.loadSignature(signature);
const result = sig.checkSignature(xml);

expect(result).to.be.false;
expect(result).to.be.false;
} else {
expect(xpath.isNodeLike(signature)).to.be.true;
}
});

it("test create and validate HMAC signature", function () {
Expand All @@ -53,13 +59,16 @@ describe("HMAC tests", function () {
"/*/*[local-name(.)='Signature' and namespace-uri(.)='http://www.w3.org/2000/09/xmldsig#']",
doc,
);
const verify = new SignedXml();
verify.enableHMAC();
verify.publicCert = fs.readFileSync("./test/static/hmac.key");
// @ts-expect-error FIXME
verify.loadSignature(signature);
const result = verify.checkSignature(sig.getSignedXml());
if (xpath.isNodeLike(signature)) {
const verify = new SignedXml();
verify.enableHMAC();
verify.publicCert = fs.readFileSync("./test/static/hmac.key");
verify.loadSignature(signature);
const result = verify.checkSignature(sig.getSignedXml());

expect(result).to.be.true;
expect(result).to.be.true;
} else {
expect(xpath.isNodeLike(signature)).to.be.true;
}
});
});
117 changes: 69 additions & 48 deletions test/saml-response-tests.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,36 +12,45 @@ describe("SAML response tests", function () {
"/*/*[local-name(.)='Signature' and namespace-uri(.)='http://www.w3.org/2000/09/xmldsig#']",
doc,
);
const sig = new SignedXml();
sig.publicCert = fs.readFileSync("./test/static/feide_public.pem");
// @ts-expect-error FIXME
sig.loadSignature(signature);
const result = sig.checkSignature(xml);
if (xpath.isNodeLike(signature)) {
const sig = new SignedXml();
sig.publicCert = fs.readFileSync("./test/static/feide_public.pem");
sig.loadSignature(signature);
const result = sig.checkSignature(xml);

expect(result).to.be.true;
expect(result).to.be.true;
} else {
expect(xpath.isNodeLike(signature)).to.be.true;
}
});

it("test validating wrapped assertion signature", function () {
const xml = fs.readFileSync("./test/static/valid_saml_signature_wrapping.xml", "utf-8");
const doc = new xmldom.DOMParser().parseFromString(xml);
const assertion = xpath.select1("//*[local-name(.)='Assertion']", doc);
const signature = xpath.select1(
"//*[local-name(.)='Signature' and namespace-uri(.)='http://www.w3.org/2000/09/xmldsig#']",
// @ts-expect-error FIXME
assertion,
);
const sig = new SignedXml();
sig.publicCert = fs.readFileSync("./test/static/feide_public.pem");
// @ts-expect-error FIXME
sig.loadSignature(signature);
expect(
function () {
sig.checkSignature(xml);
},
"Should not validate a document which contains multiple elements with the " +
"same value for the ID / Id / Id attributes, in order to prevent " +
"signature wrapping attack.",
).to.throw();
if (xpath.isNodeLike(assertion)) {
const signature = xpath.select1(
"//*[local-name(.)='Signature' and namespace-uri(.)='http://www.w3.org/2000/09/xmldsig#']",
assertion,
);
if (xpath.isNodeLike(signature)) {
const sig = new SignedXml();
sig.publicCert = fs.readFileSync("./test/static/feide_public.pem");
sig.loadSignature(signature);
expect(
function () {
sig.checkSignature(xml);
},
"Should not validate a document which contains multiple elements with the " +
"same value for the ID / Id / Id attributes, in order to prevent " +
"signature wrapping attack.",
).to.throw();
} else {
expect(xpath.isNodeLike(signature)).to.be.true;
}
} else {
expect(xpath.isNodeLike(assertion)).to.be.true;
}
});

it("test validating SAML response where a namespace is defined outside the signed element", function () {
Expand All @@ -51,30 +60,39 @@ describe("SAML response tests", function () {
"//*//*[local-name(.)='Signature' and namespace-uri(.)='http://www.w3.org/2000/09/xmldsig#']",
doc,
);
const sig = new SignedXml();
sig.publicCert = fs.readFileSync("./test/static/saml_external_ns.pem");
// @ts-expect-error FIXME
sig.loadSignature(signature);
const result = sig.checkSignature(xml);
expect(result).to.be.true;
if (xpath.isNodeLike(signature)) {
const sig = new SignedXml();
sig.publicCert = fs.readFileSync("./test/static/saml_external_ns.pem");
sig.loadSignature(signature);
const result = sig.checkSignature(xml);
expect(result).to.be.true;
} else {
expect(xpath.isNodeLike(signature)).to.be.true;
}
});

it("test reference id does not contain quotes", function () {
const xml = fs.readFileSync("./test/static/id_with_quotes.xml", "utf-8");
const doc = new xmldom.DOMParser().parseFromString(xml);
const assertion = xpath.select1("//*[local-name(.)='Assertion']", doc);
const signature = xpath.select1(
"//*[local-name(.)='Signature' and namespace-uri(.)='http://www.w3.org/2000/09/xmldsig#']",
// @ts-expect-error FIXME
assertion,
);
const sig = new SignedXml();
sig.publicCert = fs.readFileSync("./test/static/feide_public.pem");
// @ts-expect-error FIXME
sig.loadSignature(signature);
expect(function () {
sig.checkSignature(xml);
}, "id should not contain quotes").to.throw();
if (xpath.isNodeLike(assertion)) {
const signature = xpath.select1(
"//*[local-name(.)='Signature' and namespace-uri(.)='http://www.w3.org/2000/09/xmldsig#']",
assertion,
);
if (xpath.isNodeLike(signature)) {
const sig = new SignedXml();
sig.publicCert = fs.readFileSync("./test/static/feide_public.pem");
sig.loadSignature(signature);
expect(function () {
sig.checkSignature(xml);
}, "id should not contain quotes").to.throw();
} else {
expect(xpath.isNodeLike(signature)).to.be.true;
}
} else {
expect(xpath.isNodeLike(assertion)).to.be.true;
}
});

it("test validating SAML response WithComments", function () {
Expand All @@ -84,12 +102,15 @@ describe("SAML response tests", function () {
"/*/*[local-name(.)='Signature' and namespace-uri(.)='http://www.w3.org/2000/09/xmldsig#']",
doc,
);
const sig = new SignedXml();
sig.publicCert = fs.readFileSync("./test/static/feide_public.pem");
// @ts-expect-error FIXME
sig.loadSignature(signature);
const result = sig.checkSignature(xml);
// This doesn't matter, just want to make sure that we don't fail due to unknown algorithm
expect(result).to.be.false;
if (xpath.isNodeLike(signature)) {
const sig = new SignedXml();
sig.publicCert = fs.readFileSync("./test/static/feide_public.pem");
sig.loadSignature(signature);
const result = sig.checkSignature(xml);
// This doesn't matter, just want to make sure that we don't fail due to unknown algorithm
expect(result).to.be.false;
} else {
expect(xpath.isNodeLike(signature)).to.be.true;
}
});
});
Loading