mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
ClientTokenRotation: Don't rotate session cookie for authproxy (#72496)
* ClientTokenRotation: Don't rotate session cookie for authproxy * Account for config option auth.proxy enable_login_token * Limit amount of changes on devenv * Fix tests by moving authenticatedBy up * Uncomment nginx conf
This commit is contained in:
@@ -18,6 +18,7 @@ type FrontendSettingsAuthDTO struct {
|
||||
GitLabSkipOrgRoleSync bool `json:"GitLabSkipOrgRoleSync"`
|
||||
OktaSkipOrgRoleSync bool `json:"OktaSkipOrgRoleSync"`
|
||||
DisableSyncLock bool `json:"DisableSyncLock"`
|
||||
AuthProxyEnableLoginToken bool `json:"AuthProxyEnableLoginToken"`
|
||||
}
|
||||
|
||||
type FrontendSettingsBuildInfoDTO struct {
|
||||
|
||||
@@ -46,6 +46,7 @@ type CurrentUser struct {
|
||||
Language string `json:"language"`
|
||||
HelpFlags1 user.HelpFlags1 `json:"helpFlags1"`
|
||||
HasEditPermissionInFolders bool `json:"hasEditPermissionInFolders"`
|
||||
AuthenticatedBy string `json:"authenticatedBy"`
|
||||
Permissions UserPermissionsMap `json:"permissions,omitempty"`
|
||||
Analytics AnalyticsSettings `json:"analytics"`
|
||||
}
|
||||
|
||||
@@ -166,6 +166,7 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
|
||||
GitLabSkipOrgRoleSync: hs.Cfg.GitLabSkipOrgRoleSync,
|
||||
OktaSkipOrgRoleSync: hs.Cfg.OktaSkipOrgRoleSync,
|
||||
DisableSyncLock: hs.Cfg.DisableSyncLock,
|
||||
AuthProxyEnableLoginToken: hs.Cfg.AuthProxyEnableLoginToken,
|
||||
},
|
||||
|
||||
BuildInfo: dtos.FrontendSettingsBuildInfoDTO{
|
||||
|
||||
@@ -105,6 +105,7 @@ func (hs *HTTPServer) setIndexViewData(c *contextmodel.ReqContext) (*dtos.IndexV
|
||||
HelpFlags1: c.HelpFlags1,
|
||||
HasEditPermissionInFolders: hasEditPerm,
|
||||
Analytics: hs.buildUserAnalyticsSettings(c.Req.Context(), c.SignedInUser),
|
||||
AuthenticatedBy: c.SignedInUser.AuthenticatedBy,
|
||||
},
|
||||
Settings: settings,
|
||||
ThemeType: theme.Type,
|
||||
|
||||
Reference in New Issue
Block a user