Auth: Remove auth broker flag and clean up login handlers (#73109)

* Auth: Remove auth broker flag and clean up login handlers
This commit is contained in:
Karl Persson
2023-08-10 09:56:04 +02:00
committed by GitHub
parent eb6e19c7af
commit 2c57bca176
7 changed files with 31 additions and 474 deletions

View File

@@ -280,8 +280,6 @@ type Cfg struct {
// Not documented & not supported
// stand in until a more complete solution is implemented
AuthConfigUIAdminAccess bool
// TO REMOVE: Not documented & not supported. Remove with legacy handlers in 10.2
AuthBrokerEnabled bool
// TO REMOVE: Not documented & not supported. Remove in 10.3
TagAuthedDevices bool
@@ -968,12 +966,11 @@ var skipStaticRootValidation = false
func NewCfg() *Cfg {
return &Cfg{
Target: []string{},
Logger: log.New("settings"),
Raw: ini.Empty(),
Azure: &azsettings.AzureSettings{},
RBACEnabled: true,
AuthBrokerEnabled: true,
Target: []string{},
Logger: log.New("settings"),
Raw: ini.Empty(),
Azure: &azsettings.AzureSettings{},
RBACEnabled: true,
}
}
@@ -1541,7 +1538,6 @@ func readAuthSettings(iniFile *ini.File, cfg *Cfg) (err error) {
// Do not use
cfg.AuthConfigUIAdminAccess = auth.Key("config_ui_admin_access").MustBool(false)
cfg.AuthBrokerEnabled = auth.Key("broker").MustBool(true)
cfg.TagAuthedDevices = auth.Key("tag_authed_devices").MustBool(true)
cfg.DisableLoginForm = auth.Key("disable_login_form").MustBool(false)