From 3d28c6e6d9065a0153d53ec2879c44025be50a19 Mon Sep 17 00:00:00 2001 From: Ryc O'Chet Date: Mon, 8 Jun 2026 12:46:39 +0100 Subject: [PATCH] Add LDAP BindPasswordFile Fixes #927 --- internal/model/config.go | 19 ++++++++++--------- internal/service/ldap_service.go | 3 +++ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/internal/model/config.go b/internal/model/config.go index 0bd4f3b5..975d7e94 100644 --- a/internal/model/config.go +++ b/internal/model/config.go @@ -178,15 +178,16 @@ type UIConfig struct { } type LDAPConfig struct { - Address string `description:"LDAP server address." yaml:"address"` - BindDN string `description:"Bind DN for LDAP authentication." yaml:"bindDn"` - BindPassword string `description:"Bind password for LDAP authentication." yaml:"bindPassword"` - BaseDN string `description:"Base DN for LDAP searches." yaml:"baseDn"` - Insecure bool `description:"Allow insecure LDAP connections." yaml:"insecure"` - SearchFilter string `description:"LDAP search filter." yaml:"searchFilter"` - AuthCert string `description:"Certificate for mTLS authentication." yaml:"authCert"` - AuthKey string `description:"Certificate key for mTLS authentication." yaml:"authKey"` - GroupCacheTTL int `description:"Cache duration for LDAP group membership in seconds." yaml:"groupCacheTTL"` + Address string `description:"LDAP server address." yaml:"address"` + BindDN string `description:"Bind DN for LDAP authentication." yaml:"bindDn"` + BindPassword string `description:"Bind password for LDAP authentication." yaml:"bindPassword"` + BindPasswordFile string `description:"Path to the Bind password." yaml:"bindPasswordFile"` + BaseDN string `description:"Base DN for LDAP searches." yaml:"baseDn"` + Insecure bool `description:"Allow insecure LDAP connections." yaml:"insecure"` + SearchFilter string `description:"LDAP search filter." yaml:"searchFilter"` + AuthCert string `description:"Certificate for mTLS authentication." yaml:"authCert"` + AuthKey string `description:"Certificate key for mTLS authentication." yaml:"authKey"` + GroupCacheTTL int `description:"Cache duration for LDAP group membership in seconds." yaml:"groupCacheTTL"` } type LogConfig struct { diff --git a/internal/service/ldap_service.go b/internal/service/ldap_service.go index cb0f0f5a..769ac38e 100644 --- a/internal/service/ldap_service.go +++ b/internal/service/ldap_service.go @@ -212,6 +212,9 @@ 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) }