Upstream
/
harbor
mirror of https://github.com/goharbor/harbor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7 from wknet123/master 

already merged from uptream/master
This commit is contained in:
reasonerjt 2016-02-25 12:38:33 +08:00
parent 9660645fe2 634f69b2c5
commit fbbd45e656
2 changed files with 35 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
controllers/item_detail.go
View File

@ -29,46 +29,14 @@ type ItemDetailController struct {
BaseController
}
var SYS_ADMIN int = 1
var PROJECT_ADMIN int = 2
var DEVELOPER int = 3
var GUEST int = 4
func CheckProjectRole(userId int, projectId int64) bool {
if projectId == 0 {
return false
}
userQuery := models.User{UserId: int(userId)}
if userId == SYS_ADMIN {
return true
}
roleList, err := dao.GetUserProjectRoles(userQuery, projectId)
if err != nil {
beego.Error("Error occurred in GetUserProjectRoles:", err)
return false
}
return len(roleList) > 0
}
func CheckPublicProject(projectId int64) bool {
project, err := dao.GetProjectById(projectId)
if err != nil {
beego.Error("Error occurred in GetProjectById:", err)
return false
}
if project != nil && project.Public == 1 {
return true
}
return false
}
func (idc *ItemDetailController) Get() {
sessionUserId := idc.GetSession("userId")
projectId, _ := idc.GetInt64("project_id")
if CheckPublicProject(projectId) == false && (sessionUserId == nil || !CheckProjectRole(sessionUserId.(int), projectId)) {
idc.Redirect("/signIn?uri="+url.QueryEscape(idc.Ctx.Input.URI()), http.StatusFound)
if projectId <= 0 {
beego.Error("Invalid project id:", projectId)
idc.Redirect("/signIn", http.StatusFound)
return
}
project, err := dao.GetProjectById(projectId)
@ -80,6 +48,35 @@ func (idc *ItemDetailController) Get() {
if project == nil {
idc.Redirect("/signIn", http.StatusFound)
return
}
sessionUserId := idc.GetSession("userId")
if project.Public != 1 && sessionUserId == nil {
idc.Redirect("/signIn?uri="+url.QueryEscape(idc.Ctx.Input.URI()), http.StatusFound)
return
}
if sessionUserId != nil {
idc.Data["Username"] = idc.GetSession("username")
idc.Data["UserId"] = sessionUserId.(int)
roleList, err := dao.GetUserProjectRoles(models.User{UserId: sessionUserId.(int)}, projectId)
if err != nil {
beego.Error("Error occurred in GetUserProjectRoles:", err)
idc.CustomAbort(http.StatusInternalServerError, "Internal error.")
}
if project.Public == 0 && len(roleList) == 0 {
idc.Redirect("/registry/project", http.StatusFound)
return
}
if len(roleList) > 0 {
idc.Data["RoleId"] = roleList[0].RoleId
}
}
idc.Data["ProjectId"] = project.ProjectId
@ -87,19 +84,6 @@ func (idc *ItemDetailController) Get() {
idc.Data["OwnerName"] = project.OwnerName
idc.Data["OwnerId"] = project.OwnerId
if sessionUserId != nil {
idc.Data["Username"] = idc.GetSession("username")
idc.Data["UserId"] = sessionUserId.(int)
roleList, err := dao.GetUserProjectRoles(models.User{UserId: sessionUserId.(int)}, projectId)
if err != nil {
beego.Error("Error occurred in GetUserProjectRoles:", err)
idc.CustomAbort(http.StatusInternalServerError, "Internal error.")
}
if len(roleList) > 0 {
idc.Data["RoleId"] = roleList[0].RoleId
}
}
idc.Data["HarborRegUrl"] = os.Getenv("HARBOR_REG_URL")
idc.Data["RepoName"] = idc.GetString("repo_name")

2
controllers/password.go
View File

@ -36,6 +36,7 @@ func (cpc *ChangePasswordController) Get() {
sessionUserId := cpc.GetSession("userId")
if sessionUserId == nil {
cpc.Redirect("/signIn", http.StatusFound)
return
}
cpc.Data["Username"] = cpc.GetSession("username")
cpc.ForwardTo("page_title_change_password", "change-password")
@ -179,6 +180,7 @@ func (rpc *ResetPasswordController) Get() {
if resetUuid == "" {
beego.Error("Reset uuid is blank.")
rpc.Redirect("/", http.StatusFound)
return
}
queryUser := models.User{ResetUuid: resetUuid}