Updated

Author: djthorpe

pkg/ldap/manager.go

@@ -152,8 +152,10 @@ func (ldap *Manager) Host() string {
 // Return the user for the LDAP connection
 func (ldap *Manager) User() string {
 	if types.IsIdentifier(ldap.user) {
+		// If it's an identifier, then append the DN
 		return fmt.Sprint("cn=", ldap.user, ",", ldap.dn)
 	} else {
+		// Assume it's a DN
 		return ldap.user
 	}
 }
@@ -247,7 +249,8 @@ func (manager *Manager) List(ctx context.Context, request schema.ObjectListReque
 	if request.Filter != nil {
 		filter = types.PtrString(request.Filter)
 	}
-	attrs := []string{"*"}
+	// TODO
+	attrs := []string{}
 
 	// Perform the search through paging, skipping the first N entries
 	var list schema.ObjectList
@@ -276,8 +279,6 @@ func (manager *Manager) list(ctx context.Context, scope int, dn, filter string,
 		controls = []ldap.Control{paging}
 	}
 
-	fmt.Println("searching", dn, filter, attrs)
-
 	// Create the search request
 	req := ldap.NewSearchRequest(
 		dn,

pkg/ldap/manager_test.go

@@ -8,32 +8,43 @@ import (
 	"time"
 
 	// Packages
-
-	"github.com/mutablelogic/go-server/pkg/httpresponse"
+	httpresponse "github.com/mutablelogic/go-server/pkg/httpresponse"
 	ldap "github.com/mutablelogic/go-server/pkg/ldap"
 	schema "github.com/mutablelogic/go-server/pkg/ldap/schema"
 	assert "github.com/stretchr/testify/assert"
 )
 
+const (
+	User, Pass = "uid=admin,cn=users,cn=accounts,dc=demo1,dc=freeipa,dc=org", "Secret123"
+	URL        = "ldaps://ipa.demo1.freeipa.org/"
+	BaseDN     = "dc=demo1,dc=freeipa,dc=org"
+)
+
+var (
+	opts = []ldap.Opt{}
+)
+
 /////////////////////////////////////////////////////////////////////////////////
 // PUBLIC METHODS
 
-func Test_Manager_001(t *testing.T) {
-	assert := assert.New(t)
-
+func TestMain(m *testing.M) {
 	// Get opts
-	opts := []ldap.Opt{}
 	if url := os.Getenv("LDAP_URL"); url != "" {
-		opts = append(opts, ldap.WithUrl(url))
-	} else {
-		t.Skip("Skipping test, LDAP_URL not set")
-	}
-	if dn := os.Getenv("LDAP_BASE_DN"); dn != "" {
-		opts = append(opts, ldap.WithBaseDN(dn))
+		opts = append(opts, ldap.WithUrl(url), ldap.WithUser(os.Getenv("LDAP_USER")), ldap.WithPassword(os.Getenv("LDAP_PASSWORD")))
+		if dn := os.Getenv("LDAP_BASE_DN"); dn != "" {
+			opts = append(opts, ldap.WithBaseDN(dn))
+		}
 	} else {
-		t.Skip("Skipping test, LDAP_BASE_DN not set")
+		opts = append(opts, ldap.WithUrl(URL), ldap.WithUser(User), ldap.WithPassword(Pass), ldap.WithBaseDN(BaseDN), ldap.WithSkipVerify())
 	}
 
+	exitCode := m.Run()
+	os.Exit(exitCode)
+}
+
+func Test_Manager_001(t *testing.T) {
+	assert := assert.New(t)
+
 	// Create a new queue manager
 	manager, err := ldap.NewManager(opts...)
 	if !assert.NoError(err) {
@@ -79,19 +90,6 @@ func Test_Manager_001(t *testing.T) {
 func Test_Manager_002(t *testing.T) {
 	assert := assert.New(t)
 
-	// Get opts
-	opts := []ldap.Opt{}
-	if url := os.Getenv("LDAP_URL"); url != "" {
-		opts = append(opts, ldap.WithUrl(url))
-	} else {
-		t.Skip("Skipping test, LDAP_URL not set")
-	}
-	if dn := os.Getenv("LDAP_BASE_DN"); dn != "" {
-		opts = append(opts, ldap.WithBaseDN(dn))
-	} else {
-		t.Skip("Skipping test, LDAP_BASE_DN not set")
-	}
-
 	// Create a new queue manager
 	manager, err := ldap.NewManager(opts...)
 	if !assert.NoError(err) {
@@ -126,19 +124,6 @@ func Test_Manager_002(t *testing.T) {
 func Test_Manager_003(t *testing.T) {
 	assert := assert.New(t)
 
-	// Get opts
-	opts := []ldap.Opt{}
-	if url := os.Getenv("LDAP_URL"); url != "" {
-		opts = append(opts, ldap.WithUrl(url))
-	} else {
-		t.Skip("Skipping test, LDAP_URL not set")
-	}
-	if dn := os.Getenv("LDAP_BASE_DN"); dn != "" {
-		opts = append(opts, ldap.WithBaseDN(dn))
-	} else {
-		t.Skip("Skipping test, LDAP_BASE_DN not set")
-	}
-
 	// Create a new queue manager
 	manager, err := ldap.NewManager(opts...)
 	if !assert.NoError(err) {

pkg/ldap/opt.go

@@ -102,9 +102,9 @@ func WithPassword(v string) Opt {
 	}
 }
 
-func WithSkipVerify(v bool) Opt {
+func WithSkipVerify() Opt {
 	return func(o *opt) error {
-		o.skipverify = v
+		o.skipverify = true
 		return nil
 	}
 }