Mirroristas/pockethost
2
0
Fork 0
mirror of https://github.com/pockethost/pockethost.git synced 2025-11-24 06:25:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove SaaSDomain support

Browse Source
This commit is contained in:
Ben Allfree 2024-11-10 18:51:54 -08:00
parent f3d9ac8b68
commit e967d9ed45
2 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/pockethost/src/constants.ts
View File

@ -118,7 +118,6 @@ export const SETTINGS = {
PH_FTP_PASV_PORT_MIN: mkNumber(10000), PH_FTP_PASV_PORT_MIN: mkNumber(10000),
PH_FTP_PASV_PORT_MAX: mkNumber(20000), PH_FTP_PASV_PORT_MAX: mkNumber(20000),
EDGE_SASS_DOMAINS_AUTH_TOKEN: mkString(``),
EDGE_APEX_DOMAIN: mkString(_APEX_DOMAIN), EDGE_APEX_DOMAIN: mkString(_APEX_DOMAIN),
PH_INSTANCE_APP_ROOT: mkString(_INSTANCE_APP_ROOT()), 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_MIN = () => settings().PH_FTP_PASV_PORT_MIN
export const PH_FTP_PASV_PORT_MAX = () => settings().PH_FTP_PASV_PORT_MAX 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 EDGE_APEX_DOMAIN = () => settings().EDGE_APEX_DOMAIN
export const INSTANCE_APP_HOOK_DIR = () => settings().INSTANCE_APP_HOOKS_DIR 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_IP,
PH_FTP_PASV_PORT_MIN, PH_FTP_PASV_PORT_MIN,
PH_FTP_PASV_PORT_MAX, PH_FTP_PASV_PORT_MAX,
EDGE_SASS_DOMAINS_AUTH_TOKEN,
EDGE_APEX_DOMAIN, EDGE_APEX_DOMAIN,
INSTANCE_APP_HOOK_DIR, INSTANCE_APP_HOOK_DIR,
INSTANCE_APP_MIGRATIONS_DIR, INSTANCE_APP_MIGRATIONS_DIR,

31
packages/pockethost/src/services/ProxyService.ts
View File

@ -5,7 +5,6 @@ import { default as Server, default as httpProxy } from 'http-proxy'
import { AsyncReturnType } from 'type-fest' import { AsyncReturnType } from 'type-fest'
import { import {
DAEMON_PORT, DAEMON_PORT,
EDGE_SASS_DOMAINS_AUTH_TOKEN,
Logger, Logger,
LoggerService, LoggerService,
SingletonBaseConfig, SingletonBaseConfig,
@ -76,36 +75,6 @@ export const proxyService = mkSingleton(async (config: ProxyServiceConfig) => {
next() 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) || '<ct>'
const ip = (req.headers['x-saas-domains-ip'] as string) || '<ip>'
const method = req.method || '<m>'
const sig = [
method.padStart(10),
country.padStart(5),
ip.padEnd(45),
url.toString(),
].join(' ')
res.locals.sig = sig
next()
})
server.use((req, res, next) => { server.use((req, res, next) => {
res.locals.proxy = proxy res.locals.proxy = proxy
next() next()