Fixing SignedXml.CheckSignature for enveloped signature with #xpointer(/) Reference#95404

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

Merged
bartonjs merged 18 commits into from
Mar 5, 2024
Merged

Fixing SignedXml.CheckSignature for enveloped signature with #xpointer(/) Reference #95404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d1cdd43
adding failing test case for https://github.com/dotnet/runtime/issues…
m0sa Nov 29, 2023
e5d4e3b
adding both positive and negative tests, in-line with recommendations…
m0sa Nov 29, 2023
9e8c558
fix implemented
m0sa Nov 29, 2023
b1f74ec
Merge branch 'dotnet:main' into main
m0sa Nov 29, 2023
d7542ca
Update src/libraries/System.Security.Cryptography.Xml/src/System/Secu…
m0sa Nov 29, 2023
5f469bb
Update src/libraries/System.Security.Cryptography.Xml/src/System/Secu…
m0sa Nov 29, 2023
2e209c3
Merge branch 'dotnet:main' into main
m0sa Nov 30, 2023
1e0dfdb
Merge branch 'dotnet:main' into main
m0sa Nov 30, 2023
8466fc0
Merge branch 'dotnet:main' into main
m0sa Nov 30, 2023
ea74198
using MemberData for tests
m0sa Dec 16, 2023
f4c2b27
making memberdata target public
m0sa Dec 16, 2023
50e05b9
Merge branch 'dotnet:main' into main
m0sa Dec 16, 2023
000881c
Merge branch 'dotnet:main' into main
m0sa Dec 21, 2023
90f2ff2
adding test cases for empty <Reference>
m0sa Jan 10, 2024
4fa87c8
Merge branch 'dotnet:main' into main
m0sa Jan 10, 2024
5a58263
Merge branch 'main' into main
m0sa Jan 11, 2024
b03f49f
Merge branch 'main' into main
m0sa Feb 15, 2024
6c40861
Merge branch 'main' into main
vcsjones Feb 25, 2024
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
25 changes: 19 additions & 6 deletions ...raries/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/Reference.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -266,18 +266,31 @@ public void LoadXml(XmlElement value)
// let the transform read the children of the transformElement for data
transform.LoadInnerXml(transformElement.ChildNodes);
// Hack! this is done to get around the lack of here() function support in XPath
if (transform is XmlDsigEnvelopedSignatureTransform
&& _uri != null && (_uri.Length == 0 || _uri[0] == '#'))
if (transform is XmlDsigEnvelopedSignatureTransform)
{
// Walk back to the Signature tag. Find the nearest signature ancestor
// Signature-->SignedInfo-->Reference-->Transforms-->Transform
XmlNode? signatureTag = transformElement.SelectSingleNode("ancestor::ds:Signature[1]", nsm);

// Resolve the reference to get starting point for position calculation.
XmlNode? referenceTarget =
_uri.Length == 0
? transformElement.OwnerDocument
: SignedXml!.GetIdElement(transformElement.OwnerDocument, Utils.GetIdFromLocalUri(_uri, out bool _));
// This needs to match the way CalculateSignature resolves URI references.
XmlNode? referenceTarget = null;
if (_uri == null || _uri.Length == 0)
Comment thread
m0sa marked this conversation as resolved.
{
referenceTarget = transformElement.OwnerDocument;
}
else if (_uri[0] == '#')
{
string idref = Utils.ExtractIdFromLocalUri(_uri);
if (idref == "xpointer(/)")
Comment thread
vcsjones marked this conversation as resolved.
{
referenceTarget = transformElement.OwnerDocument;
}
else
{
referenceTarget = SignedXml!.GetIdElement(transformElement.OwnerDocument, idref);
Comment thread
vcsjones marked this conversation as resolved.
}
}

XmlNodeList? signatureList = referenceTarget?.SelectNodes(".//ds:Signature", nsm);
if (signatureList != null)
Expand Down
41 changes: 41 additions & 0 deletions src/libraries/System.Security.Cryptography.Xml/tests/SignedXmlTest.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
// Copyright (C) 2004-2005, 2008 Novell, Inc (http://www.novell.com)

using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Net;
Expand DownExpand Up@@ -1993,5 +1994,45 @@ public void CheckSignatureHandlesIncorrectOrTamperedReferenceWithMultipleEnvelop

Assert.False(subject.CheckSignature());
}

public static object[][] EnvelopedSignatureWithRootXpointerReference = new object[][]
{
new object[] { true, """<?xml version="1.0" encoding="UTF-8"?><hello><world>Hi</world><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference URI="#xpointer(/)"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>dqcBmS1ZvDJNhmCEgobpAb+A2XaiuB69dfGIhisZvqoxaWqAqv/0w49jp38+usJ5t3wcq3aMC631QE8iln+lHWrarojDMDWLa00isv3oE3q9UgOIV9e6MUSoRTTvQkmlK/LSYV9T/SKx6h03vLLcIkUMXaTkC/n2kthlJTGkLbU=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>t6qV1iTlkCPoaIeOTvnDczQv5pytUxMoyNXws5vaMQYxfJMKos47dvmiLtfWUDLYXFX3Yf/JMC14plJw2JA5jLrlHLnZj/vCjRtXckmWW/wGYewXUqrgR1CytStUeQKj9mNsi76erukua10UhzIrWG+H6YQ/qS4AMMJZU6jBvO0=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
new object[] { false, """<?xml version="1.0" encoding="UTF-8"?><hello>Tempered world<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference URI="#xpointer(/)"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>dqcBmS1ZvDJNhmCEgobpAb+A2XaiuB69dfGIhisZvqoxaWqAqv/0w49jp38+usJ5t3wcq3aMC631QE8iln+lHWrarojDMDWLa00isv3oE3q9UgOIV9e6MUSoRTTvQkmlK/LSYV9T/SKx6h03vLLcIkUMXaTkC/n2kthlJTGkLbU=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>t6qV1iTlkCPoaIeOTvnDczQv5pytUxMoyNXws5vaMQYxfJMKos47dvmiLtfWUDLYXFX3Yf/JMC14plJw2JA5jLrlHLnZj/vCjRtXckmWW/wGYewXUqrgR1CytStUeQKj9mNsi76erukua10UhzIrWG+H6YQ/qS4AMMJZU6jBvO0=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
};

[Theory]
[MemberData(nameof(EnvelopedSignatureWithRootXpointerReference))]
public void CheckSignatureHandlesEnvelopedSignatureWithRootXpointerReference(bool isValid, string xml)
{
XmlDocument xmlDoc = new ();
xmlDoc.LoadXml(xml);
SignedXml signedXml = new (xmlDoc);
signedXml.LoadXml(xmlDoc.GetElementsByTagName("Signature", SignedXml.XmlDsigNamespaceUrl)[0] as XmlElement);

Assert.Equal(isValid, signedXml.CheckSignature());
}


public static object[][] EnvelopedSignatureWithEmptyReference = new object[][]
{
new object[] { true, """<?xml version="1.0" encoding="UTF-8"?><hello><world>Hi</world><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>CiB9jgIS7+Wq+lpyzCGsBZQcQ2BxqQuEU9VCvb3Li5jMtjwRV1bMO+4Wfnb4VWhEtEUq6NdiVGXhC1xvtVLnnLDX7CD/jG6NvM1Yd0/rf0UUceBhzYLFE9HLsopsBmmm3t8FO6ZtRr1QqKM0XDaQleGK9vYd2m2Jq8OR3r/w4OY=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>vcM1wQVmLB9DwdnAym8l8nw63/HlTVzgTDhIwNzWPhsPE/qr2wlK4TEQ3rjU+RAdNytfFNCnuuh75ZVMjAWCV9h6VDlp0DOvBhb6GenhymtTAdJJKzBXKJP6mNPga9cPOP31IZ36Ui00G3fjBBPrHa7nStludgL9Wi0dBU28DjU=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
new object[] { false, """<?xml version="1.0" encoding="UTF-8"?><hello><WORLD>HI</WORLD><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>CiB9jgIS7+Wq+lpyzCGsBZQcQ2BxqQuEU9VCvb3Li5jMtjwRV1bMO+4Wfnb4VWhEtEUq6NdiVGXhC1xvtVLnnLDX7CD/jG6NvM1Yd0/rf0UUceBhzYLFE9HLsopsBmmm3t8FO6ZtRr1QqKM0XDaQleGK9vYd2m2Jq8OR3r/w4OY=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>vcM1wQVmLB9DwdnAym8l8nw63/HlTVzgTDhIwNzWPhsPE/qr2wlK4TEQ3rjU+RAdNytfFNCnuuh75ZVMjAWCV9h6VDlp0DOvBhb6GenhymtTAdJJKzBXKJP6mNPga9cPOP31IZ36Ui00G3fjBBPrHa7nStludgL9Wi0dBU28DjU=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
};

[Theory]
[MemberData(nameof(EnvelopedSignatureWithEmptyReference))]
public void CheckSignatureHandlesEnvelopedSignatureWithEmptyReference(bool isValid, string xml)
{
XmlDocument xmlDoc = new ();
xmlDoc.LoadXml(xml);
SignedXml signedXml = new (xmlDoc);
signedXml.LoadXml(xmlDoc.GetElementsByTagName("Signature", SignedXml.XmlDsigNamespaceUrl)[0] as XmlElement);

// without this, CheckSignature throws
((Reference)signedXml.SignedInfo.References[0]).TransformChain[0].LoadInput(xmlDoc);

Assert.Equal(isValid, signedXml.CheckSignature());
}
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fixing SignedXml.CheckSignature for enveloped signature with #xpointer(/) Reference#95404

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

