Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check x-forwarded-host before host for support reverse proxy defaults #4928

Merged
merged 8 commits into from
Feb 24, 2021
Merged

Check x-forwarded-host before host for support reverse proxy defaults #4928

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cc31bab
Check x-forwarded-host before host for proxying
MurzNN Feb 23, 2021
e7bbcad
Match to null if absent
MurzNN Feb 23, 2021
f2a6817
Added changeset
MurzNN Feb 23, 2021
edd133c
Linting
MurzNN Feb 23, 2021
765fe16
changeset-to-path
MurzNN Feb 24, 2021
b1461a3
Update changeset description
MurzNN Feb 24, 2021
66ec342
Update packages-next/auth/src/index.ts
MurzNN Feb 24, 2021
9d51904
Merge branch 'master' into init-with-reverse-proxy
timleslie Feb 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fast-meals-ring.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@keystone-next/auth': minor
---

Check x-forwarded-host before host for support reverse proxy defaults
3 changes: 2 additions & 1 deletion packages-next/auth/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,10 +337,11 @@ export function createAuth<GeneratedListTypes extends BaseGeneratedListTypes>({
// Allow access to the adminMeta data from the /init path to correctly render that page
// even if the user isn't logged in (which should always be the case if they're seeing /init)
const headers = context.req?.headers;
const host = headers ? headers['x-forwarded-host'] || headers.host : null;
const url = headers?.referer ? new URL(headers.referer) : undefined;
const accessingInitPage =
url?.pathname === '/init' &&
url?.host === headers?.host &&
url?.host === host &&
(await context.sudo().lists[listKey].count({})) === 0;
return (
accessingInitPage ||
Expand Down