refactor(be): add method to config

semaphoreui · Jan 26, 2022 · a68c64c · a68c64c
1 parent 4d00ee8
commit a68c64c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/db/AccessKey.go b/db/AccessKey.go
@@ -204,11 +204,7 @@ func (key *AccessKey) SerializeSecret() error {
 		return nil
 	}
 
-	encryptionString := os.Getenv("SEMAPHORE_ACCESS_KEY_ENCRYPTION")
-
-	if encryptionString == "" {
-		encryptionString = util.Config.AccessKeyEncryption
-	}
+	encryptionString := util.Config.GetAccessKeyEncryption()
 
 	if encryptionString == "" {
 		secret := base64.StdEncoding.EncodeToString(plaintext)
@@ -289,11 +285,7 @@ func (key *AccessKey) DeserializeSecret() error {
 		return err
 	}
 
-	encryptionString := os.Getenv("SEMAPHORE_ACCESS_KEY_ENCRYPTION")
-
-	if encryptionString == "" {
-		encryptionString = util.Config.AccessKeyEncryption
-	}
+	encryptionString := util.Config.GetAccessKeyEncryption()
 
 	if encryptionString == "" {
 		err = key.unmarshalAppropriateField(ciphertext)

diff --git a/util/config.go b/util/config.go
@@ -69,8 +69,11 @@ type ConfigType struct {
 	TmpPath string `json:"tmp_path"`
 
 	// cookie hashing & encryption
-	CookieHash          string `json:"cookie_hash"`
-	CookieEncryption    string `json:"cookie_encryption"`
+	CookieHash       string `json:"cookie_hash"`
+	CookieEncryption string `json:"cookie_encryption"`
+	// AccessKeyEncryption is BASE64 encoded byte array used
+	// for encrypting and decrypting access keys stored in database.
+	// Do not use it! Use method GetAccessKeyEncryption instead of it.
 	AccessKeyEncryption string `json:"access_key_encryption"`
 
 	// email alerting
@@ -122,6 +125,16 @@ func (conf *ConfigType) ToJSON() ([]byte, error) {
 	return json.MarshalIndent(&conf, " ", "\t")
 }
 
+func (conf *ConfigType) GetAccessKeyEncryption() string {
+	ret := os.Getenv("SEMAPHORE_ACCESS_KEY_ENCRYPTION")
+
+	if ret == "" {
+		ret = conf.AccessKeyEncryption
+	}
+
+	return ret
+}
+
 // ConfigInit reads in cli flags, and switches actions appropriately on them
 func ConfigInit(configPath string) {
 	loadConfig(configPath)