mirror of
				https://github.com/go-gitea/gitea
				synced 2025-11-04 05:18:25 +00:00 
			
		
		
		
	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: <img width="675" alt="image" src="https://github.com/go-gitea/gitea/assets/9418365/0ec60652-c2a3-47bb-9f9d-7e81665355a8"> On Gitea (before): <img width="673" alt="image" src="https://github.com/go-gitea/gitea/assets/9418365/cce818bf-5edc-4656-86e1-2c81c304cdb2"> On Gitea (after): <img width="673" alt="image" src="https://github.com/go-gitea/gitea/assets/9418365/0b3b15af-4d48-4bab-a334-4738a1b0eb4a">
		
			
				
	
	
		
			64 lines
		
	
	
		
			2.0 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			64 lines
		
	
	
		
			2.0 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
// Copyright 2022 The Gitea Authors. All rights reserved.
 | 
						|
// SPDX-License-Identifier: MIT
 | 
						|
 | 
						|
package secrets
 | 
						|
 | 
						|
import (
 | 
						|
	"net/http"
 | 
						|
	"strings"
 | 
						|
 | 
						|
	"code.gitea.io/gitea/models/db"
 | 
						|
	secret_model "code.gitea.io/gitea/models/secret"
 | 
						|
	"code.gitea.io/gitea/modules/context"
 | 
						|
	"code.gitea.io/gitea/modules/log"
 | 
						|
	"code.gitea.io/gitea/modules/web"
 | 
						|
	"code.gitea.io/gitea/services/forms"
 | 
						|
)
 | 
						|
 | 
						|
func SetSecretsContext(ctx *context.Context, ownerID, repoID int64) {
 | 
						|
	secrets, err := secret_model.FindSecrets(ctx, secret_model.FindSecretsOptions{OwnerID: ownerID, RepoID: repoID})
 | 
						|
	if err != nil {
 | 
						|
		ctx.ServerError("FindSecrets", err)
 | 
						|
		return
 | 
						|
	}
 | 
						|
 | 
						|
	ctx.Data["Secrets"] = secrets
 | 
						|
}
 | 
						|
 | 
						|
func PerformSecretsPost(ctx *context.Context, ownerID, repoID int64, redirectURL string) {
 | 
						|
	form := web.GetForm(ctx).(*forms.AddSecretForm)
 | 
						|
 | 
						|
	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"))
 | 
						|
	} else {
 | 
						|
		ctx.Flash.Success(ctx.Tr("secrets.creation.success", s.Name))
 | 
						|
	}
 | 
						|
 | 
						|
	ctx.Redirect(redirectURL)
 | 
						|
}
 | 
						|
 | 
						|
func PerformSecretsDelete(ctx *context.Context, ownerID, repoID int64, redirectURL string) {
 | 
						|
	id := ctx.FormInt64("id")
 | 
						|
 | 
						|
	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)
 | 
						|
		ctx.Flash.Error(ctx.Tr("secrets.deletion.failed"))
 | 
						|
	} else {
 | 
						|
		ctx.Flash.Success(ctx.Tr("secrets.deletion.success"))
 | 
						|
	}
 | 
						|
 | 
						|
	ctx.JSON(http.StatusOK, map[string]interface{}{
 | 
						|
		"redirect": redirectURL,
 | 
						|
	})
 | 
						|
}
 |