From 5943accc9fa7cf84bd2eb34b170eee8d2d2b0082 Mon Sep 17 00:00:00 2001 From: cohenerickson Date: Mon, 1 Jan 2024 11:56:26 -0600 Subject: [PATCH 1/2] bump UV --- package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 853b0d0..4265013 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "@fastify/compress": "^6.5.0", "@fastify/static": "^6.12.0", "@nebula-services/dynamic": "0.7.2-patch.1", - "@nebula-services/ultraviolet": "1.0.1-1.patch", + "@nebula-services/ultraviolet": "1.0.1-1.patch.5", "@tomphttp/bare-server-node": "^2.0.1", "classnames": "^2.3.2", "fastify": "^4.25.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b7e1be2..cb12d17 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,8 +15,8 @@ dependencies: specifier: 0.7.2-patch.1 version: 0.7.2-patch.1 '@nebula-services/ultraviolet': - specifier: 1.0.1-1.patch - version: 1.0.1-1.patch + specifier: 1.0.1-1.patch.5 + version: 1.0.1-1.patch.5 '@tomphttp/bare-server-node': specifier: ^2.0.1 version: 2.0.1 @@ -1017,8 +1017,8 @@ packages: - utf-8-validate dev: false - /@nebula-services/ultraviolet@1.0.1-1.patch: - resolution: {integrity: sha512-ZBD6stHsQW7oZm1Y5tiQLymknQfpUmPK0DjRKYzpEj7+Jx9FA4lylLR+P0UmOmKyKM0TdWAcjDGPER+DtLEzeg==} + /@nebula-services/ultraviolet@1.0.1-1.patch.5: + resolution: {integrity: sha512-EDwbh+AXPg+JxPcPhRHJh6crLh1AHSodcAgfO47ug4paoLkWXE0ELU5Tm0Um38kguTBHzTOPFSzNULpaFbhFLw==} dependencies: '@tomphttp/bare-client': 1.1.2-beta.3 crypto-js: 4.2.0 @@ -5769,7 +5769,7 @@ packages: engines: {node: '>=10'} '@github.com/holy-unblocker/rammerhead/releases/download/v1.2.41-holy.5/rammerhead-1.2.41-holy.5.tgz': - resolution: {tarball: https://github.com/holy-unblocker/rammerhead/releases/download/v1.2.41-holy.5/rammerhead-1.2.41-holy.5.tgz} + resolution: {registry: https://registry.npmjs.org/, tarball: https://github.com/holy-unblocker/rammerhead/releases/download/v1.2.41-holy.5/rammerhead-1.2.41-holy.5.tgz} name: rammerhead version: 1.2.41-holy.5 dependencies: From 89229d95e5e1433d8122b3dc2dc307d84e215897 Mon Sep 17 00:00:00 2001 From: rift <117926989+Riftriot@users.noreply.github.com> Date: Mon, 1 Jan 2024 13:21:48 -0600 Subject: [PATCH 2/2] AES encryption for dynamic --- package.json | 2 +- pnpm-lock.yaml | 11 ++++++----- public/dynamic/dynamic.config.js | 2 +- src/pages/ProxyFrame.tsx | 8 ++++++-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 4265013..ad78bab 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "dependencies": { "@fastify/compress": "^6.5.0", "@fastify/static": "^6.12.0", - "@nebula-services/dynamic": "0.7.2-patch.1", + "@nebula-services/dynamic": "0.7.2-patch.2", "@nebula-services/ultraviolet": "1.0.1-1.patch.5", "@tomphttp/bare-server-node": "^2.0.1", "classnames": "^2.3.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cb12d17..1bfe076 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ dependencies: specifier: ^6.12.0 version: 6.12.0 '@nebula-services/dynamic': - specifier: 0.7.2-patch.1 - version: 0.7.2-patch.1 + specifier: 0.7.2-patch.2 + version: 0.7.2-patch.2 '@nebula-services/ultraviolet': specifier: 1.0.1-1.patch.5 version: 1.0.1-1.patch.5 @@ -989,8 +989,8 @@ packages: resolution: {integrity: sha512-n3/+wko8WFd/fbiPCOuBB6HfKL6hTcygFEZ/MpmvpMRbgDSdlNMopDFGjsoTYqCbzTVTX9TL/StXco4yx2v58Q==} dev: true - /@nebula-services/dynamic@0.7.2-patch.1: - resolution: {integrity: sha512-hN40+RQ1LoxOJos2x891y9/0fumbTTrsbVY/84028tar/c2WSv4YueyD9ZGDLQjsiGiO0vdlByB04ExSxmzJvg==} + /@nebula-services/dynamic@0.7.2-patch.2: + resolution: {integrity: sha512-0g1ygwVNS0dmT38NIeZYc2Z5HiZKHT3tP7ZagIeWC/VlcZjINIPR4ThNndWVaGiZey2Y2JS2807ABb41OSYTrw==} dependencies: '@dynamic-pkg/mime': 1.0.1 '@dynamic-pkg/mutation': 1.0.0 @@ -1002,6 +1002,7 @@ packages: astring: 1.8.6 chalk: 5.3.0 cookie: 0.5.0 + crypto-js: 4.2.0 domhandler: 5.0.3 esbuild: 0.19.10 fastify: 4.25.1 @@ -5769,7 +5770,7 @@ packages: engines: {node: '>=10'} '@github.com/holy-unblocker/rammerhead/releases/download/v1.2.41-holy.5/rammerhead-1.2.41-holy.5.tgz': - resolution: {registry: https://registry.npmjs.org/, tarball: https://github.com/holy-unblocker/rammerhead/releases/download/v1.2.41-holy.5/rammerhead-1.2.41-holy.5.tgz} + resolution: {tarball: https://github.com/holy-unblocker/rammerhead/releases/download/v1.2.41-holy.5/rammerhead-1.2.41-holy.5.tgz} name: rammerhead version: 1.2.41-holy.5 dependencies: diff --git a/public/dynamic/dynamic.config.js b/public/dynamic/dynamic.config.js index 3f0b974..477e10d 100644 --- a/public/dynamic/dynamic.config.js +++ b/public/dynamic/dynamic.config.js @@ -2,7 +2,7 @@ self.__dynamic$config = { prefix: '/~/dynamic/', - encoding: 'plain', + encoding: 'aes', mode: 'production', logLevel: 0, bare: { diff --git a/src/pages/ProxyFrame.tsx b/src/pages/ProxyFrame.tsx index 8279f8e..8eb429a 100644 --- a/src/pages/ProxyFrame.tsx +++ b/src/pages/ProxyFrame.tsx @@ -47,7 +47,9 @@ export function ProxyFrame(props: { url: string }) { window.__uv$config.encodeUrl(decodedUrl); } else if (localProxy === "dynamic") { result = - window.__dynamic$config.prefix + encodeURIComponent(decodedUrl); + window.__dynamic$config.prefix + + "route?url=" + + encodeURIComponent(decodedUrl); } else { // automatic. use SiteSupport.json to determine proxy support const matchingKey = Object.keys(SiteSupport).find((key) => @@ -60,7 +62,9 @@ export function ProxyFrame(props: { url: string }) { window.__uv$config.encodeUrl(decodedUrl); } else if (SiteSupport[matchingKey] === "dynamic") { result = - window.__dynamic$config.prefix + encodeURIComponent(decodedUrl); + window.__dynamic$config.prefix + + "route?url=" + + encodeURIComponent(decodedUrl); } else if (SiteSupport[matchingKey] === "rammerhead") { result = await RammerheadEncode(decodedUrl); } else {