refactor: move connection config into own struct

netresearch · Oct 4, 2023 · 8622caf · 8622caf
1 parent 019ad6a
commit 8622caf
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 17 deletions.
diff --git a/auth.go b/auth.go
@@ -54,7 +54,7 @@ func (l *LDAP) ChangePasswordForSAMAccountName(sAMAccountName, oldPassword, newP
 		return err
 	}
 
-	if l.isActiveDirectory && !strings.HasPrefix(l.server, "ldaps://") {
+	if l.config.IsActiveDirectory && !strings.HasPrefix(l.config.Server, "ldaps://") {
 		return ErrActiveDirectoryMustBeLDAPS
 	}
 

diff --git a/auth_test.go b/auth_test.go
@@ -79,5 +79,11 @@ func getWorkingLdap() (*LDAP, error) {
 		return nil, errors.New("LDAP_READ_PASSWORD not set")
 	}
 
-	return New(server, baseDN, readUser, readPassword, false)
+	config := Config{
+		Server:            server,
+		BaseDN:            baseDN,
+		IsActiveDirectory: true,
+	}
+
+	return New(config, readUser, readPassword)
 }
diff --git a/client.go b/client.go
@@ -6,26 +6,27 @@ import (
 	"github.com/go-ldap/ldap/v3"
 )
 
-type LDAP struct {
-	server string
+type Config struct {
+	Server string
+	BaseDN string
 
-	baseDN string
+	IsActiveDirectory bool
+}
+
+type LDAP struct {
+	config Config
 
 	user     string
 	password string
-
-	isActiveDirectory bool
 }
 
 var ErrDNDuplicated = errors.New("DN is not unique")
 
-func New(server, baseDN, user, password string, isActiveDirectory bool) (*LDAP, error) {
+func New(config Config, user, password string) (*LDAP, error) {
 	l := &LDAP{
-		server,
-		baseDN,
+		config,
 		user,
 		password,
-		isActiveDirectory,
 	}
 
 	c, err := l.getConnection()
@@ -38,7 +39,7 @@ func New(server, baseDN, user, password string, isActiveDirectory bool) (*LDAP,
 }
 
 func (l LDAP) getConnection() (*ldap.Conn, error) {
-	c, err := ldap.DialURL(l.server)
+	c, err := ldap.DialURL(l.config.Server)
 	if err != nil {
 		return nil, err
 	}

diff --git a/computers.go b/computers.go
@@ -70,7 +70,7 @@ func (l *LDAP) FindComputerBySAMAccountName(sAMAccountName string) (computer *Co
 	defer c.Close()
 
 	r, err := c.Search(&ldap.SearchRequest{
-		BaseDN:       l.baseDN,
+		BaseDN:       l.config.BaseDN,
 		Scope:        ldap.ScopeWholeSubtree,
 		DerefAliases: ldap.NeverDerefAliases,
 		Filter:       fmt.Sprintf("(&(objectClass=computer)(sAMAccountName=%s))", ldap.EscapeFilter(sAMAccountName)),
@@ -113,7 +113,7 @@ func (l *LDAP) FindComputers() (computers []Computer, err error) {
 	defer c.Close()
 
 	r, err := c.Search(&ldap.SearchRequest{
-		BaseDN:       l.baseDN,
+		BaseDN:       l.config.BaseDN,
 		Scope:        ldap.ScopeWholeSubtree,
 		DerefAliases: ldap.NeverDerefAliases,
 		Filter:       "(objectClass=computer)",

diff --git a/groups.go b/groups.go
@@ -56,7 +56,7 @@ func (l *LDAP) FindGroups() (groups []Group, err error) {
 	defer c.Close()
 
 	r, err := c.Search(&ldap.SearchRequest{
-		BaseDN:       l.baseDN,
+		BaseDN:       l.config.BaseDN,
 		Scope:        ldap.ScopeWholeSubtree,
 		DerefAliases: ldap.NeverDerefAliases,
 		Filter:       "(objectClass=group)",

diff --git a/users.go b/users.go
@@ -69,7 +69,7 @@ func (l *LDAP) FindUserBySAMAccountName(sAMAccountName string) (user *User, err
 	defer c.Close()
 
 	r, err := c.Search(&ldap.SearchRequest{
-		BaseDN:       l.baseDN,
+		BaseDN:       l.config.BaseDN,
 		Scope:        ldap.ScopeWholeSubtree,
 		DerefAliases: ldap.NeverDerefAliases,
 		Filter:       fmt.Sprintf("(&(objectClass=user)(sAMAccountName=%s))", ldap.EscapeFilter(sAMAccountName)),
@@ -110,7 +110,7 @@ func (l *LDAP) FindUsers() (users []User, err error) {
 	defer c.Close()
 
 	r, err := c.Search(&ldap.SearchRequest{
-		BaseDN:       l.baseDN,
+		BaseDN:       l.config.BaseDN,
 		Scope:        ldap.ScopeWholeSubtree,
 		DerefAliases: ldap.NeverDerefAliases,
 		Filter:       "(objectClass=user)",