pangolin_mirror/newt
1
0
Fork 0
mirror of https://github.com/fosrl/newt.git synced 2026-09-18 11:59:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support aliased SITE_ID and SITE_SECRET

Browse Source
This commit is contained in:
Owen
2026-09-15 11:08:47 -04:00
parent 9e29d0b4ff
commit 0375e25092
2 changed files with 59 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
newtconfig/newtconfig.go
+20 -2
View File
@@ -188,6 +188,20 @@ func applyEnvBool(dst *bool, envName, key string, sources map[string]string) {
}
}
// applyEnvStrAlias behaves like applyEnvStr, but checks a preferred env var
// first and only falls back to an alias name when the preferred one is unset.
func applyEnvStrAlias(dst *string, envName, aliasEnvName, key string, sources map[string]string) {
if v := os.Getenv(envName); v != "" {
*dst = v
sources[key] = string(sourceEnv)
return
}
if v := os.Getenv(aliasEnvName); v != "" {
*dst = v
sources[key] = string(sourceEnv)
}
}
// validateTLSConfig validates that TLS config fields are consistent and that
// referenced files exist.
func validateTLSConfig(cfg newtpkg.Config) error {
@@ -361,8 +375,12 @@ func Load(opts Options) (newtpkg.Config, error) {
// ---- layer 2: environment variables ----
applyEnvStr(&cfg.Endpoint, "PANGOLIN_ENDPOINT", "endpoint", sources)
applyEnvStr(&cfg.ID, "NEWT_ID", "id", sources)
applyEnvStr(&cfg.Secret, "NEWT_SECRET", "secret", sources)
// SITE_ID/SITE_SECRET are accepted as aliases for NEWT_ID/NEWT_SECRET
// (NEWT_ID/NEWT_SECRET win if both are set) so a site tunnel's
// credentials can be named consistently with other Pangolin CLI
// connection types (e.g. CLIENT_ID/CLIENT_SECRET for `up client`).
applyEnvStrAlias(&cfg.ID, "NEWT_ID", "SITE_ID", "id", sources)
applyEnvStrAlias(&cfg.Secret, "NEWT_SECRET", "SITE_SECRET", "secret", sources)
applyEnvStr(&cfg.ProvisioningKey, "NEWT_PROVISIONING_KEY", "provisioning-key", sources)
applyEnvStr(&cfg.NewtName, "NEWT_NAME", "name", sources)
newtconfig/newtconfig_test.go
+39 -1
View File
@@ -11,12 +11,50 @@ func clearNewtEnv(t *testing.T) {
for _, k := range []string{
"PANGOLIN_ENDPOINT", "NEWT_ID", "NEWT_SECRET", "DNS", "LOG_LEVEL",
"MTU", "CONFIG_FILE", "NEWT_PROVISIONING_KEY", "NEWT_NAME",
"DISABLE_SSH", "DISABLE_CLIENTS",
"DISABLE_SSH", "DISABLE_CLIENTS", "SITE_ID", "SITE_SECRET",
} {
t.Setenv(k, "")
}
}
func TestLoadNewtConfig_SiteIDSecretEnvAliases(t *testing.T) {
clearNewtEnv(t)
t.Setenv("SITE_ID", "from-site-id")
t.Setenv("SITE_SECRET", "from-site-secret")
cfg, err := Load(Options{Args: []string{"--config-file", filepath.Join(t.TempDir(), "missing.json")}})
if err != nil {
t.Fatalf("Load returned error: %v", err)
}
if cfg.ID != "from-site-id" {
t.Errorf("expected id from SITE_ID, got %q", cfg.ID)
}
if cfg.Secret != "from-site-secret" {
t.Errorf("expected secret from SITE_SECRET, got %q", cfg.Secret)
}
}
func TestLoadNewtConfig_NewtIDSecretWinOverSiteAliases(t *testing.T) {
clearNewtEnv(t)
t.Setenv("SITE_ID", "from-site-id")
t.Setenv("SITE_SECRET", "from-site-secret")
t.Setenv("NEWT_ID", "from-newt-id")
t.Setenv("NEWT_SECRET", "from-newt-secret")
cfg, err := Load(Options{Args: []string{"--config-file", filepath.Join(t.TempDir(), "missing.json")}})
if err != nil {
t.Fatalf("Load returned error: %v", err)
}
if cfg.ID != "from-newt-id" {
t.Errorf("expected NEWT_ID to win over SITE_ID, got %q", cfg.ID)
}
if cfg.Secret != "from-newt-secret" {
t.Errorf("expected NEWT_SECRET to win over SITE_SECRET, got %q", cfg.Secret)
}
}
func TestLoadNewtConfig_Defaults(t *testing.T) {
clearNewtEnv(t)