use default for salt/secret for now

Author: hughneale

internal/config/services/encrypt/local.go

@@ -43,8 +43,9 @@ func deriveKey(password string, salt string) []byte {
 func (l *localVault) Initialize() error {
 
 	masterPassword := l.config.GetStringWithDefault("password", common.DefaultServerSecret)
-	salt := l.config.GetStringWithDefault("salt", common.DefaultLoginServerEndpoint)
+	salt := l.config.GetStringWithDefault("salt", common.DefaultServerSecret) // Use hostname as default salt
 
+	// Warn if using default secrets
 	if strings.EqualFold(masterPassword, common.DefaultServerSecret) ||
 		strings.EqualFold(salt, common.DefaultServerSecret) {
 		logrus.Warningln("local encryption service configured with default secrets. See https://docs.thand.io/configuration/file.html#encryption-service")

internal/config/services/encryption.go

@@ -40,7 +40,7 @@ func (e *localClient) configureEncryption() models.EncryptionImpl {
 		// better alternative than the default
 
 		if !configValues.HasString("salt") {
-			configValues.SetKeyWithValue("salt", e.GetEnvironmentConfig().Hostname)
+			configValues.SetKeyWithValue("salt", e.GetEnvironmentConfig().GetIdentifier())
 		}
 
 		if !configValues.HasString("password") && len(e.GetSecret()) > 0 {

internal/models/common.go

@@ -159,10 +159,8 @@ func (pc *BasicConfig) HasString(key string) bool {
 	if pc == nil {
 		return false
 	}
-	if _, ok := (*pc)[key]; ok {
-		return ok
-	}
-	return false
+	_, ok := (*pc)[key]
+	return ok
 }
 
 func (pc *BasicConfig) GetInt(key string) (int, bool) {