@suveren/gateway 0.7.3 → 0.7.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (206) hide show
  1. package/content/integrations/gmail.json +3 -6
  2. package/dist/control-plane/index.mjs +294 -62
  3. package/dist/mcp-server/http.mjs +467 -73
  4. package/dist/ui/assets/{index-CkWaRck1.css → index-BYVb_0oG.css} +1 -1
  5. package/dist/ui/assets/index-CsrM6RQr.js +110 -0
  6. package/dist/ui/index.html +2 -2
  7. package/node_modules/@hap/core/dist/index.d.mts +258 -9
  8. package/node_modules/@hap/core/dist/index.d.ts +258 -9
  9. package/node_modules/@hap/core/dist/index.js +227 -5
  10. package/node_modules/@hap/core/dist/index.mjs +213 -4
  11. package/node_modules/@hap/core/package.json +3 -2
  12. package/node_modules/@hap/core/src/did-key.ts +126 -0
  13. package/node_modules/@hap/core/src/identity.ts +21 -5
  14. package/node_modules/@hap/core/src/index.ts +3 -0
  15. package/node_modules/@hap/core/src/mandate.ts +207 -0
  16. package/node_modules/@hap/core/src/receipt.ts +74 -0
  17. package/node_modules/@hap/core/src/types.ts +81 -5
  18. package/node_modules/@hono/node-server/dist/index.cjs +151 -9
  19. package/node_modules/@hono/node-server/dist/index.mjs +151 -9
  20. package/node_modules/@hono/node-server/package.json +1 -1
  21. package/node_modules/@modelcontextprotocol/sdk/node_modules/body-parser/node_modules/content-type/README.md +2 -0
  22. package/node_modules/@modelcontextprotocol/sdk/node_modules/body-parser/node_modules/content-type/dist/index.d.ts +20 -0
  23. package/node_modules/@modelcontextprotocol/sdk/node_modules/body-parser/node_modules/content-type/dist/index.js +20 -14
  24. package/node_modules/@modelcontextprotocol/sdk/node_modules/body-parser/node_modules/content-type/dist/index.js.map +1 -1
  25. package/node_modules/@modelcontextprotocol/sdk/node_modules/body-parser/node_modules/content-type/package.json +1 -1
  26. package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/lib/accept.js +54 -0
  27. package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/lib/charset.js +10 -34
  28. package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/lib/encoding.js +9 -30
  29. package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/lib/language.js +15 -36
  30. package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/lib/mediaType.js +16 -134
  31. package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/node_modules/content-type/LICENSE +22 -0
  32. package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/node_modules/content-type/README.md +71 -0
  33. package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/node_modules/content-type/dist/index.d.ts +46 -0
  34. package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/node_modules/content-type/dist/index.js +176 -0
  35. package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/node_modules/content-type/dist/index.js.map +1 -0
  36. package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/node_modules/content-type/package.json +52 -0
  37. package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/package.json +16 -10
  38. package/node_modules/@modelcontextprotocol/sdk/node_modules/type-is/node_modules/content-type/README.md +2 -0
  39. package/node_modules/@modelcontextprotocol/sdk/node_modules/type-is/node_modules/content-type/dist/index.d.ts +20 -0
  40. package/node_modules/@modelcontextprotocol/sdk/node_modules/type-is/node_modules/content-type/dist/index.js +20 -14
  41. package/node_modules/@modelcontextprotocol/sdk/node_modules/type-is/node_modules/content-type/dist/index.js.map +1 -1
  42. package/node_modules/@modelcontextprotocol/sdk/node_modules/type-is/node_modules/content-type/package.json +1 -1
  43. package/node_modules/@types/node/README.md +1 -1
  44. package/node_modules/@types/node/buffer.buffer.d.ts +5 -5
  45. package/node_modules/@types/node/crypto.d.ts +2 -2
  46. package/node_modules/@types/node/http.d.ts +16 -0
  47. package/node_modules/@types/node/http2.d.ts +10 -2
  48. package/node_modules/@types/node/package.json +2 -2
  49. package/node_modules/@types/node/process.d.ts +52 -0
  50. package/node_modules/@types/node/quic.d.ts +210 -28
  51. package/node_modules/@types/node/sqlite.d.ts +6 -2
  52. package/node_modules/@types/node/test.d.ts +36 -0
  53. package/node_modules/eventsource-parser/dist/index.cjs +2 -2
  54. package/node_modules/eventsource-parser/dist/index.cjs.map +1 -1
  55. package/node_modules/eventsource-parser/dist/index.js +2 -2
  56. package/node_modules/eventsource-parser/dist/index.js.map +1 -1
  57. package/node_modules/eventsource-parser/package.json +1 -1
  58. package/node_modules/eventsource-parser/src/parse.ts +4 -2
  59. package/node_modules/fast-uri/index.js +201 -48
  60. package/node_modules/fast-uri/lib/schemes.js +9 -4
  61. package/node_modules/fast-uri/lib/utils.js +388 -91
  62. package/node_modules/fast-uri/package.json +1 -1
  63. package/node_modules/fast-uri/test/component-safe-serialization.test.js +105 -0
  64. package/node_modules/fast-uri/test/equal.test.js +31 -3
  65. package/node_modules/fast-uri/test/fixtures/uri-js-parse.json +2 -0
  66. package/node_modules/fast-uri/test/ipv6-canonical.test.js +34 -0
  67. package/node_modules/fast-uri/test/ipv6-validation.test.js +90 -0
  68. package/node_modules/fast-uri/test/malformed-percent.test.js +77 -0
  69. package/node_modules/fast-uri/test/malformed-urn.test.js +61 -0
  70. package/node_modules/fast-uri/test/parse.test.js +7 -3
  71. package/node_modules/fast-uri/test/query-fragment-normalization.test.js +33 -0
  72. package/node_modules/fast-uri/test/reserved-path-normalization.test.js +109 -0
  73. package/node_modules/fast-uri/test/scheme-validation.test.js +124 -0
  74. package/node_modules/fast-uri/test/security-normalization.test.js +101 -0
  75. package/node_modules/fast-uri/test/security.test.js +75 -3
  76. package/node_modules/fast-uri/test/urn-full-input.test.js +29 -0
  77. package/node_modules/fast-uri/test/websocket-query-preservation.test.js +24 -0
  78. package/node_modules/hono/dist/cjs/client/client.js +27 -13
  79. package/node_modules/hono/dist/cjs/client/utils.js +4 -1
  80. package/node_modules/hono/dist/cjs/context.js +4 -0
  81. package/node_modules/hono/dist/cjs/helper/accepts/accepts.js +36 -2
  82. package/node_modules/hono/dist/cjs/helper/ssg/ssg.js +1 -1
  83. package/node_modules/hono/dist/cjs/helper/ssg/utils.js +30 -10
  84. package/node_modules/hono/dist/cjs/jsx/dom/render.js +2 -0
  85. package/node_modules/hono/dist/cjs/jsx/intrinsic-element/components.js +1 -1
  86. package/node_modules/hono/dist/cjs/middleware/cache/index.js +1 -1
  87. package/node_modules/hono/dist/cjs/middleware/cors/index.js +16 -13
  88. package/node_modules/hono/dist/cjs/middleware/csrf/index.js +1 -1
  89. package/node_modules/hono/dist/cjs/middleware/etag/digest.js +47 -1
  90. package/node_modules/hono/dist/cjs/middleware/etag/index.js +3 -3
  91. package/node_modules/hono/dist/cjs/middleware/pretty-json/index.js +3 -1
  92. package/node_modules/hono/dist/cjs/middleware/secure-headers/secure-headers.js +6 -3
  93. package/node_modules/hono/dist/cjs/request.js +8 -4
  94. package/node_modules/hono/dist/cjs/router/linear-router/router.js +7 -2
  95. package/node_modules/hono/dist/cjs/router/pattern-router/router.js +3 -9
  96. package/node_modules/hono/dist/cjs/router/reg-exp-router/node.js +10 -3
  97. package/node_modules/hono/dist/cjs/router/reg-exp-router/router.js +47 -83
  98. package/node_modules/hono/dist/cjs/router/reg-exp-router/trie.js +2 -1
  99. package/node_modules/hono/dist/cjs/router/trie-router/node.js +46 -69
  100. package/node_modules/hono/dist/cjs/router/trie-router/router.js +3 -11
  101. package/node_modules/hono/dist/cjs/router/utils.js +27 -0
  102. package/node_modules/hono/dist/cjs/utils/body.js +15 -3
  103. package/node_modules/hono/dist/cjs/utils/cookie.js +1 -1
  104. package/node_modules/hono/dist/cjs/utils/ipaddr.js +5 -3
  105. package/node_modules/hono/dist/cjs/utils/stream.js +7 -1
  106. package/node_modules/hono/dist/cjs/utils/url.js +11 -3
  107. package/node_modules/hono/dist/client/client.js +27 -13
  108. package/node_modules/hono/dist/client/utils.js +4 -1
  109. package/node_modules/hono/dist/context.js +4 -0
  110. package/node_modules/hono/dist/helper/accepts/accepts.js +36 -2
  111. package/node_modules/hono/dist/helper/ssg/ssg.js +1 -1
  112. package/node_modules/hono/dist/helper/ssg/utils.js +30 -10
  113. package/node_modules/hono/dist/jsx/dom/render.js +2 -0
  114. package/node_modules/hono/dist/jsx/intrinsic-element/components.js +1 -1
  115. package/node_modules/hono/dist/middleware/cache/index.js +1 -1
  116. package/node_modules/hono/dist/middleware/cors/index.js +16 -13
  117. package/node_modules/hono/dist/middleware/csrf/index.js +1 -1
  118. package/node_modules/hono/dist/middleware/etag/digest.js +47 -1
  119. package/node_modules/hono/dist/middleware/etag/index.js +3 -3
  120. package/node_modules/hono/dist/middleware/pretty-json/index.js +3 -1
  121. package/node_modules/hono/dist/middleware/secure-headers/secure-headers.js +6 -3
  122. package/node_modules/hono/dist/request.js +8 -4
  123. package/node_modules/hono/dist/router/linear-router/router.js +7 -2
  124. package/node_modules/hono/dist/router/pattern-router/router.js +3 -9
  125. package/node_modules/hono/dist/router/reg-exp-router/node.js +6 -2
  126. package/node_modules/hono/dist/router/reg-exp-router/router.js +53 -84
  127. package/node_modules/hono/dist/router/reg-exp-router/trie.js +2 -1
  128. package/node_modules/hono/dist/router/trie-router/node.js +46 -69
  129. package/node_modules/hono/dist/router/trie-router/router.js +3 -11
  130. package/node_modules/hono/dist/router/utils.js +5 -0
  131. package/node_modules/hono/dist/types/context.d.ts +4 -0
  132. package/node_modules/hono/dist/types/middleware/secure-headers/permissions-policy.d.ts +3 -3
  133. package/node_modules/hono/dist/types/router/reg-exp-router/node.d.ts +3 -0
  134. package/node_modules/hono/dist/types/router/trie-router/node.d.ts +1 -2
  135. package/node_modules/hono/dist/types/router/trie-router/router.d.ts +0 -1
  136. package/node_modules/hono/dist/types/router/utils.d.ts +1 -0
  137. package/node_modules/hono/dist/types/utils/url.d.ts +4 -0
  138. package/node_modules/hono/dist/utils/body.js +15 -3
  139. package/node_modules/hono/dist/utils/cookie.js +1 -1
  140. package/node_modules/hono/dist/utils/ipaddr.js +5 -3
  141. package/node_modules/hono/dist/utils/stream.js +7 -1
  142. package/node_modules/hono/dist/utils/url.js +11 -3
  143. package/node_modules/hono/package.json +1 -1
  144. package/node_modules/ip-address/README.md +134 -134
  145. package/node_modules/ip-address/dist/address-error.d.ts +11 -0
  146. package/node_modules/ip-address/dist/address-error.js.map +1 -1
  147. package/node_modules/ip-address/dist/ipv4.d.ts +22 -6
  148. package/node_modules/ip-address/dist/ipv4.js +22 -6
  149. package/node_modules/ip-address/dist/ipv4.js.map +1 -1
  150. package/node_modules/ip-address/dist/ipv6.d.ts +10 -3
  151. package/node_modules/ip-address/dist/ipv6.js +26 -17
  152. package/node_modules/ip-address/dist/ipv6.js.map +1 -1
  153. package/node_modules/ip-address/package.json +1 -1
  154. package/node_modules/is-plain-object/README.md +39 -95
  155. package/node_modules/is-plain-object/dist/is-plain-object.js +0 -2
  156. package/node_modules/is-plain-object/is-plain-object.d.ts +6 -1
  157. package/node_modules/is-plain-object/package.json +8 -34
  158. package/node_modules/jose/dist/types/jwe/compact/encrypt.d.ts +4 -3
  159. package/node_modules/jose/dist/types/jwe/flattened/encrypt.d.ts +4 -3
  160. package/node_modules/jose/dist/types/jwe/general/encrypt.d.ts +4 -3
  161. package/node_modules/jose/dist/types/jwks/remote.d.ts +4 -4
  162. package/node_modules/jose/dist/types/jws/general/verify.d.ts +3 -3
  163. package/node_modules/jose/dist/types/jwt/encrypt.d.ts +12 -17
  164. package/node_modules/jose/dist/types/jwt/sign.d.ts +8 -14
  165. package/node_modules/jose/dist/types/jwt/unsecured.d.ts +9 -15
  166. package/node_modules/jose/dist/types/types.d.ts +4 -2
  167. package/node_modules/jose/dist/webapi/jwe/compact/encrypt.js +30 -8
  168. package/node_modules/jose/dist/webapi/jwe/flattened/decrypt.js +8 -4
  169. package/node_modules/jose/dist/webapi/jwe/flattened/encrypt.js +6 -13
  170. package/node_modules/jose/dist/webapi/jwe/general/decrypt.js +19 -19
  171. package/node_modules/jose/dist/webapi/jwe/general/encrypt.js +32 -21
  172. package/node_modules/jose/dist/webapi/jwk/embedded.js +15 -1
  173. package/node_modules/jose/dist/webapi/jwk/thumbprint.js +11 -5
  174. package/node_modules/jose/dist/webapi/jwks/local.js +45 -53
  175. package/node_modules/jose/dist/webapi/jwks/remote.js +82 -103
  176. package/node_modules/jose/dist/webapi/jws/compact/sign.js +10 -9
  177. package/node_modules/jose/dist/webapi/jws/flattened/sign.js +2 -1
  178. package/node_modules/jose/dist/webapi/jws/flattened/verify.js +8 -7
  179. package/node_modules/jose/dist/webapi/jws/general/sign.js +5 -3
  180. package/node_modules/jose/dist/webapi/jws/general/verify.js +51 -21
  181. package/node_modules/jose/dist/webapi/jwt/decrypt.js +7 -9
  182. package/node_modules/jose/dist/webapi/jwt/encrypt.js +21 -50
  183. package/node_modules/jose/dist/webapi/jwt/sign.js +8 -41
  184. package/node_modules/jose/dist/webapi/jwt/unsecured.js +21 -42
  185. package/node_modules/jose/dist/webapi/key/generate_key_pair.js +6 -2
  186. package/node_modules/jose/dist/webapi/key/generate_secret.js +7 -6
  187. package/node_modules/jose/dist/webapi/key/import.js +16 -12
  188. package/node_modules/jose/dist/webapi/lib/asn1.js +7 -2
  189. package/node_modules/jose/dist/webapi/lib/content_encryption.js +7 -15
  190. package/node_modules/jose/dist/webapi/lib/deflate.js +8 -0
  191. package/node_modules/jose/dist/webapi/lib/helpers.js +1 -1
  192. package/node_modules/jose/dist/webapi/lib/jwe_decrypt.js +85 -28
  193. package/node_modules/jose/dist/webapi/lib/jwe_encrypt.js +45 -13
  194. package/node_modules/jose/dist/webapi/lib/jwk_metadata.js +20 -0
  195. package/node_modules/jose/dist/webapi/lib/jws_sign.js +47 -36
  196. package/node_modules/jose/dist/webapi/lib/jws_verify.js +77 -45
  197. package/node_modules/jose/dist/webapi/lib/jwt_claims_set.js +82 -47
  198. package/node_modules/jose/dist/webapi/lib/key.js +24 -9
  199. package/node_modules/jose/dist/webapi/lib/key_management.js +10 -4
  200. package/node_modules/jose/dist/webapi/lib/key_options.js +6 -0
  201. package/node_modules/jose/dist/webapi/lib/options.js +26 -0
  202. package/node_modules/jose/dist/webapi/lib/type_checks.js +11 -13
  203. package/node_modules/jose/package.json +1 -1
  204. package/package.json +2 -2
  205. package/dist/ui/assets/index-DdJeSfV9.js +0 -110
  206. package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/HISTORY.md +0 -114
