Mike/freno-dev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

general: fix no longer needed logs

Browse Source
This commit is contained in:
Michael Freno
2026-01-13 22:24:00 -05:00
parent 6325f963ed
commit 0825c02dbc
1 changed files with 0 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
src/server/session-helpers.ts
View File

@@ -220,23 +220,13 @@ export async function createAuthSession(
: undefined // Session cookie (expires on browser close) : undefined // Session cookie (expires on browser close)
}; };
// Use updateSession to set session data directly
const session = await updateSession(event, configWithMaxAge, sessionData); const session = await updateSession(event, configWithMaxAge, sessionData);
console.log("[Session Create] updateSession returned:", {
hasData: !!session?.data,
dataKeys: session?.data ? Object.keys(session.data) : []
});
// Explicitly seal/flush the session to ensure cookie is written // Explicitly seal/flush the session to ensure cookie is written
// This is important in serverless environments where response might stream early // This is important in serverless environments where response might stream early
const { sealSession } = await import("vinxi/http"); const { sealSession } = await import("vinxi/http");
await sealSession(event, configWithMaxAge); await sealSession(event, configWithMaxAge);
console.log("[Session Create] Session sealed");
// Set a separate sessionId cookie for DB fallback (in case main session cookie fails)
setCookie(event, "session_id", sessionId, { setCookie(event, "session_id", sessionId, {
httpOnly: true, httpOnly: true,
secure: env.NODE_ENV === "production", secure: env.NODE_ENV === "production",
@@ -245,31 +235,14 @@ export async function createAuthSession(
maxAge: configWithMaxAge.maxAge maxAge: configWithMaxAge.maxAge
}); });
console.log("[Session Create] session_id cookie set");
// Verify session was actually set by reading it back
try { try {
const cookieName = sessionConfig.name || "session"; const cookieName = sessionConfig.name || "session";
const cookieValue = getCookie(event, cookieName); const cookieValue = getCookie(event, cookieName);
console.log(
"[Session Create] Verification - cookie name:",
cookieName,
"has value:",
!!cookieValue
);
// Try reading back the session immediately using the same config
const verifySession = await getSession<SessionData>( const verifySession = await getSession<SessionData>(
event, event,
configWithMaxAge configWithMaxAge
); );
console.log("[Session Create] Verification - read session back:", {
hasData: !!verifySession?.data,
hasUserId: !!verifySession?.data?.userId,
hasSessionId: !!verifySession?.data?.sessionId
});
} catch (verifyError) { } catch (verifyError) {
console.error("[Session Create] Failed to verify session:", verifyError); console.error("[Session Create] Failed to verify session:", verifyError);
} }
@@ -318,20 +291,10 @@ export async function getAuthSession(
const session = await unsealSession(event, sessionConfig, cookieValue); const session = await unsealSession(event, sessionConfig, cookieValue);
if (!session?.data || typeof session.data !== "object") { if (!session?.data || typeof session.data !== "object") {
console.log(
"[Session Get] skipUpdate: session data is empty/invalid"
);
// Try DB restoration before giving up
const sessionIdCookie = getCookie(event, "session_id"); const sessionIdCookie = getCookie(event, "session_id");
if (sessionIdCookie) { if (sessionIdCookie) {
console.log(
"[Session Get] Attempting restore from DB (empty data)..."
);
const restored = await restoreSessionFromDB(event, sessionIdCookie); const restored = await restoreSessionFromDB(event, sessionIdCookie);
if (restored) { if (restored) {
console.log(
"[Session Get] Successfully restored session from DB"
);
return restored; return restored;
} }
} }
@@ -341,28 +304,13 @@ export async function getAuthSession(
const data = session.data as SessionData; const data = session.data as SessionData;
if (!data.userId || !data.sessionId) { if (!data.userId || !data.sessionId) {
console.log(
"[Session Get] Session data missing userId or sessionId:",
{
hasUserId: !!data.userId,
hasSessionId: !!data.sessionId
}
);
// Fallback: Try to restore from DB using session_id cookie
const sessionIdCookie = getCookie(event, "session_id"); const sessionIdCookie = getCookie(event, "session_id");
console.log("[Session Get] session_id cookie:", sessionIdCookie);
if (sessionIdCookie) { if (sessionIdCookie) {
console.log("[Session Get] Attempting restore from DB...");
const restored = await restoreSessionFromDB(event, sessionIdCookie); const restored = await restoreSessionFromDB(event, sessionIdCookie);
if (restored) { if (restored) {
console.log(
"[Session Get] Successfully restored session from DB"
);
return restored; return restored;
} else { } else {
console.log("[Session Get] Failed to restore session from DB");
} }
} }
@@ -385,19 +333,10 @@ export async function getAuthSession(
// If decryption failed (after server restart), try DB restoration // If decryption failed (after server restart), try DB restoration
const sessionIdCookie = getCookie(event, "session_id"); const sessionIdCookie = getCookie(event, "session_id");
if (sessionIdCookie) { if (sessionIdCookie) {
console.log(
"[Session Get] Attempting restore from DB after decryption error..."
);
const restored = await restoreSessionFromDB(event, sessionIdCookie); const restored = await restoreSessionFromDB(event, sessionIdCookie);
if (restored) { if (restored) {
console.log(
"[Session Get] Successfully restored session from DB after error"
);
return restored; return restored;
} else { } else {
console.log(
"[Session Get] Failed to restore session from DB after error"
);
} }
} }
return null; return null;
@@ -408,34 +347,14 @@ export async function getAuthSession(
const session = await getSession<SessionData>(event, sessionConfig); const session = await getSession<SessionData>(event, sessionConfig);
console.log("[Session Get] Got session from Vinxi:", {
hasData: !!session.data,
hasUserId: !!session.data?.userId,
hasSessionId: !!session.data?.sessionId
});
if (!session.data || !session.data.userId || !session.data.sessionId) { if (!session.data || !session.data.userId || !session.data.sessionId) {
// Fallback: Try to restore from DB using session_id cookie // Fallback: Try to restore from DB using session_id cookie
const sessionIdCookie = getCookie(event, "session_id"); const sessionIdCookie = getCookie(event, "session_id");
console.log(
"[Session Get] Normal path - session_id cookie:",
sessionIdCookie
);
if (sessionIdCookie) { if (sessionIdCookie) {
console.log(
"[Session Get] Attempting restore from DB (normal path)..."
);
const restored = await restoreSessionFromDB(event, sessionIdCookie); const restored = await restoreSessionFromDB(event, sessionIdCookie);
if (restored) { if (restored) {
console.log(
"[Session Get] Successfully restored session from DB (normal path)"
);
return restored; return restored;
} else {
console.log(
"[Session Get] Failed to restore session from DB (normal path)"
);
} }
} }
@@ -490,7 +409,6 @@ async function findLatestSessionInChain(
maxDepth: number = 100 maxDepth: number = 100
): Promise<any | null> { ): Promise<any | null> {
if (maxDepth <= 0) { if (maxDepth <= 0) {
console.log("[Session Chain] Max depth reached, stopping traversal");
return null; return null;
} }
@@ -518,10 +436,6 @@ async function findLatestSessionInChain(
}); });
if (childCheck.rows.length > 0) { if (childCheck.rows.length > 0) {
// Session has a child, follow the chain
console.log(
`[Session Chain] Session ${sessionId} has child, following chain...`
);
return findLatestSessionInChain( return findLatestSessionInChain(
conn, conn,
childCheck.rows[0].id as string, childCheck.rows[0].id as string,
@@ -529,24 +443,15 @@ async function findLatestSessionInChain(
); );
} }
// No child found - this is the latest session
// Verify it's valid (not revoked, not expired)
if (currentSession.revoked === 1) { if (currentSession.revoked === 1) {
console.log(
`[Session Chain] Latest session ${sessionId} is revoked - chain invalid`
);
return null; return null;
} }
const expiresAt = new Date(currentSession.expires_at as string); const expiresAt = new Date(currentSession.expires_at as string);
if (expiresAt < new Date()) { if (expiresAt < new Date()) {
console.log(
`[Session Chain] Latest session ${sessionId} is expired - chain invalid`
);
return null; return null;
} }
console.log(`[Session Chain] Found valid latest session: ${sessionId}`);
return currentSession; return currentSession;
} }
@@ -562,15 +467,12 @@ async function restoreSessionFromDB(
sessionId: string sessionId: string
): Promise<SessionData | null> { ): Promise<SessionData | null> {
try { try {
console.log("[Session Restore] Starting restore for sessionId:", sessionId);
const conn = ConnectionFactory(); const conn = ConnectionFactory();
// Get IP and user agent early since we'll need them for any rotation
const { getRequestIP } = await import("vinxi/http"); const { getRequestIP } = await import("vinxi/http");
const ipAddress = getRequestIP(event) || "unknown"; const ipAddress = getRequestIP(event) || "unknown";
const userAgent = event.node?.req?.headers["user-agent"] || "unknown"; const userAgent = event.node?.req?.headers["user-agent"] || "unknown";
// Query DB for session with all necessary data including is_admin
const result = await conn.execute({ const result = await conn.execute({
sql: `SELECT s.id, s.user_id, s.token_family, s.refresh_token_hash, sql: `SELECT s.id, s.user_id, s.token_family, s.refresh_token_hash,
s.revoked, s.expires_at, u.is_admin s.revoked, s.expires_at, u.is_admin
@@ -580,27 +482,14 @@ async function restoreSessionFromDB(
args: [sessionId] args: [sessionId]
}); });
console.log(
"[Session Restore] DB query returned rows:",
result.rows.length
);
if (result.rows.length === 0) { if (result.rows.length === 0) {
console.log("[Session Restore] No session found in DB");
return null; return null;
} }
const dbSession = result.rows[0]; const dbSession = result.rows[0];
console.log("[Session Restore] Found session:", {
userId: dbSession.user_id,
revoked: dbSession.revoked,
expiresAt: dbSession.expires_at
});
// Check if refresh token is expired (applies to all sessions in chain)
const expiresAt = new Date(dbSession.expires_at as string); const expiresAt = new Date(dbSession.expires_at as string);
if (expiresAt < new Date()) { if (expiresAt < new Date()) {
console.log("[Session Restore] Session refresh token expired");
return null; return null;
} }
@@ -617,28 +506,15 @@ async function restoreSessionFromDB(
}); });
if (childCheck.rows.length > 0) { if (childCheck.rows.length > 0) {
console.log(
"[Session Restore] Session has already been rotated - following chain to latest child"
);
// Follow the chain to find the latest valid session
const latestSession = await findLatestSessionInChain( const latestSession = await findLatestSessionInChain(
conn, conn,
childCheck.rows[0].id as string childCheck.rows[0].id as string
); );
if (!latestSession) { if (!latestSession) {
console.log("[Session Restore] Could not find valid session in chain");
return null; return null;
} }
console.log(
"[Session Restore] Found latest session in chain:",
latestSession.id
);
// Use the latest session to restore
// Generate new refresh token and rotate from the latest session
const newSession = await createAuthSession( const newSession = await createAuthSession(
event, event,
latestSession.user_id as string, latestSession.user_id as string,
@@ -649,33 +525,22 @@ async function restoreSessionFromDB(
latestSession.token_family as string // Reuse family latestSession.token_family as string // Reuse family
); );
// Mark the latest session as revoked now that we've rotated it
await conn.execute({ await conn.execute({
sql: "UPDATE Session SET revoked = 1 WHERE id = ?", sql: "UPDATE Session SET revoked = 1 WHERE id = ?",
args: [latestSession.id] args: [latestSession.id]
}); });
console.log(
"[Session Restore] Successfully restored from latest session in chain"
);
return newSession; return newSession;
} }
// No children - this is the current session // No children - this is the current session
// Validate it's not revoked (if no children, revoked = invalid) // Validate it's not revoked (if no children, revoked = invalid)
if (dbSession.revoked === 1) { if (dbSession.revoked === 1) {
console.log(
"[Session Restore] Session is revoked and has no children - cannot restore"
);
return null; return null;
} }
// We can't restore the refresh token (it's hashed in DB) // We can't restore the refresh token (it's hashed in DB)
// So we need to generate a new one and rotate the session
console.log("[Session Restore] Creating new rotated session...");
// Create a new session (this will be a rotation)
const newSession = await createAuthSession( const newSession = await createAuthSession(
event, event,
dbSession.user_id as string, dbSession.user_id as string,
@@ -692,9 +557,6 @@ async function restoreSessionFromDB(
args: [sessionId] args: [sessionId]
}); });
console.log(
"[Session Restore] Successfully created new session and revoked parent"
);
return newSession; return newSession;
} catch (error) { } catch (error) {
console.error("[Session Restore] Error restoring session:", error); console.error("[Session Restore] Error restoring session:", error);
@@ -776,18 +638,8 @@ async function validateSessionInDB(
// Grace period allows client to receive and use new cookies from rotation // Grace period allows client to receive and use new cookies from rotation
// This is critical for SSR/serverless where response cookies may be delayed // This is critical for SSR/serverless where response cookies may be delayed
if (timeSinceRotation >= AUTH_CONFIG.REFRESH_TOKEN_REUSE_WINDOW_MS) { if (timeSinceRotation >= AUTH_CONFIG.REFRESH_TOKEN_REUSE_WINDOW_MS) {
// Grace period expired - parent session should no longer be used
// This indicates either token theft or client failed to update cookies
console.log(
`[Session Validation] Parent session used ${Math.round(timeSinceRotation / 1000)}s after rotation (grace period expired)`
);
return false; return false;
} }
// Within grace period - allow parent session use while cookies propagate
console.log(
`[Session Validation] Parent session used ${Math.round(timeSinceRotation / 1000)}s after rotation (within grace period)`
);
} }
// Update last_used and last_active_at timestamps (throttled) // Update last_used and last_active_at timestamps (throttled)