Skip to content

Commit 7297cce

Browse files
GiteaBotKN4CK3R
andauthored
Only delete secrets belonging to its owner (go-gitea#24284) (go-gitea#24286)
Backport go-gitea#24284 by @KN4CK3R Co-authored-by: KN4CK3R <[email protected]>
1 parent 077160b commit 7297cce

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

routers/web/org/setting_secrets.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ func SecretsPost(ctx *context.Context) {
4343
func SecretsDelete(ctx *context.Context) {
4444
shared.PerformSecretsDelete(
4545
ctx,
46+
ctx.ContextUser.ID,
47+
0,
4648
ctx.Org.OrgLink+"/settings/secrets",
4749
)
4850
}

routers/web/repo/setting_secrets.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ func SecretsPost(ctx *context.Context) {
4141
func DeleteSecret(ctx *context.Context) {
4242
shared.PerformSecretsDelete(
4343
ctx,
44+
0,
45+
ctx.Repo.Repository.ID,
4446
ctx.Repo.RepoLink+"/settings/secrets",
4547
)
4648
}

routers/web/shared/secrets/secrets.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ func PerformSecretsPost(ctx *context.Context, ownerID, repoID int64, redirectURL
3838
ctx.Redirect(redirectURL)
3939
}
4040

41-
func PerformSecretsDelete(ctx *context.Context, redirectURL string) {
41+
func PerformSecretsDelete(ctx *context.Context, ownerID, repoID int64, redirectURL string) {
4242
id := ctx.FormInt64("id")
4343

44-
if _, err := db.DeleteByBean(ctx, &secret_model.Secret{ID: id}); err != nil {
44+
if _, err := db.DeleteByBean(ctx, &secret_model.Secret{ID: id, OwnerID: ownerID, RepoID: repoID}); err != nil {
4545
log.Error("Delete secret %d failed: %v", id, err)
4646
ctx.Flash.Error(ctx.Tr("secrets.deletion.failed"))
4747
} else {

routers/web/user/setting/secrets.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ func SecretsPost(ctx *context.Context) {
4040
func SecretsDelete(ctx *context.Context) {
4141
shared.PerformSecretsDelete(
4242
ctx,
43+
ctx.Doer.ID,
44+
0,
4345
setting.AppSubURL+"/user/settings/secrets",
4446
)
4547
}

0 commit comments

Comments
 (0)