Skip to content

Commit da0d09a

Browse files
committed
Merge pull request #70 from ma314smith/fix-attribute-ns
unqualified attributes should have an empty namespace
2 parents 3b0fe81 + ed38238 commit da0d09a

5 files changed

+38
-5
lines changed

lib/exclusive-canonicalization.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ ExclusiveCanonicalization.prototype.attrCompare = function(a,b) {
1414

1515
var left = a.namespaceURI + a.localName
1616
var right = b.namespaceURI + b.localName
17-
17+
1818
if (left===right) return 0
1919
else if (left<right) return -1
2020
else return 1
21-
21+
2222
};
2323

2424
ExclusiveCanonicalization.prototype.nsCompare = function(a,b) {
@@ -40,7 +40,6 @@ ExclusiveCanonicalization.prototype.renderAttrs = function(node, defaultNS) {
4040
attr = node.attributes[i];
4141
//ignore namespace definition attributes
4242
if (attr.name.indexOf("xmlns") === 0) { continue; }
43-
if (!attr.namespaceURI && defaultNS) { attr.namespaceURI = defaultNS; }
4443
attrListToRender.push(attr);
4544
}
4645
}
@@ -123,7 +122,7 @@ ExclusiveCanonicalization.prototype.renderNs = function(node, prefixesInScope, d
123122
};
124123

125124
ExclusiveCanonicalization.prototype.processInner = function(node, prefixesInScope, defaultNs, inclusiveNamespacesPrefixList) {
126-
125+
127126
if (node.nodeType === 8) { return this.renderComment(node); }
128127
if (node.data) { return utils.normalizeXmlIncludingCR(node.data); }
129128

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@
3434
}
3535
],
3636
"scripts": {
37-
"test": "nodeunit ./test/canonicalization-unit-tests.js ./test/c14nWithComments-unit-tests.js ./test/signature-unit-tests.js ./test/saml-response-test.js ./test/signature-integration-tests.js ./test/document-test.js"
37+
"test": "nodeunit ./test/canonicalization-unit-tests.js ./test/c14nWithComments-unit-tests.js ./test/signature-unit-tests.js ./test/saml-response-test.js ./test/signature-integration-tests.js ./test/document-test.js ./test/wsfed-metadata-test.js"
3838
}
3939
}

test/static/wsfederation_metadata.pem

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIC4jCCAcqgAwIBAgIQQNXrmzhLN4VGlUXDYCRT3zANBgkqhkiG9w0BAQsFADAt
3+
MSswKQYDVQQDEyJhY2NvdW50cy5hY2Nlc3Njb250cm9sLndpbmRvd3MubmV0MB4X
4+
DTE0MTAyODAwMDAwMFoXDTE2MTAyNzAwMDAwMFowLTErMCkGA1UEAxMiYWNjb3Vu
5+
dHMuYWNjZXNzY29udHJvbC53aW5kb3dzLm5ldDCCASIwDQYJKoZIhvcNAQEBBQAD
6+
ggEPADCCAQoCggEBALyKs/uPhEf7zVizjfcr/ISGFe9+yUOqwpel38zgutvLHmFD
7+
39E2hpPdQhcXn4c4dt1fU5KvkbcDdVbP8+e4TvNpJMy/nEB2V92zCQ/hhBjilwhF
8+
1ETe1TMmVjALs0KFvbxW9ZN3EdUVvxFvz/gvG29nQhl4QWKj3x8opr89lmq14Z7T
9+
0mzOV8kub+cgsOU/1bsKqrIqN1fMKKFhjKaetctdjYTfGzVQ0AJAzzbtg0/Q1wdY
10+
NAnhSDafygEv6kNiquk0r0RyasUUevEXs2LY3vSgKsKseI8ZZlQEMtE9/k/iAG7J
11+
NcEbVg53YTurNTrPnXJOU88mf3TToX14HpYsS1ECAwEAATANBgkqhkiG9w0BAQsF
12+
AAOCAQEAfolx45w0i8CdAUjjeAaYdhG9+NDHxop0UvNOqlGqYJexqPLuvX8iyUaY
13+
xNGzZxFgGI3GpKfmQP2JQWQ1E5JtY/n8iNLOKRMwqkuxSCKJxZJq4Sl/m/Yv7TS1
14+
P5LNgAj8QLCypxsWrTAmq2HSpkeSk4JBtsYxX6uhbGM/K1sEktKybVTHu22/7TmR
15+
qWTmOUy9wQvMjJb2IXdMGLG3hVntN/WWcs5w8vbt1i8Kk6o19W2MjZ95JaECKjBD
16+
YRlhG1KmSBtrsKsCBQoBzwH/rXfksTO9JoUYLXiW0IppB7DhNH4PJ5hZI91R8rR0
17+
H3/bKkLSuDaKLWSqMhozdhXsIIKvJQ==
18+
-----END CERTIFICATE-----

0 commit comments

Comments
 (0)