AuthN: Lock down manual role updates for users synced through Grafana Com portal #72044
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…m auth is enabled
IevaVasiljeva
added
no-backport
IevaVasiljeva
requested review from
sakjur,
papagian and
yangkb09
and removed request for
a team
Jguer
approved these changes
Jul 21, 2023
IevaVasiljeva
changed the title
IevaVasiljeva
added
add to changelog
and removed
no-changelog
3 tasks
linoman
pushed a commit
that referenced
this pull request
Jul 24, 2023
… Com portal (#72044) take into account auth.grafananet config section when checking if gcom auth is enabled
gamab
reviewed
Jul 24, 2023
| @@ -1452,6 +1455,11 @@ func readAuthGrafanaComSettings(cfg *Cfg) { | |||
| cfg.GrafanaComSkipOrgRoleSync = sec.Key("skip_org_role_sync").MustBool(false) | |||
| } | |||
|
|
|||
| func readAuthGrafanaNetSettings(cfg *Cfg) { | |||
| sec := cfg.SectionWithEnvOverrides("auth.grafananet") | |||
| cfg.GrafanaNetAuthEnabled = sec.Key("enabled").MustBool(false) | |||
There was a problem hiding this comment.
Should there be a SkipOrgRoleSync attribute there as well?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is this feature?
Make sure that roles can't be manually updated for users synced through GCom.
Looks like for HG instances we enable GCom provider in
[auth.grafananet]config section and not[auth.grafana_com]config section. However, we only looked at[auth.grafana_com]config section when checking if GCom auth is enabled, and therefore correctly reported that it is not enabled and that users synced through GCom auth are not externally synced.Why do we need this feature?
Users roles should either be updated manually or synced through the auth provider, we want to avoid the mix of both.
Which issue(s) does this PR fix?:
Fixes https://github.com/grafana/grafana-authnz-team/issues/247
Special notes for your reviewer:
Note that we'll roll this change out behind a feature toggle (#72202), so that we can gradually introduce this to hosted Grafana users.
Please check that: