Merge branch 'master' into bitbucket-support

This commit is contained in:
runzexia
2019-08-27 16:12:23 +08:00
680 changed files with 120037 additions and 369 deletions

View File

@@ -467,6 +467,8 @@ func GetUserInfo(username string) (*models.User, error) {
return nil, err
}
defer conn.Close()
userSearchRequest := ldap.NewSearchRequest(
ldapclient.UserSearchBase,
ldap.ScopeWholeSubtree, ldap.NeverDerefAliases, 0, 0, false,
@@ -1162,6 +1164,8 @@ func DescribeGroup(path string) (*models.Group, error) {
return nil, err
}
defer conn.Close()
groupSearchRequest := ldap.NewSearchRequest(searchBase,
ldap.ScopeSingleLevel, ldap.NeverDerefAliases, 0, 0, false,
fmt.Sprintf("(&(objectClass=posixGroup)(cn=%s))", cn),