Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Fix DELETE request for non-existent public key (#19443) (#19444)

Browse source 
- Backport #19443
  - Add a return for the first "block" of errors, which fixes the double error messages.
  - Add a return for `externallyManaged`.
  - Resolves #19398

Co-authored-by: 6543 <6543@obermui.de>
This commit is contained in:
Gusted 2022-04-20 22:24:56 +00:00 committed by GitHub
parent 5863f7e048
commit 0c7bf6801f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
routers/api/v1/user/key.go
View file

@ -266,16 +266,21 @@ func DeletePublicKey(ctx *context.APIContext) {
id := ctx.ParamsInt64(":id") id := ctx.ParamsInt64(":id")
externallyManaged, err := asymkey_model.PublicKeyIsExternallyManaged(id) externallyManaged, err := asymkey_model.PublicKeyIsExternallyManaged(id)
if err != nil { if err != nil {
if asymkey_model.IsErrKeyNotExist(err) {
ctx.NotFound()
} else {
ctx.Error(http.StatusInternalServerError, "PublicKeyIsExternallyManaged", err) ctx.Error(http.StatusInternalServerError, "PublicKeyIsExternallyManaged", err)
} }
return
}
if externallyManaged { if externallyManaged {
ctx.Error(http.StatusForbidden, "", "SSH Key is externally managed for this user") ctx.Error(http.StatusForbidden, "", "SSH Key is externally managed for this user")
return
} }
if err := asymkey_service.DeletePublicKey(ctx.User, id); err != nil { if err := asymkey_service.DeletePublicKey(ctx.User, id); err != nil {
if asymkey_model.IsErrKeyNotExist(err) { if asymkey_model.IsErrKeyAccessDenied(err) {
ctx.NotFound()
} else if asymkey_model.IsErrKeyAccessDenied(err) {
ctx.Error(http.StatusForbidden, "", "You do not have access to this key") ctx.Error(http.StatusForbidden, "", "You do not have access to this key")
} else { } else {
ctx.Error(http.StatusInternalServerError, "DeletePublicKey", err) ctx.Error(http.StatusInternalServerError, "DeletePublicKey", err)