Volnei MunhozGitHubunknown <>Claude Opus 4.6Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>* fix: add CSRF protection to OAuth callback via HMAC-signed nonce The OAuth state parameter was used only for passing application data (returnTo, teamId) with no cryptographic binding to the user session. An attacker could authorize their own account on a provider, capture the authorization code, and trick a logged-in user into visiting the callback URL to link the attacker's account to the victim's Cal.com profile. Changes: - encodeOAuthState: generate a random nonce and HMAC-sign it with NEXTAUTH_SECRET + userId, injecting both into the OAuth state - decodeOAuthState: verify the HMAC on callback using timingSafeEqual; skip verification when nonce is absent (backwards compatible with apps that don't yet use encodeOAuthState) - Stripe callback: replace raw state.returnTo redirect with getSafeRedirectUrl to prevent open redirect, remove redundant getReturnToValueFromQueryState, add missing return on access_denied Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: make CSRF nonce verification mandatory with allowlist for exempt apps Makes nonce/HMAC verification mandatory by default in decodeOAuthState, preventing attackers from bypassing CSRF protection by omitting nonce fields from the state parameter. Apps not yet migrated to encodeOAuthState (stripe, basecamp3, dub, webex, tandem) are explicitly allowlisted and pass their slug to decodeOAuthState to skip verification. Addresses review feedback (identified by cubic) about the conditional check being trivially bypassable. Co-Authored-By: unknown <> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
72 lines
2.6 KiB
TypeScript
72 lines
2.6 KiB
TypeScript
import type { NextApiRequest, NextApiResponse } from "next";
|
|
|
|
import { getSafeRedirectUrl } from "@calcom/lib/getSafeRedirectUrl";
|
|
import prisma from "@calcom/prisma";
|
|
|
|
import getAppKeysFromSlug from "../../_utils/getAppKeysFromSlug";
|
|
import getInstalledAppPath from "../../_utils/getInstalledAppPath";
|
|
import createOAuthAppCredential from "../../_utils/oauth/createOAuthAppCredential";
|
|
import { decodeOAuthState } from "../../_utils/oauth/decodeOAuthState";
|
|
|
|
export default async function handler(req: NextApiRequest, res: NextApiResponse) {
|
|
if (!req.query.code) {
|
|
res.status(401).json({ message: "Missing code" });
|
|
return;
|
|
}
|
|
|
|
const code = req.query.code as string;
|
|
const state = decodeOAuthState(req, "tandem");
|
|
|
|
let clientId = "";
|
|
let clientSecret = "";
|
|
let baseUrl = "https://tandem.chat";
|
|
const appKeys = await getAppKeysFromSlug("tandem");
|
|
if (typeof appKeys.client_id === "string") clientId = appKeys.client_id;
|
|
if (typeof appKeys.client_secret === "string") clientSecret = appKeys.client_secret;
|
|
if (typeof appKeys.base_url === "string") baseUrl = appKeys.base_url;
|
|
if (!clientId) return res.status(400).json({ message: "Tandem client_id missing." });
|
|
if (!clientSecret) return res.status(400).json({ message: "Tandem client_secret missing." });
|
|
if (!baseUrl) return res.status(400).json({ message: "Tandem base_url missing." });
|
|
|
|
const result = await fetch(`${baseUrl}/api/v1/oauth/v2/token`, {
|
|
method: "POST",
|
|
headers: {
|
|
"Content-Type": "application/json",
|
|
},
|
|
body: JSON.stringify({ code, client_id: clientId, client_secret: clientSecret }),
|
|
});
|
|
|
|
const responseBody = await result.json();
|
|
|
|
const userId = req.session?.user.id;
|
|
if (!userId) {
|
|
return res.status(404).json({ message: "No user found" });
|
|
}
|
|
|
|
const existingCredentialTandemVideo = await prisma.credential.findMany({
|
|
select: {
|
|
id: true,
|
|
},
|
|
where: {
|
|
type: "tandem_video",
|
|
userId: req.session?.user.id,
|
|
appId: "tandem",
|
|
},
|
|
});
|
|
|
|
const credentialIdsToDelete = existingCredentialTandemVideo.map((item) => item.id);
|
|
if (credentialIdsToDelete.length > 0) {
|
|
await prisma.credential.deleteMany({ where: { id: { in: credentialIdsToDelete }, userId } });
|
|
}
|
|
if (result.ok) {
|
|
responseBody.expiry_date = Math.round(Date.now() + responseBody.expires_in * 1000);
|
|
delete responseBody.expires_in;
|
|
|
|
await createOAuthAppCredential({ appId: "tandem", type: "tandem_video" }, responseBody, req);
|
|
|
|
res.redirect(
|
|
getSafeRedirectUrl(state?.returnTo) ?? getInstalledAppPath({ variant: "conferencing", slug: "tandem" })
|
|
);
|
|
}
|
|
}
|