From d0a5033964ac79ecc679cb9f64df93ac47f64d80 Mon Sep 17 00:00:00 2001 From: Bagas Date: Sun, 19 Jul 2026 12:09:42 +0700 Subject: [PATCH] feat: add frontendURL env --- README.md | 1 + internal/bootstrap/bootstrap_test.go | 1 + internal/config/config.go | 2 ++ internal/config/loader.go | 7 +++++-- internal/grpc/client/client_test.go | 1 + internal/server/server_test.go | 1 + internal/session/forwarder/forwarder_test.go | 1 + internal/session/interaction/interaction_test.go | 1 + internal/session/session_test.go | 5 +++-- internal/transport/httphandler.go | 2 +- internal/transport/httphandler_test.go | 5 ++++- internal/transport/tls_test.go | 1 + 12 files changed, 22 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 628efbe..7676eb9 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,7 @@ The following environment variables can be configured in the `.env` file: | Variable | Description | Default | Required | |---------------------|-----------------------------------------------------------------------------|-------------------------|---------------------| | `DOMAIN` | Domain name for subdomain routing | `localhost` | No | +| `FRONTEND_URL` | URL for the frontend dashboard/landing page | `https://` | No | | `PORT` | SSH server port | `2200` | No | | `HTTP_PORT` | HTTP server port | `8080` | No | | `HTTPS_PORT` | HTTPS server port | `8443` | No | diff --git a/internal/bootstrap/bootstrap_test.go b/internal/bootstrap/bootstrap_test.go index f5a181e..80e9ebf 100644 --- a/internal/bootstrap/bootstrap_test.go +++ b/internal/bootstrap/bootstrap_test.go @@ -80,6 +80,7 @@ type MockConfig struct { } func (m *MockConfig) Domain() string { return m.Called().String(0) } +func (m *MockConfig) FrontendURL() string { return m.Called().String(0) } func (m *MockConfig) SSHPort() string { return m.Called().String(0) } func (m *MockConfig) HTTPPort() string { return m.Called().String(0) } func (m *MockConfig) HTTPSPort() string { return m.Called().String(0) } diff --git a/internal/config/config.go b/internal/config/config.go index f3876bf..d341269 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -6,6 +6,7 @@ import ( type Config interface { Domain() string + FrontendURL() string SSHPort() string HTTPPort() string @@ -50,6 +51,7 @@ func MustLoad() (Config, error) { } func (c *config) Domain() string { return c.domain } +func (c *config) FrontendURL() string { return c.frontendURL } func (c *config) SSHPort() string { return c.sshPort } func (c *config) HTTPPort() string { return c.httpPort } func (c *config) HTTPSPort() string { return c.httpsPort } diff --git a/internal/config/loader.go b/internal/config/loader.go index c6cb909..e8c7b1c 100644 --- a/internal/config/loader.go +++ b/internal/config/loader.go @@ -12,8 +12,9 @@ import ( ) type config struct { - domain string - sshPort string + domain string + frontendURL string + sshPort string httpPort string httpsPort string @@ -49,6 +50,7 @@ func parse() (*config, error) { } domain := getenv("DOMAIN", "localhost") + frontendURL := getenv("FRONTEND_URL", "https://"+domain) sshPort := getenv("PORT", "2200") httpPort := getenv("HTTP_PORT", "8080") @@ -89,6 +91,7 @@ func parse() (*config, error) { return &config{ domain: domain, + frontendURL: frontendURL, sshPort: sshPort, httpPort: httpPort, httpsPort: httpsPort, diff --git a/internal/grpc/client/client_test.go b/internal/grpc/client/client_test.go index 5ebd36d..cb89f51 100644 --- a/internal/grpc/client/client_test.go +++ b/internal/grpc/client/client_test.go @@ -753,6 +753,7 @@ type MockConfig struct { } func (m *MockConfig) Domain() string { return m.Called().String(0) } +func (m *MockConfig) FrontendURL() string { return m.Called().String(0) } func (m *MockConfig) SSHPort() string { return m.Called().String(0) } func (m *MockConfig) HTTPPort() string { return m.Called().String(0) } func (m *MockConfig) HTTPSPort() string { return m.Called().String(0) } diff --git a/internal/server/server_test.go b/internal/server/server_test.go index d4499a8..dbed841 100644 --- a/internal/server/server_test.go +++ b/internal/server/server_test.go @@ -33,6 +33,7 @@ type MockConfig struct { } func (m *MockConfig) Domain() string { return m.Called().String(0) } +func (m *MockConfig) FrontendURL() string { return m.Called().String(0) } func (m *MockConfig) SSHPort() string { return m.Called().String(0) } func (m *MockConfig) HTTPPort() string { return m.Called().String(0) } func (m *MockConfig) HTTPSPort() string { return m.Called().String(0) } diff --git a/internal/session/forwarder/forwarder_test.go b/internal/session/forwarder/forwarder_test.go index 2a5c24d..37853de 100644 --- a/internal/session/forwarder/forwarder_test.go +++ b/internal/session/forwarder/forwarder_test.go @@ -24,6 +24,7 @@ type mockConfig struct { } func (m *mockConfig) Domain() string { return m.Called().String(0) } +func (m *mockConfig) FrontendURL() string { return m.Called().String(0) } func (m *mockConfig) SSHPort() string { return m.Called().String(0) } func (m *mockConfig) HTTPPort() string { return m.Called().String(0) } func (m *mockConfig) HTTPSPort() string { return m.Called().String(0) } diff --git a/internal/session/interaction/interaction_test.go b/internal/session/interaction/interaction_test.go index 8b6f15b..1dc0408 100644 --- a/internal/session/interaction/interaction_test.go +++ b/internal/session/interaction/interaction_test.go @@ -32,6 +32,7 @@ type MockConfig struct { } func (m *MockConfig) Domain() string { return m.Called().String(0) } +func (m *MockConfig) FrontendURL() string { return m.Called().String(0) } func (m *MockConfig) SSHPort() string { return m.Called().String(0) } func (m *MockConfig) HTTPPort() string { return m.Called().String(0) } func (m *MockConfig) HTTPSPort() string { return m.Called().String(0) } diff --git a/internal/session/session_test.go b/internal/session/session_test.go index dc6251d..ad3cde3 100644 --- a/internal/session/session_test.go +++ b/internal/session/session_test.go @@ -38,8 +38,9 @@ type mockConfig struct { config.Config } -func (m *mockConfig) Domain() string { return m.Called().String(0) } -func (m *mockConfig) SSHPort() string { return m.Called().String(0) } +func (m *mockConfig) Domain() string { return m.Called().String(0) } +func (m *mockConfig) FrontendURL() string { return m.Called().String(0) } +func (m *mockConfig) SSHPort() string { return m.Called().String(0) } func (m *mockConfig) Mode() types.ServerMode { args := m.Called() if args.Get(0) == nil { diff --git a/internal/transport/httphandler.go b/internal/transport/httphandler.go index 795b83a..23c3694 100644 --- a/internal/transport/httphandler.go +++ b/internal/transport/httphandler.go @@ -116,7 +116,7 @@ func (hh *httpHandler) Handler(conn net.Conn, isTLS bool) { Type: types.TunnelTypeHTTP, }) if err != nil { - _ = hh.redirect(conn, http.StatusMovedPermanently, fmt.Sprintf("https://tunnl.live/tunnel-not-found?slug=%s\r\n", slug)) + _ = hh.redirect(conn, http.StatusMovedPermanently, fmt.Sprintf("%s/tunnel-not-found?slug=%s\r\n", hh.config.FrontendURL(), slug)) return } diff --git a/internal/transport/httphandler_test.go b/internal/transport/httphandler_test.go index 2ae6dd6..329e539 100644 --- a/internal/transport/httphandler_test.go +++ b/internal/transport/httphandler_test.go @@ -223,6 +223,7 @@ func TestNewHTTPHandler(t *testing.T) { msr := new(MockSessionRegistry) mockConfig := &MockConfig{} mockConfig.On("Domain").Return("domain") + mockConfig.On("FrontendURL").Return("https://domain") mockConfig.On("TLSRedirect").Return(false) hh := newHTTPHandler(mockConfig, msr) assert.NotNil(t, hh) @@ -290,7 +291,7 @@ func TestHandler(t *testing.T) { isTLS: true, redirectTLS: false, request: []byte("GET / HTTP/1.1\r\nHost: test.domain\r\n\r\n"), - expected: []byte("HTTP/1.1 301 Moved Permanently\r\nLocation: https://tunnl.live/tunnel-not-found?slug=test\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"), + expected: []byte("HTTP/1.1 301 Moved Permanently\r\nLocation: https://example.com/tunnel-not-found?slug=test\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"), setupMocks: func(msr *MockSessionRegistry) { msr.On("Get", types.SessionKey{ Id: "test", @@ -616,6 +617,7 @@ func TestHandler(t *testing.T) { mockConfig := &MockConfig{} port := "0" mockConfig.On("Domain").Return("example.com") + mockConfig.On("FrontendURL").Return("https://example.com") mockConfig.On("HTTPPort").Return(port) mockConfig.On("HeaderSize").Return(4096) mockConfig.On("TLSRedirect").Return(true) @@ -726,6 +728,7 @@ func TestHandlerForwardsPostBody(t *testing.T) { mockSessionRegistry := new(MockSessionRegistry) mockConfig := &MockConfig{} mockConfig.On("Domain").Return("example.com") + mockConfig.On("FrontendURL").Return("https://example.com") mockConfig.On("HTTPPort").Return("0") mockConfig.On("HeaderSize").Return(4096) mockConfig.On("TLSRedirect").Return(true) diff --git a/internal/transport/tls_test.go b/internal/transport/tls_test.go index 3de8066..eba738b 100644 --- a/internal/transport/tls_test.go +++ b/internal/transport/tls_test.go @@ -25,6 +25,7 @@ type MockConfig struct { } func (m *MockConfig) Domain() string { return m.Called().String(0) } +func (m *MockConfig) FrontendURL() string { return m.Called().String(0) } func (m *MockConfig) SSHPort() string { return m.Called().String(0) } func (m *MockConfig) HTTPPort() string { return m.Called().String(0) } func (m *MockConfig) HTTPSPort() string { return m.Called().String(0) }