Merge pull request #679 from ywk253100/master_d

bug fix: check whether project is nil befere reading its properties
This commit is contained in:
Daniel Jiang 2016-08-12 14:39:27 +08:00 committed by GitHub
commit 361f6bd393

View File

@ -121,6 +121,10 @@ func (ra *RepositoryAPI) Delete() {
ra.CustomAbort(http.StatusInternalServerError, "") ra.CustomAbort(http.StatusInternalServerError, "")
} }
if project == nil {
ra.CustomAbort(http.StatusNotFound, fmt.Sprintf("project %s not found", projectName))
}
if project.Public == 0 { if project.Public == 0 {
userID := ra.ValidateUser() userID := ra.ValidateUser()
if !hasProjectAdminRole(userID, project.ProjectID) { if !hasProjectAdminRole(userID, project.ProjectID) {
@ -270,6 +274,10 @@ func (ra *RepositoryAPI) GetManifests() {
ra.CustomAbort(http.StatusInternalServerError, "") ra.CustomAbort(http.StatusInternalServerError, "")
} }
if project == nil {
ra.CustomAbort(http.StatusNotFound, fmt.Sprintf("project %s not found", projectName))
}
if project.Public == 0 { if project.Public == 0 {
userID := ra.ValidateUser() userID := ra.ValidateUser()
if !checkProjectPermission(userID, project.ProjectID) { if !checkProjectPermission(userID, project.ProjectID) {