add cookie session handler
All checks were successful
Build and push image for doorman-homeassistant / docker (push) Successful in 1m36s
Build and push Doorman UI / API / docker (push) Successful in 2m42s
Build and push image for doorman-homeassistant / deploy-gitainer (push) Successful in 6s

This commit is contained in:
Martin Dimitrov 2025-10-15 17:31:20 -07:00
parent 7cac33aa3f
commit 1e464bdd6d
11 changed files with 82 additions and 7 deletions

BIN
bun.lockb

Binary file not shown.

View File

@ -34,3 +34,5 @@ DOORMAN_URL=http://localhost:3005
# this isn't really a secret, its just to prevent spam on /notify in prod # this isn't really a secret, its just to prevent spam on /notify in prod
NOTIFY_SECRET_KEY=discordnotifyme NOTIFY_SECRET_KEY=discordnotifyme
COOKIE_PASSWORD=testtesttesttesttesttesttesttest

View File

@ -28,3 +28,5 @@ LOKI_PW=doormanlogs
NOTIFY_SECRET_KEY=discordnotifyme NOTIFY_SECRET_KEY=discordnotifyme
DOORMAN_URL= DOORMAN_URL=
COOKIE_PASSWORD=testtesttesttesttesttesttesttest

View File

@ -21,6 +21,7 @@
"discord-oauth2": "^2.12.1", "discord-oauth2": "^2.12.1",
"discord.js": "^14.19.3", "discord.js": "^14.19.3",
"dynabridge": "^0.3.8", "dynabridge": "^0.3.8",
"iron-session": "^8.0.4",
"is-deep-subset": "^0.1.1", "is-deep-subset": "^0.1.1",
"prom-client": "^15.1.3", "prom-client": "^15.1.3",
"promise.timeout": "^1.2.0", "promise.timeout": "^1.2.0",

View File

