From 9c45a43584a6b34dbd89ed571a062c95c6f616fc Mon Sep 17 00:00:00 2001 From: cduvray Date: Sun, 12 Feb 2023 09:04:38 +0100 Subject: [PATCH] chore: key file renaming --- .../{ec256-private.pem => ecdsa-private1.pem} | 0 ...ivate_ecdsa_key.pem => ecdsa-private2.pem} | 0 .../{ec256-public.pem => ecdsa-public1.pem} | 0 ...public_ecdsa_key.pem => ecdsa-public2.pem} | 0 ...25519-private.pem => ed25519-private1.pem} | 0 ...e_ed25519_key.pem => ed25519-private2.pem} | 0 ...ed25519-public.pem => ed25519-public1.pem} | 0 ...ic_ed25519_key.pem => ed25519-public2.pem} | 0 config/ed256-jwk.json | 8 --- config/jwks.json | 55 ------------------- config/{jwtRS256.key => rsa-private1.pem} | 0 ...ate_rsa_key_pkcs8.pem => rsa-private2.pem} | 0 config/{jwtRS256.key.pub => rsa-public1.pem} | 0 demo-server/src/oidc_provider/mod.rs | 24 ++++---- jwt-authorizer/src/authorizer.rs | 6 +- jwt-authorizer/tests/tests.rs | 10 ++-- 16 files changed, 20 insertions(+), 83 deletions(-) rename config/{ec256-private.pem => ecdsa-private1.pem} (100%) rename config/{private_ecdsa_key.pem => ecdsa-private2.pem} (100%) rename config/{ec256-public.pem => ecdsa-public1.pem} (100%) rename config/{public_ecdsa_key.pem => ecdsa-public2.pem} (100%) rename config/{ed25519-private.pem => ed25519-private1.pem} (100%) rename config/{private_ed25519_key.pem => ed25519-private2.pem} (100%) rename config/{ed25519-public.pem => ed25519-public1.pem} (100%) rename config/{public_ed25519_key.pem => ed25519-public2.pem} (100%) delete mode 100644 config/ed256-jwk.json delete mode 100644 config/jwks.json rename config/{jwtRS256.key => rsa-private1.pem} (100%) rename config/{private_rsa_key_pkcs8.pem => rsa-private2.pem} (100%) rename config/{jwtRS256.key.pub => rsa-public1.pem} (100%) diff --git a/config/ec256-private.pem b/config/ecdsa-private1.pem similarity index 100% rename from config/ec256-private.pem rename to config/ecdsa-private1.pem diff --git a/config/private_ecdsa_key.pem b/config/ecdsa-private2.pem similarity index 100% rename from config/private_ecdsa_key.pem rename to config/ecdsa-private2.pem diff --git a/config/ec256-public.pem b/config/ecdsa-public1.pem similarity index 100% rename from config/ec256-public.pem rename to config/ecdsa-public1.pem diff --git a/config/public_ecdsa_key.pem b/config/ecdsa-public2.pem similarity index 100% rename from config/public_ecdsa_key.pem rename to config/ecdsa-public2.pem diff --git a/config/ed25519-private.pem b/config/ed25519-private1.pem similarity index 100% rename from config/ed25519-private.pem rename to config/ed25519-private1.pem diff --git a/config/private_ed25519_key.pem b/config/ed25519-private2.pem similarity index 100% rename from config/private_ed25519_key.pem rename to config/ed25519-private2.pem diff --git a/config/ed25519-public.pem b/config/ed25519-public1.pem similarity index 100% rename from config/ed25519-public.pem rename to config/ed25519-public1.pem diff --git a/config/public_ed25519_key.pem b/config/ed25519-public2.pem similarity index 100% rename from config/public_ed25519_key.pem rename to config/ed25519-public2.pem diff --git a/config/ed256-jwk.json b/config/ed256-jwk.json deleted file mode 100644 index 5f0611d..0000000 --- a/config/ed256-jwk.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "kty": "OKP", - "use": "sig", - "crv": "Ed25519", - "x": "uWtSkE-I9aTMYTTvuTE1rtu0rNdxp3DU33cJ_ksL1Gk", - "kid": "key-ed", - "alg": "EdDSA" - } \ No newline at end of file diff --git a/config/jwks.json b/config/jwks.json deleted file mode 100644 index 5a09e06..0000000 --- a/config/jwks.json +++ /dev/null @@ -1,55 +0,0 @@ - -{ - "keys": [ - { - "kty": "RSA", - "n": "2pQeZdxa7q093K7bj5h6-leIpxfTnuAxzXdhjfGEJHxmt2ekHyCBWWWXCBiDn2RTcEBcy6gZqOW45Uy_tw-5e-Px1xFj1PykGEkRlOpYSAeWsNaAWvvpGB9m4zQ0PgZeMDDXE5IIBrY6YAzmGQxV-fcGGLhJnXl0-5_z7tKC7RvBoT3SGwlc_AmJqpFtTpEBn_fDnyqiZbpcjXYLExFpExm41xDitRKHWIwfc3dV8_vlNntlxCPGy_THkjdXJoHv2IJmlhvmr5_h03iGMLWDKSywxOol_4Wc1BT7Hb6byMxW40GKwSJJ4p7W8eI5mqggRHc8jlwSsTN9LZ2VOvO-XiVShZRVg7JeraGAfWwaIgIJ1D8C1h5Pi0iFpp2suxpHAXHfyLMJXuVotpXbDh4NDX-A4KRMgaxcfAcui_x6gybksq6gF90-9nfQfmVMVJctZ6M-FvRr-itd1Nef5WAtwUp1qyZygAXU3cH3rarscajmurOsP6dE1OHl3grY_eZhQxk33VBK9lavqNKPg6Q_PLiq1ojbYBj3bcYifJrsNeQwxldQP83aWt5rGtgZTehKVJwa40Uy_Grae1iRnsDtdSy5sTJIJ6EiShnWAdMoGejdiI8vpkjrdU8SWH8lv1KXI54DsbyAuke2cYz02zPWc6JEotQqI0HwhzU0KHyoY4s", - "e": "AQAB", - "kid": "key-rsa", - "alg": "RS256", - "use": "sig" - }, - { - "kty": "RSA", - "n": "yRE6rHuNR0QbHO3H3Kt2pOKGVhQqGZXInOduQNxXzuKlvQTLUTv4l4sggh5_CYYi_cvI-SXVT9kPWSKXxJXBXd_4LkvcPuUakBoAkfh-eiFVMh2VrUyWyj3MFl0HTVF9KwRXLAcwkREiS3npThHRyIxuy0ZMeZfxVL5arMhw1SRELB8HoGfG_AtH89BIE9jDBHZ9dLelK9a184zAf8LwoPLxvJb3Il5nncqPcSfKDDodMFBIMc4lQzDKL5gvmiXLXB1AGLm8KBjfE8s3L5xqi-yUod-j8MtvIj812dkS4QMiRVN_by2h3ZY8LYVGrqZXZTcgn2ujn8uKjXLZVD5TdQ", - "e": "AQAB", - "kid": "rsa01", - "alg": "RS256", - "use": "sig" - }, - { - "kty": "EC", - "crv": "P-256", - "x": "MZiwc5EVP_E3vkd2oKedr4lWVMN9vgdyBBpBIVFJjwY", - "y": "1npLU75B6M0mb01zUAVoeYJSDOlQJmvjBdqLPjJvy3Y", - "kid": "key-ec", - "alg": "ES256", - "use": "sig" - }, - { - "kty": "EC", - "crv": "P-256", - "x": "w7JAoU_gJbZJvV-zCOvU9yFJq0FNC_edCMRM78P8eQQ", - "y": "wQg1EytcsEmGrM70Gb53oluoDbVhCZ3Uq3hHMslHVb4", - "kid": "ec01", - "alg": "ES256", - "use": "sig" - }, - { - "kty": "OKP", - "use": "sig", - "crv": "Ed25519", - "x": "uWtSkE-I9aTMYTTvuTE1rtu0rNdxp3DU33cJ_ksL1Gk", - "kid": "key-ed", - "alg": "EdDSA" - }, - { - "kty": "OKP", - "use": "sig", - "crv": "Ed25519", - "x": "2-Jj2UvNCvQiUPNYRgSi0cJSPiJI6Rs6D0UTeEpQVj8", - "kid": "ed01", - "alg": "EdDSA" - } - ] - } \ No newline at end of file diff --git a/config/jwtRS256.key b/config/rsa-private1.pem similarity index 100% rename from config/jwtRS256.key rename to config/rsa-private1.pem diff --git a/config/private_rsa_key_pkcs8.pem b/config/rsa-private2.pem similarity index 100% rename from config/private_rsa_key_pkcs8.pem rename to config/rsa-private2.pem diff --git a/config/jwtRS256.key.pub b/config/rsa-public1.pem similarity index 100% rename from config/jwtRS256.key.pub rename to config/rsa-public1.pem diff --git a/demo-server/src/oidc_provider/mod.rs b/demo-server/src/oidc_provider/mod.rs index 6fc0662..c343dc8 100644 --- a/demo-server/src/oidc_provider/mod.rs +++ b/demo-server/src/oidc_provider/mod.rs @@ -35,42 +35,42 @@ struct JwkSet { async fn jwks() -> Json { let mut kset = JwkSet { keys: Vec::::new() }; - let keypair = RsaKeyPair::from_pem(include_bytes!("../../../config/jwtRS256.key")).unwrap(); + let keypair = RsaKeyPair::from_pem(include_bytes!("../../../config/rsa-private1.pem")).unwrap(); let mut pk = keypair.to_jwk_public_key(); pk.set_key_id("rsa01"); pk.set_algorithm("RS256"); pk.set_key_use("sig"); kset.keys.push(pk); - let keypair = RsaKeyPair::from_pem(include_bytes!("../../../config/private_rsa_key_pkcs8.pem")).unwrap(); + let keypair = RsaKeyPair::from_pem(include_bytes!("../../../config/rsa-private2.pem")).unwrap(); let mut pk = keypair.to_jwk_public_key(); pk.set_key_id("rsa02"); pk.set_algorithm("RS256"); pk.set_key_use("sig"); kset.keys.push(pk); - let keypair = EcKeyPair::from_pem(include_bytes!("../../../config/ec256-private.pem"), Some(EcCurve::P256)).unwrap(); + let keypair = EcKeyPair::from_pem(include_bytes!("../../../config/ecdsa-private1.pem"), Some(EcCurve::P256)).unwrap(); let mut pk = keypair.to_jwk_public_key(); pk.set_key_id("ec01"); pk.set_algorithm("ES256"); pk.set_key_use("sig"); kset.keys.push(pk); - let keypair = EcKeyPair::from_pem(include_bytes!("../../../config/private_ecdsa_key.pem"), Some(EcCurve::P256)).unwrap(); + let keypair = EcKeyPair::from_pem(include_bytes!("../../../config/ecdsa-private2.pem"), Some(EcCurve::P256)).unwrap(); let mut pk = keypair.to_jwk_public_key(); pk.set_key_id("ec02"); pk.set_algorithm("ES256"); pk.set_key_use("sig"); kset.keys.push(pk); - let keypair = EdKeyPair::from_pem(include_bytes!("../../../config/ed25519-private.pem")).unwrap(); + let keypair = EdKeyPair::from_pem(include_bytes!("../../../config/ed25519-private1.pem")).unwrap(); let mut pk = keypair.to_jwk_public_key(); pk.set_key_id("ed01"); pk.set_algorithm("EdDSA"); pk.set_key_use("sig"); kset.keys.push(pk); - let keypair = EdKeyPair::from_pem(include_bytes!("../../../config/private_ed25519_key.pem")).unwrap(); + let keypair = EdKeyPair::from_pem(include_bytes!("../../../config/ed25519-private2.pem")).unwrap(); let mut pk = keypair.to_jwk_public_key(); pk.set_key_id("ed02"); pk.set_algorithm("EdDSA"); @@ -114,12 +114,12 @@ pub async fn tokens() -> Json { nbf: 1516239022, // Jan 2018 }; - let rsa1_key = EncodingKey::from_rsa_pem(include_bytes!("../../../config/jwtRS256.key")).unwrap(); - let rsa2_key = EncodingKey::from_rsa_pem(include_bytes!("../../../config/private_rsa_key_pkcs8.pem")).unwrap(); - let ec1_key = EncodingKey::from_ec_pem(include_bytes!("../../../config/ec256-private.pem")).unwrap(); - let ec2_key = EncodingKey::from_ec_pem(include_bytes!("../../../config/private_ecdsa_key.pem")).unwrap(); - let ed1_key = EncodingKey::from_ed_pem(include_bytes!("../../../config/ed25519-private.pem")).unwrap(); - let ed2_key = EncodingKey::from_ed_pem(include_bytes!("../../../config/ed25519-private.pem")).unwrap(); + let rsa1_key = EncodingKey::from_rsa_pem(include_bytes!("../../../config/rsa-private1.pem")).unwrap(); + let rsa2_key = EncodingKey::from_rsa_pem(include_bytes!("../../../config/rsa-private2.pem")).unwrap(); + let ec1_key = EncodingKey::from_ec_pem(include_bytes!("../../../config/ecdsa-private1.pem")).unwrap(); + let ec2_key = EncodingKey::from_ec_pem(include_bytes!("../../../config/ecdsa-private2.pem")).unwrap(); + let ed1_key = EncodingKey::from_ed_pem(include_bytes!("../../../config/ed25519-private1.pem")).unwrap(); + let ed2_key = EncodingKey::from_ed_pem(include_bytes!("../../../config/ed25519-private2.pem")).unwrap(); let rsa1_token = encode(&build_header(Algorithm::RS256, "rsa01"), &claims, &rsa1_key).unwrap(); let rsa2_token = encode(&build_header(Algorithm::RS256, "rsa02"), &claims, &rsa2_key).unwrap(); diff --git a/jwt-authorizer/src/authorizer.rs b/jwt-authorizer/src/authorizer.rs index d9f11fa..1af2a79 100644 --- a/jwt-authorizer/src/authorizer.rs +++ b/jwt-authorizer/src/authorizer.rs @@ -180,19 +180,19 @@ mod tests { #[tokio::test] async fn build_from_file() { - let a = Authorizer::::build(&KeySourceType::RSA("../config/jwtRS256.key.pub".to_owned()), None, None) + let a = Authorizer::::build(&KeySourceType::RSA("../config/rsa-public1.pem".to_owned()), None, None) .await .unwrap(); let k = a.key_source.get_key(Header::new(Algorithm::RS256)); assert!(k.await.is_ok()); - let a = Authorizer::::build(&KeySourceType::EC("../config/ec256-public.pem".to_owned()), None, None) + let a = Authorizer::::build(&KeySourceType::EC("../config/ecdsa-public1.pem".to_owned()), None, None) .await .unwrap(); let k = a.key_source.get_key(Header::new(Algorithm::ES256)); assert!(k.await.is_ok()); - let a = Authorizer::::build(&KeySourceType::ED("../config/ed25519-public.pem".to_owned()), None, None) + let a = Authorizer::::build(&KeySourceType::ED("../config/ed25519-public1.pem".to_owned()), None, None) .await .unwrap(); let k = a.key_source.get_key(Header::new(Algorithm::EdDSA)); diff --git a/jwt-authorizer/tests/tests.rs b/jwt-authorizer/tests/tests.rs index dbbf61a..235f8bf 100644 --- a/jwt-authorizer/tests/tests.rs +++ b/jwt-authorizer/tests/tests.rs @@ -43,7 +43,7 @@ mod tests { #[tokio::test] async fn protected_without_jwt() { - let jwt_auth: JwtAuthorizer = JwtAuthorizer::from_rsa_pem("../config/jwtRS256.key.pub"); + let jwt_auth: JwtAuthorizer = JwtAuthorizer::from_rsa_pem("../config/rsa-public1.pem"); let response = app(jwt_auth) .await @@ -63,7 +63,7 @@ mod tests { #[tokio::test] async fn protected_with_jwt() { - let response = make_proteced_request(JwtAuthorizer::from_rsa_pem("../config/jwtRS256.key.pub"), JWT_RSA_OK).await; + let response = make_proteced_request(JwtAuthorizer::from_rsa_pem("../config/rsa-public1.pem"), JWT_RSA_OK).await; assert_eq!(response.status(), StatusCode::OK); @@ -73,7 +73,7 @@ mod tests { #[tokio::test] async fn protected_with_bad_jwt() { - let response = make_proteced_request(JwtAuthorizer::from_rsa_pem("../config/jwtRS256.key.pub"), "xxx.xxx.xxx").await; + let response = make_proteced_request(JwtAuthorizer::from_rsa_pem("../config/rsa-public1.pem"), "xxx.xxx.xxx").await; assert_eq!(response.status(), StatusCode::UNAUTHORIZED); // TODO: check error code (https://datatracker.ietf.org/doc/html/rfc6750#section-3.1) @@ -82,7 +82,7 @@ mod tests { #[tokio::test] async fn protected_with_claims_check() { let rsp_ok = make_proteced_request( - JwtAuthorizer::from_rsa_pem("../config/jwtRS256.key.pub").check(|_| true), + JwtAuthorizer::from_rsa_pem("../config/rsa-public1.pem").check(|_| true), JWT_RSA_OK, ) .await; @@ -90,7 +90,7 @@ mod tests { assert_eq!(rsp_ok.status(), StatusCode::OK); let rsp_ko = make_proteced_request( - JwtAuthorizer::from_rsa_pem("../config/jwtRS256.key.pub").check(|_| false), + JwtAuthorizer::from_rsa_pem("../config/rsa-public1.pem").check(|_| false), JWT_RSA_OK, ) .await;