From e4f200e616e79cdea7f1c50b5dbb3f3ed2fe84db Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 16 May 2023 03:33:47 -0400 Subject: [PATCH] Respect original content when creating secrets (#24745) (#24746) Backport #24745 by @wolfogre Fix #24721. Follow what GitHub does: - Don't trim spaces for secrets. - Newline should be `\n` instead of `\r\n`. Did some tests with: ```yaml name: secrets on: push jobs: show_secrets: runs-on: ubuntu-latest steps: - name: Dump secrets context run: echo '${{ toJSON(secrets) }}' | base64 ``` `AAAAAA`: ```text AAAAAA AAAAAA ``` `BBBBBB`: ```text BBBBBB BBBBBB ``` On GitHub: image On Gitea (before): image On Gitea (after): image Co-authored-by: Jason Song --- models/secret/secret.go | 2 +- routers/web/shared/secrets/secrets.go | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/models/secret/secret.go b/models/secret/secret.go index f970d5319e..8b23b6c35c 100644 --- a/models/secret/secret.go +++ b/models/secret/secret.go @@ -59,7 +59,7 @@ func newSecret(ownerID, repoID int64, name, data string) *Secret { // InsertEncryptedSecret Creates, encrypts, and validates a new secret with yet unencrypted data and insert into database func InsertEncryptedSecret(ctx context.Context, ownerID, repoID int64, name, data string) (*Secret, error) { - encrypted, err := secret_module.EncryptSecret(setting.SecretKey, strings.TrimSpace(data)) + encrypted, err := secret_module.EncryptSecret(setting.SecretKey, data) if err != nil { return nil, err } diff --git a/routers/web/shared/secrets/secrets.go b/routers/web/shared/secrets/secrets.go index 0e6fa24741..a0d648f908 100644 --- a/routers/web/shared/secrets/secrets.go +++ b/routers/web/shared/secrets/secrets.go @@ -5,6 +5,7 @@ package secrets import ( "net/http" + "strings" "code.gitea.io/gitea/models/db" secret_model "code.gitea.io/gitea/models/secret" @@ -27,7 +28,15 @@ func SetSecretsContext(ctx *context.Context, ownerID, repoID int64) { func PerformSecretsPost(ctx *context.Context, ownerID, repoID int64, redirectURL string) { form := web.GetForm(ctx).(*forms.AddSecretForm) - s, err := secret_model.InsertEncryptedSecret(ctx, ownerID, repoID, form.Title, form.Content) + content := form.Content + // Since the content is from a form which is a textarea, the line endings are \r\n. + // It's a standard behavior of HTML. + // But we want to store them as \n like what GitHub does. + // And users are unlikely to really need to keep the \r. + // Other than this, we should respect the original content, even leading or trailing spaces. + content = strings.ReplaceAll(content, "\r\n", "\n") + + s, err := secret_model.InsertEncryptedSecret(ctx, ownerID, repoID, form.Title, content) if err != nil { log.Error("InsertEncryptedSecret: %v", err) ctx.Flash.Error(ctx.Tr("secrets.creation.failed"))