@@ -3,9 +3,10 @@ import { encode as b64u } from '../util/base64url.js';
3
3
  import { JOSENotSupported, JWKInvalid } from '../util/errors.js';
4
4
  import { encode } from '../lib/buffer_utils.js';
5
5
  import { isKeyLike } from '../lib/is_key_like.js';
6
- import { isJWK } from '../lib/type_checks.js';
6
+ import { isObject } from '../lib/type_checks.js';
7
7
  import { exportJWK } from '../key/export.js';
8
8
  import { invalidKeyInput } from '../lib/invalid_key_input.js';
9
+ import { snapshotJwk } from '../lib/jwk_metadata.js';
9
10
  const check = (value, description) => {
10
11
  if (typeof value !== 'string' || !value) {
11
12
  throw new JWKInvalid(`${description} missing or invalid`);
@@ -13,11 +14,14 @@ const check = (value, description) => {
13
14
  };
14
15
  export async function calculateJwkThumbprint(key, digestAlgorithm) {
15
16
  let jwk;
16
- if (isJWK(key)) {
17
- jwk = key;
17
+ if (isObject(key)) {
18
+ jwk = snapshotJwk(key);
19
+ if (typeof jwk.kty !== 'string') {
20
+ throw new TypeError(invalidKeyInput(key, 'CryptoKey', 'KeyObject', 'JSON Web Key'));
21
+ }
18
22
  }
19
23
  else if (isKeyLike(key)) {
20
- jwk = await exportJWK(key);
24
+ jwk = snapshotJwk(await exportJWK(key));
21
25
  }
22
26
  else {
23
27
  throw new TypeError(invalidKeyInput(key, 'CryptoKey', 'KeyObject', 'JSON Web Key'));
@@ -52,7 +56,9 @@ export async function calculateJwkThumbprint(key, digestAlgorithm) {
52
56
  components = { e: jwk.e, kty: jwk.kty, n: jwk.n };
53
57
  break;
54
58
  case 'oct':
55
- check(jwk.k, '"k" (Key Value) Parameter');
59
+ if (typeof jwk.k !== 'string') {
60
+ throw new JWKInvalid('"k" (Key Value) Parameter missing or invalid');
61
+ }
56
62
  components = { k: jwk.k, kty: jwk.kty };
57
63
  break;
58
64
  default:
@@ -1,78 +1,70 @@
1
1
  import { jwkToKey } from '../lib/jwk_to_key.js';
2
2
  import { JWS } from '../lib/jws_algorithms.js';
3
3
  import { JWKSInvalid, JOSENotSupported, JWKSNoMatchingKey, JWKSMultipleMatchingKeys, } from '../util/errors.js';
4
- import { isObject } from '../lib/type_checks.js';
5
- function signatureAlgorithm(alg) {
6
- const entry = typeof alg === 'string' ? JWS[alg] : undefined;
7
- if (!entry || entry.secret) {
8
- throw new JOSENotSupported('Unsupported "alg" value for a JSON Web Key Set');
9
- }
10
- return entry;
4
+ import { isJwkSet } from '../lib/type_checks.js';
5
+ import { snapshotJwk } from '../lib/jwk_metadata.js';
6
+ function isUsableJWK(jwk, entry, alg, kid) {
7
+ const { kty, key_ops, ext, kid: jwkKid, alg: jwkAlg, use, crv } = snapshotJwk(jwk);
8
+ const keyOps = Array.isArray(key_ops) ? [...key_ops] : key_ops;
9
+ return ((ext === undefined || typeof ext === 'boolean') &&
10
+ (keyOps === undefined ||
11
+ (Array.isArray(keyOps) &&
12
+ keyOps.every((operation, index) => typeof operation === 'string' && keyOps.indexOf(operation) === index) &&
13
+ keyOps.includes('verify'))) &&
14
+ entry.kty.includes(kty) &&
15
+ (kid === undefined || (typeof kid === 'string' && kid === jwkKid)) &&
16
+ (jwkAlg === undefined ? kty !== 'AKP' : alg === jwkAlg) &&
17
+ (use === undefined || use === 'sig') &&
18
+ (!entry.crv || crv === entry.crv));
11
19
  }
12
- function isJWKSLike(jwks) {
13
- if (!jwks || typeof jwks !== 'object') {
14
- return false;
20
+ async function importWithAlgCache(cache, jwk, entry) {
21
+ const cached = cache.get(jwk) || cache.set(jwk, {}).get(jwk);
22
+ const { alg } = entry;
23
+ if (cached[alg] === undefined) {
24
+ const key = await jwkToKey(entry, { ...jwk, alg, ext: true });
25
+ if (key.type !== 'public') {
26
+ throw new JWKSInvalid('JSON Web Key Set members must be public keys');
27
+ }
28
+ cached[alg] = key;
15
29
  }
16
- const { keys } = jwks;
17
- return Array.isArray(keys) && keys.every((isObject));
30
+ return cached[alg];
18
31
  }
19
- class LocalJWKSetImpl {
20
- #jwks;
21
- #cached = new WeakMap();
22
- constructor(jwks) {
23
- if (!isJWKSLike(jwks)) {
24
- throw new JWKSInvalid('JSON Web Key Set malformed');
25
- }
26
- this.#jwks = structuredClone(jwks);
32
+ export function createLocalJWKSet(jwks) {
33
+ let snapshot;
34
+ try {
35
+ snapshot = structuredClone(jwks);
27
36
  }
28
- jwks() {
29
- return this.#jwks;
37
+ catch { }
38
+ if (!isJwkSet(snapshot)) {
39
+ throw new JWKSInvalid('JSON Web Key Set malformed');
30
40
  }
31
- async getKey(protectedHeader, token) {
41
+ const cached = new WeakMap();
42
+ const localJWKSet = async (protectedHeader, token) => {
32
43
  const { alg, kid } = { ...protectedHeader, ...token?.header };
33
- const entry = signatureAlgorithm(alg);
34
- const candidates = this.#jwks.keys.filter((jwk) => entry.kty.includes(jwk.kty) &&
35
- (typeof kid !== 'string' || kid === jwk.kid) &&
36
- (!(typeof jwk.alg === 'string' || jwk.kty === 'AKP') || alg === jwk.alg) &&
37
- (typeof jwk.use !== 'string' || jwk.use === 'sig') &&
38
- (!Array.isArray(jwk.key_ops) || jwk.key_ops.includes('verify')) &&
39
- (!entry.crv || jwk.crv === entry.crv));
44
+ const entry = typeof alg === 'string' ? JWS[alg] : undefined;
45
+ if (!entry || entry.secret) {
46
+ throw new JOSENotSupported('Unsupported "alg" value for a JSON Web Key Set');
47
+ }
48
+ const candidates = snapshot.keys.filter((jwk) => isUsableJWK(jwk, entry, alg, kid));
40
49
  const { 0: jwk, length } = candidates;
41
- if (length === 0) {
50
+ if (!length) {
42
51
  throw new JWKSNoMatchingKey();
43
52
  }
44
53
  if (length !== 1) {
45
54
  const error = new JWKSMultipleMatchingKeys();
46
- const _cached = this.#cached;
47
55
  error[Symbol.asyncIterator] = async function* () {
48
56
  for (const jwk of candidates) {
49
57
  try {
50
- yield await importWithAlgCache(_cached, jwk, entry);
58
+ yield await importWithAlgCache(cached, jwk, entry);
51
59
  }
52
60
  catch { }
53
61
  }
54
62
  };
55
63
  throw error;
56
64
  }
57
- return importWithAlgCache(this.#cached, jwk, entry);
58
- }
59
- }
60
- async function importWithAlgCache(cache, jwk, entry) {
61
- const cached = cache.get(jwk) || cache.set(jwk, { __proto__: null }).get(jwk);
62
- if (cached[entry.alg] === undefined) {
63
- const key = await jwkToKey(entry, { ...jwk, alg: entry.alg, ext: true });
64
- if (key.type !== 'public') {
65
- throw new JWKSInvalid('JSON Web Key Set members must be public keys');
66
- }
67
- cached[entry.alg] = key;
68
- }
69
- return cached[entry.alg];
70
- }
71
- export function createLocalJWKSet(jwks) {
72
- const set = new LocalJWKSetImpl(jwks);
73
- const localJWKSet = async (protectedHeader, token) => set.getKey(protectedHeader, token);
74
- Object.defineProperty(localJWKSet, 'jwks', {
75
- value: () => structuredClone(set.jwks()),
65
+ return importWithAlgCache(cached, jwk, entry);
66
+ };
67
+ return Object.defineProperty(localJWKSet, 'jwks', {
68
+ value: () => structuredClone(snapshot),
76
69
  });
77
- return localJWKSet;
78
70
  }
@@ -1,6 +1,6 @@
1
1
  import { JOSEError, JWKSNoMatchingKey, JWKSTimeout } from '../util/errors.js';
2
2
  import { createLocalJWKSet } from './local.js';
3
- import { isObject } from '../lib/type_checks.js';
3
+ import { isJwkSet } from '../lib/type_checks.js';
4
4
  function isCloudflareWorkers() {
5
5
  return (typeof WebSocketPair !== 'undefined' ||
6
6
  (typeof navigator !== 'undefined' && navigator.userAgent === 'Cloudflare-Workers') ||
@@ -9,7 +9,7 @@ function isCloudflareWorkers() {
9
9
  let USER_AGENT;
10
10
  if (typeof navigator === 'undefined' || !navigator.userAgent?.startsWith?.('Mozilla/5.0 ')) {
11
11
  const NAME = 'jose';
12
- const VERSION = 'v6.2.8';
12
+ const VERSION = 'v6.2.10';
13
13
  USER_AGENT = `${NAME}/${VERSION}`;
14
14
  }
15
15
  export const customFetch = Symbol();
@@ -36,135 +36,114 @@ async function fetchJwks(url, headers, signal, fetchImpl = fetch) {
36
36
  }
37
37
  }
38
38
  export const jwksCache = Symbol();
39
- function isFreshJwksCache(input, cacheMaxAge) {
40
- if (typeof input !== 'object' || input === null) {
41
- return false;
42
- }
43
- if (!('uat' in input) || typeof input.uat !== 'number' || Date.now() - input.uat >= cacheMaxAge) {
44
- return false;
45
- }
46
- if (!('jwks' in input) ||
47
- !isObject(input.jwks) ||
48
- !Array.isArray(input.jwks.keys) ||
49
- !Array.prototype.every.call(input.jwks.keys, isObject)) {
50
- return false;
51
- }
52
- return true;
39
+ function isFreshFor(timestamp, duration) {
40
+ return Number.isFinite(timestamp) && Date.now() < timestamp + duration;
53
41
  }
54
- class RemoteJWKSetImpl {
55
- #url;
56
- #timeoutDuration;
57
- #cooldownDuration;
58
- #cacheMaxAge;
59
- #jwksTimestamp;
60
- #pendingFetch;
61
- #headers;
62
- #customFetch;
63
- #local;
64
- #cache;
65
- constructor(url, options) {
66
- if (!(url instanceof URL)) {
67
- throw new TypeError('url must be an instance of URL');
68
- }
69
- this.#url = new URL(url.href);
70
- const opts = options ?? {};
71
- this.#timeoutDuration = typeof opts.timeoutDuration === 'number' ? opts.timeoutDuration : 5000;
72
- this.#cooldownDuration =
73
- typeof opts.cooldownDuration === 'number' ? opts.cooldownDuration : 30000;
74
- this.#cacheMaxAge = typeof opts.cacheMaxAge === 'number' ? opts.cacheMaxAge : 600000;
75
- this.#headers = new Headers(opts.headers);
76
- if (USER_AGENT && !this.#headers.has('User-Agent')) {
77
- this.#headers.set('User-Agent', USER_AGENT);
78
- }
79
- if (!this.#headers.has('accept')) {
80
- this.#headers.set('accept', 'application/json');
81
- this.#headers.append('accept', 'application/jwk-set+json');
82
- }
83
- this.#customFetch = opts[customFetch];
84
- const cache = opts[jwksCache];
85
- if (cache !== undefined) {
86
- this.#cache = cache;
87
- if (isFreshJwksCache(cache, this.#cacheMaxAge)) {
88
- this.#jwksTimestamp = this.#cache.uat;
89
- this.#local = createLocalJWKSet(this.#cache.jwks);
90
- }
91
- }
42
+ function validateDuration(value, fallback, option) {
43
+ if (Number.isNaN(value)) {
44
+ throw new TypeError(`"${option}" option must not be NaN`);
92
45
  }
93
- pendingFetch() {
94
- return !!this.#pendingFetch;
46
+ return typeof value === 'number' ? value : fallback;
47
+ }
48
+ export function createRemoteJWKSet(url, options) {
49
+ if (!(url instanceof URL)) {
50
+ throw new TypeError('url must be an instance of URL');
95
51
  }
96
- #validFor(duration) {
97
- return typeof this.#jwksTimestamp === 'number' && Date.now() < this.#jwksTimestamp + duration;
52
+ const href = new URL(url.href).href;
53
+ const opts = options ?? {};
54
+ const timeoutOption = opts.timeoutDuration;
55
+ if (typeof timeoutOption === 'number' &&
56
+ (!Number.isInteger(timeoutOption) || timeoutOption < 0)) {
57
+ throw new TypeError('"timeoutDuration" option must be a non-negative integer');
98
58
  }
99
- coolingDown() {
100
- return this.#validFor(this.#cooldownDuration);
59
+ const timeoutDuration = typeof timeoutOption === 'number' ? timeoutOption : 5000;
60
+ const cooldownDuration = validateDuration(opts.cooldownDuration, 30000, 'cooldownDuration');
61
+ const cacheMaxAge = validateDuration(opts.cacheMaxAge, 600000, 'cacheMaxAge');
62
+ const headers = new Headers(opts.headers);
63
+ if (USER_AGENT && !headers.has('User-Agent')) {
64
+ headers.set('User-Agent', USER_AGENT);
101
65
  }
102
- fresh() {
103
- return this.#validFor(this.#cacheMaxAge);
66
+ if (!headers.has('accept')) {
67
+ headers.set('accept', 'application/json, application/jwk-set+json');
104
68
  }
105
- jwks() {
106
- return this.#local?.jwks();
69
+ const fetchImpl = opts[customFetch];
70
+ const cache = opts[jwksCache];
71
+ let jwksTimestamp;
72
+ let pendingFetch;
73
+ let reloadSequence = 0;
74
+ let appliedSequence = 0;
75
+ let local;
76
+ if (cache && typeof cache === 'object') {
77
+ const { uat, jwks } = cache;
78
+ if (isFreshFor(uat, cacheMaxAge) && isJwkSet(jwks)) {
79
+ jwksTimestamp = uat;
80
+ local = createLocalJWKSet(jwks);
81
+ }
107
82
  }
108
- async getKey(protectedHeader, token) {
109
- if (!this.#local || !this.fresh()) {
110
- await this.reload();
83
+ const reload = async () => {
84
+ if (pendingFetch && isCloudflareWorkers()) {
85
+ pendingFetch = undefined;
86
+ }
87
+ if (!pendingFetch) {
88
+ const sequence = ++reloadSequence;
89
+ const current = (pendingFetch = fetchJwks(href, headers, AbortSignal.timeout(timeoutDuration), fetchImpl)
90
+ .then((json) => {
91
+ const next = createLocalJWKSet(json);
92
+ if (sequence <= appliedSequence) {
93
+ return;
94
+ }
95
+ local = next;
96
+ const updatedAt = Date.now();
97
+ if (cache) {
98
+ cache.uat = updatedAt;
99
+ cache.jwks = json;
100
+ }
101
+ jwksTimestamp = updatedAt;
102
+ appliedSequence = sequence;
103
+ })
104
+ .finally(() => {
105
+ if (pendingFetch === current) {
106
+ pendingFetch = undefined;
107
+ }
108
+ }));
109
+ }
110
+ await pendingFetch;
111
+ };
112
+ const remoteJWKSet = async (protectedHeader, token) => {
113
+ if (!local || !isFreshFor(jwksTimestamp, cacheMaxAge)) {
114
+ await reload();
111
115
  }
112
116
  try {
113
- return await this.#local(protectedHeader, token);
117
+ return await local(protectedHeader, token);
114
118
  }
115
119
  catch (err) {
116
- if (err instanceof JWKSNoMatchingKey) {
117
- if (this.coolingDown() === false) {
118
- await this.reload();
119
- return this.#local(protectedHeader, token);
120
- }
120
+ if (err instanceof JWKSNoMatchingKey && !isFreshFor(jwksTimestamp, cooldownDuration)) {
121
+ await reload();
122
+ return local(protectedHeader, token);
121
123
  }
122
124
  throw err;
123
125
  }
124
- }
125
- async reload() {
126
- if (this.#pendingFetch && isCloudflareWorkers()) {
127
- this.#pendingFetch = undefined;
128
- }
129
- this.#pendingFetch ||= fetchJwks(this.#url.href, this.#headers, AbortSignal.timeout(this.#timeoutDuration), this.#customFetch)
130
- .then((json) => {
131
- this.#local = createLocalJWKSet(json);
132
- if (this.#cache) {
133
- this.#cache.uat = Date.now();
134
- this.#cache.jwks = json;
135
- }
136
- this.#jwksTimestamp = Date.now();
137
- })
138
- .finally(() => {
139
- this.#pendingFetch = undefined;
140
- });
141
- await this.#pendingFetch;
142
- }
143
- }
144
- export function createRemoteJWKSet(url, options) {
145
- const set = new RemoteJWKSetImpl(url, options);
146
- const remoteJWKSet = async (protectedHeader, token) => set.getKey(protectedHeader, token);
147
- Object.defineProperties(remoteJWKSet, {
126
+ };
127
+ return Object.defineProperties(remoteJWKSet, {
148
128
  coolingDown: {
149
- get: () => set.coolingDown(),
129
+ get: () => isFreshFor(jwksTimestamp, cooldownDuration),
150
130
  enumerable: true,
151
131
  },
152
132
  fresh: {
153
- get: () => set.fresh(),
133
+ get: () => isFreshFor(jwksTimestamp, cacheMaxAge),
154
134
  enumerable: true,
155
135
  },
156
136
  reload: {
157
- value: () => set.reload(),
137
+ value: reload,
158
138
  enumerable: true,
159
139
  },
160
140
  reloading: {
161
- get: () => set.pendingFetch(),
141
+ get: () => !!pendingFetch,
162
142
  enumerable: true,
163
143
  },
164
144
  jwks: {
165
- value: () => set.jwks(),
145
+ value: () => local?.jwks(),
166
146
  enumerable: true,
167
147
  },
168
148
  });
169
- return remoteJWKSet;
170
149
  }
@@ -1,21 +1,22 @@
1
- import { FlattenedSign } from '../flattened/sign.js';
2
- import { unencodedPayload } from '../../lib/jws_sign.js';
1
+ import { createCompactSignature } from '../../lib/jws_sign.js';
2
+ import { assertNotSet } from '../../lib/helpers.js';
3
3
  export class CompactSign {
4
- #flattened;
4
+ #payload;
5
5
  #protectedHeader;
6
6
  constructor(payload) {
7
- this.#flattened = new FlattenedSign(payload);
7
+ if (!(payload instanceof Uint8Array)) {
8
+ throw new TypeError('payload must be an instance of Uint8Array');
9
+ }
10
+ this.#payload = payload;
8
11
  }
9
12
  setProtectedHeader(protectedHeader) {
10
- this.#flattened.setProtectedHeader(protectedHeader);
13
+ assertNotSet(this.#protectedHeader, 'setProtectedHeader');
11
14
  this.#protectedHeader = protectedHeader;
12
15
  return this;
13
16
  }
14
17
  async sign(key, options) {
15
- if (unencodedPayload(this.#protectedHeader)) {
18
+ return createCompactSignature(this.#payload, this.#protectedHeader, options?.crit, key, () => {
16
19
  throw new TypeError('use the flattened module for creating JWS with b64: false');
17
- }
18
- const jws = await this.#flattened.sign(key, options);
19
- return `${jws.protected}.${jws.payload}.${jws.signature}`;
20
+ });
20
21
  }
21
22
  }
@@ -21,11 +21,12 @@ export class FlattenedSign {
21
21
  return this;
22
22
  }
23
23
  async sign(key, options) {
24
- return createSignature({
24
+ const [jws] = await createSignature({
25
25
  payload: this.#payload,
26
26
  protectedHeader: this.#protectedHeader,
27
27
  unprotectedHeader: this.#unprotectedHeader,
28
28
  crit: options?.crit,
29
29
  }, key);
30
+ return jws;
30
31
  }
31
32
  }
@@ -1,24 +1,25 @@
1
1
  import { JWSInvalid } from '../../util/errors.js';
2
2
  import { isObject } from '../../lib/type_checks.js';
3
- import { prepareVerify, verifySignature, verifyResult } from '../../lib/jws_verify.js';
3
+ import { encodeJsonUnencodedPayload, prepareVerify, snapshotJws, verifySignature, verifyResult, } from '../../lib/jws_verify.js';
4
4
  export async function flattenedVerify(jws, key, options) {
5
5
  if (!isObject(jws)) {
6
6
  throw new JWSInvalid('Flattened JWS must be an object');
7
7
  }
8
- if (jws.protected === undefined && jws.header === undefined) {
8
+ const snapshot = snapshotJws(jws);
9
+ if (snapshot.protected === undefined && snapshot.header === undefined) {
9
10
  throw new JWSInvalid('Flattened JWS must have either of the "protected" or "header" members');
10
11
  }
11
- if (jws.protected !== undefined && typeof jws.protected !== 'string') {
12
+ if (snapshot.protected !== undefined && typeof snapshot.protected !== 'string') {
12
13
  throw new JWSInvalid('JWS Protected Header incorrect type');
13
14
  }
14
- if (jws.payload === undefined) {
15
+ if (snapshot.payload === undefined) {
15
16
  throw new JWSInvalid('JWS Payload missing');
16
17
  }
17
- if (typeof jws.signature !== 'string') {
18
+ if (typeof snapshot.signature !== 'string') {
18
19
  throw new JWSInvalid('JWS Signature missing or incorrect type');
19
20
  }
20
- if (jws.header !== undefined && !isObject(jws.header)) {
21
+ if (snapshot.header !== undefined && !isObject(snapshot.header)) {
21
22
  throw new JWSInvalid('JWS Unprotected Header incorrect type');
22
23
  }
23
- return verifyResult(jws, await verifySignature(jws, prepareVerify(options), key));
24
+ return verifyResult(snapshot, await verifySignature(snapshot, prepareVerify(options), key, encodeJsonUnencodedPayload));
24
25
  }
@@ -51,20 +51,22 @@ export class GeneralSign {
51
51
  payload: '',
52
52
  };
53
53
  const encoded = [];
54
+ let b64;
54
55
  for (let i = 0; i < this.#signatures.length; i++) {
55
56
  const signature = this.#signatures[i];
56
57
  const [protectedHeader, unprotectedHeader, key, crit] = signature.state;
57
- const { payload, ...rest } = await createSignature({
58
+ const [{ payload, ...rest }, signatureB64] = await createSignature({
58
59
  payload: this.#payload,
59
60
  protectedHeader,
60
61
  unprotectedHeader,
61
62
  crit,
62
63
  encoded,
63
64
  }, key);
64
- if (i === 0) {
65
+ if (b64 === undefined) {
66
+ b64 = signatureB64;
65
67
  jws.payload = payload;
66
68
  }
67
- else if (jws.payload !== payload) {
69
+ else if (b64 !== signatureB64) {
68
70
  throw new JWSInvalid('inconsistent use of JWS Unencoded Payload (RFC7797)');
69
71
  }
70
72
  jws.signatures.push(rest);
@@ -1,41 +1,71 @@
1
- import { prepareVerify, verifySignature, verifyResult } from '../../lib/jws_verify.js';
1
+ import { encodeJsonUnencodedPayload, parseProtectedHeader, prepareVerify, snapshotJws, verifySignature, verifyResult, } from '../../lib/jws_verify.js';
2
2
  import { JWSInvalid, JWSSignatureVerificationFailed } from '../../util/errors.js';
3
3
  import { isObject } from '../../lib/type_checks.js';
4
+ function snapshotSignature(signature, payload) {
5
+ try {
6
+ const jws = snapshotJws(signature, [payload]);
7
+ const { protected: encodedProtected, header, signature: encodedSignature } = jws;
8
+ if (encodedProtected === undefined && header === undefined)
9
+ return undefined;
10
+ if (encodedProtected !== undefined && typeof encodedProtected !== 'string')
11
+ return undefined;
12
+ if (typeof encodedSignature !== 'string')
13
+ return undefined;
14
+ if (header !== undefined && !isObject(header))
15
+ return undefined;
16
+ const protectedHeader = parseProtectedHeader(encodedProtected);
17
+ const { b64, crit } = protectedHeader;
18
+ return [
19
+ jws,
20
+ protectedHeader,
21
+ Array.isArray(crit) && crit.includes('b64')
22
+ ? typeof b64 === 'boolean'
23
+ ? b64
24
+ ? 1
25
+ : 2
26
+ : 0
27
+ : 1,
28
+ ];
29
+ }
30
+ catch {
31
+ return undefined;
32
+ }
33
+ }
4
34
  export async function generalVerify(jws, key, options) {
5
35
  if (!isObject(jws)) {
6
36
  throw new JWSInvalid('General JWS must be an object');
7
37
  }
8
- const { signatures, payload } = jws;
9
- if (!Array.isArray(signatures) || !signatures.every(isObject)) {
38
+ const { signatures, payload: inputPayload } = jws;
39
+ if (!Array.isArray(signatures)) {
40
+ throw new JWSInvalid('JWS Signatures missing or incorrect type');
41
+ }
42
+ const signatureEntries = Array.from(signatures);
43
+ if (!signatureEntries.every(isObject)) {
10
44
  throw new JWSInvalid('JWS Signatures missing or incorrect type');
11
45
  }
12
46
  let shared;
13
47
  try {
14
- if (payload === undefined)
48
+ if (inputPayload === undefined)
15
49
  throw new Error();
16
50
  shared = prepareVerify(options);
17
51
  }
18
52
  catch {
19
53
  throw new JWSSignatureVerificationFailed();
20
54
  }
21
- for (const signature of signatures) {
55
+ const payload = inputPayload instanceof Uint8Array ? new Uint8Array(inputPayload) : inputPayload;
56
+ const candidates = signatureEntries
57
+ .map((signature) => snapshotSignature(signature, payload))
58
+ .filter((candidate) => candidate !== undefined);
59
+ let modes = 0;
60
+ for (const [, , mode] of candidates) {
61
+ modes |= mode;
62
+ if (modes === 3) {
63
+ throw new JWSInvalid('inconsistent use of JWS Unencoded Payload (RFC7797)');
64
+ }
65
+ }
66
+ for (const candidate of candidates) {
22
67
  try {
23
- const { protected: encodedProtected, header, signature: encodedSignature } = signature;
24
- if (encodedProtected === undefined && header === undefined)
25
- throw new Error();
26
- if (encodedProtected !== undefined && typeof encodedProtected !== 'string') {
27
- throw new Error();
28
- }
29
- if (typeof encodedSignature !== 'string')
30
- throw new Error();
31
- if (header !== undefined && !isObject(header))
32
- throw new Error();
33
- return verifyResult(signature, await verifySignature({
34
- header,
35
- payload,
36
- protected: encodedProtected,
37
- signature: encodedSignature,
38
- }, shared, key));
68
+ return verifyResult(candidate[0], await verifySignature(candidate[0], shared, key, encodeJsonUnencodedPayload, candidate[1]));
39
69
  }
40
70
  catch {
41
71
  }
@@ -5,15 +5,13 @@ export async function jwtDecrypt(jwt, key, options) {
5
5
  const decrypted = await decryptCompact(jwt, prepareDecrypt(options), key);
6
6
  const protectedHeader = decrypted[1];
7
7
  const payload = validateClaimsSet(protectedHeader, decrypted[0], options);
8
- if (protectedHeader.iss !== undefined && protectedHeader.iss !== payload.iss) {
9
- throw new JWTClaimValidationFailed('replicated "iss" claim header parameter mismatch', payload, 'iss', 'mismatch');
10
- }
11
- if (protectedHeader.sub !== undefined && protectedHeader.sub !== payload.sub) {
12
- throw new JWTClaimValidationFailed('replicated "sub" claim header parameter mismatch', payload, 'sub', 'mismatch');
13
- }
14
- if (protectedHeader.aud !== undefined &&
15
- JSON.stringify(protectedHeader.aud) !== JSON.stringify(payload.aud)) {
16
- throw new JWTClaimValidationFailed('replicated "aud" claim header parameter mismatch', payload, 'aud', 'mismatch');
8
+ for (const claim of ['iss', 'sub', 'aud']) {
9
+ if (protectedHeader[claim] !== undefined &&
10
+ (claim === 'aud'
11
+ ? JSON.stringify(protectedHeader.aud) !== JSON.stringify(payload.aud)
12
+ : protectedHeader[claim] !== payload[claim])) {
13
+ throw new JWTClaimValidationFailed(`replicated "${claim}" claim header parameter mismatch`, payload, claim, 'mismatch');
14
+ }
17
15
  }
18
16
  const result = { payload, protectedHeader };
19
17
  if (typeof key === 'function') {