Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-22 18:25:56 +01:00
Code Issues Projects Releases Wiki Activity

Update with PR review comment

Browse Source
This commit is contained in:
stonezdj 2017-11-24 14:53:34 +08:00
parent 16243cfbbc
commit 1179769e31
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/ui/api/member.go
View File

@ -166,21 +166,33 @@ func (pma *ProjectMemberAPI) Post() {
if userID <= 0 {
//check current authorization mode
authMode, err := config.AuthMode()
if err != nil || authMode != "ldap_auth" {
log.Warningf("User does not exist, user name: %s", username)
if err != nil {
log.Errorf("Failed the retrieve auth_mode, error: %s", err)
pma.RenderError(http.StatusInternalServerError, "Failed to retrieve auth_mode")
return
}
if authMode != "ldap_auth" {
log.Errorf("User does not exist, user name: %s", username)
pma.RenderError(http.StatusNotFound, "User does not exist")
return
}
//search and import user
newUserID, err := ldapUtils.SearchAndImportUser(username)
if err == nil || newUserID > 0 {
userID = int(newUserID)
} else {
log.Warningf("User does not exist, user name: %s", username)
pma.RenderError(http.StatusNotFound, "User does not exist")
if err != nil {
log.Errorf("Search and import user failed, error: %v ", err)
pma.RenderError(http.StatusInternalServerError, "Failed to search and import user")
return
}
if newUserID <= 0 {
log.Error("Failed to create user")
pma.RenderError(http.StatusNotFound, "Failed to create user")
return
}
userID = int(newUserID)
}
rolelist, err := dao.GetUserProjectRoles(userID, projectID)
if err != nil {

2
src/ui/config/config.go
View File

@ -185,7 +185,7 @@ func LDAP() (*models.LDAP, error) {
if cfg[common.LDAPVerifyCert] != nil {
ldap.VerifyCert = cfg[common.LDAPVerifyCert].(bool)
} else {
ldap.VerifyCert = false
ldap.VerifyCert = true
}
return ldap, nil