From e967d9ed452737e274f06c92d6193ff529258251 Mon Sep 17 00:00:00 2001 From: Ben Allfree Date: Sun, 10 Nov 2024 18:51:54 -0800 Subject: [PATCH] chore: remove SaaSDomain support --- packages/pockethost/src/constants.ts | 4 --- .../pockethost/src/services/ProxyService.ts | 31 ------------------- 2 files changed, 35 deletions(-) diff --git a/packages/pockethost/src/constants.ts b/packages/pockethost/src/constants.ts index b34bd8cd..8254259f 100644 --- a/packages/pockethost/src/constants.ts +++ b/packages/pockethost/src/constants.ts @@ -118,7 +118,6 @@ export const SETTINGS = { PH_FTP_PASV_PORT_MIN: mkNumber(10000), PH_FTP_PASV_PORT_MAX: mkNumber(20000), - EDGE_SASS_DOMAINS_AUTH_TOKEN: mkString(``), EDGE_APEX_DOMAIN: mkString(_APEX_DOMAIN), PH_INSTANCE_APP_ROOT: mkString(_INSTANCE_APP_ROOT()), @@ -222,8 +221,6 @@ export const PH_FTP_PASV_IP = () => settings().PH_FTP_PASV_IP export const PH_FTP_PASV_PORT_MIN = () => settings().PH_FTP_PASV_PORT_MIN export const PH_FTP_PASV_PORT_MAX = () => settings().PH_FTP_PASV_PORT_MAX -export const EDGE_SASS_DOMAINS_AUTH_TOKEN = () => - settings().EDGE_SASS_DOMAINS_AUTH_TOKEN export const EDGE_APEX_DOMAIN = () => settings().EDGE_APEX_DOMAIN export const INSTANCE_APP_HOOK_DIR = () => settings().INSTANCE_APP_HOOKS_DIR @@ -316,7 +313,6 @@ export const logConstants = () => { PH_FTP_PASV_IP, PH_FTP_PASV_PORT_MIN, PH_FTP_PASV_PORT_MAX, - EDGE_SASS_DOMAINS_AUTH_TOKEN, EDGE_APEX_DOMAIN, INSTANCE_APP_HOOK_DIR, INSTANCE_APP_MIGRATIONS_DIR, diff --git a/packages/pockethost/src/services/ProxyService.ts b/packages/pockethost/src/services/ProxyService.ts index f163a8ee..a0d2132a 100644 --- a/packages/pockethost/src/services/ProxyService.ts +++ b/packages/pockethost/src/services/ProxyService.ts @@ -5,7 +5,6 @@ import { default as Server, default as httpProxy } from 'http-proxy' import { AsyncReturnType } from 'type-fest' import { DAEMON_PORT, - EDGE_SASS_DOMAINS_AUTH_TOKEN, Logger, LoggerService, SingletonBaseConfig, @@ -76,36 +75,6 @@ export const proxyService = mkSingleton(async (config: ProxyServiceConfig) => { next() }) - // SaaS domains overrides - server.use((req, res, next) => { - if (!(`x-saas-domains-auth-token` in req.headers)) { - next() - return - } - - const secret = EDGE_SASS_DOMAINS_AUTH_TOKEN() - if (req.headers[`x-saas-domains-auth-token`] !== secret) { - throw new Error(`Invalid SaaS domain secret`) - } - - const host = req.headers[`x-served-for`] - res.locals.host = host - - const url = new URL(`https://${host}${req.url}`) - const country = - (req.headers['x-saas-geoip-country-code'] as string) || '' - const ip = (req.headers['x-saas-domains-ip'] as string) || '' - const method = req.method || '' - const sig = [ - method.padStart(10), - country.padStart(5), - ip.padEnd(45), - url.toString(), - ].join(' ') - res.locals.sig = sig - next() - }) - server.use((req, res, next) => { res.locals.proxy = proxy next()