Skip to content

Commit

Permalink
perf: 获取加密的配置
Browse files Browse the repository at this point in the history
  • Loading branch information
LeeEirc committed Dec 11, 2024
1 parent 0764628 commit f1f348d
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 1 deletion.
18 changes: 18 additions & 0 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ func registerRouter(jmsService *service.JMService, tunnelService *tunnel.Guacamo
}

func bootstrap(jmsService *service.JMService) {
updateEncryptConfigValue(jmsService)
replayDir := config.GlobalConfig.RecordPath
ftpFilePath := config.GlobalConfig.FTPFilePath
sessionDir := config.GlobalConfig.SessionFolderPath
Expand All @@ -367,6 +368,23 @@ func bootstrap(jmsService *service.JMService) {
go uploadRemainSessionPartReplay(jmsService, sessionDir)
}

func updateEncryptConfigValue(jmsService *service.JMService) {
cfg := config.GlobalConfig
encryptKey := cfg.SecretEncryptKey
if encryptKey != "" {
redisPassword := cfg.RedisPassword
ret, err := jmsService.GetEncryptedConfigValue(encryptKey, redisPassword)
if err != nil {
logger.Error("Get encrypted config value failed: " + err.Error())
return
}
if ret.Value != "" {
cfg.UpdateRedisPassword(ret.Value)
} else {
logger.Error("Get encrypted config value failed: empty value")
}
}
}
func uploadRemainFTPFile(jmsService *service.JMService, fileStoreDir string) {
err := config.EnsureDirExist(fileStoreDir)
if err != nil {
Expand Down
7 changes: 6 additions & 1 deletion pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,12 @@ type Config struct {
PandaHost string `mapstructure:"PANDA_HOST"`
EnablePanda bool `mapstructure:"ENABLE_PANDA"`

ReplayMaxSize int `mapstructure:"REPLAY_MAX_SIZE"`
ReplayMaxSize int `mapstructure:"REPLAY_MAX_SIZE"`
SecretEncryptKey string `mapstructure:"SECRET_ENCRYPT_KEY"`
}

func (c *Config) UpdateRedisPassword(val string) {
c.RedisPassword = val
}

func (c *Config) SelectGuacdAddr() string {
Expand Down
14 changes: 14 additions & 0 deletions pkg/jms-sdk-go/service/jms_terminal.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package service

func (s *JMService) GetEncryptedConfigValue(encryptKey, encryptedValue string) (resp ResultValue, err error) {
data := map[string]string{
"secret_encrypt_key": encryptKey,
"encrypted_value": encryptedValue,
}
_, err = s.authClient.Post(TerminalEncryptedConfigURL, data, &resp)
return
}

type ResultValue struct {
Value string `json:"value"`
}
2 changes: 2 additions & 0 deletions pkg/jms-sdk-go/service/url.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ const (
TerminalRegisterURL = "/api/v1/terminal/terminal-registrations/" // 注册
TerminalConfigURL = "/api/v1/terminal/terminals/config/" // 获取配置
TerminalHeartBeatURL = "/api/v1/terminal/terminals/status/"

TerminalEncryptedConfigURL = "/api/v1/terminal/encrypted-config/"
)

// 用户登陆认证使用的API
Expand Down

0 comments on commit f1f348d

Please sign in to comment.