Skip to content

refactor(auth): migrate plain-session batch A to shared plugin (#50) #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pranavp10 merged 1 commit into from
Jul 13, 2026
Merged

refactor(auth): migrate plain-session batch A to shared plugin (#50) #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/backend/domain/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"compile": "bun build --compile --minify --sourcemap --bytecode ./src/index.ts --outfile server",
"lint": "biome check .",
"fix-lint": "biome check --fix .",
"format": "biome format ."
"format": "biome format .",
"test": "bun test test/"
},
"dependencies": {
"@elysiajs/cors": "catalog:backend",
Expand Down Expand Up @@ -40,7 +41,6 @@
"@reloop/db": "workspace:*",
"@reloop/cache": "workspace:*",
"@reloop/auth": "workspace:*",
"@reloop/apikey": "workspace:*",
"@reloop/bus": "workspace:*",
"@reloop/webhook-events": "workspace:*",
"@elysiajs/openapi": "catalog:backend",
Expand Down
6 changes: 0 additions & 6 deletions apps/backend/domain/src/middleware/api-key-auth.ts
View file
Open in desktop

This file was deleted.

183 changes: 51 additions & 132 deletions apps/backend/domain/src/middleware/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,153 +1,72 @@
import { createId } from "@paralleldrive/cuid2";
import { validateApiKey } from "@reloop/auth/apikey/validate";
import {
createAuthPlugin,
SESSION_CACHE_REDIS_PREFIX,
} from "@reloop/auth/middleware";
import { RedisCache } from "@reloop/cache/redis-client";
import { domainConfig } from "@reloop/domain/domain.config";
import { Elysia } from "elysia";
import { evlog } from "evlog/elysia";
import { validateApiKey } from "./api-key-auth";
import { validateSession } from "./cookie-auth";

if (domainConfig.NODE_ENV !== "production") {
process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
}

const sessionRedis = new RedisCache(
SESSION_CACHE_REDIS_PREFIX,
5,
domainConfig.REDIS_URL,
);

/**
* Batch A migration: shared plugin + service-specific internal-secret macro
* for KumoMTA dkim-key injects.
*/
export const authMiddleware = new Elysia({ name: "auth-middleware" })
.use(evlog())
.use(
createAuthPlugin({
baseUrl: domainConfig.BASE_URL,
redis: sessionRedis,
ttl: 5,
}),
)
.macro({
cookieAuth: {
async resolve({ status, request: { headers }, log }) {
try {
const cookie = headers.get("cookie");
const traceId = `req_${createId()}`;
log.set({ traceId, service: "domain" });
const sessionResult = await validateSession(cookie);
if (sessionResult) {
log.set({
...sessionResult,
});
log.info("Session authentication successful");
return { ...sessionResult, traceId, logger: log };
}
return status(401, { message: "Authentication required" });
} catch (e) {
log.error("Authentication error", {
error: e instanceof Error ? e.message : "Unknown error",
stack: e instanceof Error ? e.stack : undefined,
});
return status(401, { message: "Authentication failed" });
}
},
},
apiKeyAuth: {
async resolve({ status, request: { headers }, log }) {
try {
const apiKey = headers.get("x-api-key");
const traceId = `req_${createId()}`;
log.set({ traceId, service: "domain" });
const apiKeyResult = await validateApiKey(apiKey);
if (apiKeyResult) {
log.set({
...apiKeyResult,
});
log.info("API key authentication successful");
return { ...apiKeyResult, traceId, logger: log };
}
return status(401, { message: "Authentication required" });
} catch (e) {
log.error("Authentication error", {
error: e instanceof Error ? e.message : "Unknown error",
stack: e instanceof Error ? e.stack : undefined,
});
return status(401, { message: "Authentication failed" });
}
},
detail: {
security: [{ apiKey: [] }],
},
},
/**
* API key or internal service secret (KumoMTA → dkim-key for
* already-authenticated mail-service injects).
*/
apiKeyOrInternalAuth: {
async resolve({ status, request: { headers }, log }) {
try {
const traceId = `req_${createId()}`;
log.set({ traceId, service: "domain" });

const apiKey = headers.get("x-api-key");
const apiKeyResult = await validateApiKey(apiKey);
if (apiKeyResult) {
log.set({
...apiKeyResult,
});
log.info("API key authentication successful");
return { ...apiKeyResult, traceId, logger: log };
}

const internalSecret = headers.get("x-internal-secret");
const organizationId = headers.get("x-organization-id");
if (
internalSecret &&
organizationId &&
domainConfig.RELOOP_INTERNAL_SECRET &&
internalSecret === domainConfig.RELOOP_INTERNAL_SECRET
) {
log.set({
authType: "internal",
organizationId,
});
log.info("Internal secret authentication successful");
return {
organizationId,
authType: "internal" as const,
traceId,
logger: log,
};
}

return status(401, { message: "Authentication required" });
} catch (e) {
log.error("Authentication error", {
error: e instanceof Error ? e.message : "Unknown error",
stack: e instanceof Error ? e.stack : undefined,
});
return status(401, { message: "Authentication failed" });
async resolve({ status, request: { headers } }) {
const apiKey = headers.get("x-api-key");
const apiKeyResult = await validateApiKey(apiKey, sessionRedis);
if (apiKeyResult?.organizationId) {
return {
userId: apiKeyResult.userId,
organizationId: apiKeyResult.organizationId,
role: null as string | null,
authType: "apikey" as const,
apiKeyId: apiKeyResult.apiKeyId,
};
}
},
detail: {
security: [{ apiKey: [] }],
},
},
auth: {
async resolve({ status, request: { headers }, log }) {
try {
const apiKey = headers.get("x-api-key");
const cookie = headers.get("cookie");
const traceId = `req_${createId()}`;
log.set({ traceId, service: "domain" });
const apiKeyResult = await validateApiKey(apiKey);
if (apiKeyResult) {
log.set({
...apiKeyResult,
});
log.info("API key authentication successful");
return { ...apiKeyResult, traceId, logger: log };
}
const sessionResult = await validateSession(cookie);
if (sessionResult) {
log.set({
...sessionResult,
});
log.info("Session authentication successful");
return { ...sessionResult, traceId, logger: log };
}
return status(401, { message: "Authentication required" });
} catch (e) {
log.error("Authentication error", {
error: e instanceof Error ? e.message : "Unknown error",
stack: e instanceof Error ? e.stack : undefined,
});
return status(401, { message: "Authentication failed" });

const internalSecret = headers.get("x-internal-secret");
const organizationId = headers.get("x-organization-id");
if (
internalSecret &&
organizationId &&
domainConfig.RELOOP_INTERNAL_SECRET &&
internalSecret === domainConfig.RELOOP_INTERNAL_SECRET
) {
return {
userId: "internal",
organizationId,
role: null as string | null,
authType: "session" as const,
};
}

return status(401, { message: "Authentication required" });
},
detail: {
security: [{ apiKey: [] }],
Expand Down
50 changes: 0 additions & 50 deletions apps/backend/domain/src/middleware/cookie-auth.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion apps/backend/domain/src/routes/domain/get-domain-nameserver/get-domain-dns.route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const getDomainNameserversRoute = new Elysia().use(authMiddleware).get(
});
},
{
cookieAuth: true,
auth: true,
params: t.Object({
domain_id: t.String(),
}),
Expand Down
Loading