From c2dce89190cba8fcefa49c3ea6740d17c21d613e Mon Sep 17 00:00:00 2001 From: Nathan Jaremko Date: Mon, 18 Mar 2024 22:50:07 -0400 Subject: [PATCH] Update pinned nix dependencies (#44) * Update nix pins * Fix expired test responses --- flake.lock | 88 ++++++----------------- flake.nix | 2 +- test_vectors/response_signed_by_idp_2.xml | 39 ++++++---- test_vectors/response_signed_template.xml | 53 ++++++++++---- 4 files changed, 89 insertions(+), 93 deletions(-) diff --git a/flake.lock b/flake.lock index 3d8cb78..537c17d 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "advisory-db": { "flake": false, "locked": { - "lastModified": 1697295662, - "narHash": "sha256-7bJNs2Db/hWp7PeMDRpLj/CdGubzZ/Ge7QHL56XOoCI=", + "lastModified": 1710515894, + "narHash": "sha256-tmQ9TMCb2jZY3jYdf53qIberkYV3dnUzdAYYK/NB+No=", "owner": "rustsec", "repo": "advisory-db", - "rev": "58c33af7fa0900f18653d647b35c204480f289e9", + "rev": "369d98c1b95b7b56d0859605916d7b81a7d1f1c4", "type": "github" }, "original": { @@ -18,21 +18,16 @@ }, "crane": { "inputs": { - "flake-compat": "flake-compat", - "flake-utils": [ - "flake-utils" - ], "nixpkgs": [ "nixpkgs" - ], - "rust-overlay": "rust-overlay" + ] }, "locked": { - "lastModified": 1697165857, - "narHash": "sha256-Cho+TPHCIfx/sVo5scjNDP2XUCpUxcyKvoMlJ8w9dgQ=", + "lastModified": 1710003968, + "narHash": "sha256-g8+K+mLiNG5uch35Oy9oDQBAmGSkCcqrd0Jjme7xiG0=", "owner": "ipetkov", "repo": "crane", - "rev": "117ac48319c0dbcff5540781c7c5b18166e33f6a", + "rev": "10484f86201bb94bd61ecc5335b1496794fedb78", "type": "github" }, "original": { @@ -41,32 +36,16 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696267196, - "narHash": "sha256-AAQ/2sD+0D18bb8hKuEEVpHUYD1GmO2Uh/taFamn6XQ=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "4f910c9827911b1ec2bf26b5a062cd09f8d89f85", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -77,11 +56,11 @@ }, "nix-filter": { "locked": { - "lastModified": 1694857738, - "narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=", + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", "owner": "numtide", "repo": "nix-filter", - "rev": "41fd48e00c22b4ced525af521ead8792402de0ea", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", "type": "github" }, "original": { @@ -92,16 +71,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1696983906, - "narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=", + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd1cde45c77891214131cbbea5b1203e485a9d51", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -113,35 +92,10 @@ "flake-utils": "flake-utils", "nix-filter": "nix-filter", "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay" } }, "rust-overlay": { - "inputs": { - "flake-utils": [ - "crane", - "flake-utils" - ], - "nixpkgs": [ - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1696299134, - "narHash": "sha256-RS77cAa0N+Sfj5EmKbm5IdncNXaBCE1BSSQvUE8exvo=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "611ccdceed92b4d94ae75328148d84ee4a5b462d", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "flake-utils": [ "flake-utils" @@ -151,11 +105,11 @@ ] }, "locked": { - "lastModified": 1697249410, - "narHash": "sha256-OmsnxNsjBB1DJlUuJyzDJJ7psbm4/VzokNT+o0ajzFQ=", + "lastModified": 1710814282, + "narHash": "sha256-nWaKhMQackiO0M8504HSx/E7I76C2r0/g4wqZf4hp24=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "dce60ca7fca201014868c08a612edb73a998310f", + "rev": "8c72f33c23c8e537dd59088c4560222c43eedaca", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1653d9c..e847602 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; flake-utils.url = "github:numtide/flake-utils"; nix-filter.url = "github:numtide/nix-filter"; rust-overlay = { diff --git a/test_vectors/response_signed_by_idp_2.xml b/test_vectors/response_signed_by_idp_2.xml index eafb50d..788a3f5 100644 --- a/test_vectors/response_signed_by_idp_2.xml +++ b/test_vectors/response_signed_by_idp_2.xml @@ -1,12 +1,24 @@ - https://fujifish.github.io/samling/samling.html - - - KQa/4QlfCtG78es96IG0dbGl82w=fGScazDQS3Vw7nT2RqgbSCMDTumdMBr3QQFWH9U/bdueQlorK1XjhOzJdMSGil+1 -lqqKM2nvV98NKLZQhaXrMqSNEl0w0M6A3H3ugS/pPFMS3CwjpQnwjOg6s4pyyPyF -1wJnBHP3wonHezWpE0PHLgUW3nHoJjQXLAOxTv9geRg= - + https://fujifish.github.io/samling/samling.html + + + + + + + + + + + W7iYqYBNLg7dS+ueqLf04nO5V+c= + + + HxXRgmgrGJxhp6K3Bsj9H0QnZEdJfz/idDGN02a7h4G32BpmXzJ11OVII5vR6tK5 +BrSn2COna//MaXte/hrcJrr4RO7FkwP++Z3If5dlOvrcZg4WF4S+MbwDlZY2w5AV +wgdlJCl/Iay8YB0mmq177FcNi4GZg8/sIB11+y9hmVA= + + MIICpzCCAhACCQDuFX0Db5iljDANBgkqhkiG9w0BAQsFADCBlzELMAkGA1UEBhMC VVMxEzARBgNVBAgMCkNhbGlmb3JuaWExEjAQBgNVBAcMCVBhbG8gQWx0bzEQMA4G A1UECgwHU2FtbGluZzEPMA0GA1UECwwGU2FsaW5nMRQwEgYDVQQDDAtjYXByaXph @@ -22,24 +34,27 @@ wOnxAgMBAAEwDQYJKoZIhvcNAQELBQADgYEACIylhvh6T758hcZjAQJiV7rMRg+O mb68iJI4L9f0cyBcJENR+1LQNgUGyFDMm9Wm9o81CuIKBnfpEE2Jfcs76YVWRJy5 xJ11GFKJJ5T0NEB7txbUQPoJOeNoE736lF5vYw6YKp8fJqPW0L2PLWe9qTn8hxpd njo3k6r5gXyl8tk= - + + + https://fujifish.github.io/samling/samling.html - _ce3d2948b4cf20146dee0a0b3dd6f69b6cf86f62d7 + + _ce3d2948b4cf20146dee0a0b3dd6f69b6cf86f62d7 - + - + http://test_accept_signed_with_correct_key.test - + urn:oasis:names:tc:SAML:2.0:ac:classes:Password diff --git a/test_vectors/response_signed_template.xml b/test_vectors/response_signed_template.xml index e124633..a71b93b 100644 --- a/test_vectors/response_signed_template.xml +++ b/test_vectors/response_signed_template.xml @@ -1,27 +1,53 @@ - - https://fujifish.github.io/samling/samling.html - - - gciSu0u9H5QMP776LBbSg8ai9BM= - + + https://fujifish.github.io/samling/samling.html + + + + + + + + + + + gciSu0u9H5QMP776LBbSg8ai9BM= + + + + + + + - + - + https://fujifish.github.io/samling/samling.html - _ce3d2948b4cf20146dee0a0b3dd6f69b6cf86f62d7 + + _ce3d2948b4cf20146dee0a0b3dd6f69b6cf86f62d7 - + - + http://test_accept_signed_with_correct_key.test - + urn:oasis:names:tc:SAML:2.0:ac:classes:Password @@ -33,7 +59,8 @@ test@example.com - + users examplerole1