Skip to content

Commit c2dce89

Browse files
njaremkonjaremko
authored
Update pinned nix dependencies (#44)
* Update nix pins * Fix expired test responses
1 parent 15f9fb8 commit c2dce89

File tree

4 files changed

+89
-93
lines changed

4 files changed

+89
-93
lines changed

‎flake.lock

Lines changed: 21 additions & 67 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
inputs = {
3-
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
3+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
44
flake-utils.url = "github:numtide/flake-utils";
55
nix-filter.url = "github:numtide/nix-filter";
66
rust-overlay = {

‎test_vectors/response_signed_by_idp_2.xml

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
11
<?xml version="1.0"?>
22
<samlp:Response xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" ID="pfxf63324d7-7ba2-b371-90d6-171637d97253" Version="2.0" IssueInstant="2014-07-17T01:01:48Z" Destination="http://sp.example.com/demo1/index.php?acs" InResponseTo="ONELOGIN_4fee3b046395c4e751011e97f8900b5273d56685">
3-
<saml:Issuer>https://fujifish.github.io/samling/samling.html</saml:Issuer><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
4-
<ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
5-
<ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
6-
<ds:Reference URI="#pfxf63324d7-7ba2-b371-90d6-171637d97253"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>KQa/4QlfCtG78es96IG0dbGl82w=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>fGScazDQS3Vw7nT2RqgbSCMDTumdMBr3QQFWH9U/bdueQlorK1XjhOzJdMSGil+1
7-
lqqKM2nvV98NKLZQhaXrMqSNEl0w0M6A3H3ugS/pPFMS3CwjpQnwjOg6s4pyyPyF
8-
1wJnBHP3wonHezWpE0PHLgUW3nHoJjQXLAOxTv9geRg=</ds:SignatureValue>
9-
<ds:KeyInfo><ds:X509Data>
3+
<saml:Issuer>https://fujifish.github.io/samling/samling.html</saml:Issuer>
4+
<ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
5+
<ds:SignedInfo>
6+
<ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
7+
<ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
8+
<ds:Reference URI="#pfxf63324d7-7ba2-b371-90d6-171637d97253">
9+
<ds:Transforms>
10+
<ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
11+
<ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
12+
</ds:Transforms>
13+
<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
14+
<ds:DigestValue>W7iYqYBNLg7dS+ueqLf04nO5V+c=</ds:DigestValue>
15+
</ds:Reference>
16+
</ds:SignedInfo>
17+
<ds:SignatureValue>HxXRgmgrGJxhp6K3Bsj9H0QnZEdJfz/idDGN02a7h4G32BpmXzJ11OVII5vR6tK5
18+
BrSn2COna//MaXte/hrcJrr4RO7FkwP++Z3If5dlOvrcZg4WF4S+MbwDlZY2w5AV
19+
wgdlJCl/Iay8YB0mmq177FcNi4GZg8/sIB11+y9hmVA=</ds:SignatureValue>
20+
<ds:KeyInfo>
21+
<ds:X509Data>
1022
<ds:X509Certificate>MIICpzCCAhACCQDuFX0Db5iljDANBgkqhkiG9w0BAQsFADCBlzELMAkGA1UEBhMC
1123
VVMxEzARBgNVBAgMCkNhbGlmb3JuaWExEjAQBgNVBAcMCVBhbG8gQWx0bzEQMA4G
1224
A1UECgwHU2FtbGluZzEPMA0GA1UECwwGU2FsaW5nMRQwEgYDVQQDDAtjYXByaXph
@@ -22,24 +34,27 @@ wOnxAgMBAAEwDQYJKoZIhvcNAQELBQADgYEACIylhvh6T758hcZjAQJiV7rMRg+O
2234
mb68iJI4L9f0cyBcJENR+1LQNgUGyFDMm9Wm9o81CuIKBnfpEE2Jfcs76YVWRJy5
2335
xJ11GFKJJ5T0NEB7txbUQPoJOeNoE736lF5vYw6YKp8fJqPW0L2PLWe9qTn8hxpd
2436
njo3k6r5gXyl8tk=</ds:X509Certificate>
25-
</ds:X509Data></ds:KeyInfo></ds:Signature>
37+
</ds:X509Data>
38+
</ds:KeyInfo>
39+
</ds:Signature>
2640
<samlp:Status>
2741
<samlp:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success"/>
2842
</samlp:Status>
2943
<saml:Assertion xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" ID="_d71a3a8e9fcc45c9e9d248ef7049393fc8f04e5f75" Version="2.0" IssueInstant="2014-07-17T01:01:48Z">
3044
<saml:Issuer>https://fujifish.github.io/samling/samling.html</saml:Issuer>
3145
<saml:Subject>
32-
<saml:NameID SPNameQualifier="http://sp.example.com/demo1/metadata.php" Format="urn:oasis:names:tc:SAML:2.0:nameid-format:transient">_ce3d2948b4cf20146dee0a0b3dd6f69b6cf86f62d7</saml:NameID>
46+
<saml:NameID SPNameQualifier="http://sp.example.com/demo1/metadata.php" Format="urn:oasis:names:tc:SAML:2.0:nameid-format:transient">
47+
_ce3d2948b4cf20146dee0a0b3dd6f69b6cf86f62d7</saml:NameID>
3348
<saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer">
34-
<saml:SubjectConfirmationData NotOnOrAfter="2024-01-18T06:21:48Z" Recipient="http://sp.example.com/demo1/index.php?acs" InResponseTo="ONELOGIN_4fee3b046395c4e751011e97f8900b5273d56685"/>
49+
<saml:SubjectConfirmationData NotOnOrAfter="2030-01-18T06:21:48Z" Recipient="http://sp.example.com/demo1/index.php?acs" InResponseTo="ONELOGIN_4fee3b046395c4e751011e97f8900b5273d56685"/>
3550
</saml:SubjectConfirmation>
3651
</saml:Subject>
37-
<saml:Conditions NotBefore="2014-07-17T01:01:18Z" NotOnOrAfter="2024-01-18T06:21:48Z">
52+
<saml:Conditions NotBefore="2014-07-17T01:01:18Z" NotOnOrAfter="2030-01-18T06:21:48Z">
3853
<saml:AudienceRestriction>
3954
<saml:Audience>http://test_accept_signed_with_correct_key.test</saml:Audience>
4055
</saml:AudienceRestriction>
4156
</saml:Conditions>
42-
<saml:AuthnStatement AuthnInstant="2014-07-17T01:01:48Z" SessionNotOnOrAfter="2024-07-17T09:01:48Z" SessionIndex="_be9967abd904ddcae3c0eb4189adbe3f71e327cf93">
57+
<saml:AuthnStatement AuthnInstant="2014-07-17T01:01:48Z" SessionNotOnOrAfter="2030-07-17T09:01:48Z" SessionIndex="_be9967abd904ddcae3c0eb4189adbe3f71e327cf93">
4358
<saml:AuthnContext>
4459
<saml:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:Password</saml:AuthnContextClassRef>
4560
</saml:AuthnContext>

‎test_vectors/response_signed_template.xml

Lines changed: 40 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,53 @@
11
<?xml version="1.0"?>
2-
<samlp:Response xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" ID="pfxf63324d7-7ba2-b371-90d6-171637d97253" Version="2.0" IssueInstant="2014-07-17T01:01:48Z" Destination="http://sp.example.com/demo1/index.php?acs" InResponseTo="ONELOGIN_4fee3b046395c4e751011e97f8900b5273d56685">
3-
<saml:Issuer>https://fujifish.github.io/samling/samling.html</saml:Issuer><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
4-
<ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
5-
<ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
6-
<ds:Reference URI="#pfxf63324d7-7ba2-b371-90d6-171637d97253"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>gciSu0u9H5QMP776LBbSg8ai9BM=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue/>
7-
<ds:KeyInfo><ds:X509Data/></ds:KeyInfo></ds:Signature>
2+
<samlp:Response xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
3+
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" ID="pfxf63324d7-7ba2-b371-90d6-171637d97253"
4+
Version="2.0" IssueInstant="2014-07-17T01:01:48Z"
5+
Destination="http://sp.example.com/demo1/index.php?acs"
6+
InResponseTo="ONELOGIN_4fee3b046395c4e751011e97f8900b5273d56685">
7+
<saml:Issuer>https://fujifish.github.io/samling/samling.html</saml:Issuer>
8+
<ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
9+
<ds:SignedInfo>
10+
<ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
11+
<ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
12+
<ds:Reference URI="#pfxf63324d7-7ba2-b371-90d6-171637d97253">
13+
<ds:Transforms>
14+
<ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
15+
<ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
16+
</ds:Transforms>
17+
<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
18+
<ds:DigestValue>gciSu0u9H5QMP776LBbSg8ai9BM=</ds:DigestValue>
19+
</ds:Reference>
20+
</ds:SignedInfo>
21+
<ds:SignatureValue />
22+
<ds:KeyInfo>
23+
<ds:X509Data />
24+
</ds:KeyInfo>
25+
</ds:Signature>
826
<samlp:Status>
9-
<samlp:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success"/>
27+
<samlp:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success" />
1028
</samlp:Status>
11-
<saml:Assertion xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" ID="_d71a3a8e9fcc45c9e9d248ef7049393fc8f04e5f75" Version="2.0" IssueInstant="2014-07-17T01:01:48Z">
29+
<saml:Assertion xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
30+
xmlns:xs="http://www.w3.org/2001/XMLSchema" ID="_d71a3a8e9fcc45c9e9d248ef7049393fc8f04e5f75"
31+
Version="2.0" IssueInstant="2014-07-17T01:01:48Z">
1232
<saml:Issuer>https://fujifish.github.io/samling/samling.html</saml:Issuer>
1333
<saml:Subject>
14-
<saml:NameID SPNameQualifier="http://sp.example.com/demo1/metadata.php" Format="urn:oasis:names:tc:SAML:2.0:nameid-format:transient">_ce3d2948b4cf20146dee0a0b3dd6f69b6cf86f62d7</saml:NameID>
34+
<saml:NameID SPNameQualifier="http://sp.example.com/demo1/metadata.php"
35+
Format="urn:oasis:names:tc:SAML:2.0:nameid-format:transient">
36+
_ce3d2948b4cf20146dee0a0b3dd6f69b6cf86f62d7</saml:NameID>
1537
<saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer">
16-
<saml:SubjectConfirmationData NotOnOrAfter="2024-01-18T06:21:48Z" Recipient="http://sp.example.com/demo1/index.php?acs" InResponseTo="ONELOGIN_4fee3b046395c4e751011e97f8900b5273d56685"/>
38+
<saml:SubjectConfirmationData NotOnOrAfter="2030-01-18T06:21:48Z"
39+
Recipient="http://sp.example.com/demo1/index.php?acs"
40+
InResponseTo="ONELOGIN_4fee3b046395c4e751011e97f8900b5273d56685" />
1741
</saml:SubjectConfirmation>
1842
</saml:Subject>
19-
<saml:Conditions NotBefore="2014-07-17T01:01:18Z" NotOnOrAfter="2024-01-18T06:21:48Z">
43+
<saml:Conditions NotBefore="2014-07-17T01:01:18Z" NotOnOrAfter="2030-01-18T06:21:48Z">
2044
<saml:AudienceRestriction>
2145
<saml:Audience>http://test_accept_signed_with_correct_key.test</saml:Audience>
2246
</saml:AudienceRestriction>
2347
</saml:Conditions>
24-
<saml:AuthnStatement AuthnInstant="2014-07-17T01:01:48Z" SessionNotOnOrAfter="2024-07-17T09:01:48Z" SessionIndex="_be9967abd904ddcae3c0eb4189adbe3f71e327cf93">
48+
<saml:AuthnStatement AuthnInstant="2014-07-17T01:01:48Z"
49+
SessionNotOnOrAfter="2030-07-17T09:01:48Z"
50+
SessionIndex="_be9967abd904ddcae3c0eb4189adbe3f71e327cf93">
2551
<saml:AuthnContext>
2652
<saml:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:Password</saml:AuthnContextClassRef>
2753
</saml:AuthnContext>
@@ -33,7 +59,8 @@
3359
<saml:Attribute Name="mail" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic">
3460
<saml:AttributeValue xsi:type="xs:string">[email protected]</saml:AttributeValue>
3561
</saml:Attribute>
36-
<saml:Attribute Name="eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic">
62+
<saml:Attribute Name="eduPersonAffiliation"
63+
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic">
3764
<saml:AttributeValue xsi:type="xs:string">users</saml:AttributeValue>
3865
<saml:AttributeValue xsi:type="xs:string">examplerole1</saml:AttributeValue>
3966
</saml:Attribute>

0 commit comments

Comments
 (0)