732f826ec2
- Extract base64 data from PEM files and secret files - Environment variables are not PEM encoded and only the base64 data - Affects OpenVPN certificate, key and encrypted key
64 lines
1.5 KiB
Go
64 lines
1.5 KiB
Go
package secrets
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/qdm12/gluetun/internal/configuration/sources/files"
|
|
"github.com/qdm12/gluetun/internal/openvpn/extract"
|
|
)
|
|
|
|
// getCleanedEnv returns an environment variable value with
|
|
// surrounding spaces and trailing new line characters removed.
|
|
func getCleanedEnv(envKey string) (value string) {
|
|
value = os.Getenv(envKey)
|
|
value = strings.TrimSpace(value)
|
|
value = strings.TrimSuffix(value, "\r\n")
|
|
value = strings.TrimSuffix(value, "\n")
|
|
return value
|
|
}
|
|
|
|
func readSecretFileAsStringPtr(secretPathEnvKey, defaultSecretPath string) (
|
|
stringPtr *string, err error) {
|
|
path := getCleanedEnv(secretPathEnvKey)
|
|
if path == "" {
|
|
path = defaultSecretPath
|
|
}
|
|
return files.ReadFromFile(path)
|
|
}
|
|
|
|
func readSecretFileAsString(secretPathEnvKey, defaultSecretPath string) (
|
|
s string, err error) {
|
|
path := getCleanedEnv(secretPathEnvKey)
|
|
if path == "" {
|
|
path = defaultSecretPath
|
|
}
|
|
stringPtr, err := files.ReadFromFile(path)
|
|
if err != nil {
|
|
return "", err
|
|
} else if stringPtr == nil {
|
|
return "", nil
|
|
}
|
|
return *stringPtr, nil
|
|
}
|
|
|
|
func readPEMSecretFile(secretPathEnvKey, defaultSecretPath string) (
|
|
base64Ptr *string, err error) {
|
|
pemData, err := readSecretFileAsStringPtr(secretPathEnvKey, defaultSecretPath)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("reading secret file: %w", err)
|
|
}
|
|
|
|
if pemData == nil {
|
|
return nil, nil //nolint:nilnil
|
|
}
|
|
|
|
base64Data, err := extract.PEM([]byte(*pemData))
|
|
if err != nil {
|
|
return nil, fmt.Errorf("extracting base64 encoded data from PEM content: %w", err)
|
|
}
|
|
|
|
return &base64Data, nil
|
|
}
|