 Merged

bartonjs
merged 18 commits into

from

Mar 5, 2024
 Merged


Fixing SignedXml.CheckSignature for enveloped signature with #xpointer(/) Reference
#95404
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
d1cdd43

adding failing test case for https://github.com/dotnet/runtime/issues…


m0sa Nov 29, 2023
e5d4e3b

adding both positive and negative tests, in-line with recommendations…


m0sa Nov 29, 2023
9e8c558

fix implemented


m0sa Nov 29, 2023
b1f74ec

Merge branch 'dotnet:main' into main


m0sa Nov 29, 2023
d7542ca

Update src/libraries/System.Security.Cryptography.Xml/src/System/Secu…


m0sa Nov 29, 2023
5f469bb

Update src/libraries/System.Security.Cryptography.Xml/src/System/Secu…


m0sa Nov 29, 2023
2e209c3

Merge branch 'dotnet:main' into main


m0sa Nov 30, 2023
1e0dfdb

Merge branch 'dotnet:main' into main


m0sa Nov 30, 2023
8466fc0

Merge branch 'dotnet:main' into main


m0sa Nov 30, 2023
ea74198

using MemberData for tests


m0sa Dec 16, 2023
f4c2b27

making memberdata target public


m0sa Dec 16, 2023
50e05b9

Merge branch 'dotnet:main' into main


m0sa Dec 16, 2023
000881c

Merge branch 'dotnet:main' into main


m0sa Dec 21, 2023
90f2ff2

adding test cases for empty <Reference>


m0sa Jan 10, 2024
4fa87c8

Merge branch 'dotnet:main' into main


m0sa Jan 10, 2024
5a58263

Merge branch 'main' into main


m0sa Jan 11, 2024
b03f49f

Merge branch 'main' into main


m0sa Feb 15, 2024
6c40861

Merge branch 'main' into main


vcsjones Feb 25, 2024

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


25 changes: 19 additions & 6 deletions
...raries/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/Reference.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,18 +266,31 @@ public void LoadXml(XmlElement value)
 // let the transform read the children of the transformElement for data
 transform.LoadInnerXml(transformElement.ChildNodes);
 // Hack! this is done to get around the lack of here() function support in XPath
 if (transform is XmlDsigEnvelopedSignatureTransform
 && _uri != null && (_uri.Length == 0 || _uri[0] == '#'))
 if (transform is XmlDsigEnvelopedSignatureTransform)
 {
 // Walk back to the Signature tag. Find the nearest signature ancestor
 // Signature-->SignedInfo-->Reference-->Transforms-->Transform
 XmlNode? signatureTag = transformElement.SelectSingleNode("ancestor::ds:Signature[1]", nsm);

 // Resolve the reference to get starting point for position calculation.
 XmlNode? referenceTarget =
 _uri.Length == 0
 ? transformElement.OwnerDocument
 : SignedXml!.GetIdElement(transformElement.OwnerDocument, Utils.GetIdFromLocalUri(_uri, out bool _));
 // This needs to match the way CalculateSignature resolves URI references.
 XmlNode? referenceTarget = null;
 if (_uri == null || _uri.Length == 0)
Comment thread
m0sa marked this conversation as resolved.

 {
 referenceTarget = transformElement.OwnerDocument;
 }
 else if (_uri[0] == '#')
 {
 string idref = Utils.ExtractIdFromLocalUri(_uri);
 if (idref == "xpointer(/)")
Comment thread
vcsjones marked this conversation as resolved.

 {
 referenceTarget = transformElement.OwnerDocument;
 }
 else
 {
 referenceTarget = SignedXml!.GetIdElement(transformElement.OwnerDocument, idref);
Comment thread
vcsjones marked this conversation as resolved.

 }
 }

 XmlNodeList? signatureList = referenceTarget?.SelectNodes(".//ds:Signature", nsm);
 if (signatureList != null)
Expand Down

41 changes: 41 additions & 0 deletions
src/libraries/System.Security.Cryptography.Xml/tests/SignedXmlTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
// Copyright (C) 2004-2005, 2008 Novell, Inc (http://www.novell.com)

using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Net;
Expand DownExpand Up@@ -1993,5 +1994,45 @@ public void CheckSignatureHandlesIncorrectOrTamperedReferenceWithMultipleEnvelop

 Assert.False(subject.CheckSignature());
 }

 public static object[][] EnvelopedSignatureWithRootXpointerReference = new object[][]
 {
 new object[] { true, """<?xml version="1.0" encoding="UTF-8"?><hello><world>Hi</world><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference URI="#xpointer(/)"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>dqcBmS1ZvDJNhmCEgobpAb+A2XaiuB69dfGIhisZvqoxaWqAqv/0w49jp38+usJ5t3wcq3aMC631QE8iln+lHWrarojDMDWLa00isv3oE3q9UgOIV9e6MUSoRTTvQkmlK/LSYV9T/SKx6h03vLLcIkUMXaTkC/n2kthlJTGkLbU=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>t6qV1iTlkCPoaIeOTvnDczQv5pytUxMoyNXws5vaMQYxfJMKos47dvmiLtfWUDLYXFX3Yf/JMC14plJw2JA5jLrlHLnZj/vCjRtXckmWW/wGYewXUqrgR1CytStUeQKj9mNsi76erukua10UhzIrWG+H6YQ/qS4AMMJZU6jBvO0=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 new object[] { false, """<?xml version="1.0" encoding="UTF-8"?><hello>Tempered world<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference URI="#xpointer(/)"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>dqcBmS1ZvDJNhmCEgobpAb+A2XaiuB69dfGIhisZvqoxaWqAqv/0w49jp38+usJ5t3wcq3aMC631QE8iln+lHWrarojDMDWLa00isv3oE3q9UgOIV9e6MUSoRTTvQkmlK/LSYV9T/SKx6h03vLLcIkUMXaTkC/n2kthlJTGkLbU=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>t6qV1iTlkCPoaIeOTvnDczQv5pytUxMoyNXws5vaMQYxfJMKos47dvmiLtfWUDLYXFX3Yf/JMC14plJw2JA5jLrlHLnZj/vCjRtXckmWW/wGYewXUqrgR1CytStUeQKj9mNsi76erukua10UhzIrWG+H6YQ/qS4AMMJZU6jBvO0=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 };

 [Theory]
 [MemberData(nameof(EnvelopedSignatureWithRootXpointerReference))]
 public void CheckSignatureHandlesEnvelopedSignatureWithRootXpointerReference(bool isValid, string xml)
 {
 XmlDocument xmlDoc = new ();
 xmlDoc.LoadXml(xml);
 SignedXml signedXml = new (xmlDoc);
 signedXml.LoadXml(xmlDoc.GetElementsByTagName("Signature", SignedXml.XmlDsigNamespaceUrl)[0] as XmlElement);

 Assert.Equal(isValid, signedXml.CheckSignature());
 }


 public static object[][] EnvelopedSignatureWithEmptyReference = new object[][]
 {
 new object[] { true, """<?xml version="1.0" encoding="UTF-8"?><hello><world>Hi</world><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>CiB9jgIS7+Wq+lpyzCGsBZQcQ2BxqQuEU9VCvb3Li5jMtjwRV1bMO+4Wfnb4VWhEtEUq6NdiVGXhC1xvtVLnnLDX7CD/jG6NvM1Yd0/rf0UUceBhzYLFE9HLsopsBmmm3t8FO6ZtRr1QqKM0XDaQleGK9vYd2m2Jq8OR3r/w4OY=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>vcM1wQVmLB9DwdnAym8l8nw63/HlTVzgTDhIwNzWPhsPE/qr2wlK4TEQ3rjU+RAdNytfFNCnuuh75ZVMjAWCV9h6VDlp0DOvBhb6GenhymtTAdJJKzBXKJP6mNPga9cPOP31IZ36Ui00G3fjBBPrHa7nStludgL9Wi0dBU28DjU=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 new object[] { false, """<?xml version="1.0" encoding="UTF-8"?><hello><WORLD>HI</WORLD><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>CiB9jgIS7+Wq+lpyzCGsBZQcQ2BxqQuEU9VCvb3Li5jMtjwRV1bMO+4Wfnb4VWhEtEUq6NdiVGXhC1xvtVLnnLDX7CD/jG6NvM1Yd0/rf0UUceBhzYLFE9HLsopsBmmm3t8FO6ZtRr1QqKM0XDaQleGK9vYd2m2Jq8OR3r/w4OY=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>vcM1wQVmLB9DwdnAym8l8nw63/HlTVzgTDhIwNzWPhsPE/qr2wlK4TEQ3rjU+RAdNytfFNCnuuh75ZVMjAWCV9h6VDlp0DOvBhb6GenhymtTAdJJKzBXKJP6mNPga9cPOP31IZ36Ui00G3fjBBPrHa7nStludgL9Wi0dBU28DjU=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 };

