LDAP: Move LDAP globals to Config (#63255)
* structure dtos and private methods * add basic LDAP service * use LDAP service in ldap debug API * lower non fatal error * remove unused globals * wip * remove final globals * fix tests to use cfg enabled * restructure errors * remove logger from globals * use ldap service in authn * use ldap service in context handler * fix failed tests * fix ldap middleware provides * fix provides in auth_test.go
This commit is contained in:
+12
-22
@@ -140,14 +140,6 @@ var (
|
||||
RudderstackSdkUrl string
|
||||
RudderstackConfigUrl string
|
||||
|
||||
// LDAP
|
||||
LDAPEnabled bool
|
||||
LDAPSkipOrgRoleSync bool
|
||||
LDAPConfigFile string
|
||||
LDAPSyncCron string
|
||||
LDAPAllowSignup bool
|
||||
LDAPActiveSyncEnabled bool
|
||||
|
||||
// Alerting
|
||||
AlertingEnabled *bool
|
||||
ExecuteAlerts bool
|
||||
@@ -440,10 +432,12 @@ type Cfg struct {
|
||||
GenericOAuthSkipOrgRoleSync bool
|
||||
|
||||
// LDAP
|
||||
LDAPEnabled bool
|
||||
LDAPSkipOrgRoleSync bool
|
||||
LDAPConfigFilePath string
|
||||
LDAPAllowSignup bool
|
||||
LDAPEnabled bool
|
||||
LDAPSkipOrgRoleSync bool
|
||||
LDAPConfigFilePath string
|
||||
LDAPAllowSignup bool
|
||||
LDAPActiveSyncEnabled bool
|
||||
LDAPSyncCron string
|
||||
|
||||
DefaultTheme string
|
||||
DefaultLanguage string
|
||||
@@ -1206,16 +1200,12 @@ func (cfg *Cfg) readSAMLConfig() {
|
||||
|
||||
func (cfg *Cfg) readLDAPConfig() {
|
||||
ldapSec := cfg.Raw.Section("auth.ldap")
|
||||
LDAPConfigFile = ldapSec.Key("config_file").String()
|
||||
cfg.LDAPConfigFilePath = LDAPConfigFile
|
||||
LDAPSyncCron = ldapSec.Key("sync_cron").String()
|
||||
LDAPEnabled = ldapSec.Key("enabled").MustBool(false)
|
||||
cfg.LDAPEnabled = LDAPEnabled
|
||||
LDAPSkipOrgRoleSync = ldapSec.Key("skip_org_role_sync").MustBool(false)
|
||||
cfg.LDAPSkipOrgRoleSync = LDAPSkipOrgRoleSync
|
||||
LDAPActiveSyncEnabled = ldapSec.Key("active_sync_enabled").MustBool(false)
|
||||
LDAPAllowSignup = ldapSec.Key("allow_sign_up").MustBool(true)
|
||||
cfg.LDAPAllowSignup = LDAPAllowSignup
|
||||
cfg.LDAPConfigFilePath = ldapSec.Key("config_file").String()
|
||||
cfg.LDAPSyncCron = ldapSec.Key("sync_cron").String()
|
||||
cfg.LDAPEnabled = ldapSec.Key("enabled").MustBool(false)
|
||||
cfg.LDAPSkipOrgRoleSync = ldapSec.Key("skip_org_role_sync").MustBool(false)
|
||||
cfg.LDAPActiveSyncEnabled = ldapSec.Key("active_sync_enabled").MustBool(false)
|
||||
cfg.LDAPAllowSignup = ldapSec.Key("allow_sign_up").MustBool(true)
|
||||
}
|
||||
|
||||
func (cfg *Cfg) handleAWSConfig() {
|
||||
|
||||
Reference in New Issue
Block a user