@ -1,4 +1,4 @@
import { ServerlessCallback, ServerlessFunctionSignature } from "@twilio-labs/serverless-runtime-types/types"; import { ServerlessCallback, ServerlessFunctionSignature, TwilioResponse } from "@twilio-labs/serverless-runtime-types/types";
import { PrometheusContentType, Registry, Pushgateway, Summary, Counter, register } from "prom-client"; import { PrometheusContentType, Registry, Pushgateway, Summary, Counter, register } from "prom-client";
import { DoormanLambdaContext } from "./DoormanHandlerContext"; import { DoormanLambdaContext } from "./DoormanHandlerContext";
import { shouldBlockRequest } from "../utils/blockUserAgent"; import { shouldBlockRequest } from "../utils/blockUserAgent";
@ -13,8 +13,7 @@ import pTimeout, { TimeoutError } from "promise.timeout";
import { ZodError } from "zod"; import { ZodError } from "zod";
import { fromError } from "zod-validation-error"; import { fromError } from "zod-validation-error";
import { setResponseJson } from "../utils/responseUtils"; import { setResponseJson } from "../utils/responseUtils";
import { BaseEvent, getSessionFromRequest, SessionType, setSessionOnResponse } from "./SessionHandler";
export type BaseEvent = { request: { cookies: {}; headers: {}; }; }
export type CallbackResult = Parameters<ServerlessCallback>; export type CallbackResult = Parameters<ServerlessCallback>;
export type FailFastCallback = () => CallbackResult; export type FailFastCallback = () => CallbackResult;
@ -73,7 +72,8 @@ const INNER_HANDLER_MAXIMUM_DURATION_MS: number = 8_750;
*/ */
export function withMetrics<T extends DoormanLambdaContext, U extends BaseEvent>( export function withMetrics<T extends DoormanLambdaContext, U extends BaseEvent>(
functionName: string, functionName: string,
handler: DoormanLambda<T, U> handler: DoormanLambda<T, U>,
parseSessionCookie?: boolean,
): ServerlessFunctionSignature<T, U> { ): ServerlessFunctionSignature<T, U> {
return async (context, event, callback) => { return async (context, event, callback) => {
console.log("[CommonHandler] created loki logger"); console.log("[CommonHandler] created loki logger");
@ -208,6 +208,11 @@ export function withMetrics<T extends DoormanLambdaContext, U extends BaseEvent>
const startTime = Date.now(); const startTime = Date.now();
console.log(`[CommonHandler] started handler at ${startTime}`); console.log(`[CommonHandler] started handler at ${startTime}`);
if (parseSessionCookie) {
console.log(`[CommonHandler] unwrapping session cookie`);
event.request.session = await getSessionFromRequest(event, context);
}
const handlerResponsePromise: Promise<Parameters<ServerlessCallback>> = new Promise(async (resolve, reject) => { const handlerResponsePromise: Promise<Parameters<ServerlessCallback>> = new Promise(async (resolve, reject) => {
// intercept the callbackResult // intercept the callbackResult
let callbackResult: Parameters<ServerlessCallback> | undefined; let callbackResult: Parameters<ServerlessCallback> | undefined;

View File

@ -15,4 +15,5 @@ export interface DoormanLambdaContext extends EnvironmentVariables {
LOKI_PW: string; LOKI_PW: string;
NOTIFY_SECRET_KEY: string; NOTIFY_SECRET_KEY: string;
DOORMAN_URL: string; DOORMAN_URL: string;
COOKIE_PASSWORD: string;
}; };

View File

@ -0,0 +1,50 @@
import { TwilioResponse } from "@twilio-labs/serverless-runtime-types/types";
import { TwilioContext } from "../types/TwilioContext";
import { sealData, unsealData } from "iron-session";
import { DoormanLambdaContext } from "./DoormanHandlerContext";
export type BaseEvent = { request: { cookies: { session?: string; }; headers: {}; session?: SessionType }; }
export type SessionType = any;
export const IRON_SESSION_COOKIE_NAME = "session";
export async function getSessionFromRequest(event: BaseEvent, context: DoormanLambdaContext): Promise<SessionType | undefined> {
if (!event.request.cookies[IRON_SESSION_COOKIE_NAME]) {
return undefined
}
let session: SessionType | undefined;
try {
session = await unsealData<any>(event.request.cookies[IRON_SESSION_COOKIE_NAME], {
password: context.COOKIE_PASSWORD,
});
} catch (e: any) {
console.error("error unsealing cookie");
}
return session;
}
export async function setSessionOnResponse(res: TwilioResponse, context: TwilioContext, session: any): Promise<TwilioResponse> {
if (!session) {
return res;
}
try {
const cookie = await sealData(session, {
password: context.COOKIE_PASSWORD,
});
console.log(cookie);
res.setCookie(IRON_SESSION_COOKIE_NAME, cookie);
} catch (e: any) {
console.log("failed to seal cookie");
console.log(e.message);
}
return res;
}
export async function destroySession(res: TwilioResponse): Promise<TwilioResponse> {
res.removeCookie(IRON_SESSION_COOKIE_NAME);
return res;
}

View File

@ -14,6 +14,7 @@ import { z } from "zod";
import { UserAgentHeader } from "../../../utils/blockUserAgent"; import { UserAgentHeader } from "../../../utils/blockUserAgent";
import { setResponseJson } from "../../../utils/responseUtils"; import { setResponseJson } from "../../../utils/responseUtils";
import { sanitizePhoneNumber } from "../../../utils/phoneUtils"; import { sanitizePhoneNumber } from "../../../utils/phoneUtils";
import { BaseEvent, destroySession, setSessionOnResponse } from "../../../common/SessionHandler";
export const InfoRequestSchema = z.object({ export const InfoRequestSchema = z.object({
door: z.string().optional(), door: z.string().optional(),
@ -23,7 +24,7 @@ export const InfoRequestSchema = z.object({
.refine(data => data.buzzer || data.door, 'Buzzer or door must be provided'); .refine(data => data.buzzer || data.door, 'Buzzer or door must be provided');
export type InfoRequest = z.infer<typeof InfoRequestSchema>; export type InfoRequest = z.infer<typeof InfoRequestSchema>;
export interface InfoRequestTwilio extends ServerlessEventObject<InfoRequest, UserAgentHeader> { }; export type InfoRequestTwilio = ServerlessEventObject<InfoRequest, UserAgentHeader> & BaseEvent;
export const InfoResponseClientSchema = DoorConfigSchema export const InfoResponseClientSchema = DoorConfigSchema
.omit({ PK: true, SK: true, pin: true }) .omit({ PK: true, SK: true, pin: true })
@ -95,5 +96,13 @@ export const handler: ServerlessFunctionSignature<TwilioContext, InfoRequestTwil
// @ts-ignore // @ts-ignore
db.ddbClient.destroy(); db.ddbClient.destroy();
// if (event.request.session) {
// console.log(event.request.session);
// await destroySession(response);
// } else {
// await setSessionOnResponse(response, context, { someSecret: new Date() });
// }
return callback(null, response); return callback(null, response);
}); });

View File

@ -15,4 +15,6 @@ LOKI_URL=https://logs.chromart.cc
LOKI_USER=doorman LOKI_USER=doorman
LOKI_PW=doormanlogs LOKI_PW=doormanlogs
NOTIFY_SECRET_KEY=discordnotifyme NOTIFY_SECRET_KEY=discordnotifyme
COOKIE_PASSWORD=testtesttesttesttesttesttesttest

View File

@ -15,4 +15,6 @@ LOKI_URL=https://logs.chromart.cc
LOKI_USER=doorman LOKI_USER=doorman
LOKI_PW=doormanlogs LOKI_PW=doormanlogs
NOTIFY_SECRET_KEY=discordnotifyme NOTIFY_SECRET_KEY=discordnotifyme
COOKIE_PASSWORD=testtesttesttesttesttesttesttest

View File

@ -14,6 +14,7 @@
"dependencies": { "dependencies": {
"@twilio-labs/serverless-runtime-types": "^4.0.1", "@twilio-labs/serverless-runtime-types": "^4.0.1",
"@twilio/runtime-handler": "1.3.0", "@twilio/runtime-handler": "1.3.0",
"iron-session": "^8.0.4",
"node-fetch": "^2.7.0", "node-fetch": "^2.7.0",
"prom-client": "^15.1.3", "prom-client": "^15.1.3",
"prometheus-remote-write": "^0.5.1", "prometheus-remote-write": "^0.5.1",