Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 20, 2022
+9 −4
Merged

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

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3785221
Fix DELETE request for non-existent public key (#19443)
Apr 20, 2022
6d2974a
Merge branch 'release/v1.16' into backport-19443
6543 Apr 20, 2022
3252b5a
Merge branch 'release/v1.16' into backport-19443
zeripath Apr 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions routers/api/v1/user/key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,16 +266,21 @@ func DeletePublicKey(ctx *context.APIContext) {
id := ctx.ParamsInt64(":id")
externallyManaged, err := asymkey_model.PublicKeyIsExternallyManaged(id)
if err != nil {
ctx.Error(http.StatusInternalServerError, "PublicKeyIsExternallyManaged", err)
if asymkey_model.IsErrKeyNotExist(err) {
ctx.NotFound()
} else {
ctx.Error(http.StatusInternalServerError, "PublicKeyIsExternallyManaged", err)
}
return
}

if externallyManaged {
ctx.Error(http.StatusForbidden, "", "SSH Key is externally managed for this user")
return
}

if err := asymkey_service.DeletePublicKey(ctx.User, id); err != nil {
if asymkey_model.IsErrKeyNotExist(err) {
ctx.NotFound()
} else if asymkey_model.IsErrKeyAccessDenied(err) {
if asymkey_model.IsErrKeyAccessDenied(err) {
ctx.Error(http.StatusForbidden, "", "You do not have access to this key")
} else {
ctx.Error(http.StatusInternalServerError, "DeletePublicKey", err)
Expand Down