@goodandready/dsh-voice 0.9.40 → 0.9.42

package/README.md

@@ -222,16 +222,19 @@ Open **Settings → Plugins → Plugin settings → Voice** in the Web UI:
 ### Agent Tool (`transcribe_audio`)
 Registers `transcribe_audio(file_path, language?)` in `ctx.tools`, allowing agents to analyze audio files, interview recordings, and voice notes directly from disk. Path containment is strictly enforced against allowed directories (`allowedAudioDirs`, `~/.dsh`, `tmpdir`, `cwd`) with symlink traversal escape prevention and magic-byte audio format validation.
 
-### Internal HTTP Endpoints
+### Internal HTTP & WebSocket Endpoints
+* `GET /dsh-voice/ws/stream` — RFC 6455 WebSocket streaming channel for real-time dictation with interim transcription previews (`{ type: 'interim', text }`) and final transcript dispatch (`{ type: 'final', text, action, provider }`). Authenticated via `hasSameOrigin` or `x-dsh-voice-token` (#282, #292).
 * `POST /dsh-voice/transcribe` — `{ dataBase64, mimeType, mode }` → `{ ok, text, provider, tookMs }`
 * `POST /dsh-voice/polish` — `{ text }` → `{ ok, text }`
-* `GET /dsh-voice/status` — Returns daemon status, active chains, SenseVoice and `effectiveSensevoiceProvider`.
+* `GET /dsh-voice/status` — Returns daemon status, active chains, SenseVoice and `effectiveSensevoiceProvider`. Emits `sessionToken` exclusively to verified same-origin callers (#292).
 * `GET /dsh-voice/config` — Returns live plugin configuration snapshot.
-* `PUT /dsh-voice/config` — Updates and persists plugin configuration across network.
+* `PUT /dsh-voice/config` — Updates and persists plugin configuration across network with automatic session token rotation (#292).
 * `GET/POST /dsh-voice/sensevoice-installer` — SenseVoice 1-click model installation status and trigger (protected by `isTrustedCaller`, model paths redacted).
 * `POST /api/dsh-voice/update` — Triggers plugin self-update to latest compatible npm version (protected by local caller verification and profile lock check).
 * `GET /api/dsh-voice/update` — Returns update check status (current version, latest version, updateAvailable).
 
+> **Security & Quota Protections (#292, #293)**: State-changing HTTP routes and WebSocket upgrades enforce strict same-origin verification and token authentication against reverse LAN bridges (such as `dsh-lanmode`), preventing unauthorized configuration changes or quota depletion. Real-time interim WebSocket streaming processes only the latest audio chunk ($O(N)$ linear byte consumption) and restricts recognition strictly to local engines (`local-whisper`, `sensevoice`, `browser-webgpu`), ensuring zero cloud quota consumption during interim speech preview.
+
 ### 🔒 Profile Lock & Controlled Operator Recovery Policy
 When updating or installing plugins, DeepSeek Harness profiles coordinate concurrent operations using `<profile-dir>/package.json.lock` (for example, `~/.dsh/profiles/<profile>/package.json.lock`).
 * **Canonical Contender Policy**: The contender process never deletes or unlinks an existing lockfile. Automatic stale lock removal by contenders is prohibited to eliminate TOCTOU (Time-of-Check to Time-of-Use) race conditions and prevent unintended lockfile clobbering.

package/lib/client.js

@@ -786,6 +786,12 @@ window.__ModuleLoader__.load({
     const undoIcon = () => React.createElement('svg', ic,
       React.createElement('path', { d: 'M9 14L4 9l5-5' }),
       React.createElement('path', { d: 'M4 9h10.5a5.5 5.5 0 0 1 5.5 5.5v.5' }))
+    const editIcon = () => React.createElement('svg', ic,
+      React.createElement('path', { d: 'M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7' }),
+      React.createElement('path', { d: 'M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z' }))
+    const sendIcon = () => React.createElement('svg', ic,
+      React.createElement('line', { x1: 22, y1: 2, x2: 11, y2: 13 }),
+      React.createElement('polygon', { points: '22 2 15 22 11 13 2 9 22 2' }))
     const chevronIcon = () => (
       ChevronIcon
         ? React.createElement(ChevronIcon, { className: 'dvo-chev-icon' })
@@ -1492,6 +1498,7 @@ voice._chainsPromise = null
         voice._chainsPromise = fetch('/dsh-voice/status', { cache: 'no-store' })
           .then((res) => res.json())
           .then((data) => {
+            if (data?.sessionToken && typeof window !== 'undefined') window.__dshVoiceToken = data.sessionToken
             if (data && typeof data.localOnly === 'boolean') {
               voice.settings.localOnly = data.localOnly
             }
@@ -5529,6 +5536,9 @@ function MacrosSection(props) {
       cancelPendingPreview,
       keepPendingPreview,
       submitPendingPreview,
+      renderEditablePreviewPill,
+      editIcon,
+      sendIcon,
       loadWebGpuWhisper,
       isWebGpuSupported,
       isWasmSupported,

package/lib/config-routes.js

@@ -1,7 +1,7 @@
 // lib/config-routes.js — Host route for plugin configuration persistence over network.
 // Solves DSH network limitation where client-side persistence is blocked in non-loopback environments (Gitea #149).
 
-import { writeJson, readBody, isTrustedCaller } from './http-util.js'
+import { writeJson, readBody, isTrustedCaller, rotateVoiceSessionToken, getVoiceSessionToken } from './http-util.js'
 
 export function registerConfigRoutes(ctx, {
   NS,
@@ -153,11 +153,12 @@ export function registerConfigRoutes(ctx, {
           triggerAutostart()
         }
 
+        rotateVoiceSessionToken()
         let newRev
         try {
           newRev = settingsService?.describe?.()?.find?.((r) => r.ns === NS)?.revision
         } catch {}
-        writeJson(res, 200, { ok: true, config: live(), revision: newRev })
+        writeJson(res, 200, { ok: true, config: live(), revision: newRev, sessionToken: getVoiceSessionToken() })
       } catch (err) {
         writeJson(res, 500, { ok: false, error: { code: 'save', message: String(err?.message || err) } })
       }

package/lib/host-routes.js

@@ -1,6 +1,6 @@
 // HTTP host routes registered on ctx.webServer.
 import os from 'node:os'
-import { readBody, isLoopback, isTrustedCaller, getVoiceSessionToken } from './http-util.js'
+import { readBody, isLoopback, isTrustedCaller, getVoiceSessionToken, verifyVoiceSessionToken, hasSameOrigin } from './http-util.js'
 import { resolveSensevoiceProvider } from './sensevoice-installer.js'
 import { applyVoiceMacros } from './macros.js'
 import { createSyntheticWav } from './wav.js'
@@ -46,7 +46,7 @@ export function registerHostRoutes(ctx, deps) {
       const sensevoiceError = sensevoiceOk ? null : getSensevoiceError()
       writeJson(res, 200, {
         ok: true,
-        sessionToken: getVoiceSessionToken(),
+        sessionToken: hasSameOrigin(req) ? getVoiceSessionToken() : null,
         whisperRunning: whisperOk,
         whisperError: whisperOk ? null : whisperError,
         sensevoiceRunning: sensevoiceOk,
@@ -385,7 +385,12 @@ export function registerHostRoutes(ctx, deps) {
           const url = new URL(req.url || '/', 'http://127.0.0.1')
           const token = req.headers['x-dsh-voice-token'] || url.searchParams.get('token')
           const expected = getVoiceSessionToken()
-          if (expected && token !== expected) {
+          if (!hasSameOrigin(req) && (!token || !verifyVoiceSessionToken(token))) {
+            socket.write('HTTP/1.1 403 Forbidden\r\n\r\n')
+            socket.destroy()
+            return
+          }
+          if (expected && token && !verifyVoiceSessionToken(token)) {
             socket.write('HTTP/1.1 401 Unauthorized\r\n\r\n')
             socket.destroy()
             return
@@ -409,14 +414,33 @@ export function registerHostRoutes(ctx, deps) {
                     streamChunks.push(Buffer.from(msg.dataBase64, 'base64'))
                   } else if (msg.type === 'interim') {
                     if (streamChunks.length > 0) {
-                      const buf = Buffer.concat(streamChunks)
-                      if (buf.length > 3000) {
-                        try {
-                          const interimOut = await transcribe(buf, streamMime, streamMode)
-                          if (interimOut && interimOut.text) {
-                            ws.send(JSON.stringify({ type: 'interim', text: interimOut.text }))
+                      const latestChunk = streamChunks[streamChunks.length - 1]
+                      if (latestChunk && latestChunk.length > 3000) {
+                        const cfg = live()
+                        const baseModeCfg = streamMode === 'message' ? cfg.message : cfg.dictation
+                        const LOCAL_ENGINES = new Set(['local-whisper', 'sensevoice', 'browser-webgpu'])
+                        const interimChain = (baseModeCfg.chain || []).filter((e) => LOCAL_ENGINES.has(e.provider))
+
+                        let canRunLocal = false
+                        for (const entry of interimChain) {
+                          if (entry.provider === 'local-whisper' && (await whisperAlive())) { canRunLocal = true; break }
+                          if (entry.provider === 'sensevoice' && (await sensevoiceAlive())) { canRunLocal = true; break }
+                          if (entry.provider === 'browser-webgpu') { canRunLocal = true; break }
+                        }
+
+                        if (canRunLocal && interimChain.length > 0) {
+                          const interimModeCfg = { ...baseModeCfg, chain: interimChain, polish: false }
+                          const controller = new AbortController()
+                          const timer = setTimeout(() => controller.abort(), 5000)
+                          try {
+                            const interimOut = await transcribe(interimModeCfg, latestChunk, streamMime, controller.signal)
+                            if (interimOut && interimOut.text) {
+                              ws.send(JSON.stringify({ type: 'interim', text: interimOut.text }))
+                            }
+                          } catch (err) { /* ignore interim failure */ } finally {
+                            clearTimeout(timer)
                           }
-                        } catch (_) {}
+                        }
                       }
                     }
                   } else if (msg.type === 'finish') {
@@ -426,11 +450,15 @@ export function registerHostRoutes(ctx, deps) {
                       ws.send(JSON.stringify({ type: 'final', text: '', ok: true }))
                       return
                     }
+                    const cfg = live()
+                    const modeCfg = streamMode === 'message' ? cfg.message : cfg.dictation
+                    const controller = new AbortController()
+                    const timer = setTimeout(() => controller.abort(), cfg.timeoutMs || 25000)
                     try {
-                      const finalOut = await transcribe(buf, streamMime, streamMode)
+                      const finalOut = await transcribe(modeCfg, buf, streamMime, controller.signal)
                       let text = finalOut && finalOut.text ? finalOut.text : ''
                       let action = null
-                      if (extractVoiceActions) {
+                      if (extractVoiceActions && cfg.voiceActions !== false) {
                         const act = extractVoiceActions(text)
                         if (act.action) { action = act.action; text = act.text }
                       }
@@ -443,9 +471,11 @@ export function registerHostRoutes(ctx, deps) {
                         type: 'error',
                         error: String(err && err.message ? err.message : err), ok: false,
                       }))
+                    } finally {
+                      clearTimeout(timer)
                     }
                   }
-                } catch (_) {}
+                } catch (err) { /* ignore parse error */ }
               }
             })
           })

package/lib/http-util.js

@@ -22,6 +22,11 @@ export function setVoiceSessionToken(t) {
   sessionSecret = String(t || '')
 }
 
+export function rotateVoiceSessionToken() {
+  sessionSecret = randomBytes(24).toString('hex')
+  return sessionSecret
+}
+
 export function verifyVoiceSessionToken(token) {
   if (!token || typeof token !== 'string') return false
   const secret = getVoiceSessionToken()
@@ -100,12 +105,52 @@ export function isLoopback(addr) {
   return clean === '127.0.0.1' || clean === '::1' || clean === 'localhost'
 }
 
+/**
+ * Check whether a request originates from the same origin as the Host header (#292).
+ * @param {import('node:http').IncomingMessage} req
+ * @returns {boolean}
+ */
+export function hasSameOrigin(req) {
+  if (!req || !req.headers) return false
+  const secSite = String(req.headers['sec-fetch-site'] || '').toLowerCase()
+  if (secSite === 'cross-site' || secSite === 'same-site') return false
+
+  const host = String(req.headers.host || '').trim().toLowerCase()
+  if (!host) return false
+
+  const origin = String(req.headers.origin || '').trim().toLowerCase()
+  if (origin) {
+    try {
+      const u = new URL(origin)
+      return u.host.toLowerCase() === host
+    } catch {
+      return false
+    }
+  }
+
+  const referer = String(req.headers.referer || '').trim().toLowerCase()
+  if (referer) {
+    try {
+      const u = new URL(referer)
+      return u.host.toLowerCase() === host
+    } catch {
+      return false
+    }
+  }
+
+  if (secSite === 'same-origin') return true
+
+  return false
+}
+
 /**
  * Verify that the HTTP request originates from a trusted caller.
- * Fail-closed security guard for state-changing or quota-consuming POST routes (#117, #173, #277).
- * - Loopback callers (127.0.0.1, ::1) are trusted unless rejected by browser security headers.
- * - Non-loopback LAN mutating/quota-consuming POST/PUT requests require valid session token (#277).
+ * Fail-closed security guard for state-changing or quota-consuming routes (#117, #173, #277, #292).
  * - Routes marked loopbackOnly strictly reject non-loopback callers.
+ * - Mutating requests (POST, PUT, PATCH) or WS upgrades require validated same-origin or valid session token (#292).
+ *   Loopback callers without Origin/Referer through dsh-lanmode bridge are rejected without token.
+ * - Non-loopback LAN requests require valid session token for mutating operations (#277).
+ * - Non-mutating GET requests require loopback or same-origin.
  * @param {import('node:http').IncomingMessage} req
  * @param {{ loopbackOnly?: boolean }} [options]
  * @returns {boolean}
@@ -142,7 +187,8 @@ export function isTrustedCaller(req, options = {}) {
 
   // 4. For state-changing or data-carrying requests (POST/PUT/PATCH), require application/json or octet-stream
   const method = String(req.method || 'GET').toUpperCase()
-  if (method === 'POST' || method === 'PUT' || method === 'PATCH') {
+  const isMutating = method === 'POST' || method === 'PUT' || method === 'PATCH'
+  if (isMutating) {
     const contentType = String(req.headers?.['content-type'] || '').toLowerCase()
     const isJson = contentType.startsWith('application/json')
     const isOctet = contentType.startsWith('application/octet-stream')
@@ -151,39 +197,45 @@ export function isTrustedCaller(req, options = {}) {
     }
   }
 
-  // 5. Loopback remote address is trusted when not rejected by browser headers above
   const remote = req.socket?.remoteAddress || req.connection?.remoteAddress || ''
-  if (isLoopback(remote)) return true
-
-  // If route strictly requires loopback (e.g. host model installer or hardware benchmark)
-  if (options && options.loopbackOnly) return false
+  const remoteIsLoopback = isLoopback(remote)
+  const hostName = host.replace(/:\d+$/, '')
+  const hostIsLoopback = hostName === '127.0.0.1' || hostName === 'localhost' || hostName === '::1' || hostName === '[::1]'
+  const isPureLocal = remoteIsLoopback && hostIsLoopback
+
+  // 5. If route strictly requires loopback (e.g. host model installer or hardware benchmark)
+  if (options && options.loopbackOnly) {
+    if (!isPureLocal) return false
+    return true
+  }
 
-  // 6. Non-loopback LAN requests: POST/PUT/PATCH quota-burning operations require session auth token (#277)
-  const isMutating = method === 'POST' || method === 'PUT' || method === 'PATCH'
+  // 6. Mutating requests (POST/PUT/PATCH):
+  // Even from loopback (which may be proxied via dsh-lanmode bridge), requests without Origin/Referer
+  // must present a valid x-dsh-voice-token (#292).
   if (isMutating) {
     const incomingToken = String(req.headers?.['x-dsh-voice-token'] || req.headers?.['x-voice-token'] || '')
-    if (incomingToken && verifyVoiceSessionToken(incomingToken)) {
-      return true
+    const hasValidToken = Boolean(incomingToken && verifyVoiceSessionToken(incomingToken))
+
+    if (!remoteIsLoopback) {
+      // Non-loopback LAN callers: always require valid token (#277)
+      return hasValidToken
     }
+
+    // Loopback callers (or reverse bridge dsh-lanmode):
+    // If request has verified same-origin (browser UI), allow it.
+    if (hasSameOrigin(req)) return true
+    // If request has valid session token, allow it.
+    if (hasValidToken) return true
+    // Requests without Origin/Referer and without token: strictly reject (#292)
     return false
   }
 
-  // 7. Non-state-changing GET requests from LAN: verify same-origin
+  // 7. Loopback remote address for non-mutating GET requests
+  if (remoteIsLoopback) return true
+
+  // 8. Non-loopback LAN GET requests: require same-origin
   if (secSite === 'same-origin') return true
-  if (origin) {
-    try {
-      const u = new URL(origin)
-      if (u.host === host) return true
-    } catch { /* invalid url */ }
-    return false
-  }
-  if (referer) {
-    try {
-      const u = new URL(referer)
-      if (u.host === host) return true
-    } catch { /* invalid url */ }
-    return false
-  }
+  if (hasSameOrigin(req)) return true
 
   return false
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-voice",
-  "version": "0.9.40",
+  "version": "0.9.42",
   "description": "Voice input for DeepSeek Harness: dictation chunked by pauses and voice messages, each with its own provider fallback chain (Deepgram, Groq, HuggingFace, local whisper.cpp, plus any OpenAI-compatible API of your own).",
   "license": "MIT",
   "type": "module",