docker-compose.yml

@@ -9,8 +9,18 @@ services:
     # forwarding it would often see Docker's own) and a Mumble server on this machine is
     # reachable as localhost. The proxy listens on 127.0.0.1:8080 for nginx and on UDP 3478.
     network_mode: host
-    env_file:
+    # Passed on from .env (or the shell); empty means the proxy's default. Written out one by
-      - path: .env
+    # one because older docker-compose versions cannot mark an env_file as optional.
-        required: false
     environment:
+      MUMH5_SERVERS: ${MUMH5_SERVERS:-}
+      MUMH5_ALLOW_ANY: ${MUMH5_ALLOW_ANY:-}
+      MUMH5_ALLOW_PRIVATE: ${MUMH5_ALLOW_PRIVATE:-}
+      MUMH5_PORT: ${MUMH5_PORT:-8080}
       MUMH5_BIND: ${MUMH5_BIND:-127.0.0.1}
+      MUMH5_ORIGINS: ${MUMH5_ORIGINS:-}
+      MUMH5_TRUST_PROXY: ${MUMH5_TRUST_PROXY:-}
+      MUMH5_SEND_PROXY: ${MUMH5_SEND_PROXY:-}
+      MUMH5_STUN_PORT: ${MUMH5_STUN_PORT:-3478}
+      MUMH5_STUN_BIND: ${MUMH5_STUN_BIND:-}
+      MUMH5_MAX_CONNECTIONS: ${MUMH5_MAX_CONNECTIONS:-}
+      MUMH5_MAX_PER_ADDRESS: ${MUMH5_MAX_PER_ADDRESS:-}

server/proxy.ts

@@ -55,7 +55,9 @@ export function parseServers(list: string): AllowedServer[] {
   });
 }
 
-export function configFromEnv(env: NodeJS.ProcessEnv): ProxyConfig {
+export function configFromEnv(source: NodeJS.ProcessEnv): ProxyConfig {
+  // A variable set to nothing counts as not set (docker-compose passes unset ones on that way)
+  const env = Object.fromEntries(Object.entries(source).filter(([, v]) => v !== '')) as NodeJS.ProcessEnv;
   const on = (v?: string) => v === '1' || v === 'true';
   return {
     ...defaults,

test/proxy.test.ts

@@ -6,6 +6,7 @@ import dgram from 'node:dgram';
 import assert from 'node:assert/strict';
 import { proxyLine } from '../electron/tls-transport.ts';
 import { stunResponse } from '../server/proxy.ts';
+import { configFromEnv } from '../server/proxy.ts';
 import { startProxy, defaults, parseServers, isPrivateAddress, type ProxyConfig } from '../server/proxy.ts';
 import { WebSocket as WsClient } from 'ws';
 import { WebSocketTransport } from '../src/core/ws-transport.ts';
@@ -31,6 +32,13 @@ test('server list parsing', () => {
   assert.deepEqual(parseServers(''), []);
 });
 
+test('empty environment variables fall back to the defaults', () => {
+  const c = configFromEnv({ MUMH5_PORT: '', MUMH5_BIND: '', MUMH5_STUN_PORT: '', MUMH5_STUN_BIND: '', MUMH5_MAX_CONNECTIONS: '', MUMH5_SERVERS: 'a.example', MUMH5_ALLOW_ANY: '' });
+  assert.deepEqual([c.port, c.bind, c.stunPort, c.stunBind, c.maxConnections, c.allowAny], [8080, '127.0.0.1', 3478, '::', 200, false]);
+  assert.equal(configFromEnv({ MUMH5_STUN_PORT: '0' }).stunPort, null);
+  assert.equal(configFromEnv({ MUMH5_PORT: '8089' }).port, 8089);
+});
+
 test('private address detection', () => {
   for (const a of ['127.0.0.1', '10.1.2.3', '192.168.1.1', '172.20.0.1', '169.254.1.1', '100.64.0.1', '::1', 'fd00::1', 'fe80::1', '::ffff:10.0.0.1']) assert.ok(isPrivateAddress(a), a);
   for (const a of ['8.8.8.8', '172.32.0.1', '2001:4860:4860::8888', '::ffff:8.8.8.8']) assert.ok(!isPrivateAddress(a), a);