ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2024-12-27 05:49:04 +01:00
Code Issues Packages Releases Activity

Remove needless tls option in ldap config

Browse Source 
Go's LDAP client uses tls automatically if the url starts with 'ldaps'.
This commit is contained in:
Lou Knauer 2022-02-15 10:00:55 +01:00
parent ec1f200061
commit 6d0a4a91a3
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
auth/ldap.go
View File

@ -1,7 +1,6 @@
package auth package auth
import ( import (
"crypto/tls"
"errors" "errors"
"os" "os"
"strings" "strings"
@ -13,15 +12,12 @@ import (
) )
type LdapConfig struct { type LdapConfig struct {
Url string `json:"url"` Url string `json:"url"`
UserBase string `json:"user_base"` UserBase string `json:"user_base"`
SearchDN string `json:"search_dn"` SearchDN string `json:"search_dn"`
UserBind string `json:"user_bind"` UserBind string `json:"user_bind"`
UserFilter string `json:"user_filter"` UserFilter string `json:"user_filter"`
TLS bool `json:"tls"` SyncInterval string `json:"sync_interval"` // Parsed using time.ParseDuration.
// Parsed using time.ParseDuration.
SyncInterval string `json:"sync_interval"`
SyncDelOldUsers bool `json:"sync_del_old_users"` SyncDelOldUsers bool `json:"sync_del_old_users"`
} }
@ -64,13 +60,6 @@ func (auth *Authentication) getLdapConnection(admin bool) (*ldap.Conn, error) {
return nil, err return nil, err
} }
if auth.ldapConfig.TLS {
if err := conn.StartTLS(&tls.Config{InsecureSkipVerify: true}); err != nil {
conn.Close()
return nil, err
}
}
if admin { if admin {
if err := conn.Bind(auth.ldapConfig.SearchDN, auth.ldapSyncUserPassword); err != nil { if err := conn.Bind(auth.ldapConfig.SearchDN, auth.ldapSyncUserPassword); err != nil {
conn.Close() conn.Close()