idan/sshwifty-udp-telnet-http
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support SSHWIFTY_ENV_RENAMED: prefix. When the value of an environment variable is prefixed with SSHWIFTY_ENV_RENAMED:, read another environment variable. For example: if SSHWIFTY_LISTENPORT = SSHWIFTY_ENV_RENAMED:PORT, the final value will be read from $PORT.

Browse Source 
This is useful if the application is running on a cloud platform which force application to use their environment variables.
This commit is contained in:
NI
2019-08-11 12:12:44 +08:00
parent 2f670d625a
commit ee7a6a4703
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
application/configuration/loader_enviro.go
View File

@@ -21,6 +21,7 @@ import (
"fmt" "fmt"
"os" "os"
"strconv" "strconv"
"strings"
"github.com/niruix/sshwifty/application/log" "github.com/niruix/sshwifty/application/log"
"github.com/niruix/sshwifty/application/network" "github.com/niruix/sshwifty/application/network"
@@ -30,21 +31,31 @@ const (
enviroTypeName = "Environment Variable" enviroTypeName = "Environment Variable"
) )
func parseEviro(name string) string {
v := os.Getenv(name)
if !strings.HasPrefix(v, "SSHWIFTY_ENV_RENAMED:") {
return v
}
return os.Getenv(v[21:])
}
// Enviro creates an environment variable based configuration loader // Enviro creates an environment variable based configuration loader
func Enviro() Loader { func Enviro() Loader {
return func(log log.Logger) (string, Configuration, error) { return func(log log.Logger) (string, Configuration, error) {
log.Info("Loading configuration from environment variables ...") log.Info("Loading configuration from environment variables ...")
cfg := fileCfgCommon{ cfg := fileCfgCommon{
HostName: os.Getenv("SSHWIFTY_HOSTNAME"), HostName: parseEviro("SSHWIFTY_HOSTNAME"),
SharedKey: os.Getenv("SSHWIFTY_SHAREDKEY"), SharedKey: parseEviro("SSHWIFTY_SHAREDKEY"),
Socks5: os.Getenv("SSHWIFTY_SOCKS5"), Socks5: parseEviro("SSHWIFTY_SOCKS5"),
Socks5User: os.Getenv("SSHWIFTY_SOCKS5_USER"), Socks5User: parseEviro("SSHWIFTY_SOCKS5_USER"),
Socks5Password: os.Getenv("SSHWIFTY_SOCKS5_PASSWORD"), Socks5Password: parseEviro("SSHWIFTY_SOCKS5_PASSWORD"),
} }
listenPort, listenPortErr := strconv.ParseUint( listenPort, listenPortErr := strconv.ParseUint(
os.Getenv("SSHWIFTY_LISTENPORT"), 10, 16) parseEviro("SSHWIFTY_LISTENPORT"), 10, 16)
if listenPortErr != nil { if listenPortErr != nil {
return enviroTypeName, Configuration{}, fmt.Errorf( return enviroTypeName, Configuration{}, fmt.Errorf(
@@ -52,25 +63,25 @@ func Enviro() Loader {
} }
initialTimeout, _ := strconv.ParseUint( initialTimeout, _ := strconv.ParseUint(
os.Getenv("SSHWIFTY_INITIALTIMEOUT"), 10, 32) parseEviro("SSHWIFTY_INITIALTIMEOUT"), 10, 32)
readTimeout, _ := strconv.ParseUint( readTimeout, _ := strconv.ParseUint(
os.Getenv("SSHWIFTY_READTIMEOUT"), 10, 32) parseEviro("SSHWIFTY_READTIMEOUT"), 10, 32)
writeTimeout, _ := strconv.ParseUint( writeTimeout, _ := strconv.ParseUint(
os.Getenv("SSHWIFTY_WRITETIMEOUT"), 10, 32) parseEviro("SSHWIFTY_WRITETIMEOUT"), 10, 32)
heartbeatTimeout, _ := strconv.ParseUint( heartbeatTimeout, _ := strconv.ParseUint(
os.Getenv("SSHWIFTY_HEARTBEATTIMEOUT"), 10, 32) parseEviro("SSHWIFTY_HEARTBEATTIMEOUT"), 10, 32)
readDelay, _ := strconv.ParseUint( readDelay, _ := strconv.ParseUint(
os.Getenv("SSHWIFTY_READDELAY"), 10, 32) parseEviro("SSHWIFTY_READDELAY"), 10, 32)
writeDelay, _ := strconv.ParseUint( writeDelay, _ := strconv.ParseUint(
os.Getenv("SSHWIFTY_WRITEELAY"), 10, 32) parseEviro("SSHWIFTY_WRITEELAY"), 10, 32)
cfgSer := fileCfgServer{ cfgSer := fileCfgServer{
ListenInterface: os.Getenv("SSHWIFTY_LISTENINTERFACE"), ListenInterface: parseEviro("SSHWIFTY_LISTENINTERFACE"),
ListenPort: uint16(listenPort), ListenPort: uint16(listenPort),
InitialTimeout: int(initialTimeout), InitialTimeout: int(initialTimeout),
ReadTimeout: int(readTimeout), ReadTimeout: int(readTimeout),
@@ -78,8 +89,8 @@ func Enviro() Loader {
HeartbeatTimeout: int(heartbeatTimeout), HeartbeatTimeout: int(heartbeatTimeout),
ReadDelay: int(readDelay), ReadDelay: int(readDelay),
WriteDelay: int(writeDelay), WriteDelay: int(writeDelay),
TLSCertificateFile: os.Getenv("SSHWIFTY_TLSCERTIFICATEFILE"), TLSCertificateFile: parseEviro("SSHWIFTY_TLSCERTIFICATEFILE"),
TLSCertificateKeyFile: os.Getenv("SSHWIFTY_TLSCERTIFICATEKEYFILE"), TLSCertificateKeyFile: parseEviro("SSHWIFTY_TLSCERTIFICATEKEYFILE"),
} }
var dialer network.Dial var dialer network.Dial