xiaoxue_admin
/
xLog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test: caddy header_up host

This commit is contained in:
DIYgod 2023-08-22 18:42:45 +01:00
parent fb977353fb
commit f61e983c23
No known key found for this signature in database
3 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deploy/dev/cm.yaml
View File

@ -19,9 +19,8 @@ data:
dns cloudflare {env.CF_API_TOKEN}
}
reverse_proxy http://xlog-internal.crossbell.svc:3000 {
header_up X-Forwarded-Host {host}
header_up X-Forwarded-Proto http
reverse_proxy xlog-internal.crossbell.svc:3000 {
header_up Host {host}
}
}
@ -34,9 +33,8 @@ data:
on_demand
}
reverse_proxy http://xlog-internal.crossbell.svc:3000 {
header_up X-Forwarded-Host {host}
header_up X-Forwarded-Proto http
reverse_proxy xlog-internal.crossbell.svc:3000 {
header_up Host {host}
}
}
---

10
deploy/prod/cm.yaml
View File

@ -19,9 +19,8 @@ data:
dns cloudflare {env.CF_API_TOKEN}
}
reverse_proxy http://xlog-internal.crossbell.svc:3000 {
header_up X-Forwarded-Host {host}
header_up X-Forwarded-Proto http
reverse_proxy xlog-internal.crossbell.svc:3000 {
header_up Host {host}
}
}
@ -34,9 +33,8 @@ data:
on_demand
}
reverse_proxy http://xlog-internal.crossbell.svc:3000 {
header_up X-Forwarded-Host {host}
header_up X-Forwarded-Proto http
reverse_proxy xlog-internal.crossbell.svc:3000 {
header_up Host {host}
}
}
---

20
src/middleware.ts
View File

@ -3,7 +3,7 @@ import { NextRequest, NextResponse } from "next/server"
import { getClientIp } from "@supercharge/request-ip"
import { IS_PROD } from "~/lib/constants"
import { DISCORD_LINK, OUR_DOMAIN, SITE_URL } from "~/lib/env"
import { DISCORD_LINK } from "~/lib/env"
// HTTPWhiteListPaths: White list of path for plain http request, no HTTPS redirect
const HTTPWhitelistPaths = ["/api/healthcheck"]
@ -15,12 +15,6 @@ export default async function middleware(req: NextRequest) {
console.debug(`${key}: ${value}`)
}
const forwardedHost = req.headers.get("X-Forwarded-Host")
if (forwardedHost) {
req.headers.set("host", forwardedHost)
req.nextUrl.host = forwardedHost
}
if (
IS_PROD &&
req.headers.get("x-forwarded-proto") !== "https" &&
@ -38,7 +32,7 @@ export default async function middleware(req: NextRequest) {
}
if (!cfHttps) {
// return NextResponse.redirect(
// `https://${req.headers.get("X-Forwarded-Host")}${req.nextUrl.pathname}${
// `https://${req.headers.get("host")}${req.nextUrl.pathname}${
// req.nextUrl.search
// }`,
// 301,
@ -54,9 +48,7 @@ export default async function middleware(req: NextRequest) {
return NextResponse.redirect(`https://${req.headers.get("host")}/feed`, 301)
}
console.debug(
`${req.method} ${req.headers.get("host")}${pathname}, ${req.url}`,
)
console.debug(`${req.method} ${req.nextUrl}`)
if (
pathname.startsWith("/api/") ||
@ -79,12 +71,13 @@ export default async function middleware(req: NextRequest) {
} = {}
try {
tenant = await (
await fetch(`${SITE_URL}/api/host2handle?host=${req.headers.get("host")}`)
await fetch(
new URL(`/api/host2handle?host=${req.headers.get("host")}`, req.url),
)
).json()
} catch (error) {
console.error(error)
}
console.debug("tenant", tenant)
if (tenant?.redirect && IS_PROD && !pathname.startsWith("/feed")) {
return NextResponse.redirect(
@ -100,7 +93,6 @@ export default async function middleware(req: NextRequest) {
requestHeaders.set("x-xlog-ip", getClientIp(req) || "")
if (tenant?.subdomain) {
requestHeaders.set("X-Forwarded-Host", OUR_DOMAIN)
return NextResponse.rewrite(
new URL(
`/site/${tenant?.subdomain}${pathname}${req.nextUrl.search}`,