@sd-jwt/core 0.20.1-next.5 → 0.20.1-next.6

package/dist/index.js

@@ -69,6 +69,7 @@ var __async = (__this, __arguments, generator) => {
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  DEFAULT_SECURE_HASH_ALGORITHMS: () => DEFAULT_SECURE_HASH_ALGORITHMS,
   Disclosure: () => Disclosure,
   FlattenJSON: () => FlattenJSON,
   GeneralJSON: () => GeneralJSON,
@@ -94,6 +95,8 @@ __export(index_exports, {
   decodeJwt: () => decodeJwt,
   decodeSdJwt: () => decodeSdJwt,
   decodeSdJwtSync: () => decodeSdJwtSync,
+  encodePath: () => encodePath,
+  encodePathSegment: () => encodePathSegment,
   ensureError: () => ensureError,
   getClaims: () => getClaims,
   getClaimsSync: () => getClaimsSync,
@@ -110,7 +113,8 @@ __export(index_exports, {
   uint8ArrayToBase64Url: () => import_identity_common.uint8ArrayToBase64Url,
   unpack: () => unpack,
   unpackObj: () => unpackObj,
-  unpackSync: () => unpackSync
+  unpackSync: () => unpackSync,
+  validateJwtPayload: () => validateJwtPayload
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -120,6 +124,8 @@ var SD_LIST_KEY = "...";
 var SD_DIGEST = "_sd";
 var SD_DECOY = "_sd_decoy";
 var KB_JWT_TYP = "kb+jwt";
+var encodePathSegment = (segment) => segment.replace(/~/g, "~0").replace(/\./g, "~1");
+var encodePath = (segments) => segments.map(encodePathSegment).join(".");
 var IANA_HASH_ALGORITHMS = [
   "sha-256",
   "sha-256-128",
@@ -139,6 +145,19 @@ var IANA_HASH_ALGORITHMS = [
   "k12-256",
   "k12-512"
 ];
+var DEFAULT_SECURE_HASH_ALGORITHMS = [
+  "sha-256",
+  "sha-384",
+  "sha-512",
+  "sha3-256",
+  "sha3-384",
+  "sha3-512",
+  "blake2s-256",
+  "blake2b-256",
+  "blake2b-512",
+  "k12-256",
+  "k12-512"
+];
 
 // src/utils/base64url.ts
 var import_identity_common = require("@owf/identity-common");
@@ -176,6 +195,12 @@ var decodeBase64urlJsonStrict = (encoded, errorMessage) => {
 // src/utils/disclosure.ts
 var Disclosure = class _Disclosure {
   constructor(data, _meta) {
+    if (!Array.isArray(data) || data.length !== 2 && data.length !== 3) {
+      throw new SDJWTException("Invalid disclosure data");
+    }
+    if (typeof data[0] !== "string") {
+      throw new SDJWTException("Invalid disclosure salt");
+    }
     this._digest = _meta == null ? void 0 : _meta.digest;
     this._encoded = _meta == null ? void 0 : _meta.encoded;
     if (data.length === 2) {
@@ -184,12 +209,19 @@ var Disclosure = class _Disclosure {
       return;
     }
     if (data.length === 3) {
+      if (typeof data[1] !== "string") {
+        throw new SDJWTException("Invalid disclosure claim name");
+      }
+      if (data[1] === SD_DIGEST || data[1] === SD_LIST_KEY) {
+        throw new SDJWTException(
+          `Reserved disclosure claim name "${data[1]}" is not allowed`
+        );
+      }
       this.salt = data[0];
       this.key = data[1];
       this.value = data[2];
       return;
     }
-    throw new SDJWTException("Invalid disclosure data");
   }
   // We need to digest of the original encoded data.
   // After decode process, we use JSON.stringify to encode the data.
@@ -263,10 +295,7 @@ var decodeJwt = (jwt) => {
 var splitSdJwt = (sdjwt) => {
   const [encodedJwt, ...encodedDisclosures] = sdjwt.split(SD_SEPARATOR);
   if (encodedDisclosures.length === 0) {
-    return {
-      jwt: encodedJwt,
-      disclosures: []
-    };
+    throw new SDJWTException("Invalid SD-JWT: missing SD-JWT separator");
   }
   const encodedKeyBindingJwt = encodedDisclosures.pop();
   return {
@@ -279,10 +308,7 @@ var decodeSdJwt = (sdjwt, hasher) => __async(null, null, function* () {
   const [encodedJwt, ...encodedDisclosures] = sdjwt.split(SD_SEPARATOR);
   const jwt = decodeJwt(encodedJwt);
   if (encodedDisclosures.length === 0) {
-    return {
-      jwt,
-      disclosures: []
-    };
+    throw new SDJWTException("Invalid SD-JWT: missing SD-JWT separator");
   }
   const encodedKeyBindingJwt = encodedDisclosures.pop();
   const kbJwt = encodedKeyBindingJwt ? decodeJwt(encodedKeyBindingJwt) : void 0;
@@ -302,10 +328,7 @@ var decodeSdJwtSync = (sdjwt, hasher) => {
   const [encodedJwt, ...encodedDisclosures] = sdjwt.split(SD_SEPARATOR);
   const jwt = decodeJwt(encodedJwt);
   if (encodedDisclosures.length === 0) {
-    return {
-      jwt,
-      disclosures: []
-    };
+    throw new SDJWTException("Invalid SD-JWT: missing SD-JWT separator");
   }
   const encodedKeyBindingJwt = encodedDisclosures.pop();
   const kbJwt = encodedKeyBindingJwt ? decodeJwt(encodedKeyBindingJwt) : void 0;
@@ -334,7 +357,10 @@ var unpackArray = (arr, map, prefix = "", seenDigests) => {
   arr.forEach((item, idx) => {
     if (isRecord(item)) {
       const hash = item[SD_LIST_KEY];
-      if (typeof hash === "string") {
+      if (SD_LIST_KEY in item) {
+        if (Object.keys(item).length !== 1 || typeof hash !== "string") {
+          throw new SDJWTException("Invalid array disclosure placeholder");
+        }
         if (seenDigests) {
           if (seenDigests.has(hash)) {
             throw new SDJWTException(
@@ -345,6 +371,11 @@ var unpackArray = (arr, map, prefix = "", seenDigests) => {
         }
         const disclosed = map[hash];
         if (disclosed) {
+          if (typeof disclosed.key === "string") {
+            throw new SDJWTException(
+              "Object-property disclosure cannot be used as an array element"
+            );
+          }
           const presentKey = prefix ? `${prefix}.${idx}` : `${idx}`;
           keys[presentKey] = hash;
           const { unpackedObj, disclosureKeymap: disclosureKeys } = unpackObjInternal(disclosed.value, map, presentKey, seenDigests);
@@ -387,8 +418,12 @@ var unpackObjInternal = (obj, map, prefix = "", seenDigests) => {
     }
     const record = obj;
     for (const key in record) {
+      if (prefix && key === "_sd_alg") {
+        throw new SDJWTException("Nested _sd_alg is not allowed");
+      }
       if (key !== SD_DIGEST && key !== SD_LIST_KEY && typeof record[key] === "object") {
-        const newKey = prefix ? `${prefix}.${key}` : key;
+        const escapedKey = encodePathSegment(key);
+        const newKey = prefix ? `${prefix}.${escapedKey}` : escapedKey;
         const { unpackedObj: unpackedObj2, disclosureKeymap: disclosureKeys } = unpackObjInternal(record[key], map, newKey, seenDigests);
         record[key] = unpackedObj2;
         Object.assign(keys, disclosureKeys);
@@ -396,7 +431,12 @@ var unpackObjInternal = (obj, map, prefix = "", seenDigests) => {
     }
     const _a = record, { _sd } = _a, payload = __objRest(_a, ["_sd"]);
     const claims = {};
-    if (_sd) {
+    if (_sd !== void 0) {
+      if (!Array.isArray(_sd) || !_sd.every((hash) => typeof hash === "string")) {
+        throw new SDJWTException(
+          "Invalid _sd claim: expected array of strings"
+        );
+      }
       for (const hash of _sd) {
         if (seenDigests) {
           if (seenDigests.has(hash)) {
@@ -407,13 +447,24 @@ var unpackObjInternal = (obj, map, prefix = "", seenDigests) => {
           seenDigests.add(hash);
         }
         const disclosed = map[hash];
-        if (disclosed == null ? void 0 : disclosed.key) {
+        if (disclosed) {
+          if (typeof disclosed.key !== "string") {
+            throw new SDJWTException(
+              "Array disclosure cannot be used as an object property"
+            );
+          }
           if (disclosed.key in payload) {
             throw new SDJWTException(
               `Disclosed claim name "${disclosed.key}" conflicts with existing payload key`
             );
           }
-          const presentKey = prefix ? `${prefix}.${disclosed.key}` : disclosed.key;
+          if (disclosed.key in claims) {
+            throw new SDJWTException(
+              `Disclosed claim name "${disclosed.key}" conflicts with another disclosure`
+            );
+          }
+          const escapedKey = encodePathSegment(disclosed.key);
+          const presentKey = prefix ? `${prefix}.${escapedKey}` : escapedKey;
           keys[presentKey] = hash;
           const { unpackedObj: unpackedObj2, disclosureKeymap: disclosureKeys } = unpackObjInternal(disclosed.value, map, presentKey, seenDigests);
           claims[disclosed.key] = unpackedObj2;
@@ -431,6 +482,9 @@ var createHashMapping = (disclosures, hash) => __async(null, null, function* ()
   for (let i = 0; i < disclosures.length; i++) {
     const disclosure = disclosures[i];
     const digest = yield disclosure.digest(hash);
+    if (digest in map) {
+      throw new SDJWTException("Duplicate disclosure digest detected");
+    }
     map[digest] = disclosure;
   }
   return map;
@@ -440,20 +494,29 @@ var createHashMappingSync = (disclosures, hash) => {
   for (let i = 0; i < disclosures.length; i++) {
     const disclosure = disclosures[i];
     const digest = disclosure.digestSync(hash);
+    if (digest in map) {
+      throw new SDJWTException("Duplicate disclosure digest detected");
+    }
     map[digest] = disclosure;
   }
   return map;
 };
-var getSDAlgAndPayload = (SdJwtPayload) => {
+var getSDAlgAndPayload = (SdJwtPayload, allowedAlgorithms = DEFAULT_SECURE_HASH_ALGORITHMS) => {
   const _a = SdJwtPayload, { _sd_alg } = _a, payload = __objRest(_a, ["_sd_alg"]);
-  if (typeof _sd_alg !== "string") {
+  if (_sd_alg === void 0) {
     return { _sd_alg: "sha-256", payload };
   }
+  if (typeof _sd_alg !== "string") {
+    throw new SDJWTException("Invalid _sd_alg: expected string");
+  }
   if (!IANA_HASH_ALGORITHMS.includes(
     _sd_alg
   )) {
     throw new SDJWTException(`Invalid _sd_alg: ${_sd_alg}`);
   }
+  if (!allowedAlgorithms.includes(_sd_alg)) {
+    throw new SDJWTException(`Disallowed _sd_alg: ${_sd_alg}`);
+  }
   return { _sd_alg, payload };
 };
 var unpack = (SdJwtPayload, disclosures, hasher) => __async(null, null, function* () {
@@ -562,6 +625,14 @@ var GeneralJSON = class _GeneralJSON {
     if (!json.signatures[0]) {
       throw new SDJWTException("Invalid JSON");
     }
+    for (let index = 1; index < json.signatures.length; index++) {
+      const header = json.signatures[index].header;
+      if (header && ("disclosures" in header || "kb_jwt" in header)) {
+        throw new SDJWTException(
+          "disclosures and kb_jwt MUST only appear in the first unprotected header"
+        );
+      }
+    }
     const disclosures = (_b = (_a = json.signatures[0].header) == null ? void 0 : _a.disclosures) != null ? _b : [];
     const kb_jwt = (_c = json.signatures[0].header) == null ? void 0 : _c.kb_jwt;
     return new _GeneralJSON({
@@ -634,6 +705,49 @@ var GeneralJSON = class _GeneralJSON {
 };
 
 // src/jwt.ts
+var isStringArray = (value) => Array.isArray(value) && value.every((item) => typeof item === "string");
+var validateNumericDate = (payload, claim) => {
+  const value = payload[claim];
+  if (value === void 0) return void 0;
+  if (typeof value !== "number" || !Number.isFinite(value)) {
+    throw new SDJWTException(`Verify Error: JWT ${claim} must be a number`);
+  }
+  return value;
+};
+var getAudiences = (audience) => {
+  if (typeof audience === "string") return [audience];
+  if (isStringArray(audience)) return audience;
+  return void 0;
+};
+var validateAudience = (payload, expectedAudience) => {
+  if (expectedAudience === void 0) return;
+  const expectedAudiences = Array.isArray(expectedAudience) ? expectedAudience : [expectedAudience];
+  const audiences = getAudiences(payload.aud);
+  if (!audiences || !expectedAudiences.some((expected) => audiences.includes(expected))) {
+    throw new SDJWTException("Verify Error: Invalid audience");
+  }
+};
+var validateJwtPayload = (payload, options) => {
+  var _a;
+  if (!payload) {
+    throw new SDJWTException("Verify Error: JWT payload is missing");
+  }
+  const skew = (options == null ? void 0 : options.skewSeconds) ? options.skewSeconds : 0;
+  const currentDate = (_a = options == null ? void 0 : options.currentDate) != null ? _a : Math.floor(Date.now() / 1e3);
+  const iat = validateNumericDate(payload, "iat");
+  const nbf = validateNumericDate(payload, "nbf");
+  const exp = validateNumericDate(payload, "exp");
+  if (iat !== void 0 && iat - skew > currentDate) {
+    throw new SDJWTException("Verify Error: JWT is not yet valid");
+  }
+  if (nbf !== void 0 && nbf - skew > currentDate) {
+    throw new SDJWTException("Verify Error: JWT is not yet valid");
+  }
+  if (exp !== void 0 && exp + skew <= currentDate) {
+    throw new SDJWTException("Verify Error: JWT is expired");
+  }
+  validateAudience(payload, options == null ? void 0 : options.expectedAudience);
+};
 var Jwt = class _Jwt {
   constructor(data) {
     this.header = data == null ? void 0 : data.header;
@@ -684,6 +798,9 @@ var Jwt = class _Jwt {
   }
   sign(signer) {
     return __async(this, null, function* () {
+      if (!this.header || this.header.alg === "none") {
+        throw new SDJWTException('Sign Error: alg "none" is not allowed');
+      }
       const data = this.getUnsignedToken();
       this.signature = yield signer(data);
       return this.encodeJwt();
@@ -712,20 +829,16 @@ var Jwt = class _Jwt {
    */
   verify(verifier, options) {
     return __async(this, null, function* () {
-      var _a, _b, _c, _d;
-      const skew = (options == null ? void 0 : options.skewSeconds) ? options.skewSeconds : 0;
-      const currentDate = (_a = options == null ? void 0 : options.currentDate) != null ? _a : Math.floor(Date.now() / 1e3);
-      const iat = (_b = this.payload) == null ? void 0 : _b.iat;
-      const nbf = (_c = this.payload) == null ? void 0 : _c.nbf;
-      const exp = (_d = this.payload) == null ? void 0 : _d.exp;
-      if (typeof iat === "number" && iat - skew > currentDate) {
-        throw new SDJWTException("Verify Error: JWT is not yet valid");
+      var _a;
+      const alg = (_a = this.header) == null ? void 0 : _a.alg;
+      if (typeof alg !== "string" || alg === "none") {
+        throw new SDJWTException('Verify Error: alg "none" is not allowed');
       }
-      if (typeof nbf === "number" && nbf - skew > currentDate) {
-        throw new SDJWTException("Verify Error: JWT is not yet valid");
+      if ((options == null ? void 0 : options.allowedIssuerAlgorithms) && !options.allowedIssuerAlgorithms.includes(alg)) {
+        throw new SDJWTException(`Verify Error: Disallowed alg ${alg}`);
       }
-      if (typeof exp === "number" && exp + skew < currentDate) {
-        throw new SDJWTException("Verify Error: JWT is expired");
+      if (!(options == null ? void 0 : options.skipJwtClaimValidation)) {
+        validateJwtPayload(this.payload, options);
       }
       if (!this.signature) {
         throw new SDJWTException("Verify Error: no signature in JWT");
@@ -746,16 +859,31 @@ var KBJwt = class _KBJwt extends Jwt {
   // the type unknown is not good, but we don't know at this point how to get the public key of the signer, this is defined in the kbVerifier
   verifyKB(values) {
     return __async(this, null, function* () {
+      var _a, _b, _c, _d;
       if (!this.header || !this.payload || !this.signature) {
         throw new SDJWTException("Verify Error: Invalid JWT");
       }
-      if (!this.header.alg || this.header.alg === "none" || !this.header.typ || this.header.typ !== KB_JWT_TYP || !this.payload.iat || !this.payload.aud || !this.payload.nonce || // this is for backward compatibility with version 06
-      !(this.payload.sd_hash || "_sd_hash" in this.payload && this.payload._sd_hash)) {
+      if (typeof this.header.alg !== "string" || this.header.alg === "none" || typeof this.header.typ !== "string" || this.header.typ !== KB_JWT_TYP || typeof this.payload.iat !== "number" || typeof this.payload.aud !== "string" || typeof this.payload.nonce !== "string" || typeof this.payload.sd_hash !== "string" || this.payload.sd_hash.length === 0) {
         throw new SDJWTException("Invalid Key Binding Jwt");
       }
       if (this.payload.nonce !== values.nonce) {
         throw new SDJWTException("Verify Error: Invalid Nonce");
       }
+      if (((_a = values.options) == null ? void 0 : _a.expectedKeyBindingAudience) !== void 0) {
+        const expectedAudiences = Array.isArray(
+          values.options.expectedKeyBindingAudience
+        ) ? values.options.expectedKeyBindingAudience : [values.options.expectedKeyBindingAudience];
+        if (!expectedAudiences.includes(this.payload.aud)) {
+          throw new SDJWTException("Verify Error: Invalid Key Binding audience");
+        }
+      }
+      if (((_b = values.options) == null ? void 0 : _b.keyBindingMaxAgeSeconds) !== void 0) {
+        const currentDate = (_c = values.options.currentDate) != null ? _c : Math.floor(Date.now() / 1e3);
+        const skew = (_d = values.options.skewSeconds) != null ? _d : 0;
+        if (this.payload.iat + values.options.keyBindingMaxAgeSeconds + skew < currentDate) {
+          throw new SDJWTException("Verify Error: Key Binding JWT is too old");
+        }
+      }
       yield this.verify(
         (data, sig) => values.verifier(data, sig, values.payload),
         values.options
@@ -831,16 +959,17 @@ var presentSync = (sdJwt, presentFrame, hasher) => {
     kbJwt != null ? kbJwt : ""
   ].join(SD_SEPARATOR);
 };
-var transformPresentationFrame = (obj, prefix = "") => {
+var transformPresentationFrame = (obj, prefix = []) => {
   return Object.entries(obj).reduce((acc, [key, value]) => {
-    const newPrefix = prefix ? `${prefix}.${key}` : key;
+    const newPrefix = [...prefix, key];
+    const encodedPrefix = encodePath(newPrefix);
     if (typeof value === "boolean") {
       if (value) {
-        acc.push(newPrefix);
+        acc.push(encodedPrefix);
       }
     } else if (typeof value === "object" && value !== null) {
       acc.push(
-        newPrefix,
+        encodedPrefix,
         ...transformPresentationFrame(
           value,
           newPrefix
@@ -891,6 +1020,23 @@ var selectDisclosures = (payload, disclosures, presentationFrame) => {
 };
 
 // src/sdjwt.ts
+var createDisclosureSalt = (saltGenerator, seenSalts) => __async(null, null, function* () {
+  const salt = yield saltGenerator(16);
+  if (typeof salt !== "string") {
+    throw new SDJWTException("SaltGenerator must return a string");
+  }
+  if (seenSalts.has(salt)) {
+    throw new SDJWTException("Duplicate disclosure salt detected");
+  }
+  seenSalts.add(salt);
+  return salt;
+});
+var addDisclosureDigest = (digest, seenDigests) => {
+  if (seenDigests.has(digest)) {
+    throw new SDJWTException("Duplicate disclosure digest detected");
+  }
+  seenDigests.add(digest);
+};
 var SDJwt = class _SDJwt {
   constructor(data) {
     this.jwt = data == null ? void 0 : data.jwt;
@@ -900,16 +1046,13 @@ var SDJwt = class _SDJwt {
   static decodeSDJwt(sdjwt, hasher) {
     return __async(this, null, function* () {
       const [encodedJwt, ...encodedDisclosures] = sdjwt.split(SD_SEPARATOR);
+      if (encodedDisclosures.length === 0) {
+        throw new SDJWTException("Invalid SD-JWT: missing SD-JWT separator");
+      }
       const jwt = Jwt.fromEncode(encodedJwt);
       if (!jwt.payload) {
         throw new Error("Payload is undefined on the JWT. Invalid state reached");
       }
-      if (encodedDisclosures.length === 0) {
-        return {
-          jwt,
-          disclosures: []
-        };
-      }
       const encodedKeyBindingJwt = encodedDisclosures.pop();
       const kbJwt = encodedKeyBindingJwt ? KBJwt.fromKBEncode(encodedKeyBindingJwt) : void 0;
       const { _sd_alg } = getSDAlgAndPayload(jwt.payload);
@@ -1023,7 +1166,8 @@ var listKeys = (obj, prefix = "") => {
   const keys = [];
   for (const key in obj) {
     if (obj[key] === void 0) continue;
-    const newKey = prefix ? `${prefix}.${key}` : key;
+    const escapedKey = encodePathSegment(key);
+    const newKey = prefix ? `${prefix}.${escapedKey}` : escapedKey;
     keys.push(newKey);
     const value = obj[key];
     if (value && typeof value === "object") {
@@ -1032,7 +1176,7 @@ var listKeys = (obj, prefix = "") => {
   }
   return keys;
 };
-var pack = (claims, disclosureFrame, hash, saltGenerator) => __async(null, null, function* () {
+var pack = (_0, _1, _2, _3, ..._4) => __async(null, [_0, _1, _2, _3, ..._4], function* (claims, disclosureFrame, hash, saltGenerator, seenSalts = /* @__PURE__ */ new Set(), seenDigests = /* @__PURE__ */ new Set()) {
   var _a, _b;
   if (!disclosureFrame) {
     return {
@@ -1053,7 +1197,9 @@ var pack = (claims, disclosureFrame, hash, saltGenerator) => __async(null, null,
           claims[idx],
           disclosureFrame[idx],
           hash,
-          saltGenerator
+          saltGenerator,
+          seenSalts,
+          seenDigests
         );
         recursivePackedClaims2[idx] = packed.packedClaims;
         disclosures2.push(...packed.disclosures);
@@ -1062,9 +1208,10 @@ var pack = (claims, disclosureFrame, hash, saltGenerator) => __async(null, null,
     for (let i = 0; i < claims.length; i++) {
       const claim = recursivePackedClaims2[i] ? recursivePackedClaims2[i] : claims[i];
       if (sd.includes(i)) {
-        const salt = yield saltGenerator(16);
+        const salt = yield createDisclosureSalt(saltGenerator, seenSalts);
         const disclosure = new Disclosure([salt, claim]);
         const digest = yield disclosure.digest(hash);
+        addDisclosureDigest(digest, seenDigests);
         packedClaims2.push({ [SD_LIST_KEY]: digest });
         disclosures2.push(disclosure);
       } else {
@@ -1073,6 +1220,7 @@ var pack = (claims, disclosureFrame, hash, saltGenerator) => __async(null, null,
     }
     for (let j = 0; j < decoyCount; j++) {
       const decoyDigest = yield createDecoy(hash, saltGenerator);
+      addDisclosureDigest(decoyDigest, seenDigests);
       packedClaims2.push({ [SD_LIST_KEY]: decoyDigest });
     }
     return { packedClaims: packedClaims2, disclosures: disclosures2 };
@@ -1087,7 +1235,9 @@ var pack = (claims, disclosureFrame, hash, saltGenerator) => __async(null, null,
         claims[key],
         disclosureFrame[key],
         hash,
-        saltGenerator
+        saltGenerator,
+        seenSalts,
+        seenDigests
       );
       recursivePackedClaims[key] = packed.packedClaims;
       disclosures.push(...packed.disclosures);
@@ -1097,9 +1247,10 @@ var pack = (claims, disclosureFrame, hash, saltGenerator) => __async(null, null,
   for (const key in claims) {
     const claim = recursivePackedClaims[key] ? recursivePackedClaims[key] : claims[key];
     if (sd.includes(key)) {
-      const salt = yield saltGenerator(16);
+      const salt = yield createDisclosureSalt(saltGenerator, seenSalts);
       const disclosure = new Disclosure([salt, key, claim]);
       const digest = yield disclosure.digest(hash);
+      addDisclosureDigest(digest, seenDigests);
       _sd.push(digest);
       disclosures.push(disclosure);
     } else {
@@ -1108,6 +1259,7 @@ var pack = (claims, disclosureFrame, hash, saltGenerator) => __async(null, null,
   }
   for (let j = 0; j < decoyCount; j++) {
     const decoyDigest = yield createDecoy(hash, saltGenerator);
+    addDisclosureDigest(decoyDigest, seenDigests);
     _sd.push(decoyDigest);
   }
   if (_sd.length > 0) {
@@ -1137,12 +1289,19 @@ function validateReservedFieldsInternal(payload) {
 var _SDJwtInstance = class _SDJwtInstance {
   constructor(userConfig) {
     this.userConfig = {};
+    var _a;
     if (userConfig) {
       if (userConfig.hashAlg && !IANA_HASH_ALGORITHMS.includes(userConfig.hashAlg)) {
         throw new SDJWTException(
           `Invalid hash algorithm: ${userConfig.hashAlg}`
         );
       }
+      const allowedDisclosureHashAlgorithms = (_a = userConfig.allowedDisclosureHashAlgorithms) != null ? _a : DEFAULT_SECURE_HASH_ALGORITHMS;
+      if (userConfig.hashAlg && !allowedDisclosureHashAlgorithms.includes(userConfig.hashAlg)) {
+        throw new SDJWTException(
+          `Disallowed hash algorithm: ${userConfig.hashAlg}`
+        );
+      }
       this.userConfig = userConfig;
     }
   }
@@ -1185,7 +1344,7 @@ var _SDJwtInstance = class _SDJwtInstance {
   }
   issue(payload, disclosureFrame, options) {
     return __async(this, null, function* () {
-      var _a, _b;
+      var _a, _b, _c;
       if (!this.userConfig.hasher) {
         throw new SDJWTException("Hasher not found");
       }
@@ -1195,10 +1354,17 @@ var _SDJwtInstance = class _SDJwtInstance {
       if (!this.userConfig.signAlg) {
         throw new SDJWTException("sign alogrithm not specified");
       }
+      if (this.userConfig.signAlg === "none") {
+        throw new SDJWTException('sign algorithm "none" is not allowed');
+      }
       this.validateReservedFields(payload);
       this.validateDisclosureFrame(disclosureFrame);
       const hasher = this.userConfig.hasher;
       const hashAlg = (_a = this.userConfig.hashAlg) != null ? _a : _SDJwtInstance.DEFAULT_hashAlg;
+      const allowedDisclosureHashAlgorithms = (_b = this.userConfig.allowedDisclosureHashAlgorithms) != null ? _b : DEFAULT_SECURE_HASH_ALGORITHMS;
+      if (!allowedDisclosureHashAlgorithms.includes(hashAlg)) {
+        throw new SDJWTException(`Disallowed hash algorithm: ${hashAlg}`);
+      }
       const { packedClaims, disclosures } = yield pack(
         payload,
         disclosureFrame,
@@ -1206,7 +1372,7 @@ var _SDJwtInstance = class _SDJwtInstance {
         this.userConfig.saltGenerator
       );
       const alg = this.userConfig.signAlg;
-      const OptionHeader = (_b = options == null ? void 0 : options.header) != null ? _b : {};
+      const OptionHeader = (_c = options == null ? void 0 : options.header) != null ? _c : {};
       const CustomHeader = this.userConfig.omitTyp ? OptionHeader : __spreadValues({ typ: this.type }, OptionHeader);
       const header = __spreadProps(__spreadValues({}, CustomHeader), { alg });
       const jwt = new Jwt({
@@ -1242,6 +1408,9 @@ var _SDJwtInstance = class _SDJwtInstance {
       }
       const hasher = this.userConfig.hasher;
       const sdjwt = yield SDJwt.fromEncode(encodedSDJwt, hasher);
+      if (sdjwt.kbJwt) {
+        throw new SDJWTException("Holder cannot present an SD-JWT with KB-JWT");
+      }
       if (!((_a = sdjwt.jwt) == null ? void 0 : _a.payload)) throw new SDJWTException("Payload not found");
       const presentSdJwtWithoutKb = yield sdjwt.present(
         presentationFrame,
@@ -1384,10 +1553,13 @@ var _SDJwtInstance = class _SDJwtInstance {
       }
       if (sdjwt == null ? void 0 : sdjwt.jwt) {
         try {
-          const result = yield this.VerifyJwt(sdjwt.jwt, options);
+          const result = yield this.VerifyJwt(sdjwt.jwt, __spreadProps(__spreadValues({}, options), {
+            skipJwtClaimValidation: true
+          }));
           header = result.header;
           const claims = yield sdjwt.getClaims(hasher);
           payload = claims;
+          validateJwtPayload(payload, options);
         } catch (e) {
           const error = ensureError(e);
           const code = exceptionToCode(error);
@@ -1513,9 +1685,12 @@ var _SDJwtInstance = class _SDJwtInstance {
       if (!sdjwt.jwt) {
         throw new SDJWTException("Invalid SD JWT");
       }
-      const verifiedPayloads = yield this.VerifyJwt(sdjwt.jwt, options);
+      const verifiedPayloads = yield this.VerifyJwt(sdjwt.jwt, __spreadProps(__spreadValues({}, options), {
+        skipJwtClaimValidation: true
+      }));
       const claims = yield sdjwt.getClaims(hasher);
       validateReservedFieldsInternal(claims);
+      validateJwtPayload(claims, options);
       return { payload: claims, header: verifiedPayloads.header };
     });
   }
@@ -1570,12 +1745,19 @@ var SDJwtInstance = _SDJwtInstance;
 var SDJwtGeneralJSONInstance = class {
   constructor(userConfig) {
     this.userConfig = {};
+    var _a;
     if (userConfig) {
       if (userConfig.hashAlg && !IANA_HASH_ALGORITHMS.includes(userConfig.hashAlg)) {
         throw new SDJWTException(
           `Invalid hash algorithm: ${userConfig.hashAlg}`
         );
       }
+      const allowedDisclosureHashAlgorithms = (_a = userConfig.allowedDisclosureHashAlgorithms) != null ? _a : DEFAULT_SECURE_HASH_ALGORITHMS;
+      if (userConfig.hashAlg && !allowedDisclosureHashAlgorithms.includes(userConfig.hashAlg)) {
+        throw new SDJWTException(
+          `Disallowed hash algorithm: ${userConfig.hashAlg}`
+        );
+      }
       this.userConfig = userConfig;
     }
   }
@@ -1669,6 +1851,9 @@ var SDJwtGeneralJSONInstance = class {
       const hasher = this.userConfig.hasher;
       const encodedSDJwt = generalJSON.toEncoded(0);
       const sdjwt = yield SDJwt.fromEncode(encodedSDJwt, hasher);
+      if (sdjwt.kbJwt) {
+        throw new SDJWTException("Holder cannot present an SD-JWT with KB-JWT");
+      }
       if (!((_a = sdjwt.jwt) == null ? void 0 : _a.payload)) throw new SDJWTException("Payload not found");
       const disclosures = yield sdjwt.getPresentDisclosures(
         presentationFrame,
@@ -1708,7 +1893,7 @@ var SDJwtGeneralJSONInstance = class {
         throw new SDJWTException("Hasher not found");
       }
       const hasher = this.userConfig.hasher;
-      const { payload, headers } = yield this.validate(generalJSON);
+      const { payload, headers } = yield this.validate(generalJSON, options);
       const encodedSDJwt = generalJSON.toEncoded(0);
       const sdjwt = yield SDJwt.fromEncode(encodedSDJwt, hasher);
       if (!((_a = sdjwt.jwt) == null ? void 0 : _a.payload)) {
@@ -1774,7 +1959,7 @@ var SDJwtGeneralJSONInstance = class {
   }
   // This function is for validating the SD JWT
   // Just checking signature and return its the claims
-  validate(generalJSON) {
+  validate(generalJSON, options) {
     return __async(this, null, function* () {
       if (!this.userConfig.hasher) {
         throw new SDJWTException("Hasher not found");
@@ -1790,9 +1975,21 @@ var SDJwtGeneralJSONInstance = class {
           const { protected: encodedHeader, signature } = s;
           const verified2 = yield verifier(
             `${encodedHeader}.${payload}`,
-            signature
+            signature,
+            __spreadProps(__spreadValues({}, options), { skipJwtClaimValidation: true })
+          );
+          const header = decodeBase64urlJsonStrict(
+            encodedHeader,
+            "Invalid JWT"
           );
-          const header = decodeBase64urlJsonStrict(encodedHeader, "Invalid JWT");
+          if (typeof header.alg !== "string" || header.alg === "none") {
+            throw new SDJWTException('Verify Error: alg "none" is not allowed');
+          }
+          if ((options == null ? void 0 : options.allowedIssuerAlgorithms) && !options.allowedIssuerAlgorithms.includes(header.alg)) {
+            throw new SDJWTException(
+              `Verify Error: Disallowed alg ${header.alg}`
+            );
+          }
           return { verified: verified2, header };
         }))
       );
@@ -1807,6 +2004,7 @@ var SDJwtGeneralJSONInstance = class {
       }
       const claims = yield sdjwt.getClaims(hasher);
       validateReservedFieldsInternal(claims);
+      validateJwtPayload(claims, options);
       return { payload: claims, headers: results.map((r) => r.header) };
     });
   }
@@ -1853,6 +2051,7 @@ var SDJwtGeneralJSONInstance = class {
 SDJwtGeneralJSONInstance.DEFAULT_hashAlg = "sha-256";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  DEFAULT_SECURE_HASH_ALGORITHMS,
   Disclosure,
   FlattenJSON,
   GeneralJSON,
@@ -1878,6 +2077,8 @@ SDJwtGeneralJSONInstance.DEFAULT_hashAlg = "sha-256";
   decodeJwt,
   decodeSdJwt,
   decodeSdJwtSync,
+  encodePath,
+  encodePathSegment,
   ensureError,
   getClaims,
   getClaimsSync,
@@ -1894,5 +2095,6 @@ SDJwtGeneralJSONInstance.DEFAULT_hashAlg = "sha-256";
   uint8ArrayToBase64Url,
   unpack,
   unpackObj,
-  unpackSync
+  unpackSync,
+  validateJwtPayload
 });