@aura-stack/auth 0.4.0-rc.5 → 0.4.0

package/dist/actions/index.cjs

@@ -49,9 +49,29 @@ var cacheControl = {
   Expires: "0",
   Vary: "Cookie"
 };
+var contentSecurityPolicy = {
+  "Content-Security-Policy": [
+    "default-src 'none'",
+    "script-src 'self'",
+    "frame-src 'none'",
+    "object-src 'none'",
+    "frame-ancestors 'none'",
+    "base-uri 'none'"
+  ].join("; ")
+};
+var secureHeaders = {
+  "X-Content-Type-Options": "nosniff",
+  "X-Frame-Options": "DENY",
+  "Referrer-Policy": "strict-origin-when-cross-origin"
+};
+var secureApiHeaders = {
+  ...cacheControl,
+  ...contentSecurityPolicy,
+  ...secureHeaders
+};
 
 // src/secure.ts
-var import_crypto = __toESM(require("crypto"), 1);
+var import_crypto2 = __toESM(require("crypto"), 1);
 
 // src/utils.ts
 var import_router = require("@aura-stack/router");
@@ -95,9 +115,6 @@ var isNativeError = (error) => {
 var isOAuthProtocolError = (error) => {
   return error instanceof OAuthProtocolError;
 };
-var isAuthSecurityError = (error) => {
-  return error instanceof AuthSecurityError;
-};
 
 // src/utils.ts
 var toSnakeCase = (str) => {
@@ -116,95 +133,175 @@ var equals = (a, b) => {
   if (a === null || b === null || a === void 0 || b === void 0) return false;
   return a === b;
 };
-var sanitizeURL = (url) => {
-  try {
-    let decodedURL = decodeURIComponent(url).trim();
-    const protocolMatch = decodedURL.match(/^([a-zA-Z][a-zA-Z0-9+.-]*:\/\/)/);
-    let protocol = "";
-    let rest = decodedURL;
-    if (protocolMatch) {
-      protocol = protocolMatch[1];
-      rest = decodedURL.slice(protocol.length);
-      const slashIndex = rest.indexOf("/");
-      if (slashIndex === -1) {
-        return protocol + rest;
-      }
-      const domain = rest.slice(0, slashIndex);
-      let path = rest.slice(slashIndex).replace(/\/\.\.\//g, "/").replace(/\/\.\.$/, "").replace(/\.{2,}/g, "").replace(/\/{2,}/g, "/");
-      if (path !== "/" && path.endsWith("/")) {
-        path = path.replace(/\/+$/, "/");
-      } else if (path !== "/") {
-        path = path.replace(/\/+$/, "");
-      }
-      return protocol + domain + path;
-    }
-    let sanitized = decodedURL.replace(/\/\.\.\//g, "/").replace(/\/\.\.$/, "").replace(/\.{2,}/g, "").replace(/\/{2,}/g, "/");
-    if (sanitized !== "/" && sanitized.endsWith("/")) {
-      sanitized = sanitized.replace(/\/+$/, "/");
-    } else if (sanitized !== "/") {
-      sanitized = sanitized.replace(/\/+$/, "");
-    }
-    return sanitized;
-  } catch {
-    return url.trim();
-  }
-};
-var isValidRelativePath = (path) => {
-  if (!path || typeof path !== "string") return false;
-  if (!path.startsWith("/") || path.includes("://") || path.includes("\r") || path.includes("\n")) return false;
-  if (/[\x00-\x1F\x7F]/.test(path) || path.includes("\0")) return false;
-  const sanitized = sanitizeURL(path);
-  if (sanitized.includes("..")) return false;
-  return true;
-};
-var getNormalizedOriginPath = (path) => {
-  try {
-    const url = new URL(path);
-    url.hash = "";
-    url.search = "";
-    return `${url.origin}${url.pathname}`;
-  } catch {
-    return sanitizeURL(path);
-  }
+var getBaseURL = (request) => {
+  const url = new URL(request.url);
+  return `${url.origin}${url.pathname}`;
 };
 var toISOString = (date) => {
   return new Date(date).toISOString();
 };
-var formatZodError = (error) => {
-  if (!error.issues || error.issues.length === 0) {
-    return {};
+var extractPath = (url) => {
+  const pathRegex = /^https?:\/\/[a-zA-Z0-9_\-\.]+(:\d+)?(\/.*)$/;
+  const match = url.match(pathRegex);
+  return match && match[2] ? match[2] : "/";
+};
+var getErrorName = (error) => {
+  if (error instanceof Error) {
+    return error.name;
   }
-  return error.issues.reduce((previous, issue) => {
-    const key = issue.path.join(".");
-    return {
-      ...previous,
-      [key]: {
-        code: issue.code,
-        message: issue.message
-      }
-    };
-  }, {});
+  return typeof error === "string" ? error : "UnknownError";
 };
 
 // src/assert.ts
+var import_crypto = require("crypto");
+var unsafeChars = [
+  "<",
+  ">",
+  '"',
+  "`",
+  " ",
+  "\r",
+  "\n",
+  "	",
+  "\\",
+  "%2F",
+  "%5C",
+  "%2f",
+  "%5c",
+  "\r\n",
+  "%0A",
+  "%0D",
+  "%0a",
+  "%0d",
+  "..",
+  "//",
+  "///",
+  "...",
+  "%20",
+  "\0"
+];
 var isValidURL = (value) => {
-  if (value.includes("\r\n") || value.includes("\n") || value.includes("\r")) return false;
-  const regex = /^https?:\/\/(?:[a-zA-Z0-9._-]+|localhost|\[[0-9a-fA-F:]+\])(?::\d{1,5})?(?:\/[a-zA-Z0-9._~!$&'()*+,;=:@-]*)*\/?$/;
-  return regex.test(value);
+  if (!new RegExp(/^https?:\/\/[^/]/).test(value)) {
+    return false;
+  }
+  const match = value.match(/^(https?:\/\/)(.*)$/);
+  if (!match) return false;
+  const rest = match[2];
+  for (const char of unsafeChars) {
+    if (rest.includes(char)) return false;
+  }
+  const regex = /^https?:\/\/(?:[a-zA-Z0-9._-]+|localhost|\[[0-9a-fA-F:]+\])(?::\d{1,5})?(?:\/[a-zA-Z0-9._~!$&'()?#*+,;=:@-]*)*\/?$/;
+  return regex.test(match[0]);
 };
 var isJWTPayloadWithToken = (payload) => {
   return typeof payload === "object" && payload !== null && "token" in payload && typeof payload?.token === "string";
 };
+var isRelativeURL = (value) => {
+  if (value.length > 100) return false;
+  for (const char of unsafeChars) {
+    if (value.includes(char)) return false;
+  }
+  const regex = /^\/[a-zA-Z0-9\-_\/.?&=#]*\/?$/;
+  return regex.test(value);
+};
+var isSameOrigin = (origin, expected) => {
+  const originURL = new URL(origin);
+  const expectedURL = new URL(expected);
+  return equals(originURL.origin, expectedURL.origin);
+};
+var patternToRegex = (pattern) => {
+  try {
+    if (pattern.length > 2048) return null;
+    pattern = pattern.replace(/\\/g, "");
+    const match = pattern.match(/^(https?):\/\/([a-zA-Z0-9.*-]{1,253})(?::(\d{1,5}|\*))?(?:\/.*)?$/);
+    if (!match) return null;
+    const [, protocol, host, port] = match;
+    const hasWildcard = host.includes("*");
+    if (hasWildcard && !host.startsWith("*.")) return null;
+    if (hasWildcard && host.slice(2).includes("*")) return null;
+    const domain = hasWildcard ? host.slice(2) : host;
+    const escapedDomain = domain.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const hostRegex = hasWildcard ? `[^.]+\\.${escapedDomain}` : escapedDomain;
+    const portRegex = port === "*" ? ":\\d{1,5}" : port ? `:${port}` : "";
+    return new RegExp(`^${protocol}:\\/\\/${hostRegex}${portRegex}$`);
+  } catch {
+    return null;
+  }
+};
+var isTrustedOrigin = (url, trustedOrigins) => {
+  if (!isValidURL(url) || trustedOrigins.length === 0) return false;
+  try {
+    const urlOrigin = new URL(url).origin;
+    for (const pattern of trustedOrigins) {
+      const regex = patternToRegex(pattern);
+      if (regex?.test(urlOrigin)) return true;
+      try {
+        if (isValidURL(pattern) && equals(new URL(pattern).origin, urlOrigin)) return true;
+      } catch {
+      }
+    }
+  } catch {
+  }
+  return false;
+};
+var safeEquals = (a, b) => {
+  const bufferA = Buffer.from(a);
+  const bufferB = Buffer.from(b);
+  if (bufferA.length !== bufferB.length) {
+    return false;
+  }
+  return (0, import_crypto.timingSafeEqual)(bufferA, bufferB);
+};
+
+// src/env.ts
+var import_meta = {};
+var env = new Proxy({}, {
+  get(_, prop) {
+    if (typeof prop !== "string") return void 0;
+    const hasProperty = (process2) => {
+      return process2 && Object.prototype.hasOwnProperty.call(process2, prop);
+    };
+    try {
+      if (typeof process !== "undefined" && hasProperty(process.env)) {
+        return process.env[prop];
+      }
+      if (typeof import_meta !== "undefined" && hasProperty(import_meta.env)) {
+        return import_meta.env[prop];
+      }
+      if (typeof Deno !== "undefined" && Deno.env?.get) {
+        return Deno.env.get(prop);
+      }
+      if (typeof Bun !== "undefined" && hasProperty(Bun.env)) {
+        return Bun.env[prop];
+      }
+      const globalValue = globalThis[prop];
+      return typeof globalValue === "string" ? globalValue : void 0;
+    } catch {
+      return void 0;
+    }
+  }
+});
+
+// src/jose.ts
+var import_jose = require("@aura-stack/jose");
+var jwtVerificationOptions = {
+  algorithms: ["HS256"],
+  typ: "JWT"
+};
 
 // src/secure.ts
 var generateSecure = (length = 32) => {
-  return import_crypto.default.randomBytes(length).toString("base64url");
+  return import_crypto2.default.randomBytes(length).toString("base64url");
 };
 var createHash = (data, base = "hex") => {
-  return import_crypto.default.createHash("sha256").update(data).digest().toString(base);
+  return import_crypto2.default.createHash("sha256").update(data).digest().toString(base);
 };
 var createPKCE = async (verifier) => {
-  const codeVerifier = verifier ?? generateSecure(86);
+  const byteLength = verifier ? void 0 : Math.floor(Math.random() * (96 - 32 + 1) + 32);
+  const codeVerifier = verifier ?? generateSecure(byteLength ?? 64);
+  if (codeVerifier.length < 43 || codeVerifier.length > 128) {
+    throw new AuthSecurityError("PKCE_VERIFIER_INVALID", "The code verifier must be between 43 and 128 characters in length.");
+  }
   const codeChallenge = createHash(codeVerifier, "base64url");
   return { codeVerifier, codeChallenge, method: "S256" };
 };
@@ -212,7 +309,7 @@ var createCSRF = async (jose, csrfCookie) => {
   try {
     const token = generateSecure(32);
     if (csrfCookie) {
-      await jose.verifyJWS(csrfCookie);
+      await jose.verifyJWS(csrfCookie, jwtVerificationOptions);
       return csrfCookie;
     }
     return jose.signJWS({ token });
@@ -223,20 +320,18 @@ var createCSRF = async (jose, csrfCookie) => {
 };
 var verifyCSRF = async (jose, cookie, header) => {
   try {
-    const cookiePayload = await jose.verifyJWS(cookie);
-    const headerPayload = await jose.verifyJWS(header);
+    const cookiePayload = await jose.verifyJWS(cookie, jwtVerificationOptions);
+    const headerPayload = await jose.verifyJWS(header, jwtVerificationOptions);
     if (!isJWTPayloadWithToken(cookiePayload)) {
       throw new AuthSecurityError("CSRF_TOKEN_INVALID", "Cookie payload missing token field.");
     }
     if (!isJWTPayloadWithToken(headerPayload)) {
       throw new AuthSecurityError("CSRF_TOKEN_INVALID", "Header payload missing token field.");
     }
-    const cookieBuffer = Buffer.from(cookiePayload.token);
-    const headerBuffer = Buffer.from(headerPayload.token);
-    if (!equals(headerBuffer.length, cookieBuffer.length)) {
+    if (!equals(cookiePayload.token.length, headerPayload.token.length)) {
       throw new AuthSecurityError("CSRF_TOKEN_INVALID", "The CSRF tokens do not match.");
     }
-    if (!import_crypto.default.timingSafeEqual(cookieBuffer, headerBuffer)) {
+    if (!safeEquals(cookiePayload.token, headerPayload.token)) {
       throw new AuthSecurityError("CSRF_TOKEN_INVALID", "The CSRF tokens do not match.");
     }
     return true;
@@ -247,6 +342,18 @@ var verifyCSRF = async (jose, cookie, header) => {
 
 // src/schemas.ts
 var import_zod = require("zod");
+var OAuthProviderCredentialsSchema = (0, import_zod.object)({
+  id: (0, import_zod.string)(),
+  name: (0, import_zod.string)(),
+  authorizeURL: (0, import_zod.string)().url(),
+  accessToken: (0, import_zod.string)().url(),
+  scope: (0, import_zod.string)(),
+  userInfo: (0, import_zod.string)().url(),
+  responseType: (0, import_zod.enum)(["code", "token", "id_token"]),
+  clientId: (0, import_zod.string)(),
+  clientSecret: (0, import_zod.string)(),
+  profile: import_zod.z.function().optional()
+});
 var OAuthProviderConfigSchema = (0, import_zod.object)({
   authorizeURL: (0, import_zod.string)().url(),
   accessToken: (0, import_zod.string)().url(),
@@ -314,73 +421,82 @@ var OAuthEnvSchema = (0, import_zod.object)({
 });
 
 // src/actions/signIn/authorization.ts
-var createAuthorizationURL = (oauthConfig, redirectURI, state, codeChallenge, codeChallengeMethod) => {
+var createAuthorizationURL = (oauthConfig, redirectURI, state, codeChallenge, codeChallengeMethod, logger) => {
   const parsed = OAuthAuthorization.safeParse({ ...oauthConfig, redirectURI, state, codeChallenge, codeChallengeMethod });
   if (!parsed.success) {
-    const msg = JSON.stringify(formatZodError(parsed.error), null, 2);
-    throw new AuthInternalError("INVALID_OAUTH_CONFIGURATION", msg);
+    logger?.log("INVALID_OAUTH_CONFIGURATION", {
+      structuredData: {
+        scope: oauthConfig.scope,
+        redirect_uri: redirectURI,
+        has_state: Boolean(state),
+        has_code_challenge: Boolean(codeChallenge),
+        code_challenge_method: codeChallengeMethod
+      }
+    });
+    throw new AuthInternalError("INVALID_OAUTH_CONFIGURATION", "The OAuth provider configuration is invalid.");
   }
   const { authorizeURL, ...options2 } = parsed.data;
   const { userInfo, accessToken, clientSecret, ...required } = options2;
   const searchParams = new URLSearchParams(toCastCase(required));
   return `${authorizeURL}?${searchParams}`;
 };
-var getOriginURL = (request, trustedProxyHeaders) => {
+var getTrustedOrigins = async (request, trustedOrigins) => {
+  if (!trustedOrigins) return [];
+  const raw = typeof trustedOrigins === "function" ? await trustedOrigins(request) : trustedOrigins;
+  return Array.isArray(raw) ? raw : typeof raw === "string" ? [raw] : [];
+};
+var getOriginURL = async (request, context) => {
   const headers = request.headers;
-  if (trustedProxyHeaders) {
-    const protocol = headers.get("X-Forwarded-Proto") ?? headers.get("Forwarded")?.match(/proto=([^;]+)/i)?.[1] ?? "http";
-    const host = headers.get("X-Forwarded-Host") ?? headers.get("Host") ?? headers.get("Forwarded")?.match(/host=([^;]+)/i)?.[1] ?? null;
-    return new URL(`${protocol}://${host}${getNormalizedOriginPath(new URL(request.url).pathname)}`);
-  } else {
-    return new URL(getNormalizedOriginPath(request.url));
+  let origin = new URL(request.url).origin;
+  const trustedOrigins = await getTrustedOrigins(request, context?.trustedOrigins);
+  trustedOrigins.push(origin);
+  if (context?.trustedProxyHeaders) {
+    const protocol = headers.get("Forwarded")?.match(/proto=([^;]+)/i)?.[1] ?? headers.get("X-Forwarded-Proto") ?? "http";
+    const host = headers.get("Host") ?? headers.get("Forwarded")?.match(/host=([^;]+)/i)?.[1] ?? headers.get("X-Forwarded-Host") ?? null;
+    origin = `${protocol}://${host}`;
+  }
+  if (!isTrustedOrigin(origin, trustedOrigins)) {
+    context?.logger?.log("UNTRUSTED_ORIGIN", { structuredData: { origin } });
+    throw new AuthInternalError("UNTRUSTED_ORIGIN", "The constructed origin URL is not trusted.");
   }
+  return origin;
 };
-var createRedirectURI = (request, oauth, basePath, trustedProxyHeaders) => {
-  const url = getOriginURL(request, trustedProxyHeaders);
-  return `${url.origin}${basePath}/callback/${oauth}`;
+var createRedirectURI = async (request, oauth, context) => {
+  const origin = await getOriginURL(request, context);
+  return `${origin}${context.basePath}/callback/${oauth}`;
 };
-var createRedirectTo = (request, redirectTo, trustedProxyHeaders) => {
+var createRedirectTo = async (request, redirectTo, context) => {
   try {
     const headers = request.headers;
-    const origin = headers.get("Origin");
-    const referer = headers.get("Referer");
-    let hostedURL = getOriginURL(request, trustedProxyHeaders);
-    if (redirectTo) {
-      if (redirectTo.startsWith("/")) {
-        return sanitizeURL(redirectTo);
-      }
-      const redirectToURL = new URL(sanitizeURL(getNormalizedOriginPath(redirectTo)));
-      if (!isValidURL(redirectTo) || !equals(redirectToURL.origin, hostedURL.origin)) {
-        throw new AuthSecurityError(
-          "POTENTIAL_OPEN_REDIRECT_ATTACK_DETECTED",
-          "The redirectTo parameter does not match the hosted origin."
-        );
-      }
-      return sanitizeURL(redirectToURL.pathname);
-    }
-    if (referer) {
-      const refererURL = new URL(sanitizeURL(referer));
-      if (!isValidURL(referer) || !equals(refererURL.origin, hostedURL.origin)) {
-        throw new AuthSecurityError(
-          "POTENTIAL_OPEN_REDIRECT_ATTACK_DETECTED",
-          "The referer of the request does not match the hosted origin."
-        );
+    const requestOrigin = await getOriginURL(request, context);
+    const origins = await getTrustedOrigins(request, context?.trustedOrigins);
+    const validateURL = (url) => {
+      if (!isRelativeURL(url) && !isValidURL(url)) return "/";
+      if (isRelativeURL(url)) return url;
+      if (origins.length > 0) {
+        if (isTrustedOrigin(url, origins)) {
+          const urlOrigin = new URL(url).origin;
+          for (const pattern of origins) {
+            const regex = patternToRegex(pattern);
+            if (regex?.test(urlOrigin)) {
+              return isSameOrigin(url, request.url) ? extractPath(url) : url;
+            }
+            if (isValidURL(pattern) && equals(new URL(pattern).origin, urlOrigin)) return url;
+          }
+        }
+        context?.logger?.log("OPEN_REDIRECT_ATTACK");
+        return "/";
       }
-      return sanitizeURL(refererURL.pathname);
-    }
-    if (origin) {
-      const originURL = new URL(sanitizeURL(getNormalizedOriginPath(origin)));
-      if (!isValidURL(origin) || !equals(originURL.origin, hostedURL.origin)) {
-        throw new AuthSecurityError("POTENTIAL_OPEN_REDIRECT_ATTACK_DETECTED", "Invalid origin (potential CSRF).");
+      if (isSameOrigin(url, requestOrigin)) {
+        return extractPath(url);
       }
-      return sanitizeURL(originURL.pathname);
-    }
-    return "/";
+      context?.logger?.log("OPEN_REDIRECT_ATTACK");
+      return "/";
+    };
+    return validateURL(redirectTo ?? headers.get("Referer") ?? headers.get("Origin") ?? "/");
   } catch (error) {
-    if (isAuthSecurityError(error)) {
-      throw error;
-    }
-    throw new AuthSecurityError("POTENTIAL_OPEN_REDIRECT_ATTACK_DETECTED", "Invalid origin (potential CSRF).");
+    context?.logger?.log("POTENTIAL_OPEN_REDIRECT_ATTACK_DETECTED");
+    return "/";
   }
 };
 
@@ -409,13 +525,17 @@ var signInAction = (oauth) => {
         request,
         params: { oauth: oauth2 },
         searchParams: { redirectTo },
-        context: { oauth: providers, cookies, trustedProxyHeaders, basePath }
+        context
       } = ctx;
+      const { oauth: providers, cookies, logger } = context;
       const state = generateSecure();
-      const redirectURI = createRedirectURI(request, oauth2, basePath, trustedProxyHeaders);
-      const redirectToValue = createRedirectTo(request, redirectTo, trustedProxyHeaders);
+      const redirectURI = await createRedirectURI(request, oauth2, context);
+      const redirectToValue = await createRedirectTo(request, redirectTo, context);
       const { codeVerifier, codeChallenge, method } = await createPKCE();
-      const authorization = createAuthorizationURL(providers[oauth2], redirectURI, state, codeChallenge, method);
+      const authorization = createAuthorizationURL(providers[oauth2], redirectURI, state, codeChallenge, method, logger);
+      logger?.log("SIGN_IN_INITIATED", {
+        structuredData: { oauth_provider: oauth2, code_challenge_method: method }
+      });
       const headers = new import_router2.HeadersBuilder(cacheControl).setHeader("Location", authorization).setCookie(cookies.state.name, state, cookies.state.attributes).setCookie(cookies.redirectURI.name, redirectURI, cookies.redirectURI.attributes).setCookie(cookies.redirectTo.name, redirectToValue, cookies.redirectTo.attributes).setCookie(cookies.codeVerifier.name, codeVerifier, cookies.codeVerifier.attributes).toHeaders();
       return Response.json(
         { oauth: oauth2 },
@@ -454,9 +574,14 @@ var getDefaultUserInfo = (profile) => {
     image: profile?.image ?? profile?.picture
   };
 };
-var getUserInfo = async (oauthConfig, accessToken) => {
+var getUserInfo = async (oauthConfig, accessToken, logger) => {
   const userinfoEndpoint = oauthConfig.userInfo;
   try {
+    logger?.log("OAUTH_USERINFO_REQUEST_INITIATED", {
+      structuredData: {
+        endpoint: userinfoEndpoint
+      }
+    });
     const response = await fetchAsync(userinfoEndpoint, {
       method: "GET",
       headers: {
@@ -464,35 +589,54 @@ var getUserInfo = async (oauthConfig, accessToken) => {
         Authorization: `Bearer ${accessToken}`
       }
     });
+    if (!response.ok) {
+      logger?.log("OAUTH_USERINFO_INVALID_RESPONSE");
+      throw new OAuthProtocolError("INVALID_REQUEST", "Invalid userinfo response format");
+    }
     const json = await response.json();
     const { success, data } = OAuthErrorResponse.safeParse(json);
     if (success) {
-      throw new OAuthProtocolError(
-        data.error,
-        data?.error_description ?? "An error occurred while fetching user information."
-      );
+      logger?.log("OAUTH_USERINFO_ERROR", {
+        message: "Error response received from OAuth userinfo endpoint",
+        structuredData: {
+          error: data.error,
+          error_description: data.error_description ?? ""
+        }
+      });
+      throw new OAuthProtocolError("INVALID_REQUEST", "An error was received from the OAuth userinfo endpoint.");
     }
+    logger?.log("OAUTH_USERINFO_SUCCESS");
     return oauthConfig?.profile ? oauthConfig.profile(json) : getDefaultUserInfo(json);
   } catch (error) {
     if (isOAuthProtocolError(error)) {
       throw error;
     }
+    logger?.log("OAUTH_USERINFO_REQUEST_FAILED");
     if (isNativeError(error)) {
-      throw new OAuthProtocolError("invalid_request", error.message, "", { cause: error });
+      throw new OAuthProtocolError("SERVER_ERROR", "Failed to fetch user information from OAuth provider", "", {
+        cause: error
+      });
     }
-    throw new OAuthProtocolError("invalid_request", "Failed to fetch user information.", "", { cause: error });
+    throw new OAuthProtocolError("SERVER_ERROR", "Failed to fetch user information", "", { cause: error });
   }
 };
 
 // src/actions/callback/access-token.ts
-var createAccessToken = async (oauthConfig, redirectURI, code, codeVerifier) => {
+var createAccessToken = async (oauthConfig, redirectURI, code, codeVerifier, logger) => {
   const parsed = OAuthAccessToken.safeParse({ ...oauthConfig, redirectURI, code, codeVerifier });
   if (!parsed.success) {
-    const msg = JSON.stringify(formatZodError(parsed.error), null, 2);
-    throw new AuthInternalError("INVALID_OAUTH_CONFIGURATION", msg);
+    logger?.log("INVALID_OAUTH_CONFIGURATION");
+    throw new AuthInternalError("INVALID_OAUTH_CONFIGURATION", "The OAuth provider configuration is invalid.");
   }
   const { accessToken, clientId, clientSecret, code: codeParsed, redirectURI: redirectParsed } = parsed.data;
   try {
+    logger?.log("OAUTH_ACCESS_TOKEN_REQUEST_INITIATED", {
+      structuredData: {
+        has_client_id: Boolean(clientId),
+        redirect_uri: redirectParsed,
+        grant_type: "authorization_code"
+      }
+    });
     const response = await fetchAsync(accessToken, {
       method: "POST",
       headers: {
@@ -508,17 +652,33 @@ var createAccessToken = async (oauthConfig, redirectURI, code, codeVerifier) =>
         code_verifier: codeVerifier
       }).toString()
     });
+    if (!response.ok) {
+      logger?.log("INVALID_OAUTH_ACCESS_TOKEN_RESPONSE");
+      throw new OAuthProtocolError("invalid_request", "Invalid access token response");
+    }
     const json = await response.json();
     const token = OAuthAccessTokenResponse.safeParse(json);
     if (!token.success) {
       const { success, data } = OAuthAccessTokenErrorResponse.safeParse(json);
       if (!success) {
-        throw new OAuthProtocolError("INVALID_REQUEST", "Invalid access token response format");
+        logger?.log("INVALID_OAUTH_ACCESS_TOKEN_RESPONSE");
+        throw new OAuthProtocolError("invalid_request", "Invalid access token response format");
       }
-      throw new OAuthProtocolError(data.error, data?.error_description ?? "Failed to retrieve access token");
+      logger?.log("OAUTH_ACCESS_TOKEN_ERROR", {
+        structuredData: {
+          error: data.error,
+          error_description: data.error_description ?? ""
+        }
+      });
+      throw new OAuthProtocolError("INVALID_ACCESS_TOKEN", "Failed to retrieve access token");
     }
+    logger?.log("OAUTH_ACCESS_TOKEN_SUCCESS");
     return token.data;
   } catch (error) {
+    logger?.log("OAUTH_ACCESS_TOKEN_REQUEST_FAILED");
+    if (error instanceof Error) {
+      throw new OAuthProtocolError("server_error", "Failed to communicate with OAuth provider", "", { cause: error });
+    }
     throw error;
   }
 };
@@ -543,7 +703,8 @@ var setCookie = (cookieName, value, options2) => {
 var expiredCookieAttributes = {
   ...defaultCookieOptions,
   expires: /* @__PURE__ */ new Date(0),
-  maxAge: 0
+  maxAge: 0,
+  secure: true
 };
 var getCookie = (request, cookieName) => {
   const cookies = request.headers.get("Cookie");
@@ -582,10 +743,23 @@ var callbackConfig = (oauth) => {
     },
     middlewares: [
       (ctx) => {
-        const response = OAuthAuthorizationErrorResponse.safeParse(ctx.searchParams);
+        const {
+          searchParams,
+          context: { logger }
+        } = ctx;
+        const response = OAuthAuthorizationErrorResponse.safeParse(searchParams);
         if (response.success) {
           const { error, error_description } = response.data;
-          throw new OAuthProtocolError(error, error_description ?? "OAuth Authorization Error");
+          const criticalAuthErrors = ["access_denied", "server_error"];
+          const severity = criticalAuthErrors.includes(error.toLowerCase()) ? "critical" : "warning";
+          logger?.log("OAUTH_AUTHORIZATION_ERROR", {
+            severity,
+            structuredData: {
+              error,
+              error_description: error_description ?? ""
+            }
+          });
+          throw new OAuthProtocolError(error, error_description || "OAuth Authorization Error");
         }
         return ctx;
       }
@@ -601,31 +775,54 @@ var callbackAction = (oauth) => {
         request,
         params: { oauth: oauth2 },
         searchParams: { code, state },
-        context: { oauth: providers, cookies, jose }
+        context
       } = ctx;
+      const { oauth: providers, cookies, jose, logger, trustedOrigins } = context;
       const oauthConfig = providers[oauth2];
       const cookieState = getCookie(request, cookies.state.name);
+      const codeVerifier = getCookie(request, cookies.codeVerifier.name);
       const cookieRedirectTo = getCookie(request, cookies.redirectTo.name);
       const cookieRedirectURI = getCookie(request, cookies.redirectURI.name);
-      const codeVerifier = getCookie(request, cookies.codeVerifier.name);
-      if (!equals(cookieState, state)) {
+      if (!safeEquals(cookieState, state)) {
+        logger?.log("MISMATCHING_STATE", {
+          structuredData: {
+            oauth_provider: oauth2
+          }
+        });
         throw new AuthSecurityError(
           "MISMATCHING_STATE",
           "The provided state passed in the OAuth response does not match the stored state."
         );
       }
-      const accessToken = await createAccessToken(oauthConfig, cookieRedirectURI, code, codeVerifier);
-      const sanitized = sanitizeURL(cookieRedirectTo);
-      if (!isValidRelativePath(sanitized)) {
-        throw new AuthSecurityError(
-          "POTENTIAL_OPEN_REDIRECT_ATTACK_DETECTED",
-          "Invalid redirect path. Potential open redirect attack detected."
-        );
+      const accessToken = await createAccessToken(oauthConfig, cookieRedirectURI, code, codeVerifier, logger);
+      const origins = await getTrustedOrigins(request, trustedOrigins);
+      const requestOrigin = await getOriginURL(request, context);
+      if (!isRelativeURL(cookieRedirectTo)) {
+        const isValid = origins.length > 0 ? isTrustedOrigin(cookieRedirectTo, origins) : isSameOrigin(cookieRedirectTo, requestOrigin);
+        if (!isValid) {
+          logger?.log("POTENTIAL_OPEN_REDIRECT_ATTACK_DETECTED", {
+            structuredData: {
+              redirect_path: cookieRedirectTo,
+              provider: oauth2,
+              has_trusted_origins: origins.length > 0,
+              request_origin: requestOrigin
+            }
+          });
+          throw new AuthSecurityError(
+            "POTENTIAL_OPEN_REDIRECT_ATTACK_DETECTED",
+            "Invalid redirect path. Potential open redirect attack detected."
+          );
+        }
       }
-      const userInfo = await getUserInfo(oauthConfig, accessToken.access_token);
+      const userInfo = await getUserInfo(oauthConfig, accessToken.access_token, logger);
       const sessionCookie = await createSessionCookie(jose, userInfo);
       const csrfToken = await createCSRF(jose);
-      const headers = new import_router3.HeadersBuilder(cacheControl).setHeader("Location", sanitized).setCookie(cookies.sessionToken.name, sessionCookie, cookies.sessionToken.attributes).setCookie(cookies.csrfToken.name, csrfToken, cookies.csrfToken.attributes).setCookie(cookies.state.name, "", expiredCookieAttributes).setCookie(cookies.redirectURI.name, "", expiredCookieAttributes).setCookie(cookies.redirectTo.name, "", expiredCookieAttributes).setCookie(cookies.codeVerifier.name, "", expiredCookieAttributes).toHeaders();
+      logger?.log("OAUTH_CALLBACK_SUCCESS", {
+        structuredData: {
+          provider: oauth2
+        }
+      });
+      const headers = new import_router3.HeadersBuilder(cacheControl).setHeader("Location", cookieRedirectTo).setCookie(cookies.sessionToken.name, sessionCookie, cookies.sessionToken.attributes).setCookie(cookies.csrfToken.name, csrfToken, cookies.csrfToken.attributes).setCookie(cookies.state.name, "", expiredCookieAttributes).setCookie(cookies.redirectURI.name, "", expiredCookieAttributes).setCookie(cookies.redirectTo.name, "", expiredCookieAttributes).setCookie(cookies.codeVerifier.name, "", expiredCookieAttributes).toHeaders();
       return Response.json({ oauth: oauth2 }, { status: 302, headers });
     },
     callbackConfig(oauth)
@@ -637,16 +834,18 @@ var import_router4 = require("@aura-stack/router");
 var sessionAction = (0, import_router4.createEndpoint)("GET", "/session", async (ctx) => {
   const {
     request,
-    context: { jose, cookies }
+    context: { jose, cookies, logger }
   } = ctx;
   try {
     const session = getCookie(request, cookies.sessionToken.name);
     const decoded = await jose.decodeJWT(session);
+    logger?.log("AUTH_SESSION_VALID");
     const { exp, iat, jti, nbf, ...user } = decoded;
-    const headers = new Headers(cacheControl);
+    const headers = new Headers(secureApiHeaders);
     return Response.json({ user, expires: toISOString(exp * 1e3) }, { headers });
   } catch (error) {
-    const headers = new import_router4.HeadersBuilder(cacheControl).setCookie(cookies.sessionToken.name, "", expiredCookieAttributes).toHeaders();
+    logger?.log("AUTH_SESSION_INVALID", { structuredData: { error_type: getErrorName(error) } });
+    const headers = new import_router4.HeadersBuilder(secureApiHeaders).setCookie(cookies.sessionToken.name, "", expiredCookieAttributes).toHeaders();
     return Response.json({ authenticated: false, message: "Unauthorized" }, { status: 401, headers });
   }
 });
@@ -670,30 +869,54 @@ var signOutAction = (0, import_router5.createEndpoint)(
       request,
       headers,
       searchParams: { redirectTo },
-      context: { jose, cookies }
+      context
     } = ctx;
+    const { jose, cookies, logger } = context;
     const session = headers.getCookie(cookies.sessionToken.name);
     const csrfToken = headers.getCookie(cookies.csrfToken.name);
     const header = headers.getHeader("X-CSRF-Token");
+    logger?.log("SIGN_OUT_ATTEMPT", {
+      structuredData: {
+        has_session: Boolean(session),
+        has_csrf_token: Boolean(csrfToken),
+        has_csrf_header: Boolean(header)
+      }
+    });
     if (!session) {
+      logger?.log("SESSION_TOKEN_MISSING");
       throw new AuthSecurityError("SESSION_TOKEN_MISSING", "The sessionToken is missing.");
     }
     if (!csrfToken) {
+      logger?.log("CSRF_TOKEN_MISSING");
       throw new AuthSecurityError("CSRF_TOKEN_MISSING", "The CSRF token is missing.");
     }
     if (!header) {
-      throw new AuthSecurityError("CSRF_TOKEN_MISSING", "The CSRF header is missing.");
+      logger?.log("CSRF_HEADER_MISSING");
+      throw new AuthSecurityError("CSRF_HEADER_MISSING", "The CSRF header is missing.");
+    }
+    try {
+      await verifyCSRF(jose, csrfToken, header);
+    } catch (error) {
+      logger?.log("CSRF_TOKEN_INVALID", { structuredData: { error_type: getErrorName(error) } });
+      throw new AuthSecurityError("CSRF_TOKEN_INVALID", "CSRF token verification failed");
+    }
+    logger?.log("SIGN_OUT_CSRF_VERIFIED");
+    try {
+      await jose.decodeJWT(session);
+      logger?.log("SIGN_OUT_SUCCESS");
+    } catch (error) {
+      logger?.log("INVALID_JWT_TOKEN", { structuredData: { error_type: getErrorName(error) } });
     }
-    await verifyCSRF(jose, csrfToken, header);
-    await jose.decodeJWT(session);
-    const normalizedOriginPath = getNormalizedOriginPath(request.url);
-    const location = createRedirectTo(
-      new Request(normalizedOriginPath, {
+    const baseURL = getBaseURL(request);
+    const location = await createRedirectTo(
+      new Request(baseURL, {
         headers: headers.toHeaders()
       }),
-      redirectTo
+      redirectTo,
+      context
     );
-    const headersList = new import_router5.HeadersBuilder(cacheControl).setHeader("Location", location).setCookie(cookies.csrfToken.name, "", expiredCookieAttributes).setCookie(cookies.sessionToken.name, "", expiredCookieAttributes).toHeaders();
+    logger?.log("SIGN_OUT_REDIRECT", { structuredData: { location } });
+    const headersList = new import_router5.HeadersBuilder(secureApiHeaders).setHeader("Location", location).setCookie(cookies.csrfToken.name, "", expiredCookieAttributes).setCookie(cookies.sessionToken.name, "", expiredCookieAttributes).toHeaders();
     return Response.json({ message: "Signed out successfully" }, { status: import_router5.statusCode.ACCEPTED, headers: headersList });
   },
   config
@@ -711,11 +934,13 @@ var getCSRFToken = (request, cookieName) => {
 var csrfTokenAction = (0, import_router6.createEndpoint)("GET", "/csrfToken", async (ctx) => {
   const {
     request,
-    context: { jose, cookies }
+    context: { jose, cookies, logger }
   } = ctx;
   const token = getCSRFToken(request, cookies.csrfToken.name);
+  logger?.log("CSRF_TOKEN_REQUESTED", { structuredData: { has_token: Boolean(token) } });
   const csrfToken = await createCSRF(jose, token);
-  const headers = new Headers(cacheControl);
+  logger?.log("CSRF_TOKEN_ISSUED", { structuredData: { issued: Boolean(csrfToken) } });
+  const headers = new Headers(secureApiHeaders);
   headers.append("Set-Cookie", setCookie(cookies.csrfToken.name, csrfToken, cookies.csrfToken.attributes));
   return Response.json({ csrfToken }, { headers });
 });