make idp only wait for certs when using ldap
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
committed by
Ralf Haferkamp
parent
35007ee26b
commit
9b7149d8cc
@@ -44,14 +44,6 @@ func NewService(opts ...Option) Service {
|
|||||||
assets.Config(options.Config),
|
assets.Config(options.Config),
|
||||||
)
|
)
|
||||||
|
|
||||||
if err := ldap.WaitForCA(options.Logger, options.Config.IDP.Insecure, options.Config.Ldap.TLSCACert); err != nil {
|
|
||||||
logger.Fatal().Err(err).Msg("The configured LDAP CA cert does not exist")
|
|
||||||
}
|
|
||||||
if options.Config.IDP.Insecure {
|
|
||||||
// force CACert to be empty to avoid lico try to load it
|
|
||||||
options.Config.Ldap.TLSCACert = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := createTemporaryClientsConfig(
|
if err := createTemporaryClientsConfig(
|
||||||
options.Config.IDP.IdentifierRegistrationConf,
|
options.Config.IDP.IdentifierRegistrationConf,
|
||||||
options.Config.IDP.Iss,
|
options.Config.IDP.Iss,
|
||||||
@@ -67,6 +59,15 @@ func NewService(opts ...Option) Service {
|
|||||||
logger.Fatal().Err(err).Msg("could not initialize cs3 backend env vars")
|
logger.Fatal().Err(err).Msg("could not initialize cs3 backend env vars")
|
||||||
}
|
}
|
||||||
case "ldap":
|
case "ldap":
|
||||||
|
|
||||||
|
if err := ldap.WaitForCA(options.Logger, options.Config.IDP.Insecure, options.Config.Ldap.TLSCACert); err != nil {
|
||||||
|
logger.Fatal().Err(err).Msg("The configured LDAP CA cert does not exist")
|
||||||
|
}
|
||||||
|
if options.Config.IDP.Insecure {
|
||||||
|
// force CACert to be empty to avoid lico try to load it
|
||||||
|
options.Config.Ldap.TLSCACert = ""
|
||||||
|
}
|
||||||
|
|
||||||
ldapBackendSupport.MustRegister()
|
ldapBackendSupport.MustRegister()
|
||||||
if err := initLicoInternalLDAPEnvVars(&options.Config.Ldap); err != nil {
|
if err := initLicoInternalLDAPEnvVars(&options.Config.Ldap); err != nil {
|
||||||
logger.Fatal().Err(err).Msg("could not initialize ldap env vars")
|
logger.Fatal().Err(err).Msg("could not initialize ldap env vars")
|
||||||
|
|||||||
Reference in New Issue
Block a user