mirror of
https://github.com/goharbor/harbor
synced 2024-09-21 08:48:04 +00:00
Merge pull request #1788 from ywk253100/170324_ping_ldap
Read password from config when calling ping ldap API if password is not provided
This commit is contained in:
commit
bf83ea2506
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue
Block a user