Skip to content

Commit

Permalink
Basic xades support
Browse files Browse the repository at this point in the history
  • Loading branch information
GauriSpears committed Jan 18, 2024
1 parent 5a0d317 commit 8f682f0
Showing 1 changed file with 25 additions and 6 deletions.
31 changes: 25 additions & 6 deletions src/signed-xml.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ export class SignedXml {
keyInfoAttributes: { [attrName: string]: string } = {};
getKeyInfoContent = SignedXml.getKeyInfoContent;
getCertFromKeyInfo = SignedXml.getCertFromKeyInfo;
//xadesQualifyingProperties?: null;
xadesQualifyingProperties: (() => string) | null;

// Internal state
private id = 0;
Expand Down Expand Up @@ -151,6 +153,7 @@ export class SignedXml {
this.keyInfoAttributes = keyInfoAttributes ?? this.keyInfoAttributes;
this.getKeyInfoContent = getKeyInfoContent ?? SignedXml.noop;
this.getCertFromKeyInfo = getCertFromKeyInfo ?? this.getCertFromKeyInfo;
this.xadesQualifyingProperties = null;
this.CanonicalizationAlgorithms;
this.HashAlgorithms;
this.SignatureAlgorithms;
Expand Down Expand Up @@ -802,6 +805,9 @@ export class SignedXml {

signatureXml += this.createSignedInfo(doc, prefix);
signatureXml += this.getKeyInfo(prefix);
if (this.xadesQualifyingProperties != null) {
signatureXml += `<${currentPrefix}Object>${this.xadesQualifyingProperties()}</${currentPrefix}Object>`;
}
signatureXml += `</${currentPrefix}Signature>`;

this.originalXmlWithIds = doc.toString();
Expand Down Expand Up @@ -918,21 +924,34 @@ export class SignedXml {
prefix = prefix ? `${prefix}:` : prefix;

for (const ref of this.getReferences()) {
const nodes = xpath.selectWithResolver(ref.xpath ?? "", doc, this.namespaceResolver);
let nodes = xpath.selectWithResolver(ref.xpath ?? "", doc, this.namespaceResolver);

if (!utils.isArrayHasLength(nodes)) {
throw new Error(
`the following xpath cannot be signed because it was not found: ${ref.xpath}`,
);
if (this.xadesQualifyingProperties != null) {
nodes = xpath.selectWithResolver(
ref.xpath ?? "",
new xmldom.DOMParser().parseFromString(this.xadesQualifyingProperties()),
this.namespaceResolver,
);
}
if (!utils.isArrayHasLength(nodes)) {
throw new Error(
`the following xpath cannot be signed because it was not found: ${ref.xpath}`,
);
}
}

for (const node of nodes) {
let addattr = "";
if (node["localName"] === "SignedProperties") {
addattr = ' Type="http://uri.etsi.org/01903#SignedProperties"';
}
if (ref.isEmptyUri) {
res += `<${prefix}Reference URI="">`;
res += `<${prefix}Reference URI=""${addattr}>`;
} else {
const id = this.ensureHasId(node);
ref.uri = id;
res += `<${prefix}Reference URI="#${id}">`;
res += `<${prefix}Reference URI="#${id}"${addattr}>`;
}
res += `<${prefix}Transforms>`;
for (const trans of ref.transforms || []) {
Expand Down

0 comments on commit 8f682f0

Please sign in to comment.