yel/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-12-16 22:15:43 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Add cache back for gpgsetting

Browse Source
This commit is contained in:
Lunny Xiao 2025-12-12 09:56:53 -08:00
parent 7ebcb24131
commit e2870aaa88
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
modules/git/gpg.go
View File

@ -9,6 +9,7 @@ import (
"fmt" "fmt"
"os" "os"
"strings" "strings"
"sync"
"code.gitea.io/gitea/modules/git/gitcmd" "code.gitea.io/gitea/modules/git/gitcmd"
"code.gitea.io/gitea/modules/process" "code.gitea.io/gitea/modules/process"
@ -26,6 +27,10 @@ type GPGSettings struct {
// LoadPublicKeyContent will load the key from gpg // LoadPublicKeyContent will load the key from gpg
func (gpgSettings *GPGSettings) LoadPublicKeyContent() error { func (gpgSettings *GPGSettings) LoadPublicKeyContent() error {
if gpgSettings.PublicKeyContent != "" {
return nil
}
if gpgSettings.Format == SigningKeyFormatSSH { if gpgSettings.Format == SigningKeyFormatSSH {
content, err := os.ReadFile(gpgSettings.KeyID) content, err := os.ReadFile(gpgSettings.KeyID)
if err != nil { if err != nil {
@ -44,33 +49,45 @@ func (gpgSettings *GPGSettings) LoadPublicKeyContent() error {
return nil return nil
} }
// GetDefaultPublicGPGKey will return and cache the default public GPG settings for this repository var (
loadPublicGPGKeyMutex sync.Mutex
globalGPGSettings *GPGSettings
)
// GetDefaultPublicGPGKey will return and cache the default public GPG settings
func GetDefaultPublicGPGKey(ctx context.Context, forceUpdate bool) (*GPGSettings, error) { func GetDefaultPublicGPGKey(ctx context.Context, forceUpdate bool) (*GPGSettings, error) {
gpgSettings := &GPGSettings{ loadPublicGPGKeyMutex.Lock()
defer loadPublicGPGKeyMutex.Unlock()
if globalGPGSettings != nil && !forceUpdate {
return globalGPGSettings, nil
}
globalGPGSettings = &GPGSettings{
Sign: true, Sign: true,
} }
value, _, _ := gitcmd.NewCommand("config", "--global", "--get", "commit.gpgsign").RunStdString(ctx) value, _, _ := gitcmd.NewCommand("config", "--global", "--get", "commit.gpgsign").RunStdString(ctx)
sign, valid := ParseBool(strings.TrimSpace(value)) sign, valid := ParseBool(strings.TrimSpace(value))
if !sign || !valid { if !sign || !valid {
gpgSettings.Sign = false globalGPGSettings.Sign = false
return gpgSettings, nil return globalGPGSettings, nil
} }
signingKey, _, _ := gitcmd.NewCommand("config", "--global", "--get", "user.signingkey").RunStdString(ctx) signingKey, _, _ := gitcmd.NewCommand("config", "--global", "--get", "user.signingkey").RunStdString(ctx)
gpgSettings.KeyID = strings.TrimSpace(signingKey) globalGPGSettings.KeyID = strings.TrimSpace(signingKey)
format, _, _ := gitcmd.NewCommand("config", "--global", "--default", SigningKeyFormatOpenPGP, "--get", "gpg.format").RunStdString(ctx) format, _, _ := gitcmd.NewCommand("config", "--global", "--default", SigningKeyFormatOpenPGP, "--get", "gpg.format").RunStdString(ctx)
gpgSettings.Format = strings.TrimSpace(format) globalGPGSettings.Format = strings.TrimSpace(format)
defaultEmail, _, _ := gitcmd.NewCommand("config", "--global", "--get", "user.email").RunStdString(ctx) defaultEmail, _, _ := gitcmd.NewCommand("config", "--global", "--get", "user.email").RunStdString(ctx)
gpgSettings.Email = strings.TrimSpace(defaultEmail) globalGPGSettings.Email = strings.TrimSpace(defaultEmail)
defaultName, _, _ := gitcmd.NewCommand("config", "--global", "--get", "user.name").RunStdString(ctx) defaultName, _, _ := gitcmd.NewCommand("config", "--global", "--get", "user.name").RunStdString(ctx)
gpgSettings.Name = strings.TrimSpace(defaultName) globalGPGSettings.Name = strings.TrimSpace(defaultName)
if err := gpgSettings.LoadPublicKeyContent(); err != nil { if err := globalGPGSettings.LoadPublicKeyContent(); err != nil {
return nil, err return nil, err
} }
return gpgSettings, nil return globalGPGSettings, nil
} }