mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-03-25 09:03:04 -04:00
f7873ba393
Forgejo's UI claims that whitespace is removed from the beginning and the end of the values of Forgejo Actions variables and secrets. However, that is not correct. The entered values are stored as-is. Only CRLF is replaced with LF, which is also the desired behaviour. This PR changes the incorrect text which is also no longer displayed as placeholder but as a proper help text below the input fields. Furthermore, tests were added to verify the behaviour. While adding tests, I discovered and fixed another inconsistency. Depending on whether secrets were managed using the UI or the HTTP API, they were treated differently. CRLF in secrets entered in the UI was correctly replaced with LF while secrets created using the HTTP API kept CRLF. Fixes #11003. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/11052 Reviewed-by: Gusted <gusted@noreply.codeberg.org> Co-authored-by: Andreas Ahlenstorf <andreas@ahlenstorf.ch> Co-committed-by: Andreas Ahlenstorf <andreas@ahlenstorf.ch>
79 lines
1.8 KiB
Go
79 lines
1.8 KiB
Go
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package secrets
|
|
|
|
import (
|
|
"context"
|
|
|
|
"forgejo.org/models/db"
|
|
secret_model "forgejo.org/models/secret"
|
|
)
|
|
|
|
func CreateOrUpdateSecret(ctx context.Context, ownerID, repoID int64, name, data string) (*secret_model.Secret, bool, error) {
|
|
if err := ValidateName(name); err != nil {
|
|
return nil, false, err
|
|
}
|
|
|
|
s, exists, err := db.Get[secret_model.Secret](ctx, secret_model.FindSecretsOptions{
|
|
OwnerID: ownerID,
|
|
RepoID: repoID,
|
|
Name: name,
|
|
}.ToConds())
|
|
if err != nil {
|
|
return nil, false, err
|
|
}
|
|
|
|
if !exists {
|
|
s, err := secret_model.InsertEncryptedSecret(ctx, ownerID, repoID, name, data)
|
|
if err != nil {
|
|
return nil, false, err
|
|
}
|
|
return s, true, nil
|
|
}
|
|
|
|
s.SetData(data)
|
|
if _, err := db.GetEngine(ctx).Cols("data").ID(s.ID).Update(s); err != nil {
|
|
return nil, false, err
|
|
}
|
|
return s, false, nil
|
|
}
|
|
|
|
func DeleteSecretByID(ctx context.Context, ownerID, repoID, secretID int64) error {
|
|
s, err := db.Find[secret_model.Secret](ctx, secret_model.FindSecretsOptions{
|
|
OwnerID: ownerID,
|
|
RepoID: repoID,
|
|
SecretID: secretID,
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if len(s) != 1 {
|
|
return secret_model.ErrSecretNotFound{}
|
|
}
|
|
|
|
return deleteSecret(ctx, s[0])
|
|
}
|
|
|
|
func DeleteSecretByName(ctx context.Context, ownerID, repoID int64, name string) error {
|
|
s, err := db.Find[secret_model.Secret](ctx, secret_model.FindSecretsOptions{
|
|
OwnerID: ownerID,
|
|
RepoID: repoID,
|
|
Name: name,
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if len(s) != 1 {
|
|
return secret_model.ErrSecretNotFound{}
|
|
}
|
|
|
|
return deleteSecret(ctx, s[0])
|
|
}
|
|
|
|
func deleteSecret(ctx context.Context, s *secret_model.Secret) error {
|
|
if _, err := db.DeleteByID[secret_model.Secret](ctx, s.ID); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|