@yuriai/web 0.2.38-beta.2 → 0.2.38-beta.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/assets/{AgentAvatar-DNVD6VCV.js → AgentAvatar-CjZAr6nn.js} +1 -1
- package/dist/assets/AssistantContactStatus-DoZk9r1D.js +3 -0
- package/dist/assets/AssistantUnreadBadge-BJHZUf6Z.js +1 -0
- package/dist/assets/AssistantView-DkjXm6xL.js +1 -0
- package/dist/assets/DiagramView-Byel_g4U.js +1 -0
- package/dist/assets/{FadeInOnReveal-CK7jBcu4.js → FadeInOnReveal-BrPG6IFE.js} +1 -1
- package/dist/assets/GuiPluginPage-C6iXAYM8.js +1 -0
- package/dist/assets/GuiPluginSurface-DPXPl4xG.js +1 -0
- package/dist/assets/GuiPluginWindow-BdtIwEmZ.js +1 -0
- package/dist/assets/{Icon-DsN23fuV.js → Icon-C5rHjO1K.js} +1 -1
- package/dist/assets/ImageLoadingPlaceholder-Cdj2zS3j.js +1 -0
- package/dist/assets/LoadingImage-Gh9OduKR.js +1 -0
- package/dist/assets/MarkdownRenderer-DErp8UoS.js +2 -0
- package/dist/assets/{MarkdownRendererImpl-ecACjpZw.js → MarkdownRendererImpl-H41Q6Ds9.js} +3 -3
- package/dist/assets/MarkstreamRendererImpl-CJcHC4Ts.js +3 -0
- package/dist/assets/MobileDetailNavigation-fdYiFD76.js +1 -0
- package/dist/assets/MobileResizableSheet-DDzgYZmt.js +1 -0
- package/dist/assets/MobileShareBridge-BNPPhHGf.js +3 -0
- package/dist/assets/MobileTabPageHeader-ZZPrTJl4.js +2 -0
- package/dist/assets/MultiRunWindow-DoeszXM5.js +1 -0
- package/dist/assets/OnboardingScreen-BrYqOlrO.js +1 -0
- package/dist/assets/{OverlayScrollbar-BLhv7Nq-.js → OverlayScrollbar-8lCP3DZq.js} +1 -1
- package/dist/assets/SettingsView-UuXi7Uya.js +29 -0
- package/dist/assets/SettingsWindow-DIYoXakh.js +1 -0
- package/dist/assets/SetupTourDialog-BF50uUTW.js +1 -0
- package/dist/assets/TerminalView-uVsRpvjV.js +8 -0
- package/dist/assets/ToolOutputDialog-Bz23N8ob.js +10 -0
- package/dist/assets/VoiceSettings-DbbeM4JG.js +2 -0
- package/dist/assets/YuriLogo-DcoYyXzq.js +1 -0
- package/dist/assets/YuriWordmark-Dlsq3scd.js +1 -0
- package/dist/assets/appThemeRegistry-DE7vwd6j.js +1 -0
- package/dist/assets/{appearance--vFosLNi.js → appearance-DFsI3pnP.js} +1 -1
- package/dist/assets/{assistant-attachment-cache-C-SlEpSB.js → assistant-attachment-cache-Cmzt4xXE.js} +1 -1
- package/dist/assets/bootstrap-BhC95qVC.js +1 -0
- package/dist/assets/{capgoAdapter-DceVw3SM.js → capgoAdapter-BPZyUAQO.js} +1 -1
- package/dist/assets/{checkbox-CJsiyoER.js → checkbox-Dgn0NjAK.js} +1 -1
- package/dist/assets/{collapsible-B3zojUm2.js → collapsible-DbkDwHwV.js} +1 -1
- package/dist/assets/{context-menu-DFRg1NJF.js → context-menu-HomYNhkr.js} +1 -1
- package/dist/assets/desktopHosts-DovfbQPm.js +1 -0
- package/dist/assets/desktopRelayRestore-D4pbpNKN.js +1 -0
- package/dist/assets/device-DNG0cNwQ.js +2 -0
- package/dist/assets/{diagram-OTF8YAve.js → diagram-if-ktgjK.js} +1 -1
- package/dist/assets/dialog-0fjbRGoX.js +1 -0
- package/dist/assets/{es-CrVDn7XV.js → es-30Wqm-Bx.js} +1 -1
- package/dist/assets/{fileMentionTouchSelection-CorehkTj.js → fileMentionTouchSelection-OwF_hr-t.js} +1 -1
- package/dist/assets/{fileQueries-BaEKb7SZ.js → fileQueries-D9l0crnM.js} +1 -1
- package/dist/assets/fileReferenceActions-BRF8f7uA.js +1 -0
- package/dist/assets/{fileReferenceParser-BayaidRM.js → fileReferenceParser-1HHDBUum.js} +1 -1
- package/dist/assets/{fr-CCwt5AOu.js → fr-BbWLXNYa.js} +1 -1
- package/dist/assets/{gitApi-C6rhS4rG.js → gitApi-dAPSCbXA.js} +8 -8
- package/dist/assets/gitApiHttp-B1mApXwC.js +9 -0
- package/dist/assets/{gui-CFdPKvfq.js → gui-DN2sVP96.js} +1 -1
- package/dist/assets/{historyImportQueries-BrhVXQhP.js → historyImportQueries-DkB2_92i.js} +1 -1
- package/dist/assets/host-kMLXU0hK.js +1 -0
- package/dist/assets/i18n-BU14awhU.js +1 -0
- package/dist/assets/image-loading-DEXNCcCm.js +1 -0
- package/dist/assets/{input-B7-PmgcW.js → input-DYmLJuhI.js} +1 -1
- package/dist/assets/insertionBoundaries-CYfwgLf1.js +1 -0
- package/dist/assets/{ja-BfwjUNPc.js → ja-BI7m9bgW.js} +1 -1
- package/dist/assets/{ko-CZQZFkal.js → ko-B89SVFZa.js} +1 -1
- package/dist/assets/main-CaueNFt7.js +169 -0
- package/dist/assets/main-DrIci_pj.js +2 -0
- package/dist/assets/{markdownHeightCache-DlRC53XG.js → markdownHeightCache-D8yqNy2h.js} +1 -1
- package/dist/assets/mcpQueries-DO2TKARf.js +1 -0
- package/dist/assets/miniChat-BTI2ObZ2.js +2 -0
- package/dist/assets/mobile-Cf_sQtW6.js +2 -0
- package/dist/assets/mobile-html-network-CsjZ_Ur0.js +2 -0
- package/dist/assets/mobile-network-bridge-B_h92A-9.js +1 -0
- package/dist/assets/mobileBackNavigation-DxG3cz8q.js +1 -0
- package/dist/assets/mobileConnections-CK4dMDCg.js +2 -0
- package/dist/assets/modulepreload-polyfill-P2Xu9kJm.js +1 -0
- package/dist/assets/multirun-Cd2-PUEk.js +3 -0
- package/dist/assets/native-config-C_nB8tLu.js +1 -0
- package/dist/assets/pages-CYkE04ml.js +1 -0
- package/dist/assets/path-utils-jGozTg9d.js +1 -0
- package/dist/assets/pathNormalization-ewtPqJWn.js +1 -0
- package/dist/assets/{pl-B6C3vXqv.js → pl-B55Lf3HE.js} +1 -1
- package/dist/assets/platform-DMsFWy1a.js +1 -0
- package/dist/assets/projectMeta-apTlCt8d.js +1 -0
- package/dist/assets/{pt-BR-BUDTNopP.js → pt-BR-CFZj-ECy.js} +1 -1
- package/dist/assets/pwa-wwvKWKhX.js +2 -0
- package/dist/assets/queue-abort-optimistic-BnynR3mX.js +1 -0
- package/dist/assets/react-B-mb0CtR.js +1 -0
- package/dist/assets/readiness-0tATst8c.js +1 -0
- package/dist/assets/reasoning-projection-client-BEhVknv9.js +1 -0
- package/dist/assets/renderElectronMiniChatApp-xQdVdaLB.js +2 -0
- package/dist/assets/renderMobileApp-D95eHLRE.js +29 -0
- package/dist/assets/{runtime-auth-Bh3htXtG.js → runtime-auth-mjIpsk3N.js} +1 -1
- package/dist/assets/runtime-fetch-DKZOpfzo.js +1 -0
- package/dist/assets/runtime-file-download-DMY1k1af.js +1 -0
- package/dist/assets/runtime-file-resource-CL7EVzOG.js +2 -0
- package/dist/assets/runtime-switch-BMjl5Y5W.js +1 -0
- package/dist/assets/runtimeAPIRegistry-C2VogTny.js +1 -0
- package/dist/assets/runtimeConfig-BfzZj4LK.js +2 -0
- package/dist/assets/runtimeEndpointReset-CjKHwDvh.js +149 -0
- package/dist/assets/{scheduledTaskNavigation-C8tBjNoP.js → scheduledTaskNavigation-PH-etFzZ.js} +1 -1
- package/dist/assets/select-B9Km1pk9.js +1 -0
- package/dist/assets/sessionLookup-8gdDN8Tx.js +1 -0
- package/dist/assets/sortable-tabs-strip-BU0Puyy0.js +1 -0
- package/dist/assets/{speechSettingsQueries-CJqxaC2Q.js → speechSettingsQueries-C9LCquzH.js} +1 -1
- package/dist/assets/src-BFQde2OG.css +2 -0
- package/dist/assets/{store-Myt_Fv8d.js → store-BNNIbb4k.js} +3 -3
- package/dist/assets/terminalApi-BXKIVBPo.js +1 -0
- package/dist/assets/textarea-bB6aD-GS.js +1 -0
- package/dist/assets/{tooltip-D5Xeh6py.js → tooltip-DgWHbKz2.js} +1 -1
- package/dist/assets/{types-DXSnGXVb.js → types-CnJjf4tP.js} +1 -1
- package/dist/assets/{uk-Ct9y1Y2t.js → uk-CS2c4Dtj.js} +1 -1
- package/dist/assets/{useAppFontEffects-Blo2lGTo.js → useAppFontEffects-DJp1u2mc.js} +35 -35
- package/dist/assets/{useAssistantUIStore-CVSFSgJV.js → useAssistantUIStore-Du8puXWz.js} +1 -1
- package/dist/assets/useDesktopWindowControlsLayout-DOmb8EnW.js +1 -0
- package/dist/assets/useDictation-CyWtsxSn.js +1 -0
- package/dist/assets/useEffectiveDirectory-DmGrksdp.js +1 -0
- package/dist/assets/{useFontPreferences-DqBoLHp6.js → useFontPreferences-CAdw6cBK.js} +1 -1
- package/dist/assets/useMobileHtmlPreviewStore-C03uVLfX.js +1 -0
- package/dist/assets/useMobileNavigationStore-CJBLQxTz.js +17 -0
- package/dist/assets/usePluginsStore-El9Tx9Q3.js +1 -0
- package/dist/assets/useStreamingTextThrottle-BbUkYQhX.js +1 -0
- package/dist/assets/useUIStore-BF882_0b.js +1 -0
- package/dist/assets/useWorkerHighlightedLines-CZ8YG-Hi.js +7 -0
- package/dist/assets/{zh-CN-BegPizz4.js → zh-CN-BpiwUUs4.js} +1 -1
- package/dist/assets/{zh-TW-4xftqQQG.js → zh-TW-Bl9CnlGi.js} +1 -1
- package/dist/index.html +26 -21
- package/dist/mini-chat.html +26 -21
- package/dist/mobile.html +4 -32
- package/package.json +1 -1
- package/server/index.js +10 -0
- package/server/lib/gui-customization/DOCUMENTATION.md +2 -0
- package/server/lib/gui-customization/skill/SKILL.md +1 -1
- package/server/lib/gui-customization/skill/references/global-pages.md +19 -4
- package/server/lib/gui-customization/skill/references/gui-api.md +1 -1
- package/server/lib/gui-customization/skill/references/icons.md +35 -8
- package/server/lib/gui-network/DOCUMENTATION.md +123 -0
- package/server/lib/gui-network/native-ios.test.js +127 -0
- package/server/lib/gui-network/runtime.js +146 -0
- package/server/lib/gui-network/runtime.test.js +129 -0
- package/server/lib/preview/proxy-runtime.js +1 -1
- package/server/lib/preview/proxy-runtime.test.js +4 -0
- package/server/lib/relay/DOCUMENTATION.md +5 -0
- package/server/lib/relay/tunnel-host.js +2 -1
- package/server/lib/ui-auth/DOCUMENTATION.md +8 -0
- package/server/lib/ui-auth/ui-auth.js +6 -0
- package/server/lib/ui-auth/ui-auth.test.js +10 -0
- package/dist/assets/AssistantContactStatus-C5zpVdGa.js +0 -3
- package/dist/assets/AssistantUnreadBadge-7KpCtnd3.js +0 -1
- package/dist/assets/AssistantView-BZU6TlwK.js +0 -1
- package/dist/assets/DiagramView-CXgsVJ3A.js +0 -1
- package/dist/assets/GuiPluginSurface-Bk01hnV6.js +0 -1
- package/dist/assets/GuiPluginWindow-BgOCEgEb.js +0 -1
- package/dist/assets/ImageLoadingPlaceholder-MfVzv_y1.js +0 -1
- package/dist/assets/LoadingImage-MAgXscGl.js +0 -1
- package/dist/assets/MarkdownRenderer-DswMDaKf.js +0 -2
- package/dist/assets/MarkstreamRendererImpl-Bqbq2VPn.js +0 -3
- package/dist/assets/MobileDetailNavigation-CXcMdlRH.js +0 -1
- package/dist/assets/MobileResizableSheet-D_PnyzR0.js +0 -1
- package/dist/assets/MobileShareBridge-DfgyncNh.js +0 -4
- package/dist/assets/MobileTabPageHeader-Bm8nYrzH.js +0 -2
- package/dist/assets/MultiRunWindow-CvCgKiyV.js +0 -1
- package/dist/assets/OnboardingScreen-BwJ3iMGY.js +0 -1
- package/dist/assets/SettingsView-DGduWj3I.js +0 -29
- package/dist/assets/SettingsWindow-BM8abllV.js +0 -1
- package/dist/assets/SetupTourDialog-vmNGHNXl.js +0 -1
- package/dist/assets/TerminalView-BZObkK0H.js +0 -8
- package/dist/assets/ToolOutputDialog-CbGuK5bP.css +0 -1
- package/dist/assets/ToolOutputDialog-D_CH2A0-.js +0 -10
- package/dist/assets/VoiceSettings-Ru8tm8eq.js +0 -2
- package/dist/assets/YuriLogo-C5K_9jSK.js +0 -1
- package/dist/assets/YuriWordmark-CJ8qJ14A.js +0 -1
- package/dist/assets/appThemeRegistry-CcdIpK3S.js +0 -1
- package/dist/assets/bootstrap-BzeQds0D.js +0 -9
- package/dist/assets/desktop-Brp3xDpd.js +0 -1
- package/dist/assets/desktopHosts-qQ2Rz26_.js +0 -1
- package/dist/assets/desktopRelayRestore-DifJHAur.js +0 -1
- package/dist/assets/device-Db_TcRdX.js +0 -2
- package/dist/assets/dialog-CgtwKUKd.js +0 -1
- package/dist/assets/fileReferenceActions-D06_lyuL.js +0 -1
- package/dist/assets/host-8TDDnZXo.js +0 -1
- package/dist/assets/image-loading-D1DfK_bJ.js +0 -1
- package/dist/assets/insertionBoundaries-B-ncem5c.js +0 -1
- package/dist/assets/main-BMvwUUi4.js +0 -2
- package/dist/assets/main-Chq1F31E.js +0 -169
- package/dist/assets/mcpQueries-BRFr-Gfm.js +0 -1
- package/dist/assets/miniChat-C3vDY9WG.js +0 -2
- package/dist/assets/mobile-B2KYTY1c.js +0 -2
- package/dist/assets/mobileBackNavigation-ByUDCJde.js +0 -1
- package/dist/assets/multirun-F1yOJb2_.js +0 -3
- package/dist/assets/native-config-C2j59qnN.js +0 -1
- package/dist/assets/path-utils-HRmerlyU.js +0 -1
- package/dist/assets/platform-Dids8J9D.js +0 -1
- package/dist/assets/projectMeta-C08trpZE.js +0 -1
- package/dist/assets/pwa-C956NPB0.js +0 -2
- package/dist/assets/queue-abort-optimistic-CWyeG_sJ.js +0 -1
- package/dist/assets/react-a6PrrNTm.js +0 -1
- package/dist/assets/readiness-CUPPcONt.js +0 -1
- package/dist/assets/renderElectronMiniChatApp-DNK4YFG8.js +0 -2
- package/dist/assets/renderMobileApp-DagPx3n0.js +0 -28
- package/dist/assets/runtime-fetch-9B8F_rKW.js +0 -1
- package/dist/assets/runtime-file-download-D4WGSMk-.js +0 -1
- package/dist/assets/runtime-file-resource-tDTBpJT_.js +0 -2
- package/dist/assets/runtime-switch-ibQIZnws.js +0 -1
- package/dist/assets/runtimeConfig-D_McrwNd.js +0 -2
- package/dist/assets/runtimeEndpointReset-D-aHzKPN.js +0 -149
- package/dist/assets/select-DoYUmvbX.js +0 -1
- package/dist/assets/sessionLookup-D2JIMvDo.js +0 -1
- package/dist/assets/sortable-tabs-strip-B-W7ADKC.js +0 -1
- package/dist/assets/src-CzDk_0Pp.css +0 -2
- package/dist/assets/terminalApi-BXf0a2VZ.js +0 -1
- package/dist/assets/textarea-BCTNmuPZ.js +0 -1
- package/dist/assets/url-DO6Zrx1P.js +0 -1
- package/dist/assets/useDesktopWindowControlsLayout-YAxhtSDl.js +0 -1
- package/dist/assets/useDictation-Dp2Y3X49.js +0 -1
- package/dist/assets/useEffectiveDirectory-Uc8I6wXt.js +0 -1
- package/dist/assets/useMobileNavigationStore-SCjA_7jP.js +0 -17
- package/dist/assets/usePluginsStore-DfksbEZx.js +0 -1
- package/dist/assets/useStreamingTextThrottle-BY1Ynoj1.js +0 -1
- package/dist/assets/useUIStore-BsCfUWQw.js +0 -1
- package/dist/assets/useWorkerHighlightedLines-DAxMD3fK.js +0 -7
|
@@ -0,0 +1,127 @@
|
|
|
1
|
+
import { expect, test, vi } from 'vitest';
|
|
2
|
+
import { execFile } from 'node:child_process';
|
|
3
|
+
import { promisify } from 'node:util';
|
|
4
|
+
import { cp, mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises';
|
|
5
|
+
import { tmpdir } from 'node:os';
|
|
6
|
+
import { dirname, join, resolve } from 'node:path';
|
|
7
|
+
import { fileURLToPath } from 'node:url';
|
|
8
|
+
import crypto from 'node:crypto';
|
|
9
|
+
import http from 'node:http';
|
|
10
|
+
import net from 'node:net';
|
|
11
|
+
import { once } from 'node:events';
|
|
12
|
+
import express from 'express';
|
|
13
|
+
import { createProxyMiddleware, responseInterceptor } from 'http-proxy-middleware';
|
|
14
|
+
import { WebSocketServer } from 'ws';
|
|
15
|
+
import { createPrivateRelayServer } from '../../../../relay-server/src/index.js';
|
|
16
|
+
import { startRelayHost } from '../relay/host-client.js';
|
|
17
|
+
import { generateEcdhKeyPair, exportPublicKeyJwk } from '../relay/e2ee.js';
|
|
18
|
+
import { createUiAuth } from '../ui-auth/ui-auth.js';
|
|
19
|
+
import { createRequestSecurityRuntime } from '../security/request-security.js';
|
|
20
|
+
import { attachGuiNetwork } from './runtime.js';
|
|
21
|
+
import { createPreviewProxyRuntime } from '../preview/proxy-runtime.js';
|
|
22
|
+
|
|
23
|
+
const exec = promisify(execFile);
|
|
24
|
+
const device = process.env.YURI_IOS_TEST_DEVICE;
|
|
25
|
+
const products = process.env.YURI_IOS_TEST_PRODUCTS;
|
|
26
|
+
const cases = ['localhost', '127.0.0.1', '[::1]'].flatMap(targetHost => [
|
|
27
|
+
{ targetHost, prewarm: false, preview: false }, { targetHost, prewarm: true, preview: false },
|
|
28
|
+
{ targetHost, prewarm: true, preview: true },
|
|
29
|
+
]);
|
|
30
|
+
for (const { targetHost, prewarm, preview } of cases) {
|
|
31
|
+
test.skipIf(process.platform !== 'darwin' || !device || !products)(`real WKWebView routes ${targetHost} (prewarm=${prewarm}, preview=${preview}) through encrypted Relay and fails closed`, async () => {
|
|
32
|
+
const root = resolve(dirname(fileURLToPath(import.meta.url)), '../../../../..');
|
|
33
|
+
const work = await mkdtemp(join(tmpdir(), 'yuri-gui-network-'));
|
|
34
|
+
const app = join(work, 'GuiNetworkProbe.app');
|
|
35
|
+
const bundle = 'com.yuri.gui-network-regression';
|
|
36
|
+
const simctl = (...args) => exec('xcrun', ['simctl', ...args], { encoding: 'utf8', timeout: 100000, maxBuffer: 4 * 1024 * 1024 });
|
|
37
|
+
const relay = createPrivateRelayServer();
|
|
38
|
+
const requests = [];
|
|
39
|
+
const hostSockets = new Set();
|
|
40
|
+
const connect = net.Socket.prototype.connect;
|
|
41
|
+
const trackedConnect = vi.spyOn(net.Socket.prototype, 'connect').mockImplementation(function (...args) {
|
|
42
|
+
this.once('connect', () => {
|
|
43
|
+
const port = this.localPort;
|
|
44
|
+
hostSockets.add(port);
|
|
45
|
+
this.once('close', () => hostSockets.delete(port));
|
|
46
|
+
});
|
|
47
|
+
return connect.apply(this, args);
|
|
48
|
+
});
|
|
49
|
+
const origin = http.createServer(async (req, res) => {
|
|
50
|
+
requests.push({ path: req.url, relayed: hostSockets.has(req.socket.remotePort) });
|
|
51
|
+
res.setHeader('Access-Control-Allow-Origin', '*');
|
|
52
|
+
res.setHeader('Cache-Control', 'no-store');
|
|
53
|
+
if (req.url === '/disconnect') { res.end('bye'); setTimeout(() => host.stop(), 25); return; }
|
|
54
|
+
if (req.url === '/upload') { let bytes = 0; for await (const chunk of req) bytes += chunk.length; res.end(String(bytes)); return; }
|
|
55
|
+
res.setHeader('Content-Type', 'text/plain');
|
|
56
|
+
if (req.url === '/frame') { res.setHeader('Content-Type', 'text/html'); res.end(`<head></head><iframe src="/nested"></iframe><script>onmessage=e=>{if(e.data==='nested-pass')parent.postMessage(e.data,'*')}</script>`); }
|
|
57
|
+
else if (req.url === '/nested') { res.setHeader('Content-Type', 'text/html'); res.end(`<head></head><script src="/dynamic.js"></script>`); }
|
|
58
|
+
else if (req.url === '/dynamic.js') { res.setHeader('Content-Type', 'text/javascript'); res.end(`fetch('/resource').then(r=>r.text()).then(x=>parent.postMessage(x,'*'))`); }
|
|
59
|
+
else res.end('nested-pass');
|
|
60
|
+
});
|
|
61
|
+
const echoes = new WebSocketServer({ server: origin });
|
|
62
|
+
origin.on('upgrade', req => requests.push({ path: req.url, relayed: hostSockets.has(req.socket.remotePort) }));
|
|
63
|
+
echoes.on('connection', socket => socket.on('message', data => socket.send(data.toString())));
|
|
64
|
+
const pairedClient = { id: 'probe', authMethod: 'pairing', pairingId: 'probe-pairing', usesRelay: true };
|
|
65
|
+
const auth = createUiAuth({ requireClientAuth: true, clientAuthController: { listClients: async () => [pairedClient], authenticateBearerToken: async token => token === 'probe-client'
|
|
66
|
+
? { ok: true, clientId: 'probe', sessionToken: 'client:probe', client: pairedClient } : { ok: false } } });
|
|
67
|
+
const api = express(); api.post('/auth/url-token', auth.handleUrlAuthToken); api.use(auth.requireAuth);
|
|
68
|
+
const server = http.createServer(api);
|
|
69
|
+
const security = createRequestSecurityRuntime({ readSettingsFromDiskMigrated: async () => ({}) });
|
|
70
|
+
const network = attachGuiNetwork({ server, uiAuthController: auth, isRequestOriginAllowed: security.isRequestOriginAllowed });
|
|
71
|
+
if (preview) createPreviewProxyRuntime({ crypto, URL, createProxyMiddleware, responseInterceptor }).attach(api, {
|
|
72
|
+
server, express, uiAuthController: auth, isRequestOriginAllowed: security.isRequestOriginAllowed,
|
|
73
|
+
rejectWebSocketUpgrade: (socket, status) => socket.end(`HTTP/1.1 ${status} Rejected\r\n\r\n`),
|
|
74
|
+
});
|
|
75
|
+
let host;
|
|
76
|
+
try {
|
|
77
|
+
await relay.start();
|
|
78
|
+
server.listen(0, '127.0.0.1'); await once(server, 'listening');
|
|
79
|
+
origin.listen(0, targetHost === '[::1]' ? '::1' : '127.0.0.1'); await once(origin, 'listening');
|
|
80
|
+
const enc = await generateEcdhKeyPair();
|
|
81
|
+
const sign = crypto.generateKeyPairSync('ec', { namedCurve: 'P-256' });
|
|
82
|
+
const pub = sign.publicKey.export({ format: 'jwk' });
|
|
83
|
+
const canonical = JSON.stringify({ crv: pub.crv, kty: pub.kty, x: pub.x, y: pub.y });
|
|
84
|
+
const serverId = crypto.createHash('sha256').update(canonical).digest('base64url');
|
|
85
|
+
const hostEncPubJwk = await exportPublicKeyJwk(enc.publicKey);
|
|
86
|
+
const identity = { serverId, hostEncPubJwk, hostEncPrivateKey: enc.privateKey, signRelayAuth: (role, connectionId) => {
|
|
87
|
+
const ts = Date.now();
|
|
88
|
+
return { ts, pk: Buffer.from(canonical).toString('base64url'), sig: crypto.sign('SHA256', Buffer.from(`${ts}.${serverId}.${role}.${connectionId ?? ''}`), { key: sign.privateKey, dsaEncoding: 'ieee-p1363' }).toString('base64url') };
|
|
89
|
+
} };
|
|
90
|
+
host = startRelayHost({ relayUrl: relay.wsUrl, identity, authorizeRequest: auth.authorizeRelayRequest, getLocalPort: () => server.address().port, onStatus() {}, logger: { warn() {}, info() {} } });
|
|
91
|
+
await mkdir(join(app, 'Frameworks'), { recursive: true });
|
|
92
|
+
for (const [directory, name] of [['Capacitor', 'Capacitor'], ['CapacitorCordova', 'Cordova']]) {
|
|
93
|
+
await cp(join(products, directory, `${name}.framework`), join(app, 'Frameworks', `${name}.framework`), { recursive: true });
|
|
94
|
+
}
|
|
95
|
+
const sdk = (await exec('xcrun', ['--sdk', 'iphonesimulator', '--show-sdk-path'])).stdout.trim();
|
|
96
|
+
await exec('xcrun', ['--sdk', 'iphonesimulator', 'swiftc', '-sdk', sdk, '-target', 'arm64-apple-ios17.0-simulator',
|
|
97
|
+
'-F', join(app, 'Frameworks'), '-framework', 'Capacitor', '-framework', 'Cordova', '-Xlinker', '-rpath', '-Xlinker', '@executable_path/Frameworks',
|
|
98
|
+
join(root, 'packages/mobile/ios/App/App/YuriGuiNetworkPlugin.swift'), join(root, 'packages/mobile/test/gui-network-ios-probe.swift'), '-o', join(app, 'GuiNetworkProbe')]);
|
|
99
|
+
await mkdir(join(app, 'public'));
|
|
100
|
+
await exec('bun', [join(root, 'packages/mobile/test/gui-network-probe-build.mjs'), join(app, 'public')]);
|
|
101
|
+
const config = { relayUrl: relay.wsUrl, serverId, hostEncPubJwk, target: `http://${targetHost}:${origin.address().port}`, prewarm, preview };
|
|
102
|
+
await writeFile(join(app, 'public/index.html'), `<!doctype html><html><body><script>window.guiProbe=${JSON.stringify(config)}</script><script type="module" src="probe.js"></script></body></html>`);
|
|
103
|
+
await writeFile(join(app, 'capacitor.config.json'), JSON.stringify({ appId: bundle, appName: 'GUI network probe', webDir: 'public', packageClassList: [] }));
|
|
104
|
+
await writeFile(join(app, 'config.xml'), `<widget id="${bundle}" version="1.0.0"/>`);
|
|
105
|
+
await writeFile(join(app, 'Info.plist'), `<?xml version="1.0"?><plist version="1.0"><dict><key>CFBundleIdentifier</key><string>${bundle}</string><key>CFBundleExecutable</key><string>GuiNetworkProbe</string><key>CFBundlePackageType</key><string>APPL</string><key>CFBundleVersion</key><string>1</string><key>UILaunchScreen</key><dict/><key>NSAppTransportSecurity</key><dict><key>NSAllowsArbitraryLoads</key><true/></dict></dict></plist>`);
|
|
106
|
+
await simctl('install', device, app);
|
|
107
|
+
let output;
|
|
108
|
+
try { output = (await simctl('launch', '--console', device, bundle)).stdout; }
|
|
109
|
+
catch (error) { throw new Error(`probe failed: ${(error.stdout ?? '').split('\n').filter(line => line.includes('GUI_NETWORK_PROBE')).join('\n')}\n${error.stderr ?? ''}`); }
|
|
110
|
+
const stages = output.split('\n').filter(line => line.includes('GUI_NETWORK_PROBE'));
|
|
111
|
+
console.log(stages.join('\n'));
|
|
112
|
+
expect.soft(requests.filter(request => !['/prewarm', '/after-release'].includes(request.path)), 'every active-lease request must originate at the Host TCP gateway').not.toEqual(expect.arrayContaining([expect.objectContaining({ relayed: false })]));
|
|
113
|
+
expect(stages).toContain('GUI_NETWORK_PROBE PASSED');
|
|
114
|
+
expect(requests.map(request => request.path)).toEqual(expect.arrayContaining(['/upload', '/echo', '/frame', '/nested', '/dynamic.js', '/resource']));
|
|
115
|
+
expect(requests.map(request => request.path)).not.toContain('/after-disconnect');
|
|
116
|
+
expect(requests).toContainEqual({ path: '/after-release', relayed: false });
|
|
117
|
+
} finally {
|
|
118
|
+
try { await simctl('uninstall', device, bundle); } catch { /* The probe may not have installed. */ }
|
|
119
|
+
network.stop(); host?.stop(); await relay.stop(); auth.dispose();
|
|
120
|
+
for (const client of echoes.clients) client.terminate(); echoes.close();
|
|
121
|
+
server.closeAllConnections(); origin.closeAllConnections();
|
|
122
|
+
await Promise.all([new Promise(resolve => server.close(resolve)), new Promise(resolve => origin.close(resolve))]);
|
|
123
|
+
trackedConnect.mockRestore();
|
|
124
|
+
await rm(work, { recursive: true, force: true });
|
|
125
|
+
}
|
|
126
|
+
}, 180000);
|
|
127
|
+
}
|
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
import net from 'node:net';
|
|
2
|
+
import { WebSocketServer } from 'ws';
|
|
3
|
+
|
|
4
|
+
const PATH = '/api/gui-network/ws';
|
|
5
|
+
const CHUNK = 16 * 1024;
|
|
6
|
+
const WINDOW = 128 * 1024;
|
|
7
|
+
const MAX_STREAMS = 32;
|
|
8
|
+
|
|
9
|
+
// One authenticated socket owns the whole proxy lifetime. Website bytes are opaque:
|
|
10
|
+
// TLS and website credentials remain browser-owned, never Yuri-authenticated upstream.
|
|
11
|
+
export function attachGuiNetwork({ server, uiAuthController, isRequestOriginAllowed, isClientActive = async () => true }) {
|
|
12
|
+
const wss = new WebSocketServer({ noServer: true, maxPayload: CHUNK + 4, perMessageDeflate: false });
|
|
13
|
+
const reject = (socket, status) => socket.end(`HTTP/1.1 ${status} Rejected\r\nConnection: close\r\nContent-Length: 0\r\n\r\n`);
|
|
14
|
+
let stopped = false;
|
|
15
|
+
wss.on('connection', (ws, auth) => {
|
|
16
|
+
const streams = new Map();
|
|
17
|
+
let closed = false;
|
|
18
|
+
let lastSeen = Date.now();
|
|
19
|
+
const send = (value) => {
|
|
20
|
+
if (closed || ws.readyState !== 1) return;
|
|
21
|
+
if (ws.bufferedAmount > MAX_STREAMS * WINDOW) { ws.close(1009, 'backpressure'); return; }
|
|
22
|
+
ws.send(Buffer.isBuffer(value) ? value : JSON.stringify(value));
|
|
23
|
+
};
|
|
24
|
+
const closeStream = (id, notify = true) => {
|
|
25
|
+
const stream = streams.get(id);
|
|
26
|
+
if (!stream) return;
|
|
27
|
+
streams.delete(id);
|
|
28
|
+
clearTimeout(stream.timeout);
|
|
29
|
+
stream.socket.destroy();
|
|
30
|
+
if (notify) send({ type: 'close', id });
|
|
31
|
+
};
|
|
32
|
+
const cleanup = () => {
|
|
33
|
+
if (closed) return;
|
|
34
|
+
closed = true;
|
|
35
|
+
clearInterval(timer);
|
|
36
|
+
for (const id of streams.keys()) closeStream(id, false);
|
|
37
|
+
};
|
|
38
|
+
const invalid = () => { ws.close(1008, 'invalid_message'); cleanup(); };
|
|
39
|
+
const pump = (stream) => {
|
|
40
|
+
if (!stream.connected || streams.get(stream.id) !== stream) return;
|
|
41
|
+
while (stream.credit > 0) {
|
|
42
|
+
const available = Math.min(stream.socket.readableLength, CHUNK, stream.credit);
|
|
43
|
+
if (!available) break;
|
|
44
|
+
const bytes = stream.socket.read(available);
|
|
45
|
+
if (!bytes) break;
|
|
46
|
+
stream.credit -= bytes.length;
|
|
47
|
+
const frame = Buffer.allocUnsafe(bytes.length + 4);
|
|
48
|
+
frame.writeUInt32BE(stream.id);
|
|
49
|
+
bytes.copy(frame, 4);
|
|
50
|
+
send(frame);
|
|
51
|
+
}
|
|
52
|
+
};
|
|
53
|
+
ws.on('message', (bytes, binary) => {
|
|
54
|
+
lastSeen = Date.now();
|
|
55
|
+
if (closed) return;
|
|
56
|
+
if (binary) {
|
|
57
|
+
if (bytes.length <= 4 || bytes.length > CHUNK + 4) return invalid();
|
|
58
|
+
const id = bytes.readUInt32BE(0);
|
|
59
|
+
const stream = streams.get(id);
|
|
60
|
+
if (!stream) return;
|
|
61
|
+
const length = bytes.length - 4;
|
|
62
|
+
if (!stream.connected || stream.fin || stream.pending + length > WINDOW) return invalid();
|
|
63
|
+
stream.pending += length;
|
|
64
|
+
stream.socket.write(bytes.subarray(4), () => {
|
|
65
|
+
stream.pending -= length;
|
|
66
|
+
if (streams.get(id) === stream) send({ type: 'credit', id, bytes: length });
|
|
67
|
+
});
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
let message;
|
|
71
|
+
try { message = JSON.parse(bytes.toString()); } catch { return invalid(); }
|
|
72
|
+
if (!message || typeof message !== 'object') return invalid();
|
|
73
|
+
if (message.type === 'ping') { send({ type: 'pong' }); return; }
|
|
74
|
+
const { id } = message;
|
|
75
|
+
if (!Number.isInteger(id) || id <= 0 || id > 0xffffffff) return invalid();
|
|
76
|
+
if (message.type === 'open') {
|
|
77
|
+
const { hostname, port } = message;
|
|
78
|
+
if (streams.has(id) || streams.size >= MAX_STREAMS || typeof hostname !== 'string'
|
|
79
|
+
|| !hostname.length || hostname.length > 253 || /[\s/\\@\0]/.test(hostname)
|
|
80
|
+
|| !Number.isInteger(port) || port < 1 || port > 65535) return invalid();
|
|
81
|
+
const socket = new net.Socket({ allowHalfOpen: true });
|
|
82
|
+
const stream = { id, socket, connected: false, fin: false, pending: 0, credit: WINDOW,
|
|
83
|
+
timeout: setTimeout(() => closeStream(id), 15_000) };
|
|
84
|
+
streams.set(id, stream);
|
|
85
|
+
socket.setNoDelay(true);
|
|
86
|
+
socket.setTimeout(120_000, () => closeStream(id));
|
|
87
|
+
socket.on('error', () => closeStream(id));
|
|
88
|
+
socket.on('close', () => closeStream(id));
|
|
89
|
+
socket.on('readable', () => pump(stream));
|
|
90
|
+
socket.on('end', () => send({ type: 'fin', id }));
|
|
91
|
+
socket.connect({ host: hostname, port }, () => {
|
|
92
|
+
if (streams.get(id) !== stream) return socket.destroy();
|
|
93
|
+
clearTimeout(stream.timeout);
|
|
94
|
+
stream.connected = true;
|
|
95
|
+
send({ type: 'opened', id, credit: WINDOW });
|
|
96
|
+
pump(stream);
|
|
97
|
+
});
|
|
98
|
+
return;
|
|
99
|
+
}
|
|
100
|
+
const stream = streams.get(id);
|
|
101
|
+
if (!stream) return;
|
|
102
|
+
if (message.type === 'close') { closeStream(id, false); return; }
|
|
103
|
+
if (message.type === 'fin' && !stream.fin) { stream.fin = true; stream.socket.end(); return; }
|
|
104
|
+
if (message.type === 'credit' && Number.isInteger(message.bytes) && message.bytes > 0
|
|
105
|
+
&& stream.credit + message.bytes <= WINDOW) {
|
|
106
|
+
stream.credit += message.bytes;
|
|
107
|
+
pump(stream);
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
110
|
+
invalid();
|
|
111
|
+
});
|
|
112
|
+
const timer = setInterval(() => {
|
|
113
|
+
if (Date.now() - lastSeen > 60_000) { ws.terminate(); cleanup(); return; }
|
|
114
|
+
if (auth.type === 'client') void isClientActive(auth.clientId ?? auth.client?.id).then(active => {
|
|
115
|
+
if (!active) { ws.close(4001, 'authentication_required'); cleanup(); }
|
|
116
|
+
}).catch(() => { ws.terminate(); cleanup(); });
|
|
117
|
+
}, 20_000);
|
|
118
|
+
timer.unref?.();
|
|
119
|
+
ws.on('error', cleanup);
|
|
120
|
+
ws.on('close', cleanup);
|
|
121
|
+
const address = server.address();
|
|
122
|
+
send({ type: 'ready', version: 1, chunk: CHUNK, window: WINDOW, streams: MAX_STREAMS,
|
|
123
|
+
...(address && typeof address === 'object' ? { httpOrigin: `http://localhost:${address.port}` } : {}) });
|
|
124
|
+
});
|
|
125
|
+
const upgrade = (req, socket, head) => {
|
|
126
|
+
let path;
|
|
127
|
+
try { path = new URL(req.url, 'http://localhost').pathname; } catch { return; }
|
|
128
|
+
if (path !== PATH) return;
|
|
129
|
+
void (async () => {
|
|
130
|
+
try {
|
|
131
|
+
const auth = await uiAuthController.resolveAuthContext(req, null, { allowClientAuth: true, allowUrlToken: true });
|
|
132
|
+
if (!auth || (auth.type !== 'client' && !uiAuthController.enabled)) return reject(socket, 401);
|
|
133
|
+
if (!await isRequestOriginAllowed(req)) return reject(socket, 403);
|
|
134
|
+
if (stopped || wss.clients.size >= 8) return reject(socket, 503);
|
|
135
|
+
if (!socket.destroyed) wss.handleUpgrade(req, socket, head, ws => wss.emit('connection', ws, auth));
|
|
136
|
+
} catch { reject(socket, 401); }
|
|
137
|
+
})();
|
|
138
|
+
};
|
|
139
|
+
server.on('upgrade', upgrade);
|
|
140
|
+
return { stop() {
|
|
141
|
+
stopped = true;
|
|
142
|
+
server.off('upgrade', upgrade);
|
|
143
|
+
for (const ws of wss.clients) ws.terminate();
|
|
144
|
+
wss.close();
|
|
145
|
+
} };
|
|
146
|
+
}
|
|
@@ -0,0 +1,129 @@
|
|
|
1
|
+
import { afterEach, beforeEach, expect, it, vi } from 'vitest';
|
|
2
|
+
import express from 'express';
|
|
3
|
+
import http from 'node:http';
|
|
4
|
+
import net from 'node:net';
|
|
5
|
+
import { once } from 'node:events';
|
|
6
|
+
import * as fsPromises from 'node:fs/promises';
|
|
7
|
+
import os from 'node:os';
|
|
8
|
+
import path from 'node:path';
|
|
9
|
+
import crypto from 'node:crypto';
|
|
10
|
+
import { WebSocket } from 'ws';
|
|
11
|
+
import request from 'supertest';
|
|
12
|
+
import { createUiAuth } from '../ui-auth/ui-auth.js';
|
|
13
|
+
import { createRemoteClientAuthRuntime } from '../client-auth/remote-clients.js';
|
|
14
|
+
import { createRequestSecurityRuntime } from '../security/request-security.js';
|
|
15
|
+
import { createTunnelHost } from '../relay/tunnel-host.js';
|
|
16
|
+
import { decodeTunnelFrame, encodeJsonPayload, encodeTunnelFrame, TunnelFrameType } from '../relay/tunnel-codec.js';
|
|
17
|
+
import { attachGuiNetwork } from './runtime.js';
|
|
18
|
+
|
|
19
|
+
let root, auth, clients, client, server, port, runtime, token;
|
|
20
|
+
const sockets = new Set();
|
|
21
|
+
const destinations = new Set();
|
|
22
|
+
beforeEach(async () => {
|
|
23
|
+
root = await fsPromises.mkdtemp(path.join(os.tmpdir(), 'gui-network-'));
|
|
24
|
+
clients = createRemoteClientAuthRuntime({ fsPromises, path, crypto, storePath: path.join(root, 'clients.json') });
|
|
25
|
+
client = await clients.createClient({ label: 'GUI fixture', clientKind: 'mobile', authMethod: 'pairing', pairingId: 'gui-fixture', usesRelay: true });
|
|
26
|
+
auth = createUiAuth({ password: null, clientAuthController: clients, readSettingsFromDiskMigrated: async () => ({}) });
|
|
27
|
+
const security = createRequestSecurityRuntime({ readSettingsFromDiskMigrated: async () => ({}) });
|
|
28
|
+
const app = express();
|
|
29
|
+
app.post('/auth/url-token', auth.handleUrlAuthToken);
|
|
30
|
+
server = http.createServer(app);
|
|
31
|
+
runtime = attachGuiNetwork({ server, uiAuthController: auth, isRequestOriginAllowed: security.isRequestOriginAllowed });
|
|
32
|
+
server.listen(0, '127.0.0.1'); await once(server, 'listening'); port = server.address().port;
|
|
33
|
+
token = (await request(app).post('/auth/url-token').set('Authorization', `Bearer ${client.token}`)).body.token;
|
|
34
|
+
});
|
|
35
|
+
afterEach(async () => {
|
|
36
|
+
for (const socket of sockets) { if (socket.terminate) socket.terminate(); else socket.destroy(); }
|
|
37
|
+
sockets.clear();
|
|
38
|
+
runtime.stop(); auth.dispose();
|
|
39
|
+
await Promise.all([new Promise(resolve => server.close(resolve)), ...[...destinations].map(target => new Promise(resolve => target.close(resolve)))]);
|
|
40
|
+
destinations.clear();
|
|
41
|
+
await fsPromises.rm(root, { recursive: true, force: true });
|
|
42
|
+
});
|
|
43
|
+
function connect(query = `?yuri_url_token=${encodeURIComponent(token)}`, origin = `http://127.0.0.1:${port}`) {
|
|
44
|
+
const ws = new WebSocket(`ws://127.0.0.1:${port}/api/gui-network/ws${query}`, { headers: { Origin: origin } });
|
|
45
|
+
ws.on('error', () => {}); sockets.add(ws);
|
|
46
|
+
return ws;
|
|
47
|
+
}
|
|
48
|
+
async function denied(ws) {
|
|
49
|
+
return new Promise((resolve, reject) => {
|
|
50
|
+
ws.on('unexpected-response', (_req, res) => { res.resume(); ws.terminate(); resolve(res.statusCode); });
|
|
51
|
+
ws.on('open', () => reject(new Error('unexpected connection')));
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
async function target(handler) {
|
|
55
|
+
const destination = net.createServer({ allowHalfOpen: true }, socket => { sockets.add(socket); handler(socket); });
|
|
56
|
+
destinations.add(destination);
|
|
57
|
+
destination.listen(0, '127.0.0.1'); await once(destination, 'listening');
|
|
58
|
+
return destination.address().port;
|
|
59
|
+
}
|
|
60
|
+
const packet = (id, bytes) => {
|
|
61
|
+
const frame = Buffer.alloc(bytes.length + 4); frame.writeUInt32BE(id); bytes.copy(frame, 4); return frame;
|
|
62
|
+
};
|
|
63
|
+
|
|
64
|
+
it('rejects unauthenticated, forged-token and hostile-origin upgrades through real auth gates', async () => {
|
|
65
|
+
expect(await denied(connect(''))).toBe(401);
|
|
66
|
+
expect(await denied(connect(`?yuri_url_token=${client.token}`))).toBe(401);
|
|
67
|
+
expect(await denied(connect(undefined, 'https://untrusted.example'))).toBe(403);
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
it('relays opaque bytes bidirectionally, preserves half-close and closes remaining targets on disconnect', async () => {
|
|
71
|
+
const received = [];
|
|
72
|
+
let destination;
|
|
73
|
+
const targetPort = await target(socket => {
|
|
74
|
+
destination = socket;
|
|
75
|
+
socket.on('data', bytes => received.push(bytes));
|
|
76
|
+
socket.on('end', () => socket.end(Buffer.from('after-fin')));
|
|
77
|
+
});
|
|
78
|
+
const ws = connect();
|
|
79
|
+
const controls = [], data = [];
|
|
80
|
+
ws.on('message', (bytes, binary) => { if (binary) data.push(bytes); else controls.push(JSON.parse(bytes)); });
|
|
81
|
+
await once(ws, 'open');
|
|
82
|
+
await vi.waitFor(() => expect(controls).toContainEqual(expect.objectContaining({ type: 'ready', httpOrigin: `http://localhost:${port}` })));
|
|
83
|
+
ws.send(JSON.stringify({ type: 'open', id: 1, hostname: '127.0.0.1', port: targetPort }));
|
|
84
|
+
await vi.waitFor(() => expect(controls).toContainEqual({ type: 'opened', id: 1, credit: 131072 }));
|
|
85
|
+
const payload = crypto.randomBytes(16384);
|
|
86
|
+
ws.send(packet(1, payload));
|
|
87
|
+
ws.send(JSON.stringify({ type: 'fin', id: 1 }));
|
|
88
|
+
await vi.waitFor(() => expect(Buffer.concat(received)).toEqual(payload));
|
|
89
|
+
await vi.waitFor(() => expect(data.length).toBe(1));
|
|
90
|
+
expect(data[0].subarray(4).toString()).toBe('after-fin');
|
|
91
|
+
expect(data[0].readUInt32BE()).toBe(1);
|
|
92
|
+
expect(controls).toContainEqual({ type: 'credit', id: 1, bytes: payload.length });
|
|
93
|
+
ws.close(); await once(ws, 'close');
|
|
94
|
+
await vi.waitFor(() => expect(destination.destroyed).toBe(true));
|
|
95
|
+
});
|
|
96
|
+
|
|
97
|
+
it('bounds outbound bytes by credit until the native consumer acknowledges them', async () => {
|
|
98
|
+
const targetPort = await target(socket => socket.write(Buffer.alloc(256 * 1024, 7)));
|
|
99
|
+
const ws = connect(); const data = [];
|
|
100
|
+
ws.on('message', (bytes, binary) => { if (binary) data.push(bytes.subarray(4)); });
|
|
101
|
+
await once(ws, 'open');
|
|
102
|
+
ws.send(JSON.stringify({ type: 'open', id: 2, hostname: '127.0.0.1', port: targetPort }));
|
|
103
|
+
await vi.waitFor(() => expect(Buffer.concat(data).length).toBe(128 * 1024));
|
|
104
|
+
ws.send(JSON.stringify({ type: 'credit', id: 2, bytes: 128 * 1024 }));
|
|
105
|
+
await vi.waitFor(() => expect(Buffer.concat(data)).toEqual(Buffer.alloc(256 * 1024, 7)));
|
|
106
|
+
ws.send(JSON.stringify({ type: 'credit', id: 2, bytes: 128 * 1024 + 1 }));
|
|
107
|
+
expect((await once(ws, 'close'))[0]).toBe(1008);
|
|
108
|
+
});
|
|
109
|
+
|
|
110
|
+
it('uses the existing Relay dispatcher for TCP, with immediate data flush and unchanged website bytes', async () => {
|
|
111
|
+
const targetPort = await target(socket => socket.on('data', bytes => socket.write(bytes)));
|
|
112
|
+
const frames = [];
|
|
113
|
+
const host = createTunnelHost({ connectionId: 'gui-network', getLocalPort: () => port,
|
|
114
|
+
authorizeRequest: auth.authorizeRelayRequest,
|
|
115
|
+
sendFrame: (frame, immediate) => frames.push({ ...decodeTunnelFrame(frame), immediate }), getBufferedAmount: () => 0 });
|
|
116
|
+
const control = value => host.handleFrame(encodeTunnelFrame(TunnelFrameType.WsText, 2, Buffer.from(JSON.stringify(value))));
|
|
117
|
+
try {
|
|
118
|
+
await host.handleFrame(encodeTunnelFrame(TunnelFrameType.WsOpen, 2, encodeJsonPayload({ path: '/api/gui-network/ws', query: `yuri_url_token=${token}` })));
|
|
119
|
+
await vi.waitFor(() => expect(frames.some(frame => frame.frameType === TunnelFrameType.WsOpened)).toBe(true));
|
|
120
|
+
await control({ type: 'open', id: 3, hostname: '127.0.0.1', port: targetPort });
|
|
121
|
+
await vi.waitFor(() => expect(frames.filter(frame => frame.frameType === TunnelFrameType.WsText).map(frame => JSON.parse(Buffer.from(frame.payload)))).toContainEqual({ type: 'opened', id: 3, credit: 131072 }));
|
|
122
|
+
const payload = packet(3, crypto.randomBytes(8192));
|
|
123
|
+
await host.handleFrame(encodeTunnelFrame(TunnelFrameType.WsBinary, 2, payload));
|
|
124
|
+
await vi.waitFor(() => expect(frames.some(frame => frame.frameType === TunnelFrameType.WsBinary)).toBe(true));
|
|
125
|
+
const result = frames.find(frame => frame.frameType === TunnelFrameType.WsBinary);
|
|
126
|
+
expect(Buffer.from(result.payload)).toEqual(payload);
|
|
127
|
+
expect(result.immediate).toBe(true);
|
|
128
|
+
} finally { host.close(); }
|
|
129
|
+
});
|
|
@@ -1008,7 +1008,7 @@ export const normalizeProxyTargetUrl = (rawUrl, { allowExternal = false } = {})
|
|
|
1008
1008
|
|
|
1009
1009
|
// Normalize common loopback hostnames to IPv4 to avoid environments where
|
|
1010
1010
|
// `localhost` resolves to ::1 but the dev server only binds IPv4.
|
|
1011
|
-
if (LOOPBACK_HOSTS.has(hostname) && (hostname === '0.0.0.0' || hostname === 'localhost'
|
|
1011
|
+
if (LOOPBACK_HOSTS.has(hostname) && (hostname === '0.0.0.0' || hostname === 'localhost')) {
|
|
1012
1012
|
url.hostname = '127.0.0.1';
|
|
1013
1013
|
}
|
|
1014
1014
|
|
|
@@ -18,6 +18,10 @@ const rewrite = (bodyText, kind) => rewritePreviewBody({
|
|
|
18
18
|
targetOrigin: 'http://127.0.0.1:3000',
|
|
19
19
|
});
|
|
20
20
|
|
|
21
|
+
it('preserves an explicit IPv6 loopback service instead of dialing IPv4', () => {
|
|
22
|
+
expect(normalizeProxyTargetUrl('http://[::1]:3000/app')).toEqual({ ok: true, origin: 'http://[::1]:3000' });
|
|
23
|
+
});
|
|
24
|
+
|
|
21
25
|
describe('preview Inertia header passthrough', () => {
|
|
22
26
|
it('forwards Inertia request headers to the preview target', () => {
|
|
23
27
|
const forwarded = new Map();
|
|
@@ -58,6 +58,11 @@ Everything a client normally sends to the single Yuri origin:
|
|
|
58
58
|
- **Events** — relay `auto` uses SSE (bearer), the same path mobile uses. Desktop WebSocket upgrades over the tunnel close and drop assistant deltas; an explicit `ws` setting is unchanged.
|
|
59
59
|
- **SSE** — streamed responses opened through `runtimeFetch`, including `/api/yuri/events` and SDK global SSE. Relay carries these HTTP response body frames through the tunnel.
|
|
60
60
|
- **WebSocket** — the endpoints that use a real socket (the global event stream on platforms that support WS, terminal I/O, dictation, and Preview/Browser HMR under `/api/preview/proxy/<id>/...`).
|
|
61
|
+
- **Mobile GUI TCP egress** — `/api/gui-network/ws` carries bounded SOCKS TCP
|
|
62
|
+
streams to the authenticated Host. It uses a separate client connection to the
|
|
63
|
+
same paired Relay identity, with a native wire so the WebView proxy needs no
|
|
64
|
+
hostname bypass. E2EE and tunnel framing are unchanged; both senders immediately
|
|
65
|
+
flush this path. Scope, auth and native probe evidence: `../gui-network/DOCUMENTATION.md`.
|
|
61
66
|
|
|
62
67
|
The host dispatcher restricts tunneled traffic to explicit path allowlists (one for HTTP, one for WS). WS allowlist is exact-match for app sockets and **prefix** `/api/preview/proxy/` for Vite/dev-server HMR only (`isTunnelWsPathAllowed`).
|
|
63
68
|
|
|
@@ -33,6 +33,7 @@ const ALLOWED_WS_PATHS = new Set([
|
|
|
33
33
|
'/api/event/ws',
|
|
34
34
|
'/api/terminal/ws',
|
|
35
35
|
'/api/remote-desktop/ws',
|
|
36
|
+
'/api/gui-network/ws',
|
|
36
37
|
'/api/dictation/ws',
|
|
37
38
|
]);
|
|
38
39
|
|
|
@@ -402,7 +403,7 @@ export const createTunnelHost = ({
|
|
|
402
403
|
for (const frame of encodeFragmentedMessage(frameType, streamId, bytes)) {
|
|
403
404
|
await waitForBackpressure(null);
|
|
404
405
|
if (streams.get(streamId) !== stream || closed) return;
|
|
405
|
-
await send(frame, open.path === '/api/remote-desktop/ws');
|
|
406
|
+
await send(frame, open.path === '/api/remote-desktop/ws' || open.path === '/api/gui-network/ws');
|
|
406
407
|
}
|
|
407
408
|
});
|
|
408
409
|
});
|
|
@@ -27,6 +27,14 @@ Remote desktop uses the exact `/api/remote-desktop/ws` scoped URL-token path, mi
|
|
|
27
27
|
- `packages/web/server/lib/client-auth/pairing.js`: short-lived Pairing v2 sessions and one-time secret redemption into trusted-device client tokens.
|
|
28
28
|
|
|
29
29
|
## Public exports (ui-auth.js)
|
|
30
|
+
|
|
31
|
+
Browser URL auth also permits GET/HEAD/POST/PUT/PATCH/DELETE/OPTIONS beneath an
|
|
32
|
+
exact `/api/preview/proxy/<hex-id>/...` target. This lets framed websites submit
|
|
33
|
+
forms and fetch through the Host without Yuri bearer headers. The preview runtime
|
|
34
|
+
independently requires its short-lived target token and strips Yuri credentials
|
|
35
|
+
before forwarding. Target registration and arbitrary Yuri write routes still
|
|
36
|
+
reject URL tokens; filesystem URL access remains GET-only.
|
|
37
|
+
|
|
30
38
|
- `isUrlAuthWebSocketPath(pathname)`: true when a WebSocket upgrade may authenticate with `yuri_url_token` (exact terminal/dictation/event/realtime-proxy paths, plus prefix `/api/preview/proxy/` for Preview HMR). Keep in sync with tunnel-host `isTunnelWsPathAllowed`.
|
|
31
39
|
- `createUiAuth({ password, cookieName, sessionTtlMs, readSettingsFromDiskMigrated })`: creates UI auth controller with methods:
|
|
32
40
|
- `authorizeRelayRequest(req)`
|
|
@@ -320,6 +320,7 @@ export const isUrlAuthWebSocketPath = (pathname) => {
|
|
|
320
320
|
|| pathname === '/api/yuri/realtime-proxy/ws'
|
|
321
321
|
|| pathname === '/api/terminal/ws'
|
|
322
322
|
|| pathname === '/api/remote-desktop/ws'
|
|
323
|
+
|| pathname === '/api/gui-network/ws'
|
|
323
324
|
|| pathname === '/api/dictation/ws'
|
|
324
325
|
|| pathname.startsWith('/api/preview/proxy/');
|
|
325
326
|
};
|
|
@@ -330,6 +331,11 @@ const canUseUrlAuthTokenForRequest = (req) => {
|
|
|
330
331
|
if (isWebSocketUpgrade(req)) {
|
|
331
332
|
return isUrlAuthWebSocketPath(pathname);
|
|
332
333
|
}
|
|
334
|
+
// Browser-owned preview forms/fetch cannot attach Yuri headers. The proxy also
|
|
335
|
+
// requires its separate target token and strips both tokens before forwarding.
|
|
336
|
+
if (/^\/api\/preview\/proxy\/[a-f0-9]{16,64}(?:\/|$)/i.test(pathname)) {
|
|
337
|
+
return ['GET', 'HEAD', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'].includes(method);
|
|
338
|
+
}
|
|
333
339
|
return method === 'GET' && isUrlAuthReadableHttpPath(pathname);
|
|
334
340
|
};
|
|
335
341
|
|
|
@@ -334,6 +334,16 @@ describe('ui auth client credential seam', () => {
|
|
|
334
334
|
expect(arbitraryGetCalled).toBe(false);
|
|
335
335
|
expect(arbitraryGetRes.statusCode).toBe(401);
|
|
336
336
|
|
|
337
|
+
for (const method of ['GET', 'HEAD', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS']) {
|
|
338
|
+
const proxyPath = '/api/preview/proxy/1234567890abcdef/form';
|
|
339
|
+
const proxyReq = { method, path: proxyPath, url: `${proxyPath}?yuri_url_token=${encodeURIComponent(urlToken)}`, headers: {} };
|
|
340
|
+
let allowed = false;
|
|
341
|
+
await auth.requireAuth(proxyReq, createResponse(), () => { allowed = true; });
|
|
342
|
+
expect(allowed, `browser preview ${method}`).toBe(true);
|
|
343
|
+
}
|
|
344
|
+
const registerReq = { method: 'POST', path: '/api/preview/targets', url: `/api/preview/targets?yuri_url_token=${encodeURIComponent(urlToken)}`, headers: {} };
|
|
345
|
+
expect(await auth.ensureSessionToken(registerReq, createResponse())).toBe(null);
|
|
346
|
+
|
|
337
347
|
for (const method of ['POST', 'PUT', 'PATCH', 'DELETE']) {
|
|
338
348
|
const writeReq = { method, path: '/api/fs/raw', url: `/api/fs/raw?path=%2Ftmp%2Fimage.png&yuri_url_token=${encodeURIComponent(urlToken)}`, headers: { accept: 'application/json' } };
|
|
339
349
|
const writeRes = createResponse();
|