diff --git a/go.mod b/go.mod index fdc9f7f6..503fdad6 100644 --- a/go.mod +++ b/go.mod @@ -17,6 +17,7 @@ require ( require ( github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect + github.com/cenkalti/backoff/v5 v5.0.2 // indirect github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect github.com/charmbracelet/x/cellbuf v0.0.13 // indirect github.com/containerd/errdefs v1.0.0 // indirect diff --git a/go.sum b/go.sum index 37a5ad20..f790e5b7 100644 --- a/go.sum +++ b/go.sum @@ -26,6 +26,8 @@ github.com/catppuccin/go v0.3.0 h1:d+0/YicIq+hSTo5oPuRi5kOpqkVA5tAsU6dNhvRu+aY= github.com/catppuccin/go v0.3.0/go.mod h1:8IHJuMGaUUjQM82qBrGNBv7LFq6JI3NnQCF6MOlZjpc= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/cenkalti/backoff/v5 v5.0.2 h1:rIfFVxEf1QsI7E1ZHfp/B4DF/6QBAUhmgkxc0H7Zss8= +github.com/cenkalti/backoff/v5 v5.0.2/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw= github.com/charmbracelet/bubbles v0.21.0 h1:9TdC97SdRVg/1aaXNVWfFH3nnLAwOXr8Fn6u6mfQdFs= github.com/charmbracelet/bubbles v0.21.0/go.mod h1:HF+v6QUR4HkEpz62dx7ym2xc71/KBHg+zKwJtMw+qtg= github.com/charmbracelet/bubbletea v1.3.4 h1:kCg7B+jSCFPLYRA52SDZjr51kG/fMUEoPoZrkaDHyoI= diff --git a/internal/ldap/ldap.go b/internal/ldap/ldap.go index 79e8a9bb..94818192 100644 --- a/internal/ldap/ldap.go +++ b/internal/ldap/ldap.go @@ -1,11 +1,13 @@ package ldap import ( + "context" "crypto/tls" "fmt" "time" "tinyauth/internal/types" + "github.com/cenkalti/backoff/v5" ldapgo "github.com/go-ldap/ldap/v3" "github.com/rs/zerolog/log" ) @@ -30,6 +32,11 @@ func NewLDAP(config types.LdapConfig) (*LDAP, error) { err := ldap.heartbeat() if err != nil { log.Error().Err(err).Msg("LDAP connection heartbeat failed") + if reconnectErr := ldap.reconnect(); reconnectErr != nil { + log.Error().Err(reconnectErr).Msg("Failed to reconnect to LDAP server") + continue + } + log.Info().Msg("Successfully reconnected to LDAP server") } } }() @@ -38,6 +45,7 @@ func NewLDAP(config types.LdapConfig) (*LDAP, error) { } func (l *LDAP) connect() (*ldapgo.Conn, error) { + log.Debug().Msg("Connecting to LDAP server") conn, err := ldapgo.DialURL(l.Config.Address, ldapgo.DialWithTLSConfig(&tls.Config{ InsecureSkipVerify: l.Config.Insecure, MinVersion: tls.VersionTLS12, @@ -46,6 +54,7 @@ func (l *LDAP) connect() (*ldapgo.Conn, error) { return nil, err } + log.Debug().Msg("Binding to LDAP server") err = conn.Bind(l.Config.BindDN, l.Config.BindPassword) if err != nil { return nil, err @@ -109,3 +118,29 @@ func (l *LDAP) heartbeat() error { // No error means the connection is alive return nil } + +func (l *LDAP) reconnect() error { + log.Info().Msg("Reconnecting to LDAP server") + + exp := backoff.NewExponentialBackOff() + exp.InitialInterval = 500 * time.Millisecond + exp.RandomizationFactor = 0.1 + exp.Multiplier = 1.5 + exp.Reset() + + operation := func() (*ldapgo.Conn, error) { + _, err := l.connect() + if err != nil { + return nil, nil + } + return nil, nil + } + + _, err := backoff.Retry(context.TODO(), operation, backoff.WithBackOff(exp), backoff.WithMaxTries(3)) + + if err != nil { + return err + } + + return nil +}