Harden cookie authentication
This commit is contained in:
1 parent
a0a62c1c06
commit
31e6c0c5d2
5 files changed
+116
-17
No files matched your search
+87
-7
@@ -1,5 +1,13 @@
|
||||
import type { H3Event } from "h3"
|
||||
import { createError, getCookie } from "h3"
|
||||
import {
|
||||
createError,
|
||||
defineEventHandler,
|
||||
getCookie,
|
||||
getRequestHeader,
|
||||
getRequestURL,
|
||||
setResponseStatus,
|
||||
type EventHandler,
|
||||
} from "h3"
|
||||
import parseDuration from "parse-duration"
|
||||
import mongoose from "mongoose"
|
||||
import { getSessionModel } from "../models/session"
|
||||
@@ -7,6 +15,64 @@ import { getBackendRuntimeConfig } from "./backend-config"
|
||||
|
||||
export const SESSION_COOKIE = "musicSession"
|
||||
export const REFRESH_COOKIE = "refreshToken"
|
||||
const INVALID_REQUEST_ORIGIN = "Invalid request origin"
|
||||
|
||||
/**
|
||||
* Keep the legacy API's direct authentication response body while leaving all
|
||||
* unrelated H3 errors to Nitro's normal error handler.
|
||||
*/
|
||||
export function defineAuthenticatedEventHandler(handler: EventHandler) {
|
||||
return defineEventHandler(async (event) => {
|
||||
try {
|
||||
return await handler(event)
|
||||
} catch (error) {
|
||||
const statusCode = (error as { statusCode?: number } | undefined)?.statusCode
|
||||
const statusMessage = (error as { statusMessage?: string } | undefined)?.statusMessage
|
||||
const message = (error as { data?: { message?: string } } | undefined)?.data?.message
|
||||
|
||||
if (statusCode === 401 && statusMessage === "Unauthorized" && message === "Unauthorized") {
|
||||
setResponseStatus(event, 401)
|
||||
return { message: "Unauthorized" }
|
||||
}
|
||||
|
||||
if (statusCode === 403 && statusMessage === "Forbidden" && message === INVALID_REQUEST_ORIGIN) {
|
||||
setResponseStatus(event, 403)
|
||||
return { message: INVALID_REQUEST_ORIGIN }
|
||||
}
|
||||
|
||||
throw error
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
export function assertCookieRequestOrigin(event: H3Event) {
|
||||
const originHeader = getRequestHeader(event, "origin")
|
||||
const refererHeader = getRequestHeader(event, "referer")
|
||||
let requestOrigin: string | undefined
|
||||
let suppliedOrigin: string | undefined
|
||||
|
||||
try {
|
||||
// H3 uses Host for the request host. A trusted ingress may provide
|
||||
// x-forwarded-proto; it must overwrite that header before this app.
|
||||
requestOrigin = getRequestURL(event, { xForwardedProto: true }).origin
|
||||
if (originHeader !== undefined) {
|
||||
const parsedOrigin = new URL(originHeader)
|
||||
if (parsedOrigin.origin === originHeader) suppliedOrigin = parsedOrigin.origin
|
||||
} else if (refererHeader !== undefined) {
|
||||
suppliedOrigin = new URL(refererHeader).origin
|
||||
}
|
||||
} catch {
|
||||
// Invalid or absent browser origin proof is rejected below.
|
||||
}
|
||||
|
||||
if (!suppliedOrigin || !requestOrigin || suppliedOrigin !== requestOrigin) {
|
||||
throw createError({
|
||||
statusCode: 403,
|
||||
statusMessage: "Forbidden",
|
||||
data: { message: INVALID_REQUEST_ORIGIN },
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
export function getSessionTtl(event?: H3Event) {
|
||||
const { tokenExpire } = getBackendRuntimeConfig(event)
|
||||
@@ -14,15 +80,17 @@ export function getSessionTtl(event?: H3Event) {
|
||||
}
|
||||
|
||||
function getSessionTokens(event: H3Event) {
|
||||
const tokens: string[] = []
|
||||
const tokens: { token: string; source: "cookie" | "bearer" }[] = []
|
||||
const cookieToken = getCookie(event, SESSION_COOKIE)
|
||||
const authorization = event.node.req.headers.authorization
|
||||
const bearerToken = authorization?.startsWith("Bearer ")
|
||||
? authorization.slice("Bearer ".length)
|
||||
: undefined
|
||||
|
||||
if (cookieToken) tokens.push(cookieToken)
|
||||
if (bearerToken && bearerToken !== cookieToken) tokens.push(bearerToken)
|
||||
if (cookieToken) tokens.push({ token: cookieToken, source: "cookie" })
|
||||
if (bearerToken && bearerToken !== cookieToken) {
|
||||
tokens.push({ token: bearerToken, source: "bearer" })
|
||||
}
|
||||
|
||||
return tokens
|
||||
}
|
||||
@@ -30,8 +98,8 @@ function getSessionTokens(event: H3Event) {
|
||||
export async function findSession(event: H3Event) {
|
||||
const Session = getSessionModel(getSessionTtl(event)) as mongoose.Model<any>
|
||||
|
||||
for (const token of getSessionTokens(event)) {
|
||||
const session = await Session.findOne({ token })
|
||||
for (const credential of getSessionTokens(event)) {
|
||||
const session = await Session.findOne({ token: credential.token })
|
||||
.populate("userId", "+verified")
|
||||
.exec()
|
||||
|
||||
@@ -41,7 +109,13 @@ export async function findSession(event: H3Event) {
|
||||
|
||||
if (!session || !user) continue
|
||||
|
||||
return { session, user }
|
||||
const bearerToken = event.node.req.headers.authorization?.startsWith("Bearer ")
|
||||
? event.node.req.headers.authorization.slice("Bearer ".length)
|
||||
: undefined
|
||||
// If the cookie and bearer header carry the same valid token, the request
|
||||
// is independently authenticated by the explicit bearer credential.
|
||||
const source = bearerToken === credential.token ? "bearer" : credential.source
|
||||
return { session, user, source }
|
||||
}
|
||||
|
||||
return null
|
||||
@@ -63,5 +137,11 @@ export async function requireAuthenticatedUser(event: H3Event, adminOnly = false
|
||||
})
|
||||
}
|
||||
|
||||
const method = event.node.req.method?.toUpperCase() || "GET"
|
||||
const isUnsafeMethod = !["GET", "HEAD", "OPTIONS"].includes(method)
|
||||
if (isUnsafeMethod && auth.source === "cookie") {
|
||||
assertCookieRequestOrigin(event)
|
||||
}
|
||||
|
||||
return auth.user
|
||||
}
|
||||
Reference in new issue
Block a user