Fix API for edit and delete release attachment (#8285)
* Add logging for when user requested attachment doesn't belong to the specified release. * Fix API to use correct variable for release asset (attachment)
This commit is contained in:
parent
eb11ca6847
commit
c6fb7fe27c
1 changed files with 6 additions and 2 deletions
|
@ -9,6 +9,7 @@ import (
|
||||||
|
|
||||||
"code.gitea.io/gitea/models"
|
"code.gitea.io/gitea/models"
|
||||||
"code.gitea.io/gitea/modules/context"
|
"code.gitea.io/gitea/modules/context"
|
||||||
|
"code.gitea.io/gitea/modules/log"
|
||||||
"code.gitea.io/gitea/modules/setting"
|
"code.gitea.io/gitea/modules/setting"
|
||||||
api "code.gitea.io/gitea/modules/structs"
|
api "code.gitea.io/gitea/modules/structs"
|
||||||
"code.gitea.io/gitea/modules/upload"
|
"code.gitea.io/gitea/modules/upload"
|
||||||
|
@ -55,6 +56,7 @@ func GetReleaseAttachment(ctx *context.APIContext) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if attach.ReleaseID != releaseID {
|
if attach.ReleaseID != releaseID {
|
||||||
|
log.Info("User requested attachment is not in release, release_id %v, attachment_id: %v", releaseID, attachID)
|
||||||
ctx.NotFound()
|
ctx.NotFound()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -242,13 +244,14 @@ func EditReleaseAttachment(ctx *context.APIContext, form api.EditAttachmentOptio
|
||||||
|
|
||||||
// Check if release exists an load release
|
// Check if release exists an load release
|
||||||
releaseID := ctx.ParamsInt64(":id")
|
releaseID := ctx.ParamsInt64(":id")
|
||||||
attachID := ctx.ParamsInt64(":attachment")
|
attachID := ctx.ParamsInt64(":asset")
|
||||||
attach, err := models.GetAttachmentByID(attachID)
|
attach, err := models.GetAttachmentByID(attachID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.Error(500, "GetAttachmentByID", err)
|
ctx.Error(500, "GetAttachmentByID", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if attach.ReleaseID != releaseID {
|
if attach.ReleaseID != releaseID {
|
||||||
|
log.Info("User requested attachment is not in release, release_id %v, attachment_id: %v", releaseID, attachID)
|
||||||
ctx.NotFound()
|
ctx.NotFound()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -299,13 +302,14 @@ func DeleteReleaseAttachment(ctx *context.APIContext) {
|
||||||
|
|
||||||
// Check if release exists an load release
|
// Check if release exists an load release
|
||||||
releaseID := ctx.ParamsInt64(":id")
|
releaseID := ctx.ParamsInt64(":id")
|
||||||
attachID := ctx.ParamsInt64(":attachment")
|
attachID := ctx.ParamsInt64(":asset")
|
||||||
attach, err := models.GetAttachmentByID(attachID)
|
attach, err := models.GetAttachmentByID(attachID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.Error(500, "GetAttachmentByID", err)
|
ctx.Error(500, "GetAttachmentByID", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if attach.ReleaseID != releaseID {
|
if attach.ReleaseID != releaseID {
|
||||||
|
log.Info("User requested attachment is not in release, release_id %v, attachment_id: %v", releaseID, attachID)
|
||||||
ctx.NotFound()
|
ctx.NotFound()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue