Skip to content

Commit 8b18d16

Browse files
refactor(server): share request credential selection
1 parent 0d20adb commit 8b18d16

3 files changed

Lines changed: 54 additions & 38 deletions

File tree

‎apps/server/src/auth/EnvironmentAuth.ts‎

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -563,18 +563,32 @@ function parseDpopToken(request: HttpServerRequest.HttpServerRequest): string |
563563
return token.length > 0 ? token : null;
564564
}
565565

566-
export function selectedLegacySessionCookieToken(
566+
export function selectRequestCredential(
567567
request: HttpServerRequest.HttpServerRequest,
568568
cookieName: string,
569569
legacyCookieName: string | undefined,
570-
): string | undefined {
570+
) {
571+
const cookieToken = request.cookies[cookieName];
572+
if (cookieToken !== undefined) {
573+
return { token: cookieToken, source: "cookie" } as const;
574+
}
575+
576+
const bearerToken = parseBearerToken(request);
577+
if (bearerToken !== null) {
578+
return { token: bearerToken, source: "bearer" } as const;
579+
}
580+
581+
const dpopToken = parseDpopToken(request);
582+
if (dpopToken !== null) {
583+
return { token: dpopToken, source: "dpop" } as const;
584+
}
585+
571586
const legacyToken = legacyCookieName ? request.cookies[legacyCookieName] : undefined;
572-
return legacyToken &&
573-
!request.cookies[cookieName] &&
574-
!parseBearerToken(request) &&
575-
!parseDpopToken(request)
576-
? legacyToken
577-
: undefined;
587+
if (legacyToken !== undefined) {
588+
return { token: legacyToken, source: "legacy-cookie" } as const;
589+
}
590+
591+
return undefined;
578592
}
579593

580594
export const make = Effect.gen(function* () {
@@ -615,20 +629,19 @@ export const make = Effect.gen(function* () {
615629
const authenticateRequest = (
616630
request: HttpServerRequest.HttpServerRequest,
617631
): Effect.Effect<AuthenticatedSession, ServerAuthCredentialError | ServerAuthInternalError> => {
618-
const cookieToken = request.cookies[sessions.cookieName];
619-
const legacyCookieToken = sessions.legacyCookieName
620-
? request.cookies[sessions.legacyCookieName]
621-
: undefined;
622-
const bearerToken = parseBearerToken(request);
623-
const dpopToken = parseDpopToken(request);
624-
const credential = cookieToken ?? bearerToken ?? dpopToken ?? legacyCookieToken;
625-
if (!credential) {
632+
const credential = selectRequestCredential(
633+
request,
634+
sessions.cookieName,
635+
sessions.legacyCookieName,
636+
);
637+
if (!credential?.token) {
626638
return Effect.fail(new ServerAuthMissingCredentialError({}));
627639
}
628-
return authenticateToken(credential).pipe(
640+
const dpopToken = parseDpopToken(request);
641+
return authenticateToken(credential.token).pipe(
629642
Effect.flatMap((session) => {
630643
if (session.proofKeyThumbprint) {
631-
if (!dpopToken || dpopToken !== credential) {
644+
if (!dpopToken || dpopToken !== credential.token) {
632645
return Effect.fail(
633646
new ServerAuthInvalidCredentialError({
634647
diagnostic: "DPoP-bound access token requires DPoP authorization.",

‎apps/server/src/auth/http.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,18 +242,18 @@ export const authHttpApiLayer = HttpApiBuilder.group(
242242
yield* annotateEnvironmentRequest(args.endpoint.name);
243243
const request = yield* HttpServerRequest.HttpServerRequest;
244244
const result = yield* serverAuth.getSessionState(request);
245-
const legacyToken = EnvironmentAuth.selectedLegacySessionCookieToken(
245+
const credential = EnvironmentAuth.selectRequestCredential(
246246
request,
247247
sessions.cookieName,
248248
sessions.legacyCookieName,
249249
);
250250
if (
251-
legacyToken &&
251+
credential?.source === "legacy-cookie" &&
252252
result.authenticated &&
253253
result.sessionMethod === "browser-session-cookie" &&
254254
result.expiresAt
255255
) {
256-
yield* appendSessionCookie(sessions.cookieName, legacyToken, result.expiresAt);
256+
yield* appendSessionCookie(sessions.cookieName, credential.token, result.expiresAt);
257257
}
258258
return result;
259259
},

‎apps/server/src/server.test.ts‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1657,28 +1657,31 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
16571657
const body = yield* responseJsonEffect<{ readonly authenticated: boolean }>(response);
16581658

16591659
assert.equal(body.authenticated, true);
1660-
assert.match(response.headers["set-cookie"] ?? "", /^t3_session_[a-f0-9]{12}=/);
1660+
assert.equal(response.headers["set-cookie"], cookie);
16611661
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
16621662
);
16631663

1664-
it.effect("does not migrate a stale legacy cookie when bearer auth succeeds", () =>
1665-
Effect.gen(function* () {
1666-
yield* buildAppUnderTest({ config: { mode: "web", host: "192.168.1.50" } });
1664+
it.effect.each(["cookie", "bearer"])(
1665+
"does not migrate a stale legacy cookie when %s auth succeeds",
1666+
(source) =>
1667+
Effect.gen(function* () {
1668+
yield* buildAppUnderTest({ config: { mode: "web", host: "192.168.1.50" } });
16671669

1668-
const { cookie } = yield* bootstrapBrowserSession();
1669-
const sessionToken = cookie?.split(";")[0]?.split("=")[1] ?? "";
1670-
const sessionUrl = yield* getHttpServerUrl("/api/auth/session");
1671-
const response = yield* fetchEffect(sessionUrl, {
1672-
headers: {
1673-
authorization: `Bearer ${sessionToken}`,
1674-
cookie: "t3_session=stale",
1675-
},
1676-
});
1677-
const body = yield* responseJsonEffect<{ readonly authenticated: boolean }>(response);
1670+
const { cookie } = yield* bootstrapBrowserSession();
1671+
const sessionCookie = cookie?.split(";")[0] ?? "";
1672+
const sessionToken = extractSessionTokenFromSetCookie(cookie ?? "");
1673+
const sessionUrl = yield* getHttpServerUrl("/api/auth/session");
1674+
const response = yield* fetchEffect(sessionUrl, {
1675+
headers:
1676+
source === "cookie"
1677+
? { cookie: `${sessionCookie}; t3_session=stale` }
1678+
: { authorization: `Bearer ${sessionToken}`, cookie: "t3_session=stale" },
1679+
});
1680+
const body = yield* responseJsonEffect<{ readonly authenticated: boolean }>(response);
16781681

1679-
assert.equal(body.authenticated, true);
1680-
assert.isUndefined(response.headers["set-cookie"]);
1681-
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
1682+
assert.equal(body.authenticated, true);
1683+
assert.isUndefined(response.headers["set-cookie"]);
1684+
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
16821685
);
16831686

16841687
it.effect("exchanges a bootstrap grant for a scoped bearer access token", () =>

0 commit comments

Comments
 (0)