Move secret loading to only run once

Rycochet · Rycochet · commit b68426d931ef · 2026-06-09T10:28:23.000+01:00
diff --git a/internal/service/ldap_service.go b/internal/service/ldap_service.go
@@ -62,6 +62,10 @@ func NewLdapService(
 		*/
 	}
 
+	secret := utils.GetSecret(config.LDAP.BindPassword, config.LDAP.BindPasswordFile)
+	config.LDAP.BindPassword = secret
+	config.LDAP.BindPasswordFile = ""
+
 	_, err := ldap.connect()
 
 	if err != nil {
@@ -213,9 +217,6 @@ func (ldap *LdapService) BindService(rebind bool) error {
 	if ldap.cert != nil {
 		return ldap.conn.ExternalBind()
 	}
-	secret := utils.GetSecret(ldap.config.LDAP.BindPassword, ldap.config.LDAP.BindPasswordFile)
-	ldap.config.LDAP.BindPassword = secret
-	ldap.config.LDAP.BindPasswordFile = ""
 	return ldap.conn.Bind(ldap.config.LDAP.BindDN, ldap.config.LDAP.BindPassword)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,10 @@ func NewLdapService(`
`62`	`62`	`*/`
`63`	`63`	`}`
`64`	`64`
	`65`	`+ secret := utils.GetSecret(config.LDAP.BindPassword, config.LDAP.BindPasswordFile)`
	`66`	`+ config.LDAP.BindPassword = secret`
	`67`	`+ config.LDAP.BindPasswordFile = ""`
	`68`	`+`
`65`	`69`	`_, err := ldap.connect()`
`66`	`70`
`67`	`71`	`if err != nil {`
`@@ -213,9 +217,6 @@ func (ldap *LdapService) BindService(rebind bool) error {`
`213`	`217`	`if ldap.cert != nil {`
`214`	`218`	`return ldap.conn.ExternalBind()`
`215`	`219`	`}`
`216`		`- secret := utils.GetSecret(ldap.config.LDAP.BindPassword, ldap.config.LDAP.BindPasswordFile)`
`217`		`- ldap.config.LDAP.BindPassword = secret`
`218`		`- ldap.config.LDAP.BindPasswordFile = ""`
`219`	`220`	`return ldap.conn.Bind(ldap.config.LDAP.BindDN, ldap.config.LDAP.BindPassword)`
`220`	`221`	`}`
`221`	`222`