@darkauth/client 1.12.0 → 1.13.1

package/dist/index.d.ts

@@ -12,7 +12,7 @@ type Config = {
     discovery?: boolean;
     firstParty?: boolean;
     tokenStorage?: "memory" | "localStorage";
-    drkStorage?: "memory" | "localStorage";
+    drkStorage?: "memory";
     refreshMode?: "cookie" | "token";
     credentials?: RequestCredentials;
 };

package/dist/index.js

@@ -31,13 +31,13 @@ let cfg = {
             : "http://localhost:5173/callback"),
     zk: true,
 };
-const OBFUSCATION_KEY = "DarkAuth-Storage-Protection-2025";
 const EMPTY_DRK = new Uint8Array(0);
 const ID_TOKEN_KEY = "id_token";
 const ACCESS_TOKEN_KEY = "access_token";
 const REFRESH_TOKEN_KEY = "refresh_token";
 const DRK_STORAGE_KEY = "drk_protected";
 const OAUTH_STATE_KEY = "oauth_state";
+const V2_KEY_JWE_MAX_TTL_SECONDS = 600;
 let memorySession = null;
 let memoryRefreshToken = null;
 export function setConfig(next) {
@@ -66,9 +66,6 @@ function clearStoredAccessToken() {
 function tokenStorageMode() {
     return cfg.tokenStorage || (cfg.firstParty === false ? "localStorage" : "memory");
 }
-function drkStorageMode() {
-    return cfg.drkStorage || (cfg.firstParty === false ? "localStorage" : "memory");
-}
 function refreshMode() {
     return cfg.refreshMode || (cfg.firstParty === false ? "token" : "cookie");
 }
@@ -150,42 +147,44 @@ function parseFragmentParams(hash) {
     }
     return res;
 }
-function obfuscateKey(drk) {
-    const obfKey = new TextEncoder().encode(OBFUSCATION_KEY);
-    const out = new Uint8Array(drk.length);
-    for (let i = 0; i < drk.length; i++) {
-        const a = drk[i] ?? 0;
-        const b = obfKey[i % obfKey.length] ?? 0;
-        out[i] = a ^ b;
-    }
-    return out;
+async function sha256Base64Url(value) {
+    return bytesToBase64Url(await sha256(new TextEncoder().encode(value)));
+}
+function isStringArray(value) {
+    return Array.isArray(value) && value.every((item) => typeof item === "string");
+}
+function audienceMatches(value, expected) {
+    if (typeof value === "string")
+        return value === expected;
+    if (isStringArray(value))
+        return value.includes(expected);
+    return false;
 }
-function deobfuscateKey(obfuscated) {
-    return obfuscateKey(obfuscated);
+function requireString(value, name) {
+    if (typeof value !== "string" || value.length === 0)
+        throw new Error(`Invalid ${name}`);
+    return value;
+}
+function requireNumber(value, name) {
+    if (typeof value !== "number" || !Number.isFinite(value))
+        throw new Error(`Invalid ${name}`);
+    return value;
+}
+function parseJsonPayload(bytes) {
+    const parsed = JSON.parse(new TextDecoder().decode(bytes));
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
+        throw new Error("Invalid key payload");
+    return parsed;
 }
 function clearStoredDrk() {
     localStorage.removeItem(DRK_STORAGE_KEY);
 }
 function getStoredDrk() {
-    if (drkStorageMode() !== "localStorage") {
-        clearStoredDrk();
-        return null;
-    }
-    const obfuscatedDrkBase64 = localStorage.getItem(DRK_STORAGE_KEY);
-    if (!obfuscatedDrkBase64)
-        return null;
-    try {
-        const obfuscatedDrk = base64UrlToBytes(obfuscatedDrkBase64);
-        return deobfuscateKey(obfuscatedDrk);
-    }
-    catch {
-        clearStoredDrk();
-        return null;
-    }
+    clearStoredDrk();
+    return null;
 }
 function storeSession(session) {
     const tokenMode = tokenStorageMode();
-    const drkMode = drkStorageMode();
     const currentRefreshMode = refreshMode();
     const storedSession = {
         idToken: session.idToken,
@@ -205,13 +204,7 @@ function storeSession(session) {
         clearStoredIdToken();
         clearStoredAccessToken();
     }
-    if (drkMode === "localStorage" && session.drk.length > 0) {
-        const obfuscatedDrk = obfuscateKey(session.drk);
-        localStorage.setItem(DRK_STORAGE_KEY, bytesToBase64Url(obfuscatedDrk));
-    }
-    else {
-        clearStoredDrk();
-    }
+    clearStoredDrk();
     if (currentRefreshMode === "token") {
         memoryRefreshToken = session.refreshToken || memoryRefreshToken;
         if (tokenMode === "localStorage" && session.refreshToken) {
@@ -229,12 +222,13 @@ function clearCallbackStorage() {
     sessionStorage.removeItem(OAUTH_STATE_KEY);
     sessionStorage.removeItem("pkce_verifier");
 }
-function stripDrkJweFragment() {
-    if (!location.hash.includes("drk_jwe="))
+function stripKeyJweFragment() {
+    if (!location.hash.includes("drk_jwe=") && !location.hash.includes("darkauth_key_jwe="))
         return;
     const hash = location.hash.startsWith("#") ? location.hash.slice(1) : location.hash;
     const params = new URLSearchParams(hash);
     params.delete("drk_jwe");
+    params.delete("darkauth_key_jwe");
     const nextHash = params.toString();
     const nextUrl = `${location.origin}${location.pathname}${location.search || ""}${nextHash ? `#${nextHash}` : ""}`;
     try {
@@ -307,8 +301,9 @@ export async function handleCallback() {
         return null;
     const fragmentParams = parseFragmentParams(location.hash || "");
     const drkJwe = fragmentParams.drk_jwe;
-    if (drkJwe)
-        stripDrkJweFragment();
+    const darkauthKeyJwe = fragmentParams.darkauth_key_jwe;
+    if (drkJwe || darkauthKeyJwe)
+        stripKeyJweFragment();
     const expectedState = sessionStorage.getItem(OAUTH_STATE_KEY);
     const returnedState = params.get("state");
     if (!expectedState)
@@ -342,6 +337,15 @@ export async function handleCallback() {
             const zkDrkHash = typeof tokenResponse.zk_drk_hash === "string"
                 ? tokenResponse.zk_drk_hash
                 : null;
+            const zkKeyHash = typeof tokenResponse.zk_key_hash === "string"
+                ? tokenResponse.zk_key_hash
+                : null;
+            const zkKeyKind = typeof tokenResponse.zk_key_kind === "string"
+                ? tokenResponse.zk_key_kind
+                : null;
+            const zkKeyVersion = typeof tokenResponse.zk_key_version === "string"
+                ? tokenResponse.zk_key_version
+                : null;
             const idToken = tokenResponse.id_token;
             const accessToken = typeof tokenResponse.access_token === "string"
                 ? tokenResponse.access_token
@@ -350,25 +354,87 @@ export async function handleCallback() {
             const refreshToken = tokenRefreshMode === "token"
                 ? tokenResponse.refresh_token
                 : undefined;
-            const hasZkArtifacts = !!drkJwe || !!zkDrkHash;
+            const hasV2Artifacts = !!darkauthKeyJwe || !!zkKeyHash || !!zkKeyKind || !!zkKeyVersion;
+            const hasLegacyArtifacts = !!drkJwe || !!zkDrkHash;
+            const hasZkArtifacts = hasV2Artifacts || hasLegacyArtifacts;
             if (!hasZkArtifacts) {
                 clearCallbackUrl();
                 return storeSession({ idToken, accessToken, drk: EMPTY_DRK, refreshToken });
             }
-            if (!drkJwe || typeof drkJwe !== "string")
-                throw new Error("Missing DRK JWE from URL fragment");
-            if (zkDrkHash) {
-                const hash = bytesToBase64Url(await sha256(new TextEncoder().encode(drkJwe)));
-                if (zkDrkHash !== hash)
-                    throw new Error("DRK hash mismatch");
-            }
             const privateJwkString = sessionStorage.getItem("zk_eph_priv_jwk");
             if (!privateJwkString)
                 throw new Error("Missing ZK private key for callback");
             sessionStorage.removeItem("zk_eph_priv_jwk");
             const privateKey = await crypto.subtle.importKey("jwk", JSON.parse(privateJwkString), { name: "ECDH", namedCurve: "P-256" }, true, ["deriveBits", "deriveKey"]);
-            const { plaintext } = await compactDecrypt(drkJwe, privateKey);
-            const drk = new Uint8Array(plaintext);
+            let drk;
+            if (hasV2Artifacts) {
+                if (hasLegacyArtifacts)
+                    throw new Error("Mixed key delivery metadata");
+                if (!darkauthKeyJwe || typeof darkauthKeyJwe !== "string")
+                    throw new Error("Missing client key JWE from URL fragment");
+                if (!zkKeyHash)
+                    throw new Error("Missing client key hash");
+                if (zkKeyKind !== "client_app_key")
+                    throw new Error("Invalid client key kind");
+                if (zkKeyVersion !== "v2")
+                    throw new Error("Invalid client key version");
+                const hash = await sha256Base64Url(darkauthKeyJwe);
+                if (zkKeyHash !== hash)
+                    throw new Error("Client key hash mismatch");
+                const { plaintext, protectedHeader } = await compactDecrypt(darkauthKeyJwe, privateKey);
+                if (protectedHeader.alg !== "ECDH-ES" || protectedHeader.enc !== "A256GCM")
+                    throw new Error("Invalid client key JWE header");
+                const payload = parseJsonPayload(new Uint8Array(plaintext));
+                if (payload.typ !== "DarkAuth-Client-Key")
+                    throw new Error("Invalid client key type");
+                if (payload.version !== "v2" && payload.version !== "v2-client-key")
+                    throw new Error("Invalid client key payload version");
+                if (payload.key_kind !== "client_app_key")
+                    throw new Error("Invalid client key payload kind");
+                if (payload.client_id !== cfg.clientId)
+                    throw new Error("Invalid client key client");
+                if (!audienceMatches(payload.aud, cfg.clientId))
+                    throw new Error("Invalid client key audience");
+                const idTokenSubject = parseJwt(idToken)?.sub;
+                if (!idTokenSubject || payload.sub !== idTokenSubject)
+                    throw new Error("Invalid client key subject");
+                if (payload.state_hash !== (await sha256Base64Url(expectedState)))
+                    throw new Error("Invalid client key state");
+                if (payload.redirect_uri_hash !== (await sha256Base64Url(cfg.redirectUri)))
+                    throw new Error("Invalid client key redirect URI");
+                requireString(payload.key_id, "client key id");
+                const exp = requireNumber(payload.exp, "client key expiry");
+                const now = Date.now() / 1000;
+                if (exp <= now)
+                    throw new Error("Client key JWE expired");
+                if (typeof payload.iat === "number") {
+                    if (!Number.isFinite(payload.iat))
+                        throw new Error("Invalid client key issued-at");
+                    if (payload.iat > now + 60)
+                        throw new Error("Invalid client key issued-at");
+                    if (exp - payload.iat > V2_KEY_JWE_MAX_TTL_SECONDS)
+                        throw new Error("Client key JWE lifetime too long");
+                }
+                else if (exp > now + V2_KEY_JWE_MAX_TTL_SECONDS) {
+                    throw new Error("Client key JWE lifetime too long");
+                }
+                drk = base64UrlToBytes(requireString(payload.cak, "client app key"));
+                if (drk.length === 0)
+                    throw new Error("Invalid client app key");
+            }
+            else {
+                if (!drkJwe || typeof drkJwe !== "string")
+                    throw new Error("Missing DRK JWE from URL fragment");
+                if (zkDrkHash) {
+                    const hash = await sha256Base64Url(drkJwe);
+                    if (zkDrkHash !== hash)
+                        throw new Error("DRK hash mismatch");
+                }
+                const { plaintext, protectedHeader } = await compactDecrypt(drkJwe, privateKey);
+                if (protectedHeader.alg !== "ECDH-ES" || protectedHeader.enc !== "A256GCM")
+                    throw new Error("Invalid DRK JWE header");
+                drk = new Uint8Array(plaintext);
+            }
             clearCallbackUrl();
             return storeSession({ idToken, accessToken, drk, refreshToken });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkauth/client",
-  "version": "1.12.0",
+  "version": "1.13.1",
   "license": "MIT",
   "repository": {
     "directory": "packages/darkauth-client",