bagas/tunnel-please
Public Access
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 8 Wiki Activity

staging #77

Merged
bagas merged 48 commits from staging into main 2026-01-27 18:08:36 +07:00
Conversation 0 Commits 48 Files Changed 58
+21 -17
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 09aa92a0ae - Show all commits
internal/config/config_test.go
+19 -17
View File
@@ -267,23 +267,24 @@ func TestParse(t *testing.T) {
func TestGetters(t *testing.T) { func TestGetters(t *testing.T) {
envs := map[string]string{ envs := map[string]string{
"DOMAIN": "example.com", "DOMAIN": "example.com",
"PORT": "2222", "PORT": "2222",
"HTTP_PORT": "80", "HTTP_PORT": "80",
"HTTPS_PORT": "443", "HTTPS_PORT": "443",
"TLS_ENABLED": "true", "TLS_ENABLED": "true",
"TLS_REDIRECT": "true", "TLS_REDIRECT": "true",
"ACME_EMAIL": "test@example.com", "TLS_STORAGE_PATH": "certs/tls/",
"CF_API_TOKEN": "token", "ACME_EMAIL": "test@example.com",
"ACME_STAGING": "true", "CF_API_TOKEN": "token",
"ALLOWED_PORTS": "1000-2000", "ACME_STAGING": "true",
"BUFFER_SIZE": "16384", "ALLOWED_PORTS": "1000-2000",
"PPROF_ENABLED": "true", "BUFFER_SIZE": "16384",
"PPROF_PORT": "7070", "PPROF_ENABLED": "true",
"MODE": "standalone", "PPROF_PORT": "7070",
"GRPC_ADDRESS": "127.0.0.1", "MODE": "standalone",
"GRPC_PORT": "9090", "GRPC_ADDRESS": "127.0.0.1",
"NODE_TOKEN": "ntoken", "GRPC_PORT": "9090",
"NODE_TOKEN": "ntoken",
} }
os.Clearenv() os.Clearenv()
@@ -300,6 +301,7 @@ func TestGetters(t *testing.T) {
assert.Equal(t, "443", cfg.HTTPSPort()) assert.Equal(t, "443", cfg.HTTPSPort())
assert.Equal(t, true, cfg.TLSEnabled()) assert.Equal(t, true, cfg.TLSEnabled())
assert.Equal(t, true, cfg.TLSRedirect()) assert.Equal(t, true, cfg.TLSRedirect())
assert.Equal(t, "certs/tls/", cfg.TLSStoragePath())
assert.Equal(t, "test@example.com", cfg.ACMEEmail()) assert.Equal(t, "test@example.com", cfg.ACMEEmail())
assert.Equal(t, "token", cfg.CFAPIToken()) assert.Equal(t, "token", cfg.CFAPIToken())
assert.Equal(t, true, cfg.ACMEStaging()) assert.Equal(t, true, cfg.ACMEStaging())
internal/config/loader.go
+2
View File
@@ -57,6 +57,7 @@ func parse() (*config, error) {
tlsEnabled := getenvBool("TLS_ENABLED", false) tlsEnabled := getenvBool("TLS_ENABLED", false)
tlsRedirect := tlsEnabled && getenvBool("TLS_REDIRECT", false) tlsRedirect := tlsEnabled && getenvBool("TLS_REDIRECT", false)
tlsStoragePath := getenv("TLS_STORAGE_PATH", "certs/tls/")
acmeEmail := getenv("ACME_EMAIL", "admin@"+domain) acmeEmail := getenv("ACME_EMAIL", "admin@"+domain)
acmeStaging := getenvBool("ACME_STAGING", false) acmeStaging := getenvBool("ACME_STAGING", false)
@@ -92,6 +93,7 @@ func parse() (*config, error) {
keyLoc: keyLoc, keyLoc: keyLoc,
tlsEnabled: tlsEnabled, tlsEnabled: tlsEnabled,
tlsRedirect: tlsRedirect, tlsRedirect: tlsRedirect,
tlsStoragePath: tlsStoragePath,
acmeEmail: acmeEmail, acmeEmail: acmeEmail,
cfAPIToken: cfToken, cfAPIToken: cfToken,
acmeStaging: acmeStaging, acmeStaging: acmeStaging,