Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

refactor(cookie): streamline cookie signing integration in app and routes

Victor Hugo dos Santos6db86fa5c2de
diff --git a/backend/src/server/app.ts b/backend/src/server/app.ts
index 82811a23c7..4247ad3b31 100644
--- a/backend/src/server/app.ts
+++ b/backend/src/server/app.ts
@@ -2,8 +2,6 @@
import path from "node:path";
import type { ClickHouseClient } from "@clickhouse/client";
-import type { FastifyCookieOptions } from "@fastify/cookie";
-import cookie, { signerFactory } from "@fastify/cookie";
import type { FastifyCorsOptions } from "@fastify/cors";
import cors from "@fastify/cors";
import fastifyEtag from "@fastify/etag";
@@ -20,7 +18,6 @@ import { Knex } from "knex";
import { THsmServiceFactory } from "@app/ee/services/hsm/hsm-service";
import { TKeyStoreFactory } from "@app/keystore/keystore";
import { getConfig, IS_PACKAGED, TEnvConfig } from "@app/lib/config/env";
-import { getCookieSigningKey } from "@app/lib/crypto/cookie-signing-key";
import { CustomLogger } from "@app/lib/logger/logger";
import { alphaNumericNanoId } from "@app/lib/nanoid";
import { RequestContextKey } from "@app/lib/request-context/request-context-keys";
@@ -114,19 +111,6 @@ export const main = async ({
});
try {
- let cookieSigner: ReturnType<typeof signerFactory> | undefined;
- const getCookieSigner = () => {
- if (!cookieSigner) cookieSigner = signerFactory(getCookieSigningKey());
- return cookieSigner;
- };
-
- await server.register<FastifyCookieOptions>(cookie, {
- secret: {
- sign: (value) => getCookieSigner().sign(value),
- unsign: (value) => getCookieSigner().unsign(value)
- }
- });
-
await server.register(fastifyEtag);
await server.register<FastifyCorsOptions>(cors, {
diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.ts
index 38ac0482bf..ac350358b1 100644
--- a/backend/src/server/routes/index.ts
+++ b/backend/src/server/routes/index.ts
@@ -1,5 +1,7 @@
import { registerBddNockRouter } from "@bdd_routes/bdd-nock-router";
import type { ClickHouseClient } from "@clickhouse/client";
+import type { FastifyCookieOptions } from "@fastify/cookie";
+import cookie from "@fastify/cookie";
import { CronJob } from "cron";
import { Cluster, Redis } from "ioredis";
import { Knex } from "knex";
@@ -199,7 +201,7 @@ import { keyValueStoreDALFactory } from "@app/keystore/key-value-store-dal";
import { TKeyStoreFactory } from "@app/keystore/keystore";
import { getConfig, TEnvConfig } from "@app/lib/config/env";
import { cronJobFactory } from "@app/lib/cron/cron-job";
-import { setCookieSigningKey } from "@app/lib/crypto/cookie-signing-key";
+import { getCookieSigningKey, setCookieSigningKey } from "@app/lib/crypto/cookie-signing-key";
import { crypto } from "@app/lib/crypto/cryptography";
import { BadRequestError } from "@app/lib/errors";
import { initGatewayLoadTracker } from "@app/lib/gateway-v2/gateway-load-tracker";
@@ -3997,6 +3999,8 @@ export const registerRoutes = async (
await kmsService.startService(hsmStatus);
setCookieSigningKey(appCfg.COOKIE_SECRET_SIGN_KEY || kmsService.getCookieSigningKey());
+ await server.register<FastifyCookieOptions>(cookie, { secret: getCookieSigningKey() });
+
// Register all cron jobs (synchronous registrations) before starting the scheduler
encryptionKeyRotationService.init();
telemetryQueue.startTelemetryCheck();