dsh-zen-remote 2.3.1 → 2.3.2

package/README.md

@@ -94,7 +94,7 @@ dsh plugin --profile web add dsh-zen-remote
 // ~/.dsh/profiles/desktop/package.json
 {
   "dependencies": {
-    "dsh-zen-remote": "^2.3.1"        // for local development: "link:/path/to/dsh-zen-remote"
+    "dsh-zen-remote": "^2.3.2"        // for local development: "link:/path/to/dsh-zen-remote"
   }
 }
 ```

package/README.zh-CN.md

@@ -94,7 +94,7 @@ dsh plugin --profile web add dsh-zen-remote
 // ~/.dsh/profiles/desktop/package.json
 {
   "dependencies": {
-    "dsh-zen-remote": "^2.3.1"        // 本地开发换成 "link:/path/to/dsh-zen-remote"
+    "dsh-zen-remote": "^2.3.2"        // 本地开发换成 "link:/path/to/dsh-zen-remote"
   }
 }
 ```

package/lib/client.js

@@ -18886,8 +18886,8 @@ function GatewayWizard(props) {
                 };
                 if (path === 'lan') {
                     // LAN / Tailscale direct connections arrive on the machine's LAN or
-                    // Tailscale interface, so the gateway child must bind to `0.0.0.0`
-                    // rather than loopback-only `127.0.0.1`.
+                    // Tailscale interface, so the gateway child binds to `0.0.0.0` (with
+                    // lan-gate's private-IP wall blocking any unproxied public IP).
                     await props.saveRowFields({
                         ...baseFields,
                         host: '0.0.0.0',
@@ -18903,8 +18903,12 @@ function GatewayWizard(props) {
                     });
                 }
                 else {
+                    // Managed Caddy and Cloudflare Tunnel both run on the same host and
+                    // connect to the gateway over loopback, so reset `host` back to
+                    // `127.0.0.1` in case the user previously enabled LAN mode.
                     await props.saveRowFields({
                         ...baseFields,
+                        host: '127.0.0.1',
                         ingressMode: path,
                         ingressDomain: domain.trim(),
                         ingressHttpsPort: readiness.httpsPort,

package/lib/lan-gate-server.cjs

@@ -239,6 +239,22 @@ var lastWebClaim = null // { id, secure, at } | null
 // ---- client identity --------------------------------------------------------
 function normalizeIp(raw) { return String(raw || '').replace(/^::ffff:/, '') }
 function isLoopbackIp(ip) { return ip === '127.0.0.1' || ip === '::1' }
+function isPrivateOrLoopbackIp(ip) {
+  if (isLoopbackIp(ip)) return true
+  var m4 = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/.exec(ip)
+  if (m4) {
+    var a = Number(m4[1]), b = Number(m4[2]), c = Number(m4[3]), d = Number(m4[4])
+    if (a > 255 || b > 255 || c > 255 || d > 255) return false
+    if (a === 10 || a === 127) return true
+    if (a === 172 && b >= 16 && b <= 31) return true
+    if (a === 192 && b === 168) return true
+    if (a === 169 && b === 254) return true
+    if (a === 100 && b >= 64 && b <= 127) return true // CGNAT / Tailscale
+    return false
+  }
+  var lower = String(ip || '').toLowerCase()
+  return /^f[cd][0-9a-f]{2}:/.test(lower) || /^fe[89ab][0-9a-f]:/.test(lower)
+}
 function hasForwardHeaders(req) { return req.headers['x-forwarded-for'] !== undefined || req.headers['x-forwarded-proto'] !== undefined || req.headers['x-forwarded-host'] !== undefined }
 
 // Resolve who is really talking to us. Forwarded headers are only trusted
@@ -1186,6 +1202,15 @@ function localOnlyBlocked(req, res) {
 
 var server = http.createServer(function (req, res) {
   var client = resolveClient(req)
+  // Direct (non-proxied) connections from a public IP are refused outright:
+  // plain HTTP on 0.0.0.0:3088 is for loopback, LAN (RFC1918), and Tailscale
+  // (100.64.0.0/10) only — public internet traffic must enter through a
+  // TLS-terminating reverse proxy or tunnel (which connects from loopback or
+  // a configured trustedProxy).
+  if (!client.viaProxy && !isPrivateOrLoopbackIp(client.ip)) {
+    json(req, res, 403, { ok: false, reason: 'public-direct-forbidden' })
+    return
+  }
   var pathname = String(req.url || '/').split('?')[0]
   var local = isLocalDirect(req, client)
   var device = local ? undefined : deviceForReq(req)
@@ -1277,6 +1302,10 @@ var server = http.createServer(function (req, res) {
 
 server.on('upgrade', function (req, socket, head) {
   var client = resolveClient(req)
+  if (!client.viaProxy && !isPrivateOrLoopbackIp(client.ip)) {
+    try { socket.end('HTTP/1.1 403 Forbidden\r\nConnection: close\r\n\r\n') } catch (e) {}
+    return
+  }
   var local = isLocalDirect(req, client)
   var device = local ? undefined : deviceForReq(req)
   if (!local && !device && overRate(client.ip)) { try { socket.end('HTTP/1.1 429 Too Many Requests\r\nConnection: close\r\n\r\n') } catch (e) {} return }

package/lib/types/client/wizard/GatewayWizard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GatewayWizard.d.ts","sourceRoot":"","sources":["../../../../src/client/wizard/GatewayWizard.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AACjF,OAAO,KAAK,EAMV,qBAAqB,EACtB,MAAM,oCAAoC,CAAA;AAmD3C,OAAO,EAAE,EAAE,EAAE,MAAM,eAAe,CAAA;AAMlC,MAAM,WAAW,kBAAmB,SAAQ,YAAY,CAAC,uBAAuB,CAAC,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC;IACvG,qEAAqE;IACrE,MAAM,EAAE,qBAAqB,CAAA;IAC7B,2EAA2E;IAC3E,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAC3G;AAoGD,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,SAAS,CA++DlE"}
+{"version":3,"file":"GatewayWizard.d.ts","sourceRoot":"","sources":["../../../../src/client/wizard/GatewayWizard.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AACjF,OAAO,KAAK,EAMV,qBAAqB,EACtB,MAAM,oCAAoC,CAAA;AAmD3C,OAAO,EAAE,EAAE,EAAE,MAAM,eAAe,CAAA;AAMlC,MAAM,WAAW,kBAAmB,SAAQ,YAAY,CAAC,uBAAuB,CAAC,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC;IACvG,qEAAqE;IACrE,MAAM,EAAE,qBAAqB,CAAA;IAC7B,2EAA2E;IAC3E,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAC3G;AAoGD,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,SAAS,CAm/DlE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-zen-remote",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "description": "一个插件、两种角色：主服务端把 DeepSeek Harness 变成手机能安全访问的 PWA（移动端界面、配对码网关、Web Push），并把选定会话共享给已配对的桌面端；子客户端在另一台 DSH 桌面端的侧边栏里远程使用这些会话。One DSH plugin, two roles: the host turns DeepSeek Harness into a phone-reachable PWA (mobile UI, pairing-code gateway behind your own reverse proxy, Web Push) and shares chosen sessions to paired desktops; the client uses those sessions remotely from another DSH desktop app's sidebar.",
   "license": "MIT",
   "type": "module",

package/src/client/wizard/GatewayWizard.tsx

@@ -600,8 +600,8 @@ export function GatewayWizard(props: GatewayWizardProps): ReactNode {
         }
         if (path === 'lan') {
           // LAN / Tailscale direct connections arrive on the machine's LAN or
-          // Tailscale interface, so the gateway child must bind to `0.0.0.0`
-          // rather than loopback-only `127.0.0.1`.
+          // Tailscale interface, so the gateway child binds to `0.0.0.0` (with
+          // lan-gate's private-IP wall blocking any unproxied public IP).
           await props.saveRowFields(
             {
               ...baseFields,
@@ -618,8 +618,12 @@ export function GatewayWizard(props: GatewayWizardProps): ReactNode {
             ingressPublicUrl: readiness.publicUrl,
           })
         } else {
+          // Managed Caddy and Cloudflare Tunnel both run on the same host and
+          // connect to the gateway over loopback, so reset `host` back to
+          // `127.0.0.1` in case the user previously enabled LAN mode.
           await props.saveRowFields({
             ...baseFields,
+            host: '127.0.0.1',
             ingressMode: path,
             ingressDomain: domain.trim(),
             ingressHttpsPort: readiness.httpsPort,