mirror of
https://github.com/pockethost/pockethost.git
synced 2025-07-01 18:32:31 +00:00
Remove subdomain filter from proxyservice
This commit is contained in:
parent
2b6da4ded7
commit
0d68cfa2a5
@ -454,7 +454,6 @@ export const instanceService = mkSingleton(
|
|||||||
}
|
}
|
||||||
|
|
||||||
;(await proxyService()).use(
|
;(await proxyService()).use(
|
||||||
(subdomain) => true,
|
|
||||||
['(/*)'],
|
['(/*)'],
|
||||||
async (req, res, meta, logger) => {
|
async (req, res, meta, logger) => {
|
||||||
const { dbg } = logger
|
const { dbg } = logger
|
||||||
|
@ -6,7 +6,6 @@ import {
|
|||||||
mkSingleton,
|
mkSingleton,
|
||||||
} from '$shared'
|
} from '$shared'
|
||||||
import { asyncExitHook } from '$util'
|
import { asyncExitHook } from '$util'
|
||||||
import { isFunction } from '@s-libs/micro-dash'
|
|
||||||
import {
|
import {
|
||||||
IncomingMessage,
|
IncomingMessage,
|
||||||
RequestListener,
|
RequestListener,
|
||||||
@ -98,22 +97,17 @@ export const proxyService = mkSingleton(async (config: ProxyServiceConfig) => {
|
|||||||
const middleware: MiddlewareListener[] = []
|
const middleware: MiddlewareListener[] = []
|
||||||
|
|
||||||
const use = (
|
const use = (
|
||||||
subdomainFilter: string | ((subdomain: string) => boolean),
|
|
||||||
urlFilters: string | string[],
|
urlFilters: string | string[],
|
||||||
handler: ProxyMiddleware,
|
handler: ProxyMiddleware,
|
||||||
handlerName: string,
|
handlerName: string,
|
||||||
) => {
|
) => {
|
||||||
const _handlerLogger = _proxyLogger.create(`${handlerName}`)
|
const _handlerLogger = _proxyLogger.create(`${handlerName}`)
|
||||||
const { dbg, trace } = _handlerLogger
|
const { dbg, trace } = _handlerLogger
|
||||||
dbg({ subdomainFilter, urlFilters })
|
dbg({ urlFilters })
|
||||||
|
|
||||||
const _urlFilters = Array.isArray(urlFilters)
|
const _urlFilters = Array.isArray(urlFilters)
|
||||||
? urlFilters.map((f) => new UrlPattern(f))
|
? urlFilters.map((f) => new UrlPattern(f))
|
||||||
: [new UrlPattern(urlFilters)]
|
: [new UrlPattern(urlFilters)]
|
||||||
const _subdomainFilter = isFunction(subdomainFilter)
|
|
||||||
? subdomainFilter
|
|
||||||
: (subdomain: string) =>
|
|
||||||
subdomainFilter === '*' || subdomain === subdomainFilter
|
|
||||||
|
|
||||||
middleware.push((req, res) => {
|
middleware.push((req, res) => {
|
||||||
const host = req.headers.host
|
const host = req.headers.host
|
||||||
@ -132,11 +126,8 @@ export const proxyService = mkSingleton(async (config: ProxyServiceConfig) => {
|
|||||||
if (!url) {
|
if (!url) {
|
||||||
throw new Error(`Expected URL here`)
|
throw new Error(`Expected URL here`)
|
||||||
}
|
}
|
||||||
trace({ subdomainFilter, _urlFilters, host, url })
|
trace({ _urlFilters, host, url })
|
||||||
if (!_subdomainFilter(subdomain)) {
|
|
||||||
trace(`Subdomain ${subdomain} does not match filter ${subdomainFilter}`)
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if (
|
if (
|
||||||
!_urlFilters.find((u) => {
|
!_urlFilters.find((u) => {
|
||||||
const isMatch = !!u.match(url)
|
const isMatch = !!u.match(url)
|
||||||
|
@ -22,7 +22,6 @@ export const realtimeLog = mkSingleton(async (config: RealtimeLogConfig) => {
|
|||||||
const { dbg, error } = _realtimeLogger
|
const { dbg, error } = _realtimeLogger
|
||||||
|
|
||||||
;(await proxyService()).use(
|
;(await proxyService()).use(
|
||||||
'*',
|
|
||||||
'/logs',
|
'/logs',
|
||||||
async (req, res, meta, logger) => {
|
async (req, res, meta, logger) => {
|
||||||
const { subdomain, host, coreInternalUrl } = meta
|
const { subdomain, host, coreInternalUrl } = meta
|
||||||
|
Loading…
x
Reference in New Issue
Block a user