sim1222-mirror/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-08-23 09:04:03 +09:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revert "Add simple master key provider for secret encryption"

Browse Source 
This reverts commit d4e84c0433.
This commit is contained in:
Jason Song
2022-12-22 11:45:06 +08:00
parent b54f148164
commit 88e813d1ca
12 changed files with 0 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
cmd/generate.go
View File

@ -5,14 +5,10 @@
package cmd
import (
"encoding/base64"
"fmt"
"os"
"code.gitea.io/gitea/modules/generate"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/services/secrets"
"github.com/mattn/go-isatty"
"github.com/urfave/cli"
@ -35,7 +31,6 @@ var (
microcmdGenerateInternalToken,
microcmdGenerateLfsJwtSecret,
microcmdGenerateSecretKey,
microcmdGenerateMasterKey,
},
}
@ -57,12 +52,6 @@ var (
Usage: "Generate a new SECRET_KEY",
Action: runGenerateSecretKey,
}
microcmdGenerateMasterKey = cli.Command{
Name: "MASTER_KEY",
Usage: "Generate a new MASTER_KEY",
Action: runGenerateMasterKey,
}
)
func runGenerateInternalToken(c *cli.Context) error {
@ -109,43 +98,3 @@ func runGenerateSecretKey(c *cli.Context) error {
return nil
}
func runGenerateMasterKey(c *cli.Context) error {
// Silence the console logger
log.DelNamedLogger("console")
log.DelNamedLogger(log.DEFAULT)
// Read configuration file
setting.LoadFromExisting()
providerType := secrets.MasterKeyProviderType(setting.MasterKeyProvider)
if providerType == secrets.MasterKeyProviderTypeNone {
return fmt.Errorf("configured master key provider does not support key generation")
}
if err := secrets.Init(); err != nil {
return err
}
scrts, err := secrets.GenerateMasterKey()
if err != nil {
return err
}
if len(scrts) > 1 {
fmt.Println("Unseal secrets:")
for i, secret := range scrts {
if i > 0 {
fmt.Printf("\n")
}
fmt.Printf("%s\n", base64.StdEncoding.EncodeToString(secret))
}
}
fmt.Println("Setting changes required:")
fmt.Println("[secrets]")
if providerType == secrets.MasterKeyProviderTypePlain && len(scrts) == 1 {
fmt.Printf("MASTER_KEY = %s\n", base64.StdEncoding.EncodeToString(scrts[0]))
}
return nil
}