Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-06-29 08:15:06 +02:00
Code Issues Projects Releases Wiki Activity

if password is not provided read it from config when calling ping ldap API

Browse Source
This commit is contained in:
Wenkai Yin 2017-03-24 18:00:21 +08:00
parent ed1cad0ba8
commit 12847f90d1
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ui/api/ldap.go
View File

@ -16,6 +16,7 @@
package api
import (
"encoding/json"
"fmt"
"net/http"
"strings"
@ -65,6 +66,22 @@ func (l *LdapAPI) Ping() {
}
} else {
l.DecodeJSONReqAndValidate(&ldapConfs)
v := map[string]interface{}{}
if err := json.Unmarshal(l.Ctx.Input.RequestBody,
&v); err != nil {
log.Errorf("failed to unmarshal LDAP server settings: %v", err)
l.RenderError(http.StatusInternalServerError, "")
return
}
if _, ok := v["ldap_search_password"]; !ok {
settings, err := ldapUtils.GetSystemLdapConf()
if err != nil {
log.Errorf("Can't load system configuration, error: %v", err)
l.RenderError(http.StatusInternalServerError, fmt.Sprintf("can't load system configuration: %v", err))
return
}
ldapConfs.LdapSearchPassword = settings.LdapSearchPassword
}
}
ldapConfs, err = ldapUtils.ValidateLdapConf(ldapConfs)