History

l

Rhys Sullivan committed 8 months ago

Commit 0084d681 parent 9256d113 files · +23 −61Browse files

Unified · Split

3 files
  1. executor/apps/web/src/lib/workos-callback.ts +0 −53
  2. executor/apps/web/src/lib/workos-redirect.test.ts +4 −4
  3. executor/apps/web/src/lib/workos-redirect.ts +19 −4
executor/apps/web/src/lib/workos-callback.ts+0−53
@@ -14,46 +14,8 @@ const callbackHandler = handleCallbackRoute({ · 13 unmodified lines
1414 },
1515 });
1616
17−const WORKOS_CALLBACK_REPLAY_MS = 10 * 60 * 1000;
18−const CALLBACK_REPLAY_PRUNE_INTERVAL_MS = 30 * 1000;
19−const callbackCodeReplay = new Map<string, number>();
20−let nextReplayPruneAt = 0;
21−
2217 type WorkOSCallbackInput = Parameters<typeof callbackHandler>[0];
2318
24−function pruneCallbackReplays(now = Date.now()): void {
25− if (now < nextReplayPruneAt) {
26− return;
27− }
28−
29− callbackCodeReplay.forEach((expiresAt, code) => {
30− if (expiresAt <= now) {
31− callbackCodeReplay.delete(code);
32− }
33− });
34−
35− nextReplayPruneAt = now + CALLBACK_REPLAY_PRUNE_INTERVAL_MS;
36−}
37−
38−function isReplayedCode(code: string, now = Date.now()): boolean {
39− pruneCallbackReplays(now);
40− const expiresAt = callbackCodeReplay.get(code);
41−
42− if (!expiresAt || expiresAt <= now) {
43− if (expiresAt) {
44− callbackCodeReplay.delete(code);
45− }
46−
47− return false;
48− }
49−
50− return true;
51−}
52−
53−function markCodeAsReplayed(code: string, now = Date.now()): void {
54− callbackCodeReplay.set(code, now + WORKOS_CALLBACK_REPLAY_MS);
55−}
56−
5719 function getSetCookieValues(responseHeaders: Headers): string[] {
5820 const getSetCookie = (responseHeaders as { getSetCookie?: () => string[] }).getSetCookie;
5921 if (typeof getSetCookie === "function") {
@@ -121,17 +83,6 @@ export async function handleWorkOSCallback(context: WorkOSCallbackInput): Promis · 61 unmodified lines
12183 });
12284 }
12385
124− if (code && isReplayedCode(code)) {
125− if (isWorkosDebugEnabled()) {
126− logWorkosAuth("callback.replay-blocked", {
127− requestId,
128− code: redactAuthCode(code),
129− });
130− }
131−
132− return redirectResponse("/", 302);
133− }
134−
13586 try {
13687 const response = await callbackHandler(context);
13788
@@ -171,8 +122,6 @@ export async function handleWorkOSCallback(context: WorkOSCallbackInput): Promis · 33 unmodified lines
171122 }
172123
173124 if (code && response.status >= 300 && response.status < 400) {
174− markCodeAsReplayed(code);
175−
176125 if (isWorkosDebugEnabled()) {
177126 logWorkosAuth("callback.code-marked-used", {
178127 requestId,
@@ -212,8 +161,6 @@ export async function handleWorkOSCallback(context: WorkOSCallbackInput): Promis · 33 unmodified lines
212161 }
213162
214163 if (code && invalidGrant) {
215− markCodeAsReplayed(code);
216−
217164 return redirectResponse("/", 302);
218165 }
219166
executor/apps/web/src/lib/workos-redirect.test.ts+4−4
@@ -35,7 +35,7 @@ test("uses explicit WORKOS_REDIRECT_URI when set", () => { · 34 unmodified lines
3535 process.env.NEXT_PUBLIC_WORKOS_REDIRECT_URI = "https://public.example.com/callback";
3636
3737 const request = new Request("https://request.example.com/sign-in");
38− expect(resolveWorkosRedirectUri(request)).toBe("https://app.example.com/callback");
38+ expect(resolveWorkosRedirectUri(request)).toBe("https://app.example.com/api/auth/callback");
3939 });
4040
4141 test("falls back to NEXT_PUBLIC_WORKOS_REDIRECT_URI when server var is absent", () => {
@@ -45,7 +45,7 @@ test("falls back to NEXT_PUBLIC_WORKOS_REDIRECT_URI when server var is absent", · 3 unmodified lines
4545 process.env.NEXT_PUBLIC_WORKOS_REDIRECT_URI = "https://public.example.com/callback";
4646
4747 const request = new Request("https://request.example.com/sign-in");
48− expect(resolveWorkosRedirectUri(request)).toBe("https://public.example.com/callback");
48+ expect(resolveWorkosRedirectUri(request)).toBe("https://public.example.com/api/auth/callback");
4949 });
5050
5151 test("derives from forwarded request origin when not explicitly configured", () => {
@@ -61,7 +61,7 @@ test("derives from forwarded request origin when not explicitly configured", () · 9 unmodified lines
6161 },
6262 });
6363
64− expect(resolveWorkosRedirectUri(request)).toBe("https://executor.sh/callback");
64+ expect(resolveWorkosRedirectUri(request)).toBe("https://executor.sh/api/auth/callback");
6565 });
6666
6767 test("falls back to localhost when host cannot be derived locally", () => {
@@ -76,7 +76,7 @@ test("falls back to localhost when host cannot be derived locally", () => { · 8 unmodified lines
7676 process.env.NODE_ENV = "development";
7777
7878 const request = new Request("http://localhost:1234/sign-in");
79− expect(resolveWorkosRedirectUri(request)).toBe("http://localhost:1234/callback");
79+ expect(resolveWorkosRedirectUri(request)).toBe("http://localhost:1234/api/auth/callback");
8080 });
8181
8282 resetWorkosEnv();
executor/apps/web/src/lib/workos-redirect.ts+19−4
@@ -1,6 +1,21 @@
11 import { externalOriginFromRequest } from "./http/request-origin";
22
3−const WORKOS_REDIRECT_PATH = "/callback";
3+const WORKOS_REDIRECT_PATH = "/api/auth/callback";
4+
5+function normalizeWorkosRedirectUri(redirectUri: string): string {
6+ try {
7+ const parsed = new URL(redirectUri);
8+ if (parsed.pathname === "/callback") {
9+ parsed.pathname = WORKOS_REDIRECT_PATH;
10+ parsed.search = "";
11+ parsed.hash = "";
12+ return parsed.toString();
13+ }
14+ return parsed.toString();
15+ } catch {
16+ return redirectUri;
17+ }
18+}
419
520 function trim(value: string | undefined): string | undefined {
621 const candidate = value?.trim();
@@ -32,17 +47,17 @@ function fallbackWorkosOriginFromServer(): string | undefined { · 25 unmodified lines
3247 export function resolveWorkosRedirectUri(request?: Request): string | undefined {
3348 const explicitRedirect = trim(process.env.WORKOS_REDIRECT_URI);
3449 if (explicitRedirect) {
35− return explicitRedirect;
50+ return normalizeWorkosRedirectUri(explicitRedirect);
3651 }
3752
3853 const publicRedirect = trim(process.env.NEXT_PUBLIC_WORKOS_REDIRECT_URI);
3954 if (publicRedirect) {
40− return publicRedirect;
55+ return normalizeWorkosRedirectUri(publicRedirect);
4156 }
4257
4358 const origin = request
4459 ? externalOriginFromRequest(request)
4560 : fallbackWorkosOriginFromServer();
4661
47− return origin ? `${origin}${WORKOS_REDIRECT_PATH}` : undefined;
62+ return origin ? normalizeWorkosRedirectUri(`${origin}${WORKOS_REDIRECT_PATH}`) : undefined;
4863 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t