Merge pull request #580 from Litrop/master

foxcpp · web-flow · commit 13a210f2a434 · 2023-05-04T21:50:36.000+03:00
Clone tlsCfg with ServerName because ServerName is needed by StartTLS
diff --git a/internal/auth/ldap/ldap.go b/internal/auth/ldap/ldap.go
@@ -147,8 +147,8 @@ func (a *Auth) newConn() (*ldap.Conn, error) {
 			return nil, fmt.Errorf("auth.ldap: invalid server URL: %w", err)
 		}
 		hostname := parsedURL.Host
+		a.tlsCfg.ServerName = strings.Split(hostname, ":")[0]
 		tlsCfg = a.tlsCfg.Clone()
-		a.tlsCfg.ServerName = hostname
 
 		conn, err = ldap.DialURL(u, ldap.DialWithDialer(a.dialer), ldap.DialWithTLSConfig(tlsCfg))
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,8 @@ func (a Auth) newConn() (ldap.Conn, error) {`
`147`	`147`	`return nil, fmt.Errorf("auth.ldap: invalid server URL: %w", err)`
`148`	`148`	`}`
`149`	`149`	`hostname := parsedURL.Host`
	`150`	`+ a.tlsCfg.ServerName = strings.Split(hostname, ":")[0]`
`150`	`151`	`tlsCfg = a.tlsCfg.Clone()`
`151`		`- a.tlsCfg.ServerName = hostname`
`152`	`152`
`153`	`153`	`conn, err = ldap.DialURL(u, ldap.DialWithDialer(a.dialer), ldap.DialWithTLSConfig(tlsCfg))`
`154`	`154`	`if err != nil {`