@absolutejs/auth 0.75.0 → 0.75.1

package/dist/server.js

@@ -7187,8 +7187,8 @@ var createMfaGate = ({ getUserId, mfaStore }) => async (user) => isMfaEnrolled(a
 
 // src/nativePush.ts
 import { Elysia as Elysia17, t as t11 } from "elysia";
-var DEFAULT_PUSH_ROUTE = "/auth/push";
 var DEFAULT_NATIVE_PUSH_ROUTE = "/auth/mobile/push";
+var DEFAULT_PUSH_ROUTE = "/auth/push";
 var requireServerText = (value, field) => {
   const normalized = value.trim();
   if (!normalized)
@@ -7242,9 +7242,11 @@ var pushRoutes = ({
     }
     return true;
   };
+  const installationIdSchema = t11.Optional(t11.String({ maxLength: 128, minLength: 1 }));
+  const localeSchema = t11.Optional(t11.String({ maxLength: 64, minLength: 1 }));
   const commonRegistrationFields = {
-    installationId: t11.Optional(t11.String({ maxLength: 128, minLength: 1 })),
-    locale: t11.Optional(t11.String({ maxLength: 64, minLength: 1 }))
+    installationId: installationIdSchema,
+    locale: localeSchema
   };
   const registrationBody = t11.Union([
     t11.Object({
@@ -7264,18 +7266,20 @@ var pushRoutes = ({
       })
     })
   ]);
+  const requirePushPrincipal = ({
+    pushPrincipal,
+    status
+  }) => pushPrincipal ? undefined : status("Unauthorized", "User is not authenticated");
   const registrationOptions = {
-    body: registrationBody,
-    beforeHandle: ({
-      pushPrincipal,
-      status
-    }) => pushPrincipal ? undefined : status("Unauthorized", "User is not authenticated")
+    beforeHandle: requirePushPrincipal,
+    body: registrationBody
   };
+  const removalBody = t11.Object({
+    installationId: t11.String({ maxLength: 128, minLength: 1 })
+  });
   const removalOptions = {
-    body: t11.Object({
-      installationId: t11.String({ maxLength: 128, minLength: 1 })
-    }),
-    beforeHandle: registrationOptions.beforeHandle
+    beforeHandle: requirePushPrincipal,
+    body: removalBody
   };
   return new Elysia17({ name: "@absolutejs/auth/push" }).use(sessionStore()).guard({
     cookie: t11.Cookie({ user_session_id: userSessionIdTypebox }),
@@ -9082,6 +9086,7 @@ var verifyCertificateBoundToken = async ({
 // src/oidc/dpop.ts
 init_constants();
 var DEFAULT_MAX_AGE_MS = 60000;
+var MAX_JTI_LENGTH = 128;
 var SECONDS_TO_MS = 1000;
 var NONCE_WINDOW_SECONDS = 120;
 var NONCE_WINDOW_MS = NONCE_WINDOW_SECONDS * MILLISECONDS_IN_A_SECOND;
@@ -9122,17 +9127,38 @@ var verifyDpopNonce = async ({
   const candidates = await Promise.all(Array.from({ length: NONCE_PREVIOUS_WINDOWS_ACCEPTED + 1 }, (_, offset) => hmacSha2562(secret, String(currentWindow - offset))));
   return candidates.some((expected) => expected === nonce);
 };
-var decodeHeader = (segment) => JSON.parse(Buffer.from(segment, "base64url").toString("utf8"));
-var normalizeHtu = (value) => {
+var decodeHeader = (segment) => {
+  try {
+    const value = JSON.parse(Buffer.from(segment, "base64url").toString("utf8"));
+    return typeof value === "object" && value !== null && !Array.isArray(value) ? value : undefined;
+  } catch {
+    return;
+  }
+};
+var normalizeHtu = (value, proofClaim = false) => {
   try {
     const url = new URL(String(value));
+    if (url.username || url.password || proofClaim && (url.search.length > 0 || url.hash.length > 0))
+      return;
     return `${url.origin}${url.pathname}`;
   } catch {
-    return "";
+    return;
   }
 };
+var isPublicEs256Jwk = (value) => {
+  if (typeof value !== "object" || value === null || Array.isArray(value))
+    return false;
+  const kty = Reflect.get(value, "kty");
+  const crv = Reflect.get(value, "crv");
+  const xCoordinate = Reflect.get(value, "x");
+  const yCoordinate = Reflect.get(value, "y");
+  const privateComponent = Reflect.get(value, "d");
+  const alg = Reflect.get(value, "alg");
+  return kty === "EC" && crv === "P-256" && typeof xCoordinate === "string" && xCoordinate.length > 0 && typeof yCoordinate === "string" && yCoordinate.length > 0 && privateComponent === undefined && (alg === undefined || alg === "ES256");
+};
 var verifyDpopProof = async ({
   accessToken,
+  consumeJti,
   htm,
   htu,
   isUsedJti,
@@ -9142,14 +9168,20 @@ var verifyDpopProof = async ({
 }) => {
   if (proof === undefined)
     return;
-  const [headerSegment] = proof.split(".");
+  const segments = proof.split(".");
+  if (segments.length !== 3)
+    return;
+  const [headerSegment] = segments;
   if (headerSegment === undefined)
     return;
   const header = decodeHeader(headerSegment);
-  if (header?.typ !== "dpop+jwt" || header.alg !== "ES256" || header.jwk === undefined) {
+  const publicJwk = header === undefined ? undefined : Reflect.get(header, "jwk");
+  if (header === undefined || Reflect.get(header, "typ") !== "dpop+jwt" || Reflect.get(header, "alg") !== "ES256" || !isPublicEs256Jwk(publicJwk)) {
     return;
   }
-  const verified = await verifyJwt(proof, header.jwk);
+  const verified = await verifyJwt(proof, publicJwk).catch(() => {
+    return;
+  });
   if (verified === undefined)
     return;
   const { payload } = verified;
@@ -9159,14 +9191,19 @@ var verifyDpopProof = async ({
       return;
   }
   const iatMs = typeof payload.iat === "number" ? payload.iat * SECONDS_TO_MS : 0;
-  if (payload.htm !== htm || normalizeHtu(payload.htu) !== normalizeHtu(htu) || iatMs === 0 || Math.abs(now - iatMs) > maxAgeMs) {
+  const claimedHtu = normalizeHtu(payload.htu, true);
+  const expectedHtu = normalizeHtu(htu);
+  const jti = typeof payload.jti === "string" ? payload.jti : undefined;
+  if (payload.htm !== htm || claimedHtu === undefined || expectedHtu === undefined || claimedHtu !== expectedHtu || iatMs === 0 || Math.abs(now - iatMs) > maxAgeMs || jti === undefined || jti.length === 0 || jti.length > MAX_JTI_LENGTH) {
     return;
   }
-  const jti = typeof payload.jti === "string" ? payload.jti : undefined;
-  if (jti !== undefined && isUsedJti !== undefined && await isUsedJti(jti)) {
+  const jkt = await jwkThumbprint(publicJwk);
+  if (isUsedJti !== undefined && await isUsedJti(jti)) {
     return;
   }
-  return { jkt: await jwkThumbprint(header.jwk), jti };
+  if (consumeJti !== undefined && !await consumeJti({ expiresAt: iatMs + maxAgeMs, jkt, jti }))
+    return;
+  return { jkt, jti };
 };
 
 // src/oidc/logout.ts
@@ -9905,7 +9942,7 @@ var oidcProviderRoutes = (config) => {
         "dpop-nonce": fresh,
         "www-authenticate": 'DPoP error="use_dpop_nonce"'
       },
-      status: HTTP_UNAUTHORIZED4
+      status: HTTP_BAD_REQUEST3
     });
   };
   const grantAuthorizationCode = async (client, body, dpop, clientCertThumbprint) => {
@@ -37602,6 +37639,7 @@ var readAudience = (audience) => {
 };
 var createOidcAgentCredentialVerifier = ({
   issuer,
+  consumeDpopJti,
   isUsedDpopJti,
   maxDpopAgeMs,
   publicJwk,
@@ -37630,6 +37668,7 @@ var createOidcAgentCredentialVerifier = ({
         return;
       const proof = await verifyDpopProof({
         accessToken: token,
+        consumeJti: consumeDpopJti,
         htm: request.method,
         htu: request.url,
         isUsedJti: isUsedDpopJti,
@@ -41619,5 +41658,5 @@ export {
   VerificationProviderError
 };
 
-//# debugId=471E09DA92BB95D564756E2164756E21
+//# debugId=77EFAA9D607737B964756E2164756E21
 //# sourceMappingURL=server.js.map