 [Theory]
 [MemberData(nameof(EnvelopedSignatureWithEmptyReference))]
 public void CheckSignatureHandlesEnvelopedSignatureWithEmptyReference(bool isValid, string xml)
 {
 XmlDocument xmlDoc = new ();
 xmlDoc.LoadXml(xml);
 SignedXml signedXml = new (xmlDoc);
 signedXml.LoadXml(xmlDoc.GetElementsByTagName("Signature", SignedXml.XmlDsigNamespaceUrl)[0] as XmlElement);

 // without this, CheckSignature throws
 ((Reference)signedXml.SignedInfo.References[0]).TransformChain[0].LoadInput(xmlDoc);

 Assert.Equal(isValid, signedXml.CheckSignature());
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fixing SignedXml.CheckSignature for enveloped signature with #xpointer(/) Reference#95404

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

 Merged

bartonjs
merged 18 commits into

from

Mar 5, 2024
 Merged


Fixing SignedXml.CheckSignature for enveloped signature with #xpointer(/) Reference
#95404
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
d1cdd43

adding failing test case for https://github.com/dotnet/runtime/issues…


m0sa Nov 29, 2023
e5d4e3b

adding both positive and negative tests, in-line with recommendations…


m0sa Nov 29, 2023
9e8c558

fix implemented


m0sa Nov 29, 2023
b1f74ec

Merge branch 'dotnet:main' into main


m0sa Nov 29, 2023
d7542ca

Update src/libraries/System.Security.Cryptography.Xml/src/System/Secu…


m0sa Nov 29, 2023
5f469bb

Update src/libraries/System.Security.Cryptography.Xml/src/System/Secu…


m0sa Nov 29, 2023
2e209c3

Merge branch 'dotnet:main' into main


m0sa Nov 30, 2023
1e0dfdb

Merge branch 'dotnet:main' into main


m0sa Nov 30, 2023
8466fc0

Merge branch 'dotnet:main' into main


m0sa Nov 30, 2023
ea74198

using MemberData for tests


m0sa Dec 16, 2023
f4c2b27

making memberdata target public


m0sa Dec 16, 2023
50e05b9

Merge branch 'dotnet:main' into main


m0sa Dec 16, 2023
000881c

Merge branch 'dotnet:main' into main


m0sa Dec 21, 2023
90f2ff2

adding test cases for empty <Reference>


m0sa Jan 10, 2024
4fa87c8

Merge branch 'dotnet:main' into main


m0sa Jan 10, 2024
5a58263

Merge branch 'main' into main


m0sa Jan 11, 2024
b03f49f

Merge branch 'main' into main


m0sa Feb 15, 2024
6c40861

Merge branch 'main' into main


vcsjones Feb 25, 2024

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


25 changes: 19 additions & 6 deletions
...raries/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/Reference.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,18 +266,31 @@ public void LoadXml(XmlElement value)
 // let the transform read the children of the transformElement for data
 transform.LoadInnerXml(transformElement.ChildNodes);
 // Hack! this is done to get around the lack of here() function support in XPath
 if (transform is XmlDsigEnvelopedSignatureTransform
 && _uri != null && (_uri.Length == 0 || _uri[0] == '#'))
 if (transform is XmlDsigEnvelopedSignatureTransform)
 {
 // Walk back to the Signature tag. Find the nearest signature ancestor
 // Signature-->SignedInfo-->Reference-->Transforms-->Transform
 XmlNode? signatureTag = transformElement.SelectSingleNode("ancestor::ds:Signature[1]", nsm);

 // Resolve the reference to get starting point for position calculation.
 XmlNode? referenceTarget =
 _uri.Length == 0
 ? transformElement.OwnerDocument
 : SignedXml!.GetIdElement(transformElement.OwnerDocument, Utils.GetIdFromLocalUri(_uri, out bool _));
 // This needs to match the way CalculateSignature resolves URI references.
 XmlNode? referenceTarget = null;
 if (_uri == null || _uri.Length == 0)
Comment thread
m0sa marked this conversation as resolved.

 {
 referenceTarget = transformElement.OwnerDocument;
 }
 else if (_uri[0] == '#')
 {
 string idref = Utils.ExtractIdFromLocalUri(_uri);
 if (idref == "xpointer(/)")
Comment thread
vcsjones marked this conversation as resolved.

 {
 referenceTarget = transformElement.OwnerDocument;
 }
 else
 {
 referenceTarget = SignedXml!.GetIdElement(transformElement.OwnerDocument, idref);
Comment thread
vcsjones marked this conversation as resolved.

 }
 }

 XmlNodeList? signatureList = referenceTarget?.SelectNodes(".//ds:Signature", nsm);
 if (signatureList != null)
Expand Down

41 changes: 41 additions & 0 deletions
src/libraries/System.Security.Cryptography.Xml/tests/SignedXmlTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
// Copyright (C) 2004-2005, 2008 Novell, Inc (http://www.novell.com)

using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Net;
Expand DownExpand Up@@ -1993,5 +1994,45 @@ public void CheckSignatureHandlesIncorrectOrTamperedReferenceWithMultipleEnvelop

 Assert.False(subject.CheckSignature());
 }

 public static object[][] EnvelopedSignatureWithRootXpointerReference = new object[][]
 {
 new object[] { true, """<?xml version="1.0" encoding="UTF-8"?><hello><world>Hi</world><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference URI="#xpointer(/)"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>dqcBmS1ZvDJNhmCEgobpAb+A2XaiuB69dfGIhisZvqoxaWqAqv/0w49jp38+usJ5t3wcq3aMC631QE8iln+lHWrarojDMDWLa00isv3oE3q9UgOIV9e6MUSoRTTvQkmlK/LSYV9T/SKx6h03vLLcIkUMXaTkC/n2kthlJTGkLbU=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>t6qV1iTlkCPoaIeOTvnDczQv5pytUxMoyNXws5vaMQYxfJMKos47dvmiLtfWUDLYXFX3Yf/JMC14plJw2JA5jLrlHLnZj/vCjRtXckmWW/wGYewXUqrgR1CytStUeQKj9mNsi76erukua10UhzIrWG+H6YQ/qS4AMMJZU6jBvO0=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 new object[] { false, """<?xml version="1.0" encoding="UTF-8"?><hello>Tempered world<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference URI="#xpointer(/)"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>dqcBmS1ZvDJNhmCEgobpAb+A2XaiuB69dfGIhisZvqoxaWqAqv/0w49jp38+usJ5t3wcq3aMC631QE8iln+lHWrarojDMDWLa00isv3oE3q9UgOIV9e6MUSoRTTvQkmlK/LSYV9T/SKx6h03vLLcIkUMXaTkC/n2kthlJTGkLbU=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>t6qV1iTlkCPoaIeOTvnDczQv5pytUxMoyNXws5vaMQYxfJMKos47dvmiLtfWUDLYXFX3Yf/JMC14plJw2JA5jLrlHLnZj/vCjRtXckmWW/wGYewXUqrgR1CytStUeQKj9mNsi76erukua10UhzIrWG+H6YQ/qS4AMMJZU6jBvO0=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 };

 [Theory]
 [MemberData(nameof(EnvelopedSignatureWithRootXpointerReference))]
 public void CheckSignatureHandlesEnvelopedSignatureWithRootXpointerReference(bool isValid, string xml)
 {
 XmlDocument xmlDoc = new ();
 xmlDoc.LoadXml(xml);
 SignedXml signedXml = new (xmlDoc);
 signedXml.LoadXml(xmlDoc.GetElementsByTagName("Signature", SignedXml.XmlDsigNamespaceUrl)[0] as XmlElement);

 Assert.Equal(isValid, signedXml.CheckSignature());
 }


 public static object[][] EnvelopedSignatureWithEmptyReference = new object[][]
 {
 new object[] { true, """<?xml version="1.0" encoding="UTF-8"?><hello><world>Hi</world><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>CiB9jgIS7+Wq+lpyzCGsBZQcQ2BxqQuEU9VCvb3Li5jMtjwRV1bMO+4Wfnb4VWhEtEUq6NdiVGXhC1xvtVLnnLDX7CD/jG6NvM1Yd0/rf0UUceBhzYLFE9HLsopsBmmm3t8FO6ZtRr1QqKM0XDaQleGK9vYd2m2Jq8OR3r/w4OY=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>vcM1wQVmLB9DwdnAym8l8nw63/HlTVzgTDhIwNzWPhsPE/qr2wlK4TEQ3rjU+RAdNytfFNCnuuh75ZVMjAWCV9h6VDlp0DOvBhb6GenhymtTAdJJKzBXKJP6mNPga9cPOP31IZ36Ui00G3fjBBPrHa7nStludgL9Wi0dBU28DjU=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 new object[] { false, """<?xml version="1.0" encoding="UTF-8"?><hello><WORLD>HI</WORLD><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>CiB9jgIS7+Wq+lpyzCGsBZQcQ2BxqQuEU9VCvb3Li5jMtjwRV1bMO+4Wfnb4VWhEtEUq6NdiVGXhC1xvtVLnnLDX7CD/jG6NvM1Yd0/rf0UUceBhzYLFE9HLsopsBmmm3t8FO6ZtRr1QqKM0XDaQleGK9vYd2m2Jq8OR3r/w4OY=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>vcM1wQVmLB9DwdnAym8l8nw63/HlTVzgTDhIwNzWPhsPE/qr2wlK4TEQ3rjU+RAdNytfFNCnuuh75ZVMjAWCV9h6VDlp0DOvBhb6GenhymtTAdJJKzBXKJP6mNPga9cPOP31IZ36Ui00G3fjBBPrHa7nStludgL9Wi0dBU28DjU=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 };

 [Theory]
 [MemberData(nameof(EnvelopedSignatureWithEmptyReference))]
 public void CheckSignatureHandlesEnvelopedSignatureWithEmptyReference(bool isValid, string xml)
 {
 XmlDocument xmlDoc = new ();
 xmlDoc.LoadXml(xml);
 SignedXml signedXml = new (xmlDoc);
 signedXml.LoadXml(xmlDoc.GetElementsByTagName("Signature", SignedXml.XmlDsigNamespaceUrl)[0] as XmlElement);

 // without this, CheckSignature throws
 ((Reference)signedXml.SignedInfo.References[0]).TransformChain[0].LoadInput(xmlDoc);

 Assert.Equal(isValid, signedXml.CheckSignature());
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fixing SignedXml.CheckSignature for enveloped signature with #xpointer(/) Reference#95404

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

 Merged

bartonjs
merged 18 commits into

from

Mar 5, 2024
 Merged


Fixing SignedXml.CheckSignature for enveloped signature with #xpointer(/) Reference
#95404
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
d1cdd43

adding failing test case for https://github.com/dotnet/runtime/issues…


m0sa Nov 29, 2023
e5d4e3b

adding both positive and negative tests, in-line with recommendations…


m0sa Nov 29, 2023
9e8c558

fix implemented


m0sa Nov 29, 2023
b1f74ec

Merge branch 'dotnet:main' into main


m0sa Nov 29, 2023
d7542ca

Update src/libraries/System.Security.Cryptography.Xml/src/System/Secu…


m0sa Nov 29, 2023
5f469bb

Update src/libraries/System.Security.Cryptography.Xml/src/System/Secu…


m0sa Nov 29, 2023
2e209c3

Merge branch 'dotnet:main' into main


m0sa Nov 30, 2023
1e0dfdb

Merge branch 'dotnet:main' into main


m0sa Nov 30, 2023
8466fc0

Merge branch 'dotnet:main' into main


m0sa Nov 30, 2023
ea74198

using MemberData for tests


m0sa Dec 16, 2023
f4c2b27

making memberdata target public


m0sa Dec 16, 2023
50e05b9

Merge branch 'dotnet:main' into main


m0sa Dec 16, 2023
000881c

Merge branch 'dotnet:main' into main


m0sa Dec 21, 2023
90f2ff2

adding test cases for empty <Reference>


m0sa Jan 10, 2024
4fa87c8

Merge branch 'dotnet:main' into main


m0sa Jan 10, 2024
5a58263

Merge branch 'main' into main


m0sa Jan 11, 2024
b03f49f

Merge branch 'main' into main


m0sa Feb 15, 2024
6c40861

Merge branch 'main' into main


vcsjones Feb 25, 2024

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


25 changes: 19 additions & 6 deletions
...raries/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/Reference.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,18 +266,31 @@ public void LoadXml(XmlElement value)
 // let the transform read the children of the transformElement for data
 transform.LoadInnerXml(transformElement.ChildNodes);
 // Hack! this is done to get around the lack of here() function support in XPath
 if (transform is XmlDsigEnvelopedSignatureTransform
 && _uri != null && (_uri.Length == 0 || _uri[0] == '#'))
 if (transform is XmlDsigEnvelopedSignatureTransform)
 {
 // Walk back to the Signature tag. Find the nearest signature ancestor
 // Signature-->SignedInfo-->Reference-->Transforms-->Transform
 XmlNode? signatureTag = transformElement.SelectSingleNode("ancestor::ds:Signature[1]", nsm);

 // Resolve the reference to get starting point for position calculation.
 XmlNode? referenceTarget =
 _uri.Length == 0
 ? transformElement.OwnerDocument
 : SignedXml!.GetIdElement(transformElement.OwnerDocument, Utils.GetIdFromLocalUri(_uri, out bool _));
 // This needs to match the way CalculateSignature resolves URI references.
 XmlNode? referenceTarget = null;
 if (_uri == null || _uri.Length == 0)
Comment thread
m0sa marked this conversation as resolved.

 {
 referenceTarget = transformElement.OwnerDocument;
 }
 else if (_uri[0] == '#')
 {
 string idref = Utils.ExtractIdFromLocalUri(_uri);
 if (idref == "xpointer(/)")
Comment thread
vcsjones marked this conversation as resolved.

 {
 referenceTarget = transformElement.OwnerDocument;
 }
 else
 {
 referenceTarget = SignedXml!.GetIdElement(transformElement.OwnerDocument, idref);
Comment thread
vcsjones marked this conversation as resolved.

 }
 }

 XmlNodeList? signatureList = referenceTarget?.SelectNodes(".//ds:Signature", nsm);
 if (signatureList != null)
Expand Down

41 changes: 41 additions & 0 deletions
src/libraries/System.Security.Cryptography.Xml/tests/SignedXmlTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
// Copyright (C) 2004-2005, 2008 Novell, Inc (http://www.novell.com)

using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Net;
Expand DownExpand Up@@ -1993,5 +1994,45 @@ public void CheckSignatureHandlesIncorrectOrTamperedReferenceWithMultipleEnvelop

 Assert.False(subject.CheckSignature());
 }

 public static object[][] EnvelopedSignatureWithRootXpointerReference = new object[][]
 {
 new object[] { true, """<?xml version="1.0" encoding="UTF-8"?><hello><world>Hi</world><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference URI="#xpointer(/)"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>dqcBmS1ZvDJNhmCEgobpAb+A2XaiuB69dfGIhisZvqoxaWqAqv/0w49jp38+usJ5t3wcq3aMC631QE8iln+lHWrarojDMDWLa00isv3oE3q9UgOIV9e6MUSoRTTvQkmlK/LSYV9T/SKx6h03vLLcIkUMXaTkC/n2kthlJTGkLbU=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>t6qV1iTlkCPoaIeOTvnDczQv5pytUxMoyNXws5vaMQYxfJMKos47dvmiLtfWUDLYXFX3Yf/JMC14plJw2JA5jLrlHLnZj/vCjRtXckmWW/wGYewXUqrgR1CytStUeQKj9mNsi76erukua10UhzIrWG+H6YQ/qS4AMMJZU6jBvO0=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 new object[] { false, """<?xml version="1.0" encoding="UTF-8"?><hello>Tempered world<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference URI="#xpointer(/)"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>dqcBmS1ZvDJNhmCEgobpAb+A2XaiuB69dfGIhisZvqoxaWqAqv/0w49jp38+usJ5t3wcq3aMC631QE8iln+lHWrarojDMDWLa00isv3oE3q9UgOIV9e6MUSoRTTvQkmlK/LSYV9T/SKx6h03vLLcIkUMXaTkC/n2kthlJTGkLbU=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>t6qV1iTlkCPoaIeOTvnDczQv5pytUxMoyNXws5vaMQYxfJMKos47dvmiLtfWUDLYXFX3Yf/JMC14plJw2JA5jLrlHLnZj/vCjRtXckmWW/wGYewXUqrgR1CytStUeQKj9mNsi76erukua10UhzIrWG+H6YQ/qS4AMMJZU6jBvO0=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 };

 [Theory]
 [MemberData(nameof(EnvelopedSignatureWithRootXpointerReference))]
 public void CheckSignatureHandlesEnvelopedSignatureWithRootXpointerReference(bool isValid, string xml)
 {
 XmlDocument xmlDoc = new ();
 xmlDoc.LoadXml(xml);
 SignedXml signedXml = new (xmlDoc);
 signedXml.LoadXml(xmlDoc.GetElementsByTagName("Signature", SignedXml.XmlDsigNamespaceUrl)[0] as XmlElement);

 Assert.Equal(isValid, signedXml.CheckSignature());
 }


 public static object[][] EnvelopedSignatureWithEmptyReference = new object[][]
 {
 new object[] { true, """<?xml version="1.0" encoding="UTF-8"?><hello><world>Hi</world><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>CiB9jgIS7+Wq+lpyzCGsBZQcQ2BxqQuEU9VCvb3Li5jMtjwRV1bMO+4Wfnb4VWhEtEUq6NdiVGXhC1xvtVLnnLDX7CD/jG6NvM1Yd0/rf0UUceBhzYLFE9HLsopsBmmm3t8FO6ZtRr1QqKM0XDaQleGK9vYd2m2Jq8OR3r/w4OY=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>vcM1wQVmLB9DwdnAym8l8nw63/HlTVzgTDhIwNzWPhsPE/qr2wlK4TEQ3rjU+RAdNytfFNCnuuh75ZVMjAWCV9h6VDlp0DOvBhb6GenhymtTAdJJKzBXKJP6mNPga9cPOP31IZ36Ui00G3fjBBPrHa7nStludgL9Wi0dBU28DjU=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 new object[] { false, """<?xml version="1.0" encoding="UTF-8"?><hello><WORLD>HI</WORLD><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>CiB9jgIS7+Wq+lpyzCGsBZQcQ2BxqQuEU9VCvb3Li5jMtjwRV1bMO+4Wfnb4VWhEtEUq6NdiVGXhC1xvtVLnnLDX7CD/jG6NvM1Yd0/rf0UUceBhzYLFE9HLsopsBmmm3t8FO6ZtRr1QqKM0XDaQleGK9vYd2m2Jq8OR3r/w4OY=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>vcM1wQVmLB9DwdnAym8l8nw63/HlTVzgTDhIwNzWPhsPE/qr2wlK4TEQ3rjU+RAdNytfFNCnuuh75ZVMjAWCV9h6VDlp0DOvBhb6GenhymtTAdJJKzBXKJP6mNPga9cPOP31IZ36Ui00G3fjBBPrHa7nStludgL9Wi0dBU28DjU=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 };

 [Theory]
 [MemberData(nameof(EnvelopedSignatureWithEmptyReference))]
 public void CheckSignatureHandlesEnvelopedSignatureWithEmptyReference(bool isValid, string xml)
 {
 XmlDocument xmlDoc = new ();
 xmlDoc.LoadXml(xml);
 SignedXml signedXml = new (xmlDoc);
 signedXml.LoadXml(xmlDoc.GetElementsByTagName("Signature", SignedXml.XmlDsigNamespaceUrl)[0] as XmlElement);

 // without this, CheckSignature throws
 ((Reference)signedXml.SignedInfo.References[0]).TransformChain[0].LoadInput(xmlDoc);

 Assert.Equal(isValid, signedXml.CheckSignature());
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fixing SignedXml.CheckSignature for enveloped signature with #xpointer(/) Reference#95404

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

 Merged

bartonjs
merged 18 commits into

from

Mar 5, 2024
 Merged


Fixing SignedXml.CheckSignature for enveloped signature with #xpointer(/) Reference
#95404
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
d1cdd43

adding failing test case for https://github.com/dotnet/runtime/issues…


m0sa Nov 29, 2023
e5d4e3b

adding both positive and negative tests, in-line with recommendations…


m0sa Nov 29, 2023
9e8c558

fix implemented


m0sa Nov 29, 2023
b1f74ec

Merge branch 'dotnet:main' into main


m0sa Nov 29, 2023
d7542ca

Update src/libraries/System.Security.Cryptography.Xml/src/System/Secu…


m0sa Nov 29, 2023
5f469bb

Update src/libraries/System.Security.Cryptography.Xml/src/System/Secu…


m0sa Nov 29, 2023
2e209c3

Merge branch 'dotnet:main' into main


m0sa Nov 30, 2023
1e0dfdb

Merge branch 'dotnet:main' into main


m0sa Nov 30, 2023
8466fc0

Merge branch 'dotnet:main' into main


m0sa Nov 30, 2023
ea74198

using MemberData for tests


m0sa Dec 16, 2023
f4c2b27

making memberdata target public


m0sa Dec 16, 2023
50e05b9

Merge branch 'dotnet:main' into main


m0sa Dec 16, 2023
000881c

Merge branch 'dotnet:main' into main


m0sa Dec 21, 2023
90f2ff2

adding test cases for empty <Reference>


m0sa Jan 10, 2024
4fa87c8

Merge branch 'dotnet:main' into main


m0sa Jan 10, 2024
5a58263

Merge branch 'main' into main


m0sa Jan 11, 2024
b03f49f

Merge branch 'main' into main


m0sa Feb 15, 2024
6c40861

Merge branch 'main' into main


vcsjones Feb 25, 2024

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


25 changes: 19 additions & 6 deletions
...raries/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/Reference.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,18 +266,31 @@ public void LoadXml(XmlElement value)
 // let the transform read the children of the transformElement for data
 transform.LoadInnerXml(transformElement.ChildNodes);
 // Hack! this is done to get around the lack of here() function support in XPath
 if (transform is XmlDsigEnvelopedSignatureTransform
 && _uri != null && (_uri.Length == 0 || _uri[0] == '#'))
 if (transform is XmlDsigEnvelopedSignatureTransform)
 {
 // Walk back to the Signature tag. Find the nearest signature ancestor
 // Signature-->SignedInfo-->Reference-->Transforms-->Transform
 XmlNode? signatureTag = transformElement.SelectSingleNode("ancestor::ds:Signature[1]", nsm);

 // Resolve the reference to get starting point for position calculation.
 XmlNode? referenceTarget =
 _uri.Length == 0
 ? transformElement.OwnerDocument
 : SignedXml!.GetIdElement(transformElement.OwnerDocument, Utils.GetIdFromLocalUri(_uri, out bool _));
 // This needs to match the way CalculateSignature resolves URI references.
 XmlNode? referenceTarget = null;
 if (_uri == null || _uri.Length == 0)
Comment thread
m0sa marked this conversation as resolved.

 {
 referenceTarget = transformElement.OwnerDocument;
 }
 else if (_uri[0] == '#')
 {
 string idref = Utils.ExtractIdFromLocalUri(_uri);
 if (idref == "xpointer(/)")
Comment thread
vcsjones marked this conversation as resolved.

 {
 referenceTarget = transformElement.OwnerDocument;
 }
 else
 {
 referenceTarget = SignedXml!.GetIdElement(transformElement.OwnerDocument, idref);
Comment thread
vcsjones marked this conversation as resolved.

 }
 }

 XmlNodeList? signatureList = referenceTarget?.SelectNodes(".//ds:Signature", nsm);
 if (signatureList != null)
Expand Down

41 changes: 41 additions & 0 deletions
src/libraries/System.Security.Cryptography.Xml/tests/SignedXmlTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
// Copyright (C) 2004-2005, 2008 Novell, Inc (http://www.novell.com)

using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Net;
Expand DownExpand Up@@ -1993,5 +1994,45 @@ public void CheckSignatureHandlesIncorrectOrTamperedReferenceWithMultipleEnvelop

 Assert.False(subject.CheckSignature());
 }

 public static object[][] EnvelopedSignatureWithRootXpointerReference = new object[][]
 {
 new object[] { true, """<?xml version="1.0" encoding="UTF-8"?><hello><world>Hi</world><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference URI="#xpointer(/)"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>dqcBmS1ZvDJNhmCEgobpAb+A2XaiuB69dfGIhisZvqoxaWqAqv/0w49jp38+usJ5t3wcq3aMC631QE8iln+lHWrarojDMDWLa00isv3oE3q9UgOIV9e6MUSoRTTvQkmlK/LSYV9T/SKx6h03vLLcIkUMXaTkC/n2kthlJTGkLbU=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>t6qV1iTlkCPoaIeOTvnDczQv5pytUxMoyNXws5vaMQYxfJMKos47dvmiLtfWUDLYXFX3Yf/JMC14plJw2JA5jLrlHLnZj/vCjRtXckmWW/wGYewXUqrgR1CytStUeQKj9mNsi76erukua10UhzIrWG+H6YQ/qS4AMMJZU6jBvO0=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 new object[] { false, """<?xml version="1.0" encoding="UTF-8"?><hello>Tempered world<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference URI="#xpointer(/)"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>dqcBmS1ZvDJNhmCEgobpAb+A2XaiuB69dfGIhisZvqoxaWqAqv/0w49jp38+usJ5t3wcq3aMC631QE8iln+lHWrarojDMDWLa00isv3oE3q9UgOIV9e6MUSoRTTvQkmlK/LSYV9T/SKx6h03vLLcIkUMXaTkC/n2kthlJTGkLbU=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>t6qV1iTlkCPoaIeOTvnDczQv5pytUxMoyNXws5vaMQYxfJMKos47dvmiLtfWUDLYXFX3Yf/JMC14plJw2JA5jLrlHLnZj/vCjRtXckmWW/wGYewXUqrgR1CytStUeQKj9mNsi76erukua10UhzIrWG+H6YQ/qS4AMMJZU6jBvO0=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 };

 [Theory]
 [MemberData(nameof(EnvelopedSignatureWithRootXpointerReference))]
 public void CheckSignatureHandlesEnvelopedSignatureWithRootXpointerReference(bool isValid, string xml)
 {
 XmlDocument xmlDoc = new ();
 xmlDoc.LoadXml(xml);
 SignedXml signedXml = new (xmlDoc);
 signedXml.LoadXml(xmlDoc.GetElementsByTagName("Signature", SignedXml.XmlDsigNamespaceUrl)[0] as XmlElement);

 Assert.Equal(isValid, signedXml.CheckSignature());
 }


 public static object[][] EnvelopedSignatureWithEmptyReference = new object[][]
 {
 new object[] { true, """<?xml version="1.0" encoding="UTF-8"?><hello><world>Hi</world><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>CiB9jgIS7+Wq+lpyzCGsBZQcQ2BxqQuEU9VCvb3Li5jMtjwRV1bMO+4Wfnb4VWhEtEUq6NdiVGXhC1xvtVLnnLDX7CD/jG6NvM1Yd0/rf0UUceBhzYLFE9HLsopsBmmm3t8FO6ZtRr1QqKM0XDaQleGK9vYd2m2Jq8OR3r/w4OY=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>vcM1wQVmLB9DwdnAym8l8nw63/HlTVzgTDhIwNzWPhsPE/qr2wlK4TEQ3rjU+RAdNytfFNCnuuh75ZVMjAWCV9h6VDlp0DOvBhb6GenhymtTAdJJKzBXKJP6mNPga9cPOP31IZ36Ui00G3fjBBPrHa7nStludgL9Wi0dBU28DjU=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 new object[] { false, """<?xml version="1.0" encoding="UTF-8"?><hello><WORLD>HI</WORLD><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>CiB9jgIS7+Wq+lpyzCGsBZQcQ2BxqQuEU9VCvb3Li5jMtjwRV1bMO+4Wfnb4VWhEtEUq6NdiVGXhC1xvtVLnnLDX7CD/jG6NvM1Yd0/rf0UUceBhzYLFE9HLsopsBmmm3t8FO6ZtRr1QqKM0XDaQleGK9vYd2m2Jq8OR3r/w4OY=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>vcM1wQVmLB9DwdnAym8l8nw63/HlTVzgTDhIwNzWPhsPE/qr2wlK4TEQ3rjU+RAdNytfFNCnuuh75ZVMjAWCV9h6VDlp0DOvBhb6GenhymtTAdJJKzBXKJP6mNPga9cPOP31IZ36Ui00G3fjBBPrHa7nStludgL9Wi0dBU28DjU=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 };

 [Theory]
 [MemberData(nameof(EnvelopedSignatureWithEmptyReference))]
 public void CheckSignatureHandlesEnvelopedSignatureWithEmptyReference(bool isValid, string xml)
 {
 XmlDocument xmlDoc = new ();
 xmlDoc.LoadXml(xml);
 SignedXml signedXml = new (xmlDoc);
 signedXml.LoadXml(xmlDoc.GetElementsByTagName("Signature", SignedXml.XmlDsigNamespaceUrl)[0] as XmlElement);

 // without this, CheckSignature throws
 ((Reference)signedXml.SignedInfo.References[0]).TransformChain[0].LoadInput(xmlDoc);

 Assert.Equal(isValid, signedXml.CheckSignature());
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fixing SignedXml.CheckSignature for enveloped signature with #xpointer(/) Reference#95404

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

 Merged

bartonjs
merged 18 commits into

from

Mar 5, 2024
 Merged


Fixing SignedXml.CheckSignature for enveloped signature with #xpointer(/) Reference
#95404
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
d1cdd43

adding failing test case for https://github.com/dotnet/runtime/issues…


m0sa Nov 29, 2023
e5d4e3b

adding both positive and negative tests, in-line with recommendations…


m0sa Nov 29, 2023
9e8c558

fix implemented


m0sa Nov 29, 2023
b1f74ec

Merge branch 'dotnet:main' into main


m0sa Nov 29, 2023
d7542ca

Update src/libraries/System.Security.Cryptography.Xml/src/System/Secu…


m0sa Nov 29, 2023
5f469bb

Update src/libraries/System.Security.Cryptography.Xml/src/System/Secu…


m0sa Nov 29, 2023
2e209c3

Merge branch 'dotnet:main' into main


m0sa Nov 30, 2023
1e0dfdb

Merge branch 'dotnet:main' into main


m0sa Nov 30, 2023
8466fc0

Merge branch 'dotnet:main' into main


m0sa Nov 30, 2023
ea74198

using MemberData for tests


m0sa Dec 16, 2023
f4c2b27

making memberdata target public


m0sa Dec 16, 2023
50e05b9

Merge branch 'dotnet:main' into main


m0sa Dec 16, 2023
000881c

Merge branch 'dotnet:main' into main


m0sa Dec 21, 2023
90f2ff2

adding test cases for empty <Reference>


m0sa Jan 10, 2024
4fa87c8

Merge branch 'dotnet:main' into main


m0sa Jan 10, 2024
5a58263

Merge branch 'main' into main


m0sa Jan 11, 2024
b03f49f

Merge branch 'main' into main


m0sa Feb 15, 2024
6c40861

Merge branch 'main' into main


vcsjones Feb 25, 2024

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


25 changes: 19 additions & 6 deletions
...raries/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/Reference.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,18 +266,31 @@ public void LoadXml(XmlElement value)
 // let the transform read the children of the transformElement for data
 transform.LoadInnerXml(transformElement.ChildNodes);
 // Hack! this is done to get around the lack of here() function support in XPath
 if (transform is XmlDsigEnvelopedSignatureTransform
 && _uri != null && (_uri.Length == 0 || _uri[0] == '#'))
 if (transform is XmlDsigEnvelopedSignatureTransform)
 {
 // Walk back to the Signature tag. Find the nearest signature ancestor
 // Signature-->SignedInfo-->Reference-->Transforms-->Transform
 XmlNode? signatureTag = transformElement.SelectSingleNode("ancestor::ds:Signature[1]", nsm);

 // Resolve the reference to get starting point for position calculation.
 XmlNode? referenceTarget =
 _uri.Length == 0
 ? transformElement.OwnerDocument
 : SignedXml!.GetIdElement(transformElement.OwnerDocument, Utils.GetIdFromLocalUri(_uri, out bool _));
 // This needs to match the way CalculateSignature resolves URI references.
 XmlNode? referenceTarget = null;
 if (_uri == null || _uri.Length == 0)
Comment thread
m0sa marked this conversation as resolved.

 {
 referenceTarget = transformElement.OwnerDocument;
 }
 else if (_uri[0] == '#')
 {
 string idref = Utils.ExtractIdFromLocalUri(_uri);
 if (idref == "xpointer(/)")
Comment thread
vcsjones marked this conversation as resolved.

 {
 referenceTarget = transformElement.OwnerDocument;
 }
 else
 {
 referenceTarget = SignedXml!.GetIdElement(transformElement.OwnerDocument, idref);
Comment thread
vcsjones marked this conversation as resolved.

 }
 }

 XmlNodeList? signatureList = referenceTarget?.SelectNodes(".//ds:Signature", nsm);
 if (signatureList != null)
Expand Down

41 changes: 41 additions & 0 deletions
src/libraries/System.Security.Cryptography.Xml/tests/SignedXmlTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
// Copyright (C) 2004-2005, 2008 Novell, Inc (http://www.novell.com)

using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Net;
Expand DownExpand Up@@ -1993,5 +1994,45 @@ public void CheckSignatureHandlesIncorrectOrTamperedReferenceWithMultipleEnvelop

 Assert.False(subject.CheckSignature());
 }

 public static object[][] EnvelopedSignatureWithRootXpointerReference = new object[][]
 {
 new object[] { true, """<?xml version="1.0" encoding="UTF-8"?><hello><world>Hi</world><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference URI="#xpointer(/)"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>dqcBmS1ZvDJNhmCEgobpAb+A2XaiuB69dfGIhisZvqoxaWqAqv/0w49jp38+usJ5t3wcq3aMC631QE8iln+lHWrarojDMDWLa00isv3oE3q9UgOIV9e6MUSoRTTvQkmlK/LSYV9T/SKx6h03vLLcIkUMXaTkC/n2kthlJTGkLbU=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>t6qV1iTlkCPoaIeOTvnDczQv5pytUxMoyNXws5vaMQYxfJMKos47dvmiLtfWUDLYXFX3Yf/JMC14plJw2JA5jLrlHLnZj/vCjRtXckmWW/wGYewXUqrgR1CytStUeQKj9mNsi76erukua10UhzIrWG+H6YQ/qS4AMMJZU6jBvO0=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 new object[] { false, """<?xml version="1.0" encoding="UTF-8"?><hello>Tempered world<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference URI="#xpointer(/)"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>dqcBmS1ZvDJNhmCEgobpAb+A2XaiuB69dfGIhisZvqoxaWqAqv/0w49jp38+usJ5t3wcq3aMC631QE8iln+lHWrarojDMDWLa00isv3oE3q9UgOIV9e6MUSoRTTvQkmlK/LSYV9T/SKx6h03vLLcIkUMXaTkC/n2kthlJTGkLbU=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>t6qV1iTlkCPoaIeOTvnDczQv5pytUxMoyNXws5vaMQYxfJMKos47dvmiLtfWUDLYXFX3Yf/JMC14plJw2JA5jLrlHLnZj/vCjRtXckmWW/wGYewXUqrgR1CytStUeQKj9mNsi76erukua10UhzIrWG+H6YQ/qS4AMMJZU6jBvO0=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 };

 [Theory]
 [MemberData(nameof(EnvelopedSignatureWithRootXpointerReference))]
 public void CheckSignatureHandlesEnvelopedSignatureWithRootXpointerReference(bool isValid, string xml)
 {
 XmlDocument xmlDoc = new ();
 xmlDoc.LoadXml(xml);
 SignedXml signedXml = new (xmlDoc);
 signedXml.LoadXml(xmlDoc.GetElementsByTagName("Signature", SignedXml.XmlDsigNamespaceUrl)[0] as XmlElement);

 Assert.Equal(isValid, signedXml.CheckSignature());
 }


 public static object[][] EnvelopedSignatureWithEmptyReference = new object[][]
 {
 new object[] { true, """<?xml version="1.0" encoding="UTF-8"?><hello><world>Hi</world><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>CiB9jgIS7+Wq+lpyzCGsBZQcQ2BxqQuEU9VCvb3Li5jMtjwRV1bMO+4Wfnb4VWhEtEUq6NdiVGXhC1xvtVLnnLDX7CD/jG6NvM1Yd0/rf0UUceBhzYLFE9HLsopsBmmm3t8FO6ZtRr1QqKM0XDaQleGK9vYd2m2Jq8OR3r/w4OY=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>vcM1wQVmLB9DwdnAym8l8nw63/HlTVzgTDhIwNzWPhsPE/qr2wlK4TEQ3rjU+RAdNytfFNCnuuh75ZVMjAWCV9h6VDlp0DOvBhb6GenhymtTAdJJKzBXKJP6mNPga9cPOP31IZ36Ui00G3fjBBPrHa7nStludgL9Wi0dBU28DjU=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 new object[] { false, """<?xml version="1.0" encoding="UTF-8"?><hello><WORLD>HI</WORLD><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>CiB9jgIS7+Wq+lpyzCGsBZQcQ2BxqQuEU9VCvb3Li5jMtjwRV1bMO+4Wfnb4VWhEtEUq6NdiVGXhC1xvtVLnnLDX7CD/jG6NvM1Yd0/rf0UUceBhzYLFE9HLsopsBmmm3t8FO6ZtRr1QqKM0XDaQleGK9vYd2m2Jq8OR3r/w4OY=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>vcM1wQVmLB9DwdnAym8l8nw63/HlTVzgTDhIwNzWPhsPE/qr2wlK4TEQ3rjU+RAdNytfFNCnuuh75ZVMjAWCV9h6VDlp0DOvBhb6GenhymtTAdJJKzBXKJP6mNPga9cPOP31IZ36Ui00G3fjBBPrHa7nStludgL9Wi0dBU28DjU=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 };

 [Theory]
 [MemberData(nameof(EnvelopedSignatureWithEmptyReference))]
 public void CheckSignatureHandlesEnvelopedSignatureWithEmptyReference(bool isValid, string xml)
 {
 XmlDocument xmlDoc = new ();
 xmlDoc.LoadXml(xml);
 SignedXml signedXml = new (xmlDoc);
 signedXml.LoadXml(xmlDoc.GetElementsByTagName("Signature", SignedXml.XmlDsigNamespaceUrl)[0] as XmlElement);

 // without this, CheckSignature throws
 ((Reference)signedXml.SignedInfo.References[0]).TransformChain[0].LoadInput(xmlDoc);

 Assert.Equal(isValid, signedXml.CheckSignature());
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fixing SignedXml.CheckSignature for enveloped signature with #xpointer(/) Reference#95404

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

 Merged

bartonjs
merged 18 commits into

from

Mar 5, 2024
 Merged


Fixing SignedXml.CheckSignature for enveloped signature with #xpointer(/) Reference
#95404
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
d1cdd43

adding failing test case for https://github.com/dotnet/runtime/issues…


m0sa Nov 29, 2023
e5d4e3b

adding both positive and negative tests, in-line with recommendations…


m0sa Nov 29, 2023
9e8c558

fix implemented


m0sa Nov 29, 2023
b1f74ec

Merge branch 'dotnet:main' into main


m0sa Nov 29, 2023
d7542ca

Update src/libraries/System.Security.Cryptography.Xml/src/System/Secu…


m0sa Nov 29, 2023
5f469bb

Update src/libraries/System.Security.Cryptography.Xml/src/System/Secu…


m0sa Nov 29, 2023
2e209c3

Merge branch 'dotnet:main' into main


m0sa Nov 30, 2023
1e0dfdb

Merge branch 'dotnet:main' into main


m0sa Nov 30, 2023
8466fc0

Merge branch 'dotnet:main' into main


m0sa Nov 30, 2023
ea74198

using MemberData for tests


m0sa Dec 16, 2023
f4c2b27

making memberdata target public


m0sa Dec 16, 2023
50e05b9

Merge branch 'dotnet:main' into main


m0sa Dec 16, 2023
000881c

Merge branch 'dotnet:main' into main


m0sa Dec 21, 2023
90f2ff2

adding test cases for empty <Reference>


m0sa Jan 10, 2024
4fa87c8

Merge branch 'dotnet:main' into main


m0sa Jan 10, 2024
5a58263

Merge branch 'main' into main


m0sa Jan 11, 2024
b03f49f

Merge branch 'main' into main


m0sa Feb 15, 2024
6c40861

Merge branch 'main' into main


vcsjones Feb 25, 2024

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


25 changes: 19 additions & 6 deletions
...raries/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/Reference.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,18 +266,31 @@ public void LoadXml(XmlElement value)
 // let the transform read the children of the transformElement for data
 transform.LoadInnerXml(transformElement.ChildNodes);
 // Hack! this is done to get around the lack of here() function support in XPath
 if (transform is XmlDsigEnvelopedSignatureTransform
 && _uri != null && (_uri.Length == 0 || _uri[0] == '#'))
 if (transform is XmlDsigEnvelopedSignatureTransform)
 {
 // Walk back to the Signature tag. Find the nearest signature ancestor
 // Signature-->SignedInfo-->Reference-->Transforms-->Transform
 XmlNode? signatureTag = transformElement.SelectSingleNode("ancestor::ds:Signature[1]", nsm);

 // Resolve the reference to get starting point for position calculation.
 XmlNode? referenceTarget =
 _uri.Length == 0
 ? transformElement.OwnerDocument
 : SignedXml!.GetIdElement(transformElement.OwnerDocument, Utils.GetIdFromLocalUri(_uri, out bool _));
 // This needs to match the way CalculateSignature resolves URI references.
 XmlNode? referenceTarget = null;
 if (_uri == null || _uri.Length == 0)
Comment thread
m0sa marked this conversation as resolved.

 {
 referenceTarget = transformElement.OwnerDocument;
 }
 else if (_uri[0] == '#')
 {
 string idref = Utils.ExtractIdFromLocalUri(_uri);
 if (idref == "xpointer(/)")
Comment thread
vcsjones marked this conversation as resolved.

 {
 referenceTarget = transformElement.OwnerDocument;
 }
 else
 {
 referenceTarget = SignedXml!.GetIdElement(transformElement.OwnerDocument, idref);
Comment thread
vcsjones marked this conversation as resolved.

 }
 }

 XmlNodeList? signatureList = referenceTarget?.SelectNodes(".//ds:Signature", nsm);
 if (signatureList != null)
Expand Down

41 changes: 41 additions & 0 deletions
src/libraries/System.Security.Cryptography.Xml/tests/SignedXmlTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
// Copyright (C) 2004-2005, 2008 Novell, Inc (http://www.novell.com)

using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Net;
Expand DownExpand Up@@ -1993,5 +1994,45 @@ public void CheckSignatureHandlesIncorrectOrTamperedReferenceWithMultipleEnvelop

 Assert.False(subject.CheckSignature());
 }

 public static object[][] EnvelopedSignatureWithRootXpointerReference = new object[][]
 {
 new object[] { true, """<?xml version="1.0" encoding="UTF-8"?><hello><world>Hi</world><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference URI="#xpointer(/)"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>dqcBmS1ZvDJNhmCEgobpAb+A2XaiuB69dfGIhisZvqoxaWqAqv/0w49jp38+usJ5t3wcq3aMC631QE8iln+lHWrarojDMDWLa00isv3oE3q9UgOIV9e6MUSoRTTvQkmlK/LSYV9T/SKx6h03vLLcIkUMXaTkC/n2kthlJTGkLbU=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>t6qV1iTlkCPoaIeOTvnDczQv5pytUxMoyNXws5vaMQYxfJMKos47dvmiLtfWUDLYXFX3Yf/JMC14plJw2JA5jLrlHLnZj/vCjRtXckmWW/wGYewXUqrgR1CytStUeQKj9mNsi76erukua10UhzIrWG+H6YQ/qS4AMMJZU6jBvO0=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 new object[] { false, """<?xml version="1.0" encoding="UTF-8"?><hello>Tempered world<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference URI="#xpointer(/)"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>dqcBmS1ZvDJNhmCEgobpAb+A2XaiuB69dfGIhisZvqoxaWqAqv/0w49jp38+usJ5t3wcq3aMC631QE8iln+lHWrarojDMDWLa00isv3oE3q9UgOIV9e6MUSoRTTvQkmlK/LSYV9T/SKx6h03vLLcIkUMXaTkC/n2kthlJTGkLbU=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>t6qV1iTlkCPoaIeOTvnDczQv5pytUxMoyNXws5vaMQYxfJMKos47dvmiLtfWUDLYXFX3Yf/JMC14plJw2JA5jLrlHLnZj/vCjRtXckmWW/wGYewXUqrgR1CytStUeQKj9mNsi76erukua10UhzIrWG+H6YQ/qS4AMMJZU6jBvO0=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 };

 [Theory]
 [MemberData(nameof(EnvelopedSignatureWithRootXpointerReference))]
 public void CheckSignatureHandlesEnvelopedSignatureWithRootXpointerReference(bool isValid, string xml)
 {
 XmlDocument xmlDoc = new ();
 xmlDoc.LoadXml(xml);
 SignedXml signedXml = new (xmlDoc);
 signedXml.LoadXml(xmlDoc.GetElementsByTagName("Signature", SignedXml.XmlDsigNamespaceUrl)[0] as XmlElement);

 Assert.Equal(isValid, signedXml.CheckSignature());
 }


 public static object[][] EnvelopedSignatureWithEmptyReference = new object[][]
 {
 new object[] { true, """<?xml version="1.0" encoding="UTF-8"?><hello><world>Hi</world><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>CiB9jgIS7+Wq+lpyzCGsBZQcQ2BxqQuEU9VCvb3Li5jMtjwRV1bMO+4Wfnb4VWhEtEUq6NdiVGXhC1xvtVLnnLDX7CD/jG6NvM1Yd0/rf0UUceBhzYLFE9HLsopsBmmm3t8FO6ZtRr1QqKM0XDaQleGK9vYd2m2Jq8OR3r/w4OY=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>vcM1wQVmLB9DwdnAym8l8nw63/HlTVzgTDhIwNzWPhsPE/qr2wlK4TEQ3rjU+RAdNytfFNCnuuh75ZVMjAWCV9h6VDlp0DOvBhb6GenhymtTAdJJKzBXKJP6mNPga9cPOP31IZ36Ui00G3fjBBPrHa7nStludgL9Wi0dBU28DjU=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 new object[] { false, """<?xml version="1.0" encoding="UTF-8"?><hello><WORLD>HI</WORLD><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>CiB9jgIS7+Wq+lpyzCGsBZQcQ2BxqQuEU9VCvb3Li5jMtjwRV1bMO+4Wfnb4VWhEtEUq6NdiVGXhC1xvtVLnnLDX7CD/jG6NvM1Yd0/rf0UUceBhzYLFE9HLsopsBmmm3t8FO6ZtRr1QqKM0XDaQleGK9vYd2m2Jq8OR3r/w4OY=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>vcM1wQVmLB9DwdnAym8l8nw63/HlTVzgTDhIwNzWPhsPE/qr2wlK4TEQ3rjU+RAdNytfFNCnuuh75ZVMjAWCV9h6VDlp0DOvBhb6GenhymtTAdJJKzBXKJP6mNPga9cPOP31IZ36Ui00G3fjBBPrHa7nStludgL9Wi0dBU28DjU=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 };

 [Theory]
 [MemberData(nameof(EnvelopedSignatureWithEmptyReference))]
 public void CheckSignatureHandlesEnvelopedSignatureWithEmptyReference(bool isValid, string xml)
 {
 XmlDocument xmlDoc = new ();
 xmlDoc.LoadXml(xml);
 SignedXml signedXml = new (xmlDoc);
 signedXml.LoadXml(xmlDoc.GetElementsByTagName("Signature", SignedXml.XmlDsigNamespaceUrl)[0] as XmlElement);

 // without this, CheckSignature throws
 ((Reference)signedXml.SignedInfo.References[0]).TransformChain[0].LoadInput(xmlDoc);

 Assert.Equal(isValid, signedXml.CheckSignature());
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fixing SignedXml.CheckSignature for enveloped signature with #xpointer(/) Reference#95404

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

 Merged

bartonjs
merged 18 commits into

from

Mar 5, 2024
 Merged


Fixing SignedXml.CheckSignature for enveloped signature with #xpointer(/) Reference
#95404
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
d1cdd43

adding failing test case for https://github.com/dotnet/runtime/issues…


m0sa Nov 29, 2023
e5d4e3b

adding both positive and negative tests, in-line with recommendations…


m0sa Nov 29, 2023
9e8c558

fix implemented


m0sa Nov 29, 2023
b1f74ec

Merge branch 'dotnet:main' into main


m0sa Nov 29, 2023
d7542ca

Update src/libraries/System.Security.Cryptography.Xml/src/System/Secu…


m0sa Nov 29, 2023
5f469bb

Update src/libraries/System.Security.Cryptography.Xml/src/System/Secu…


m0sa Nov 29, 2023
2e209c3

Merge branch 'dotnet:main' into main


m0sa Nov 30, 2023
1e0dfdb

Merge branch 'dotnet:main' into main


m0sa Nov 30, 2023
8466fc0

Merge branch 'dotnet:main' into main


m0sa Nov 30, 2023
ea74198

using MemberData for tests


m0sa Dec 16, 2023
f4c2b27

making memberdata target public


m0sa Dec 16, 2023
50e05b9

Merge branch 'dotnet:main' into main


m0sa Dec 16, 2023
000881c

Merge branch 'dotnet:main' into main


m0sa Dec 21, 2023
90f2ff2

adding test cases for empty <Reference>


m0sa Jan 10, 2024
4fa87c8

Merge branch 'dotnet:main' into main


m0sa Jan 10, 2024
5a58263

Merge branch 'main' into main


m0sa Jan 11, 2024
b03f49f

Merge branch 'main' into main


m0sa Feb 15, 2024
6c40861

Merge branch 'main' into main


vcsjones Feb 25, 2024

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


25 changes: 19 additions & 6 deletions
...raries/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/Reference.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,18 +266,31 @@ public void LoadXml(XmlElement value)
 // let the transform read the children of the transformElement for data
 transform.LoadInnerXml(transformElement.ChildNodes);
 // Hack! this is done to get around the lack of here() function support in XPath
 if (transform is XmlDsigEnvelopedSignatureTransform
 && _uri != null && (_uri.Length == 0 || _uri[0] == '#'))
 if (transform is XmlDsigEnvelopedSignatureTransform)
 {
 // Walk back to the Signature tag. Find the nearest signature ancestor
 // Signature-->SignedInfo-->Reference-->Transforms-->Transform
 XmlNode? signatureTag = transformElement.SelectSingleNode("ancestor::ds:Signature[1]", nsm);

 // Resolve the reference to get starting point for position calculation.
 XmlNode? referenceTarget =
 _uri.Length == 0
 ? transformElement.OwnerDocument
 : SignedXml!.GetIdElement(transformElement.OwnerDocument, Utils.GetIdFromLocalUri(_uri, out bool _));
 // This needs to match the way CalculateSignature resolves URI references.
 XmlNode? referenceTarget = null;
 if (_uri == null || _uri.Length == 0)
Comment thread
m0sa marked this conversation as resolved.

 {
 referenceTarget = transformElement.OwnerDocument;
 }
 else if (_uri[0] == '#')
 {
 string idref = Utils.ExtractIdFromLocalUri(_uri);
 if (idref == "xpointer(/)")
Comment thread
vcsjones marked this conversation as resolved.

 {
 referenceTarget = transformElement.OwnerDocument;
 }
 else
 {
 referenceTarget = SignedXml!.GetIdElement(transformElement.OwnerDocument, idref);
Comment thread
vcsjones marked this conversation as resolved.

 }
 }

 XmlNodeList? signatureList = referenceTarget?.SelectNodes(".//ds:Signature", nsm);
 if (signatureList != null)
Expand Down

41 changes: 41 additions & 0 deletions
src/libraries/System.Security.Cryptography.Xml/tests/SignedXmlTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
// Copyright (C) 2004-2005, 2008 Novell, Inc (http://www.novell.com)

using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Net;
Expand DownExpand Up@@ -1993,5 +1994,45 @@ public void CheckSignatureHandlesIncorrectOrTamperedReferenceWithMultipleEnvelop

 Assert.False(subject.CheckSignature());
 }

 public static object[][] EnvelopedSignatureWithRootXpointerReference = new object[][]
 {
 new object[] { true, """<?xml version="1.0" encoding="UTF-8"?><hello><world>Hi</world><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference URI="#xpointer(/)"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>dqcBmS1ZvDJNhmCEgobpAb+A2XaiuB69dfGIhisZvqoxaWqAqv/0w49jp38+usJ5t3wcq3aMC631QE8iln+lHWrarojDMDWLa00isv3oE3q9UgOIV9e6MUSoRTTvQkmlK/LSYV9T/SKx6h03vLLcIkUMXaTkC/n2kthlJTGkLbU=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>t6qV1iTlkCPoaIeOTvnDczQv5pytUxMoyNXws5vaMQYxfJMKos47dvmiLtfWUDLYXFX3Yf/JMC14plJw2JA5jLrlHLnZj/vCjRtXckmWW/wGYewXUqrgR1CytStUeQKj9mNsi76erukua10UhzIrWG+H6YQ/qS4AMMJZU6jBvO0=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 new object[] { false, """<?xml version="1.0" encoding="UTF-8"?><hello>Tempered world<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference URI="#xpointer(/)"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>dqcBmS1ZvDJNhmCEgobpAb+A2XaiuB69dfGIhisZvqoxaWqAqv/0w49jp38+usJ5t3wcq3aMC631QE8iln+lHWrarojDMDWLa00isv3oE3q9UgOIV9e6MUSoRTTvQkmlK/LSYV9T/SKx6h03vLLcIkUMXaTkC/n2kthlJTGkLbU=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>t6qV1iTlkCPoaIeOTvnDczQv5pytUxMoyNXws5vaMQYxfJMKos47dvmiLtfWUDLYXFX3Yf/JMC14plJw2JA5jLrlHLnZj/vCjRtXckmWW/wGYewXUqrgR1CytStUeQKj9mNsi76erukua10UhzIrWG+H6YQ/qS4AMMJZU6jBvO0=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 };

 [Theory]
 [MemberData(nameof(EnvelopedSignatureWithRootXpointerReference))]
 public void CheckSignatureHandlesEnvelopedSignatureWithRootXpointerReference(bool isValid, string xml)
 {
 XmlDocument xmlDoc = new ();
 xmlDoc.LoadXml(xml);
 SignedXml signedXml = new (xmlDoc);
 signedXml.LoadXml(xmlDoc.GetElementsByTagName("Signature", SignedXml.XmlDsigNamespaceUrl)[0] as XmlElement);

 Assert.Equal(isValid, signedXml.CheckSignature());
 }


 public static object[][] EnvelopedSignatureWithEmptyReference = new object[][]
 {
 new object[] { true, """<?xml version="1.0" encoding="UTF-8"?><hello><world>Hi</world><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>CiB9jgIS7+Wq+lpyzCGsBZQcQ2BxqQuEU9VCvb3Li5jMtjwRV1bMO+4Wfnb4VWhEtEUq6NdiVGXhC1xvtVLnnLDX7CD/jG6NvM1Yd0/rf0UUceBhzYLFE9HLsopsBmmm3t8FO6ZtRr1QqKM0XDaQleGK9vYd2m2Jq8OR3r/w4OY=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>vcM1wQVmLB9DwdnAym8l8nw63/HlTVzgTDhIwNzWPhsPE/qr2wlK4TEQ3rjU+RAdNytfFNCnuuh75ZVMjAWCV9h6VDlp0DOvBhb6GenhymtTAdJJKzBXKJP6mNPga9cPOP31IZ36Ui00G3fjBBPrHa7nStludgL9Wi0dBU28DjU=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 new object[] { false, """<?xml version="1.0" encoding="UTF-8"?><hello><WORLD>HI</WORLD><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments" /><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><Reference><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><DigestValue>SVaCE5w9iLXTVYTKP1t/yjjmPXvWovMYpgljGgpgz2Y=</DigestValue></Reference></SignedInfo><SignatureValue>CiB9jgIS7+Wq+lpyzCGsBZQcQ2BxqQuEU9VCvb3Li5jMtjwRV1bMO+4Wfnb4VWhEtEUq6NdiVGXhC1xvtVLnnLDX7CD/jG6NvM1Yd0/rf0UUceBhzYLFE9HLsopsBmmm3t8FO6ZtRr1QqKM0XDaQleGK9vYd2m2Jq8OR3r/w4OY=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>vcM1wQVmLB9DwdnAym8l8nw63/HlTVzgTDhIwNzWPhsPE/qr2wlK4TEQ3rjU+RAdNytfFNCnuuh75ZVMjAWCV9h6VDlp0DOvBhb6GenhymtTAdJJKzBXKJP6mNPga9cPOP31IZ36Ui00G3fjBBPrHa7nStludgL9Wi0dBU28DjU=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue></KeyInfo></Signature></hello>""" },
 };

 [Theory]
 [MemberData(nameof(EnvelopedSignatureWithEmptyReference))]
 public void CheckSignatureHandlesEnvelopedSignatureWithEmptyReference(bool isValid, string xml)
 {
 XmlDocument xmlDoc = new ();
 xmlDoc.LoadXml(xml);
 SignedXml signedXml = new (xmlDoc);
 signedXml.LoadXml(xmlDoc.GetElementsByTagName("Signature", SignedXml.XmlDsigNamespaceUrl)[0] as XmlElement);

 // without this, CheckSignature throws
 ((Reference)signedXml.SignedInfo.References[0]).TransformChain[0].LoadInput(xmlDoc);

 Assert.Equal(isValid, signedXml.CheckSignature());
 }
 }
}