mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-09-08 00:03:28 +00:00
Only delete secrets belonging to its owner (#24284)
This commit is contained in:
parent
60e7963141
commit
b3e849d1d6
4 changed files with 8 additions and 2 deletions
|
@ -43,6 +43,8 @@ func SecretsPost(ctx *context.Context) {
|
||||||
func SecretsDelete(ctx *context.Context) {
|
func SecretsDelete(ctx *context.Context) {
|
||||||
shared.PerformSecretsDelete(
|
shared.PerformSecretsDelete(
|
||||||
ctx,
|
ctx,
|
||||||
|
ctx.ContextUser.ID,
|
||||||
|
0,
|
||||||
ctx.Org.OrgLink+"/settings/secrets",
|
ctx.Org.OrgLink+"/settings/secrets",
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,6 +41,8 @@ func SecretsPost(ctx *context.Context) {
|
||||||
func DeleteSecret(ctx *context.Context) {
|
func DeleteSecret(ctx *context.Context) {
|
||||||
shared.PerformSecretsDelete(
|
shared.PerformSecretsDelete(
|
||||||
ctx,
|
ctx,
|
||||||
|
0,
|
||||||
|
ctx.Repo.Repository.ID,
|
||||||
ctx.Repo.RepoLink+"/settings/secrets",
|
ctx.Repo.RepoLink+"/settings/secrets",
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,10 +38,10 @@ func PerformSecretsPost(ctx *context.Context, ownerID, repoID int64, redirectURL
|
||||||
ctx.Redirect(redirectURL)
|
ctx.Redirect(redirectURL)
|
||||||
}
|
}
|
||||||
|
|
||||||
func PerformSecretsDelete(ctx *context.Context, redirectURL string) {
|
func PerformSecretsDelete(ctx *context.Context, ownerID, repoID int64, redirectURL string) {
|
||||||
id := ctx.FormInt64("id")
|
id := ctx.FormInt64("id")
|
||||||
|
|
||||||
if _, err := db.DeleteByBean(ctx, &secret_model.Secret{ID: id}); err != nil {
|
if _, err := db.DeleteByBean(ctx, &secret_model.Secret{ID: id, OwnerID: ownerID, RepoID: repoID}); err != nil {
|
||||||
log.Error("Delete secret %d failed: %v", id, err)
|
log.Error("Delete secret %d failed: %v", id, err)
|
||||||
ctx.Flash.Error(ctx.Tr("secrets.deletion.failed"))
|
ctx.Flash.Error(ctx.Tr("secrets.deletion.failed"))
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -40,6 +40,8 @@ func SecretsPost(ctx *context.Context) {
|
||||||
func SecretsDelete(ctx *context.Context) {
|
func SecretsDelete(ctx *context.Context) {
|
||||||
shared.PerformSecretsDelete(
|
shared.PerformSecretsDelete(
|
||||||
ctx,
|
ctx,
|
||||||
|
ctx.Doer.ID,
|
||||||
|
0,
|
||||||
setting.AppSubURL+"/user/settings/secrets",
|
setting.AppSubURL+"/user/settings/secrets",
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue