Skip to content

Commit a093d00

Browse files
ybykov-a9sbenjaminguttmann-avtq
authored andcommitted
Add insecure email lookup property to Grafana
1 parent b9fc3e0 commit a093d00

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

jobs/grafana/spec

+2
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,8 @@ properties:
347347
description: "mask the Grafana version number for unauthenticated users"
348348
grafana.auth.oauth_skip_org_role_update_sync:
349349
description: "Skip forced assignment of OrgID 1 or 'auto_assign_org_id' for social logins"
350+
grafana.auth.oauth_allow_insecure_email_lookup:
351+
description: "Enable user lookup based on email in addition to using unique ID provided by IdPs."
350352
grafana.auth.azure_auth_enabled:
351353
description: "Set to true to enable Azure authentication option for HTTP-based datasources"
352354

jobs/grafana/templates/config/grafana.ini

+5
Original file line numberDiff line numberDiff line change
@@ -720,6 +720,11 @@ oauth_state_cookie_max_age = <%= oauth_state_cookie_max_age %>
720720
oauth_skip_org_role_update_sync = <%= oauth_skip_org_role_update_sync %>
721721
<% end %>
722722

723+
<% if_p('grafana.auth.oauth_allow_insecure_email_lookup') do |oauth_allow_insecure_email_lookup| %>
724+
# Enable user lookup based on email in addition to using unique ID provided by IdPs.
725+
oauth_allow_insecure_email_lookup = <%= oauth_allow_insecure_email_lookup %>
726+
<% end %>
727+
723728
<% if_p('grafana.auth.api_key_max_seconds_to_live') do |api_key_max_seconds_to_live| %>
724729
# limit of api_key seconds to live before expiration
725730
api_key_max_seconds_to_live = <%= api_key_max_seconds_to_live %>

0 commit comments

Comments
 (0)