The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
fix: flakey ec keypair test (#68591)
Edward Pagete3b200b319d8
diff --git a/test/metabase/sso/oidc/tokens_test.clj b/test/metabase/sso/oidc/tokens_test.cljindex 9a3a96cea93..2133dd47afe 100644--- a/test/metabase/sso/oidc/tokens_test.clj+++ b/test/metabase/sso/oidc/tokens_test.clj@@ -5,10 +5,7 @@[clj-http.client :as http][clojure.test :refer :all][java-time.api :as t]- [metabase.sso.oidc.tokens :as oidc.tokens])- (:import- (java.security KeyPairGenerator)- (java.security.spec ECGenParameterSpec)))+ [metabase.sso.oidc.tokens :as oidc.tokens]))(set! *warn-on-reflection* true)@@ -57,44 +54,48 @@ FSQLmSztbSlqSjEJzWZgwLwL7mQsZeoO45DoOopQoWrudLLKKHHhuIewJ8HaqG4U(def ^:private test-rsa-private-key"Test RSA private key for signing JWTs"- (buddy.keys/str->private-key test-rsa-private-key-pem))+ (delay (buddy.keys/str->private-key test-rsa-private-key-pem)))(def ^:private test-rsa-public-key"Test RSA public key for verifying JWTs"- (buddy.keys/str->public-key test-rsa-public-key-pem))+ (delay (buddy.keys/str->public-key test-rsa-public-key-pem)))(def ^:private test-jwks"Test JWKS"- {:keys [(merge {:kid "test-key-id" :use "sig"} (buddy.keys/public-key->jwk test-rsa-public-key))]})--(defn- generate-ec-keypair- "Generate an ECDSA keypair for the given curve (e.g., \"secp256r1\" for ES256)."- [curve-name]- (let [kpg (KeyPairGenerator/getInstance "EC")]- (.initialize kpg (ECGenParameterSpec. curve-name))- (.generateKeyPair kpg)))--(def ^:private test-ec-keypair- "Test ECDSA keypair for ES256 algorithm"- (generate-ec-keypair "secp256r1"))+ (delay {:keys [(merge {:kid "test-key-id" :use "sig"} (buddy.keys/public-key->jwk @test-rsa-public-key))]}))++(def ^:private test-ec-private-key-pem+ "Test EC private key PEM string for signing JWTs (P-256/secp256r1 curve for ES256)"+ "-----BEGIN EC PRIVATE KEY-----+MHcCAQEEINOLAzWGZc5f3vfDUdiuh2HRs9QF1ZJ0thhCXISfP93BoAoGCCqGSM49+AwEHoUQDQgAE8AxkRgT49uqNDRXwSJ+VxEJfljNLh0ccjghRm1/Az8L/HL+gdQmt+Y0NdB4Ml2mZHCVsPYf5WzIirTpjY0EzKDA==+-----END EC PRIVATE KEY-----")++(def ^:private test-ec-public-key-pem+ "Test EC public key PEM string corresponding to test-ec-private-key-pem"+ "-----BEGIN PUBLIC KEY-----+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE8AxkRgT49uqNDRXwSJ+VxEJfljNL+h0ccjghRm1/Az8L/HL+gdQmtY0NdB4Ml2mZHCVsPYf5WzIirTpjY0EzKDA==+-----END PUBLIC KEY-----")(def ^:private test-ec-private-key"Test EC private key for signing JWTs"- (.getPrivate test-ec-keypair))+ (delay (buddy.keys/str->private-key test-ec-private-key-pem)))(def ^:private test-ec-public-key"Test EC public key for verifying JWTs"- (.getPublic test-ec-keypair))+ (delay (buddy.keys/str->public-key test-ec-public-key-pem)))(def ^:private test-ec-jwks"Test JWKS with EC key"- {:keys [(merge {:kid "test-ec-key-id" :use "sig" :alg "ES256"}- (buddy.keys/public-key->jwk test-ec-public-key))]})+ (delay {:keys [(merge {:kid "test-ec-key-id" :use "sig" :alg "ES256"}+ (buddy.keys/public-key->jwk @test-ec-public-key))]}))(defn- create-test-id-token"Create a test ID token with the given claims"[claims]- (jwt/sign claims test-rsa-private-key {:alg :rs256 :header {:kid "test-key-id"}}))+ (jwt/sign claims @test-rsa-private-key {:alg :rs256 :header {:kid "test-key-id"}}))(deftest validate-id-token-valid-test(oidc.tokens/clear-jwks-cache!)@@ -115,7 +116,7 @@ FSQLmSztbSlqSjEJzWZgwLwL7mQsZeoO45DoOopQoWrudLLKKHHhuIewJ8HaqG4U:client-id "test-client-id"}](with-redefs [http/get (fn [_url _opts]{:status 200- :body test-jwks})]+ :body @test-jwks})](let [result (oidc.tokens/validate-id-token token config "test-nonce")](is (true? (:valid? result)))(is (some? (:claims result)))@@ -132,7 +133,7 @@ FSQLmSztbSlqSjEJzWZgwLwL7mQsZeoO45DoOopQoWrudLLKKHHhuIewJ8HaqG4U:client-id "test-client-id"}](with-redefs [http/get (fn [_url _opts]{:status 200- :body test-jwks})]+ :body @test-jwks})](let [result (oidc.tokens/validate-id-token token config "test-nonce")](is (false? (:valid? result)))(is (some? (:error result))))))))@@ -155,7 +156,7 @@ FSQLmSztbSlqSjEJzWZgwLwL7mQsZeoO45DoOopQoWrudLLKKHHhuIewJ8HaqG4U:client-id "test-client-id"}](with-redefs [http/get (fn [_url _opts]{:status 200- :body test-jwks})]+ :body @test-jwks})](let [result (oidc.tokens/validate-id-token token config "test-nonce")](is (false? (:valid? result)))(is (some? (:error result))))))))@@ -178,7 +179,7 @@ FSQLmSztbSlqSjEJzWZgwLwL7mQsZeoO45DoOopQoWrudLLKKHHhuIewJ8HaqG4U:client-id "test-client-id"}](with-redefs [http/get (fn [_url _opts]{:status 200- :body test-jwks})]+ :body @test-jwks})](let [result (oidc.tokens/validate-id-token token config "test-nonce")](is (false? (:valid? result)))(is (some? (:error result))))))))@@ -201,7 +202,7 @@ FSQLmSztbSlqSjEJzWZgwLwL7mQsZeoO45DoOopQoWrudLLKKHHhuIewJ8HaqG4U:client-id "test-client-id"}](with-redefs [http/get (fn [_url _opts]{:status 200- :body test-jwks})]+ :body @test-jwks})](let [result (oidc.tokens/validate-id-token token config "test-nonce")](is (false? (:valid? result)))(is (some? (:error result))))))))@@ -224,7 +225,7 @@ FSQLmSztbSlqSjEJzWZgwLwL7mQsZeoO45DoOopQoWrudLLKKHHhuIewJ8HaqG4U:client-id "test-client-id"}](with-redefs [http/get (fn [_url _opts]{:status 200- :body test-jwks})]+ :body @test-jwks})](let [result (oidc.tokens/validate-id-token token config "test-nonce")](is (false? (:valid? result)))(is (some? (:error result))))))))@@ -247,7 +248,7 @@ FSQLmSztbSlqSjEJzWZgwLwL7mQsZeoO45DoOopQoWrudLLKKHHhuIewJ8HaqG4U:client-id "test-client-id"}](with-redefs [http/get (fn [_url _opts]{:status 200- :body test-jwks})]+ :body @test-jwks})](let [result (oidc.tokens/validate-id-token token config "test-nonce")](is (true? (:valid? result))))))))@@ -273,7 +274,7 @@ FSQLmSztbSlqSjEJzWZgwLwL7mQsZeoO45DoOopQoWrudLLKKHHhuIewJ8HaqG4U:client-id "test-client-id"}](with-redefs [http/get (fn [_url _opts]{:status 200- :body test-jwks})]+ :body @test-jwks})](let [result (oidc.tokens/validate-id-token token config "test-nonce")](is (false? (:valid? result)))(is (some? (:error result))))))))@@ -287,7 +288,7 @@ FSQLmSztbSlqSjEJzWZgwLwL7mQsZeoO45DoOopQoWrudLLKKHHhuIewJ8HaqG4U(with-redefs [http/get (fn [_url _opts](swap! fetch-count inc){:status 200- :body test-jwks})]+ :body @test-jwks})];; First call should fetch(let [result1 (oidc.tokens/get-jwks "https://provider.com/jwks")](is (some? result1))@@ -304,7 +305,7 @@ FSQLmSztbSlqSjEJzWZgwLwL7mQsZeoO45DoOopQoWrudLLKKHHhuIewJ8HaqG4U(with-redefs [http/get (fn [_url _opts](swap! fetch-count inc){:status 200- :body test-jwks})]+ :body @test-jwks})];; First call should fetch(oidc.tokens/get-jwks "https://github.com/jwks")(is (= 1 @fetch-count))@@ -326,7 +327,7 @@ FSQLmSztbSlqSjEJzWZgwLwL7mQsZeoO45DoOopQoWrudLLKKHHhuIewJ8HaqG4U(with-redefs [http/get (fn [_url _opts](swap! fetch-count inc){:status 200- :body test-jwks})]+ :body @test-jwks})];; Populate cache(oidc.tokens/get-jwks "https://provider.com/jwks")(is (= 1 @fetch-count))@@ -376,7 +377,7 @@ FSQLmSztbSlqSjEJzWZgwLwL7mQsZeoO45DoOopQoWrudLLKKHHhuIewJ8HaqG4U(defn- create-test-ec-token"Create a test ID token signed with ES256 algorithm"[claims]- (jwt/sign claims test-ec-private-key {:alg :es256 :header {:kid "test-ec-key-id"}}))+ (jwt/sign claims @test-ec-private-key {:alg :es256 :header {:kid "test-ec-key-id"}}))(deftest validate-id-token-es256-algorithm-test(oidc.tokens/clear-jwks-cache!)@@ -397,7 +398,7 @@ FSQLmSztbSlqSjEJzWZgwLwL7mQsZeoO45DoOopQoWrudLLKKHHhuIewJ8HaqG4U:client-id "test-client-id"}](with-redefs [http/get (fn [_url _opts]{:status 200- :body test-ec-jwks})]+ :body @test-ec-jwks})](let [result (oidc.tokens/validate-id-token token config "test-nonce")](is (true? (:valid? result)))(is (some? (:claims result)))@@ -420,7 +421,7 @@ FSQLmSztbSlqSjEJzWZgwLwL7mQsZeoO45DoOopQoWrudLLKKHHhuIewJ8HaqG4Utoken (create-test-id-token claims);; JWK with unsupported algorithmunsupported-jwks {:keys [(merge {:kid "test-key-id" :use "sig" :alg "HS256"}- (buddy.keys/public-key->jwk test-rsa-public-key))]}+ (buddy.keys/public-key->jwk @test-rsa-public-key))]}config {:jwks-uri "https://provider.com/jwks":issuer-uri "https://provider.com":client-id "test-client-id"}]@@ -447,7 +448,7 @@ FSQLmSztbSlqSjEJzWZgwLwL7mQsZeoO45DoOopQoWrudLLKKHHhuIewJ8HaqG4Utoken (create-test-id-token claims);; JWK without alg field (should default to RS256)jwks-without-alg {:keys [(merge {:kid "test-key-id" :use "sig"}- (buddy.keys/public-key->jwk test-rsa-public-key))]}+ (buddy.keys/public-key->jwk @test-rsa-public-key))]}config {:jwks-uri "https://provider.com/jwks":issuer-uri "https://provider.com":client-id "test-client-id"}]