Merge pull request #79 from NorskHelsenett/fix/set-ldap-query-defaulk…

…t-timeout add default timeout 10s
NorskHelsenett · Apr 23, 2024 · 9bb1c36 · 9bb1c36
2 parents 9d05937 + fea955e
commit 9bb1c36
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/pkg/auth/userauth/activedirectory/ad.go b/pkg/auth/userauth/activedirectory/ad.go
@@ -18,6 +18,8 @@ import (
 	"github.com/go-ldap/ldap"
 )
 
+var DefaultTimeout = 10 * time.Second
+
 type AdConfig struct {
 	Domain       string     `json:"domain"`
 	BindUser     string     `json:"bindUser"`
@@ -84,6 +86,8 @@ func (l *AdClient) Connect() error {
 	//shuffle servers to spread the love
 	rand.Shuffle(len(l.config.Servers), func(i, j int) { l.config.Servers[i], l.config.Servers[j] = l.config.Servers[j], l.config.Servers[i] })
 
+	ldap.DefaultTimeout = DefaultTimeout
+
 	for _, ldapserver := range l.config.Servers {
 		rlog.Infof("Trying server %s for domain %s.", ldapserver.Host, l.config.Domain)
 		if l.config.Certificate != nil {

diff --git a/pkg/auth/userauth/ldaps/openldap.go b/pkg/auth/userauth/ldaps/openldap.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"strconv"
+	"time"
 
 	"github.com/NorskHelsenett/ror/pkg/auth/authtools"
 	identitymodels "github.com/NorskHelsenett/ror/pkg/models/identity"
@@ -14,6 +15,8 @@ import (
 	"github.com/go-ldap/ldap"
 )
 
+var DefaultTimeout = 10 * time.Second
+
 type LdapConfig struct {
 	Domain       string       `json:"domain"`
 	BindUser     string       `json:"bindUser"`
@@ -45,6 +48,8 @@ func NewLdapsClient(config LdapConfig) (*LdapsClient, error) {
 func (l *LdapsClient) Connect() error {
 	var client *ldap.Conn
 
+	ldap.DefaultTimeout = DefaultTimeout
+
 	for _, ldapserver := range l.config.Servers {
 		ldapsport, err := strconv.Atoi(ldap.DefaultLdapsPort)
 		rlog.Infof("Trying server %s for domain %s.", ldapserver.Host, l.config.Domain)