From 40ba2ba18d3c5d343476368bbf9dfa1d2399ab28 Mon Sep 17 00:00:00 2001 From: Conor Evans <43791257+conorevans@users.noreply.github.com> Date: Mon, 7 Nov 2022 12:29:27 +0000 Subject: [PATCH] fix(config/jwt): the value should be "expect_claims", not "expected_claims" (#58284) Signed-off-by: Conor Evans --- conf/defaults.ini | 2 +- conf/sample.ini | 2 +- devenv/docker/blocks/auth/jwt_proxy/readme.md | 2 +- devenv/docker/blocks/auth/oauth/readme.md | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index cbe9b4d6878..305aa20b949 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -639,7 +639,7 @@ username_claim = jwk_set_url = jwk_set_file = cache_ttl = 60m -expected_claims = {} +expect_claims = {} key_file = role_attribute_path = role_attribute_strict = false diff --git a/conf/sample.ini b/conf/sample.ini index b482b0ea0ea..7a04486abeb 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -629,7 +629,7 @@ ;jwk_set_url = https://foo.bar/.well-known/jwks.json ;jwk_set_file = /path/to/jwks.json ;cache_ttl = 60m -;expected_claims = {"aud": ["foo", "bar"]} +;expect_claims = {"aud": ["foo", "bar"]} ;key_file = /path/to/key/file ;role_attribute_path = ;role_attribute_strict = false diff --git a/devenv/docker/blocks/auth/jwt_proxy/readme.md b/devenv/docker/blocks/auth/jwt_proxy/readme.md index 425be0ca7e8..75819652220 100644 --- a/devenv/docker/blocks/auth/jwt_proxy/readme.md +++ b/devenv/docker/blocks/auth/jwt_proxy/readme.md @@ -20,7 +20,7 @@ username_claim = login email_claim = email jwk_set_file = devenv/docker/blocks/auth/oauth/jwks.json cache_ttl = 60m -expected_claims = {"iss": "http://env.grafana.local:8087/auth/realms/grafana", "azp": "grafana-oauth"} +expect_claims = {"iss": "http://env.grafana.local:8087/auth/realms/grafana", "azp": "grafana-oauth"} auto_sign_up = true role_attribute_path = contains(roles[*], 'grafanaadmin') && 'GrafanaAdmin' || contains(roles[*], 'admin') && 'Admin' || contains(roles[*], 'editor') && 'Editor' || 'Viewer' role_attribute_strict = false diff --git a/devenv/docker/blocks/auth/oauth/readme.md b/devenv/docker/blocks/auth/oauth/readme.md index c2a8b34ccf6..e0966a8b717 100644 --- a/devenv/docker/blocks/auth/oauth/readme.md +++ b/devenv/docker/blocks/auth/oauth/readme.md @@ -48,7 +48,7 @@ username_claim = login email_claim = email jwk_set_file = devenv/docker/blocks/auth/oauth/jwks.json cache_ttl = 60m -expected_claims = {"iss": "http://localhost:8087/auth/realms/grafana", "azp": "grafana-oauth"} +expect_claims = {"iss": "http://localhost:8087/auth/realms/grafana", "azp": "grafana-oauth"} auto_sign_up = true ``` @@ -96,7 +96,7 @@ username_claim = login email_claim = email jwk_set_url = /auth/realms/grafana/protocol/openid-connect/certs cache_ttl = 60m -expected_claims = {"iss": "http://localhost:8087/auth/realms/grafana", "azp": "grafana-oauth"} +expect_claims = {"iss": "http://localhost:8087/auth/realms/grafana", "azp": "grafana-oauth"} auto_sign_up = true ```