outposts/ldap: more cleanup

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

outpost/pkg/ldap/api.go

@@ -122,21 +122,3 @@ func (ls *LDAPServer) Start() error {
 	wg.Wait()
 	return nil
 }
-
-type transport struct {
-	headers map[string]string
-	inner   http.RoundTripper
-}
-
-func (t *transport) RoundTrip(req *http.Request) (*http.Response, error) {
-	for key, value := range t.headers {
-		req.Header.Add(key, value)
-	}
-	return t.inner.RoundTrip(req)
-}
-func newTransport(inner http.RoundTripper, headers map[string]string) *transport {
-	return &transport{
-		inner:   inner,
-		headers: headers,
-	}
-}

outpost/pkg/ldap/instance_bind.go

@@ -57,10 +57,9 @@ func (pi *ProviderInstance) Bind(username string, bindDN, bindPW string, conn ne
 	config.UserAgent = pkg.UserAgent()
 	config.HTTPClient = &http.Client{
 		Jar:       jar,
-		Transport: newTransport(ak.GetTLSTransport(), map[string]string{
-			"X-authentik-remote-ip": host,
-		}),
+		Transport: ak.GetTLSTransport(),
 	}
+	config.AddDefaultHeader("X-authentik-remote-ip", host)
 	// create the API client, with the transport
 	apiClient := api.NewAPIClient(config)
 

outpost/pkg/ldap/instance_search.go

@@ -148,7 +148,7 @@ func (pi *ProviderInstance) GroupEntry(g LDAPGroup) *ldap.Entry {
 		},
 	}
 
-	if (g.isVirtualGroup) {
+	if g.isVirtualGroup {
 		attrs = append(attrs, &ldap.EntryAttribute{
 			Name:   "objectClass",
 			Values: []string{GroupObjectClass, "goauthentik.io/ldap/group", "goauthentik.io/ldap/virtual-group"},
@@ -163,7 +163,7 @@ func (pi *ProviderInstance) GroupEntry(g LDAPGroup) *ldap.Entry {
 	attrs = append(attrs, &ldap.EntryAttribute{Name: "member", Values: g.member})
 	attrs = append(attrs, &ldap.EntryAttribute{Name: "goauthentik.io/ldap/superuser", Values: []string{BoolToString(g.isSuperuser)}})
 
-	if (g.akAttributes != nil) {
+	if g.akAttributes != nil {
 		attrs = append(attrs, AKAttrsToLDAP(g.akAttributes)...)
 	}