IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(config/jwt): the value should be "expect_claims", not "expected_claims" (#58284)

Browse Source 
Signed-off-by: Conor Evans <coevans@tcd.ie>
This commit is contained in:
Conor Evans 2022-11-07 12:29:27 +00:00 committed by GitHub
parent d4e3d47f56
commit 40ba2ba18d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/defaults.ini
View File

@ -639,7 +639,7 @@ username_claim =
jwk_set_url = jwk_set_url =
jwk_set_file = jwk_set_file =
cache_ttl = 60m cache_ttl = 60m
expected_claims = {} expect_claims = {}
key_file = key_file =
role_attribute_path = role_attribute_path =
role_attribute_strict = false role_attribute_strict = false

2
conf/sample.ini
View File

@ -629,7 +629,7 @@
;jwk_set_url = https://foo.bar/.well-known/jwks.json ;jwk_set_url = https://foo.bar/.well-known/jwks.json
;jwk_set_file = /path/to/jwks.json ;jwk_set_file = /path/to/jwks.json
;cache_ttl = 60m ;cache_ttl = 60m
;expected_claims = {"aud": ["foo", "bar"]} ;expect_claims = {"aud": ["foo", "bar"]}
;key_file = /path/to/key/file ;key_file = /path/to/key/file
;role_attribute_path = ;role_attribute_path =
;role_attribute_strict = false ;role_attribute_strict = false

2
devenv/docker/blocks/auth/jwt_proxy/readme.md
View File

@ -20,7 +20,7 @@ username_claim = login
email_claim = email email_claim = email
jwk_set_file = devenv/docker/blocks/auth/oauth/jwks.json jwk_set_file = devenv/docker/blocks/auth/oauth/jwks.json
cache_ttl = 60m 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 auto_sign_up = true
role_attribute_path = contains(roles[*], 'grafanaadmin') && 'GrafanaAdmin' || contains(roles[*], 'admin') && 'Admin' || contains(roles[*], 'editor') && 'Editor' || 'Viewer' role_attribute_path = contains(roles[*], 'grafanaadmin') && 'GrafanaAdmin' || contains(roles[*], 'admin') && 'Admin' || contains(roles[*], 'editor') && 'Editor' || 'Viewer'
role_attribute_strict = false role_attribute_strict = false

4
devenv/docker/blocks/auth/oauth/readme.md
View File

@ -48,7 +48,7 @@ username_claim = login
email_claim = email email_claim = email
jwk_set_file = devenv/docker/blocks/auth/oauth/jwks.json jwk_set_file = devenv/docker/blocks/auth/oauth/jwks.json
cache_ttl = 60m 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 auto_sign_up = true
``` ```
@ -96,7 +96,7 @@ username_claim = login
email_claim = email email_claim = email
jwk_set_url = <YOUR REVERSE PROXY URL>/auth/realms/grafana/protocol/openid-connect/certs jwk_set_url = <YOUR REVERSE PROXY URL>/auth/realms/grafana/protocol/openid-connect/certs
cache_ttl = 60m 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 auto_sign_up = true
``` ```