Skip to content

Modern Docker Management, Designed for Everyone

feat: allow configurable LISTEN address (#1685)

Kyle Mendellff083b4508d2
diff --git a/backend/internal/bootstrap/bootstrap.go b/backend/internal/bootstrap/bootstrap.go
index f1626e3f0..551d820b5 100644
--- a/backend/internal/bootstrap/bootstrap.go
+++ b/backend/internal/bootstrap/bootstrap.go
@@ -202,14 +202,15 @@ func runServices(appCtx context.Context, cfg *config.Config, router http.Handler
}()
}
+ listenAddr := cfg.ListenAddr()
srv := &http.Server{
- Addr: ":" + cfg.Port,
+ Addr: listenAddr,
Handler: router,
ReadHeaderTimeout: 5 * time.Second,
}
go func() {
- slog.InfoContext(appCtx, "Starting HTTP server", "port", cfg.Port)
+ slog.InfoContext(appCtx, "Starting HTTP server", "addr", listenAddr, "listen", cfg.Listen, "port", cfg.Port)
if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
slog.ErrorContext(appCtx, "Failed to start server", "error", err)
}
diff --git a/backend/internal/config/config.go b/backend/internal/config/config.go
index 86b321cec..27baf9cc5 100644
--- a/backend/internal/config/config.go
+++ b/backend/internal/config/config.go
@@ -3,6 +3,7 @@ package config
import (
"fmt"
"log/slog"
+ "net"
"os"
"reflect"
"strconv"
@@ -27,6 +28,7 @@ type Config struct {
AppUrl string `env:"APP_URL" default:"http://localhost:3552"`
DatabaseURL string `env:"DATABASE_URL" default:"file:data/arcane.db?_pragma=journal_mode(WAL)&_pragma=busy_timeout(2500)&_txlock=immediate" options:"file"`
Port string `env:"PORT" default:"3552"`
+ Listen string `env:"LISTEN" default:""`
Environment AppEnvironment `env:"ENVIRONMENT" default:"production"`
JWTSecret string `env:"JWT_SECRET" default:"default-jwt-secret-change-me" options:"file"`
EncryptionKey string `env:"ENCRYPTION_KEY" default:"arcane-dev-key-32-characters!!!" options:"file"`
@@ -255,6 +257,20 @@ func (a AppEnvironment) IsTestEnvironment() bool {
return a == AppEnvironmentTest
}
+// ListenAddr returns the effective address for the HTTP server to bind to.
+// It uses LISTEN as the host (if set) and PORT for the port.
+func (c *Config) ListenAddr() string {
+ host := strings.TrimSpace(c.Listen)
+ port := c.Port
+ if port == "" {
+ port = "3552"
+ }
+ if host == "" {
+ return ":" + port
+ }
+ return net.JoinHostPort(host, port)
+}
+
// GetManagerBaseURL returns the base URL of the manager application.
// It strips any trailing slashes or /api suffix from MANAGER_API_URL.
func (c *Config) GetManagerBaseURL() string {
diff --git a/backend/internal/config/config_test.go b/backend/internal/config/config_test.go
index f894ab5e1..d21baa4e8 100644
--- a/backend/internal/config/config_test.go
+++ b/backend/internal/config/config_test.go
@@ -202,6 +202,50 @@ func TestConfig_OptionsToLower(t *testing.T) {
})
}
+func TestConfig_ListenAddr(t *testing.T) {
+ tests := []struct {
+ name string
+ listen string
+ port string
+ expected string
+ }{
+ {
+ name: "empty listen uses all interfaces",
+ listen: "",
+ port: "3553",
+ expected: ":3553",
+ },
+ {
+ name: "ipv4 listen",
+ listen: "127.0.0.1",
+ port: "3553",
+ expected: "127.0.0.1:3553",
+ },
+ {
+ name: "ipv6 listen",
+ listen: "::1",
+ port: "3553",
+ expected: "[::1]:3553",
+ },
+ {
+ name: "empty port falls back to default",
+ listen: "127.0.0.1",
+ port: "",
+ expected: "127.0.0.1:3552",
+ },
+ }
+
+ for _, testCase := range tests {
+ t.Run(testCase.name, func(t *testing.T) {
+ cfg := &Config{
+ Listen: testCase.listen,
+ Port: testCase.port,
+ }
+ assert.Equal(t, testCase.expected, cfg.ListenAddr())
+ })
+ }
+}
+
func restoreEnv(key, value string) {
if value == "" {
os.Unsetenv(key)
diff --git a/backend/internal/utils/edge/client.go b/backend/internal/utils/edge/client.go
index f904c824e..35d8f3e5d 100644
--- a/backend/internal/utils/edge/client.go
+++ b/backend/internal/utils/edge/client.go
@@ -6,6 +6,7 @@ import (
"fmt"
"io"
"log/slog"
+ "net"
"net/http"
"strings"
"sync"
@@ -319,7 +320,25 @@ func (c *TunnelClient) buildLocalWebSocketURL(msg *TunnelMessage) string {
if msg.Query != "" {
path = path + "?" + msg.Query
}
- return "ws://localhost:" + c.localPort + path
+ host := c.localWebSocketHostInternal()
+ return "ws://" + net.JoinHostPort(host, c.localPort) + path
+}
+
+func (c *TunnelClient) localWebSocketHostInternal() string {
+ listenHost := strings.TrimSpace(c.cfg.Listen)
+ if listenHost == "" {
+ return "localhost"
+ }
+
+ trimmed := strings.TrimPrefix(listenHost, "[")
+ trimmed = strings.TrimSuffix(trimmed, "]")
+
+ switch trimmed {
+ case "0.0.0.0", "::":
+ return "localhost"
+ default:
+ return trimmed
+ }
}
func (c *TunnelClient) buildLocalWebSocketHeaders(msg *TunnelMessage) http.Header {
diff --git a/backend/internal/utils/edge/client_test.go b/backend/internal/utils/edge/client_test.go
index e0e758dac..ffbef5b09 100644
--- a/backend/internal/utils/edge/client_test.go
+++ b/backend/internal/utils/edge/client_test.go
@@ -245,3 +245,70 @@ func TestTunnelClient_InternalHelpers(t *testing.T) {
// Test sendErrorResponse
client.sendErrorResponse("req-1", 500, "error")
}
+
+func TestTunnelClient_BuildLocalWebSocketURL(t *testing.T) {
+ tests := []struct {
+ name string
+ listen string
+ port string
+ path string
+ query string
+ expected string
+ }{
+ {
+ name: "empty listen uses localhost",
+ listen: "",
+ port: "3553",
+ path: "/api",
+ query: "",
+ expected: "ws://localhost:3553/api",
+ },
+ {
+ name: "wildcard ipv4 maps to localhost",
+ listen: "0.0.0.0",
+ port: "3553",
+ path: "/",
+ query: "",
+ expected: "ws://localhost:3553/",
+ },
+ {
+ name: "wildcard ipv6 maps to localhost",
+ listen: "::",
+ port: "3553",
+ path: "/",
+ query: "",
+ expected: "ws://localhost:3553/",
+ },
+ {
+ name: "explicit ipv4 listen",
+ listen: "127.0.0.1",
+ port: "3553",
+ path: "/",
+ query: "q=1",
+ expected: "ws://127.0.0.1:3553/?q=1",
+ },
+ {
+ name: "explicit ipv6 listen",
+ listen: "2001:db8::1",
+ port: "3553",
+ path: "/ws",
+ query: "",
+ expected: "ws://[2001:db8::1]:3553/ws",
+ },
+ }
+
+ for _, testCase := range tests {
+ t.Run(testCase.name, func(t *testing.T) {
+ cfg := &config.Config{
+ Listen: testCase.listen,
+ Port: testCase.port,
+ }
+ client := NewTunnelClient(cfg, http.NotFoundHandler())
+ msg := &TunnelMessage{
+ Path: testCase.path,
+ Query: testCase.query,
+ }
+ assert.Equal(t, testCase.expected, client.buildLocalWebSocketURL(msg))
+ })
+ }
+}
diff --git a/frontend/src/lib/types/notification-providers.ts b/frontend/src/lib/types/notification-providers.ts
index c7916ef15..8ae16eab3 100644
--- a/frontend/src/lib/types/notification-providers.ts
+++ b/frontend/src/lib/types/notification-providers.ts
@@ -20,7 +20,7 @@ export interface BaseProviderFormValues {
eventImageUpdate: boolean;
eventContainerUpdate: boolean;
eventVulnerabilityFound: boolean;
- eventPruneReport: boolean;
+ eventPruneReport: boolean;
}
// Provider-specific form value types
diff --git a/frontend/src/routes/(app)/environments/[id]/+page.svelte b/frontend/src/routes/(app)/environments/[id]/+page.svelte
index 090e8bd7a..ea81f2537 100644
--- a/frontend/src/routes/(app)/environments/[id]/+page.svelte
+++ b/frontend/src/routes/(app)/environments/[id]/+page.svelte
@@ -149,7 +149,7 @@
scheduledPruneNetworks: z.boolean(),
scheduledPruneBuildCache: z.boolean(),
vulnerabilityScanEnabled: z.boolean(),
- autoUpdateExcludedContainers: z.string().optional()
+ autoUpdateExcludedContainers: z.string().optional()
});
// Build current settings object from environment and settings data
@@ -173,7 +173,7 @@
scheduledPruneNetworks: settings?.scheduledPruneNetworks ?? true,
scheduledPruneBuildCache: settings?.scheduledPruneBuildCache ?? false,
vulnerabilityScanEnabled: settings?.vulnerabilityScanEnabled ?? false,
- autoUpdateExcludedContainers: settings?.autoUpdateExcludedContainers || ''
+ autoUpdateExcludedContainers: settings?.autoUpdateExcludedContainers || ''
});
// Custom save handler for environment-specific settings
@@ -204,7 +204,7 @@
scheduledPruneNetworks: formData.scheduledPruneNetworks,
scheduledPruneBuildCache: formData.scheduledPruneBuildCache,
vulnerabilityScanEnabled: formData.vulnerabilityScanEnabled,
- autoUpdateExcludedContainers: formData.autoUpdateExcludedContainers
+ autoUpdateExcludedContainers: formData.autoUpdateExcludedContainers
});
}
diff --git a/frontend/src/routes/(app)/environments/[id]/components/JobsTab.svelte b/frontend/src/routes/(app)/environments/[id]/components/JobsTab.svelte
index c1e38bbe1..06b3755a3 100644
--- a/frontend/src/routes/(app)/environments/[id]/components/JobsTab.svelte
+++ b/frontend/src/routes/(app)/environments/[id]/components/JobsTab.svelte
@@ -341,4 +341,4 @@
{/await}
</Card.Content>
</Card.Root>
-</div>
\ No newline at end of file
+</div>
diff --git a/frontend/src/routes/(app)/settings/notifications/providers/DiscordProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/DiscordProviderForm.svelte
index f865fbc27..45a000279 100644
--- a/frontend/src/routes/(app)/settings/notifications/providers/DiscordProviderForm.svelte
+++ b/frontend/src/routes/(app)/settings/notifications/providers/DiscordProviderForm.svelte
@@ -28,7 +28,7 @@
eventImageUpdate: z.boolean(),
eventContainerUpdate: z.boolean(),
eventVulnerabilityFound: z.boolean(),
- eventPruneReport: z.boolean()
+ eventPruneReport: z.boolean()
})
.superRefine((d, ctx) => {
if (!d.enabled) return;
@@ -113,7 +113,7 @@
bind:eventImageUpdate={values.eventImageUpdate}
bind:eventContainerUpdate={values.eventContainerUpdate}
bind:eventVulnerabilityFound={values.eventVulnerabilityFound}
- bind:eventPruneReport={values.eventPruneReport}
+ bind:eventPruneReport={values.eventPruneReport}
{disabled}
/>
diff --git a/frontend/src/routes/(app)/settings/notifications/providers/EmailProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/EmailProviderForm.svelte
index 932470708..a1e54df6b 100644
--- a/frontend/src/routes/(app)/settings/notifications/providers/EmailProviderForm.svelte
+++ b/frontend/src/routes/(app)/settings/notifications/providers/EmailProviderForm.svelte
@@ -34,7 +34,7 @@
eventImageUpdate: z.boolean(),
eventContainerUpdate: z.boolean(),
eventVulnerabilityFound: z.boolean(),
- eventPruneReport: z.boolean()
+ eventPruneReport: z.boolean()
})
.superRefine((d, ctx) => {
if (!d.enabled) return;
@@ -197,7 +197,7 @@
bind:eventImageUpdate={values.eventImageUpdate}
bind:eventContainerUpdate={values.eventContainerUpdate}
bind:eventVulnerabilityFound={values.eventVulnerabilityFound}
- bind:eventPruneReport={values.eventPruneReport}
+ bind:eventPruneReport={values.eventPruneReport}
{disabled}
/>
diff --git a/frontend/src/routes/(app)/settings/notifications/providers/EventSubscriptions.svelte b/frontend/src/routes/(app)/settings/notifications/providers/EventSubscriptions.svelte
index f1b8c4b4b..a09776ba7 100644
--- a/frontend/src/routes/(app)/settings/notifications/providers/EventSubscriptions.svelte
+++ b/frontend/src/routes/(app)/settings/notifications/providers/EventSubscriptions.svelte
@@ -8,7 +8,7 @@
eventImageUpdate: boolean;
eventContainerUpdate: boolean;
eventVulnerabilityFound: boolean;
- eventPruneReport: boolean;
+ eventPruneReport: boolean;
disabled?: boolean;
}
@@ -17,7 +17,7 @@
eventImageUpdate = $bindable(),
eventContainerUpdate = $bindable(),
eventVulnerabilityFound = $bindable(),
- eventPruneReport = $bindable(),
+ eventPruneReport = $bindable(),
disabled = false
}: Props = $props();
</script>
@@ -46,8 +46,8 @@
{disabled}
label={m.notifications_event_prune_report_label()}
description={m.notifications_event_prune_report_description()}
- />
- <SwitchWithLabel
+ />
+ <SwitchWithLabel
id="{providerId}-event-vulnerability-found"
bind:checked={eventVulnerabilityFound}
{disabled}
diff --git a/frontend/src/routes/(app)/settings/notifications/providers/GenericProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/GenericProviderForm.svelte
index a0583bea3..e0435c7da 100644
--- a/frontend/src/routes/(app)/settings/notifications/providers/GenericProviderForm.svelte
+++ b/frontend/src/routes/(app)/settings/notifications/providers/GenericProviderForm.svelte
@@ -30,7 +30,7 @@
eventImageUpdate: z.boolean(),
eventContainerUpdate: z.boolean(),
eventVulnerabilityFound: z.boolean(),
- eventPruneReport: z.boolean()
+ eventPruneReport: z.boolean()
})
.superRefine((d, ctx) => {
if (!d.enabled) return;
@@ -135,7 +135,7 @@
bind:eventImageUpdate={values.eventImageUpdate}
bind:eventContainerUpdate={values.eventContainerUpdate}
bind:eventVulnerabilityFound={values.eventVulnerabilityFound}
- bind:eventPruneReport={values.eventPruneReport}
+ bind:eventPruneReport={values.eventPruneReport}
{disabled}
/>
diff --git a/frontend/src/routes/(app)/settings/notifications/providers/GotifyProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/GotifyProviderForm.svelte
index 6a78be0bb..c0a9c740c 100644
--- a/frontend/src/routes/(app)/settings/notifications/providers/GotifyProviderForm.svelte
+++ b/frontend/src/routes/(app)/settings/notifications/providers/GotifyProviderForm.svelte
@@ -52,7 +52,7 @@
eventImageUpdate: z.boolean(),
eventContainerUpdate: z.boolean(),
eventVulnerabilityFound: z.boolean(),
- eventPruneReport: z.boolean()
+ eventPruneReport: z.boolean()
})
.superRefine((d, ctx) => {
if (!d.enabled) return;
@@ -188,7 +188,7 @@
bind:eventImageUpdate={values.eventImageUpdate}
bind:eventContainerUpdate={values.eventContainerUpdate}
bind:eventVulnerabilityFound={values.eventVulnerabilityFound}
- bind:eventPruneReport={values.eventPruneReport}
+ bind:eventPruneReport={values.eventPruneReport}
{disabled}
/>
diff --git a/frontend/src/routes/(app)/settings/notifications/providers/NtfyProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/NtfyProviderForm.svelte
index aedbc6f8c..c6fde7e6d 100644
--- a/frontend/src/routes/(app)/settings/notifications/providers/NtfyProviderForm.svelte
+++ b/frontend/src/routes/(app)/settings/notifications/providers/NtfyProviderForm.svelte
@@ -38,7 +38,7 @@
eventImageUpdate: z.boolean(),
eventContainerUpdate: z.boolean(),
eventVulnerabilityFound: z.boolean(),
- eventPruneReport: z.boolean()
+ eventPruneReport: z.boolean()
})
.superRefine((d, ctx) => {
if (!d.enabled) return;
@@ -196,7 +196,7 @@
bind:eventImageUpdate={values.eventImageUpdate}
bind:eventContainerUpdate={values.eventContainerUpdate}
bind:eventVulnerabilityFound={values.eventVulnerabilityFound}
- bind:eventPruneReport={values.eventPruneReport}
+ bind:eventPruneReport={values.eventPruneReport}
{disabled}
/>
diff --git a/frontend/src/routes/(app)/settings/notifications/providers/PushoverProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/PushoverProviderForm.svelte
index 7dbe53f84..4a471af3e 100644
--- a/frontend/src/routes/(app)/settings/notifications/providers/PushoverProviderForm.svelte
+++ b/frontend/src/routes/(app)/settings/notifications/providers/PushoverProviderForm.svelte
@@ -42,7 +42,7 @@
eventImageUpdate: z.boolean(),
eventContainerUpdate: z.boolean(),
eventVulnerabilityFound: z.boolean(),
- eventPruneReport: z.boolean()
+ eventPruneReport: z.boolean()
})
.superRefine((d, ctx) => {
if (!d.enabled) return;
@@ -156,7 +156,7 @@
bind:eventImageUpdate={values.eventImageUpdate}
bind:eventContainerUpdate={values.eventContainerUpdate}
bind:eventVulnerabilityFound={values.eventVulnerabilityFound}
- bind:eventPruneReport={values.eventPruneReport}
+ bind:eventPruneReport={values.eventPruneReport}
{disabled}
/>
diff --git a/frontend/src/routes/(app)/settings/notifications/providers/SignalProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/SignalProviderForm.svelte
index 13114ba66..0a9901da9 100644
--- a/frontend/src/routes/(app)/settings/notifications/providers/SignalProviderForm.svelte
+++ b/frontend/src/routes/(app)/settings/notifications/providers/SignalProviderForm.svelte
@@ -35,7 +35,7 @@
eventImageUpdate: z.boolean(),
eventContainerUpdate: z.boolean(),
eventVulnerabilityFound: z.boolean(),
- eventPruneReport: z.boolean()
+ eventPruneReport: z.boolean()
})
.superRefine((d, ctx) => {
if (!d.enabled) return;
@@ -224,7 +224,7 @@
bind:eventImageUpdate={values.eventImageUpdate}
bind:eventContainerUpdate={values.eventContainerUpdate}
bind:eventVulnerabilityFound={values.eventVulnerabilityFound}
- bind:eventPruneReport={values.eventPruneReport}
+ bind:eventPruneReport={values.eventPruneReport}
{disabled}
/>
diff --git a/frontend/src/routes/(app)/settings/notifications/providers/SlackProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/SlackProviderForm.svelte
index e088ff7db..7ff808c5b 100644
--- a/frontend/src/routes/(app)/settings/notifications/providers/SlackProviderForm.svelte
+++ b/frontend/src/routes/(app)/settings/notifications/providers/SlackProviderForm.svelte
@@ -31,7 +31,7 @@
eventImageUpdate: z.boolean(),
eventContainerUpdate: z.boolean(),
eventVulnerabilityFound: z.boolean(),
- eventPruneReport: z.boolean()
+ eventPruneReport: z.boolean()
})
.superRefine((d, ctx) => {
if (!d.enabled) return;
@@ -150,7 +150,7 @@
bind:eventImageUpdate={values.eventImageUpdate}
bind:eventContainerUpdate={values.eventContainerUpdate}
bind:eventVulnerabilityFound={values.eventVulnerabilityFound}
- bind:eventPruneReport={values.eventPruneReport}
+ bind:eventPruneReport={values.eventPruneReport}
{disabled}
/>
diff --git a/frontend/src/routes/(app)/settings/notifications/providers/TelegramProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/TelegramProviderForm.svelte
index eac75f888..f9c6c7dcd 100644
--- a/frontend/src/routes/(app)/settings/notifications/providers/TelegramProviderForm.svelte
+++ b/frontend/src/routes/(app)/settings/notifications/providers/TelegramProviderForm.svelte
@@ -32,7 +32,7 @@
eventImageUpdate: z.boolean(),
eventContainerUpdate: z.boolean(),
eventVulnerabilityFound: z.boolean(),
- eventPruneReport: z.boolean()
+ eventPruneReport: z.boolean()
})
.superRefine((d, ctx) => {
if (!d.enabled) return;
@@ -130,7 +130,7 @@
bind:eventImageUpdate={values.eventImageUpdate}
bind:eventContainerUpdate={values.eventContainerUpdate}
bind:eventVulnerabilityFound={values.eventVulnerabilityFound}
- bind:eventPruneReport={values.eventPruneReport}
+ bind:eventPruneReport={values.eventPruneReport}
{disabled}
/>