@opentdf/sdk 0.4.1-rc.37 → 0.5.0-beta.42

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 (221) hide show
  1. package/dist/cjs/src/access/access-fetch.js +2 -1
  2. package/dist/cjs/src/access/access-rpc.js +11 -5
  3. package/dist/cjs/src/access/constants.js +6 -0
  4. package/dist/cjs/src/access.js +39 -4
  5. package/dist/cjs/src/auth/oidc-clientcredentials-provider.js +4 -2
  6. package/dist/cjs/src/auth/oidc-externaljwt-provider.js +5 -3
  7. package/dist/cjs/src/auth/oidc-refreshtoken-provider.js +19 -3
  8. package/dist/cjs/src/auth/oidc.js +9 -8
  9. package/dist/cjs/src/auth/providers.js +7 -1
  10. package/dist/cjs/src/index.js +4 -2
  11. package/dist/cjs/src/nanoclients.js +4 -4
  12. package/dist/cjs/src/nanotdf/Client.js +10 -6
  13. package/dist/cjs/src/opentdf.js +102 -13
  14. package/dist/cjs/src/platform/authorization/v2/authorization_pb.js +112 -0
  15. package/dist/cjs/src/platform/buf/validate/validate_pb.js +114 -170
  16. package/dist/cjs/src/platform/common/common_pb.js +16 -5
  17. package/dist/cjs/src/platform/entity/entity_pb.js +51 -0
  18. package/dist/cjs/src/platform/entityresolution/entity_resolution_pb.js +1 -1
  19. package/dist/cjs/src/platform/entityresolution/v2/entity_resolution_pb.js +49 -0
  20. package/dist/cjs/src/platform/google/api/annotations_pb.js +1 -1
  21. package/dist/cjs/src/platform/google/api/http_pb.js +3 -3
  22. package/dist/cjs/src/platform/kas/kas_pb.js +2 -2
  23. package/dist/cjs/src/platform/policy/attributes/attributes_pb.js +12 -2
  24. package/dist/cjs/src/platform/policy/kasregistry/key_access_server_registry_pb.js +57 -4
  25. package/dist/cjs/src/platform/policy/keymanagement/key_management_pb.js +2 -2
  26. package/dist/cjs/src/platform/policy/namespaces/namespaces_pb.js +31 -4
  27. package/dist/cjs/src/platform/policy/objects_pb.js +116 -42
  28. package/dist/cjs/src/platform/policy/obligations/obligations_pb.js +159 -0
  29. package/dist/cjs/src/platform/policy/registeredresources/registered_resources_pb.js +20 -15
  30. package/dist/cjs/src/platform/policy/resourcemapping/resource_mapping_pb.js +2 -3
  31. package/dist/cjs/src/platform/policy/selectors_pb.js +1 -1
  32. package/dist/cjs/src/platform/policy/subjectmapping/subject_mapping_pb.js +2 -3
  33. package/dist/cjs/src/platform/policy/unsafe/unsafe_pb.js +2 -4
  34. package/dist/cjs/src/platform.js +20 -3
  35. package/dist/cjs/src/policy/api.js +27 -7
  36. package/dist/cjs/src/policy/granter.js +75 -48
  37. package/dist/cjs/src/seekable.js +32 -1
  38. package/dist/cjs/src/utils.js +85 -3
  39. package/dist/cjs/src/version.js +1 -1
  40. package/dist/cjs/tdf3/src/assertions.js +39 -2
  41. package/dist/cjs/tdf3/src/client/DecoratedReadableStream.js +8 -1
  42. package/dist/cjs/tdf3/src/client/builders.js +13 -1
  43. package/dist/cjs/tdf3/src/client/index.js +213 -54
  44. package/dist/cjs/tdf3/src/client/validation.js +3 -3
  45. package/dist/cjs/tdf3/src/tdf.js +42 -9
  46. package/dist/cjs/tdf3/src/utils/unwrap.js +2 -2
  47. package/dist/types/src/access/access-fetch.d.ts +1 -0
  48. package/dist/types/src/access/access-fetch.d.ts.map +1 -1
  49. package/dist/types/src/access/access-rpc.d.ts +2 -1
  50. package/dist/types/src/access/access-rpc.d.ts.map +1 -1
  51. package/dist/types/src/access/constants.d.ts +3 -0
  52. package/dist/types/src/access/constants.d.ts.map +1 -0
  53. package/dist/types/src/access.d.ts +30 -1
  54. package/dist/types/src/access.d.ts.map +1 -1
  55. package/dist/types/src/auth/oidc-clientcredentials-provider.d.ts +1 -1
  56. package/dist/types/src/auth/oidc-clientcredentials-provider.d.ts.map +1 -1
  57. package/dist/types/src/auth/oidc-externaljwt-provider.d.ts +1 -1
  58. package/dist/types/src/auth/oidc-externaljwt-provider.d.ts.map +1 -1
  59. package/dist/types/src/auth/oidc-refreshtoken-provider.d.ts +15 -1
  60. package/dist/types/src/auth/oidc-refreshtoken-provider.d.ts.map +1 -1
  61. package/dist/types/src/auth/oidc.d.ts +4 -0
  62. package/dist/types/src/auth/oidc.d.ts.map +1 -1
  63. package/dist/types/src/auth/providers.d.ts.map +1 -1
  64. package/dist/types/src/index.d.ts +1 -0
  65. package/dist/types/src/index.d.ts.map +1 -1
  66. package/dist/types/src/nanotdf/Client.d.ts +8 -1
  67. package/dist/types/src/nanotdf/Client.d.ts.map +1 -1
  68. package/dist/types/src/opentdf.d.ts +137 -6
  69. package/dist/types/src/opentdf.d.ts.map +1 -1
  70. package/dist/types/src/platform/authorization/v2/authorization_pb.d.ts +439 -0
  71. package/dist/types/src/platform/authorization/v2/authorization_pb.d.ts.map +1 -0
  72. package/dist/types/src/platform/buf/validate/validate_pb.d.ts +495 -370
  73. package/dist/types/src/platform/buf/validate/validate_pb.d.ts.map +1 -1
  74. package/dist/types/src/platform/common/common_pb.d.ts +36 -0
  75. package/dist/types/src/platform/common/common_pb.d.ts.map +1 -1
  76. package/dist/types/src/platform/entity/entity_pb.d.ts +130 -0
  77. package/dist/types/src/platform/entity/entity_pb.d.ts.map +1 -0
  78. package/dist/types/src/platform/entityresolution/entity_resolution_pb.d.ts +4 -0
  79. package/dist/types/src/platform/entityresolution/entity_resolution_pb.d.ts.map +1 -1
  80. package/dist/types/src/platform/entityresolution/v2/entity_resolution_pb.d.ts +136 -0
  81. package/dist/types/src/platform/entityresolution/v2/entity_resolution_pb.d.ts.map +1 -0
  82. package/dist/types/src/platform/google/api/http_pb.d.ts.map +1 -1
  83. package/dist/types/src/platform/kas/kas_pb.d.ts +5 -0
  84. package/dist/types/src/platform/kas/kas_pb.d.ts.map +1 -1
  85. package/dist/types/src/platform/policy/attributes/attributes_pb.d.ts +44 -13
  86. package/dist/types/src/platform/policy/attributes/attributes_pb.d.ts.map +1 -1
  87. package/dist/types/src/platform/policy/kasregistry/key_access_server_registry_pb.d.ts +329 -24
  88. package/dist/types/src/platform/policy/kasregistry/key_access_server_registry_pb.d.ts.map +1 -1
  89. package/dist/types/src/platform/policy/keymanagement/key_management_pb.d.ts +20 -1
  90. package/dist/types/src/platform/policy/keymanagement/key_management_pb.d.ts.map +1 -1
  91. package/dist/types/src/platform/policy/namespaces/namespaces_pb.d.ts +143 -5
  92. package/dist/types/src/platform/policy/namespaces/namespaces_pb.d.ts.map +1 -1
  93. package/dist/types/src/platform/policy/objects_pb.d.ts +382 -33
  94. package/dist/types/src/platform/policy/objects_pb.d.ts.map +1 -1
  95. package/dist/types/src/platform/policy/obligations/obligations_pb.d.ts +670 -0
  96. package/dist/types/src/platform/policy/obligations/obligations_pb.d.ts.map +1 -0
  97. package/dist/types/src/platform/policy/registeredresources/registered_resources_pb.d.ts +67 -0
  98. package/dist/types/src/platform/policy/registeredresources/registered_resources_pb.d.ts.map +1 -1
  99. package/dist/types/src/platform/policy/resourcemapping/resource_mapping_pb.d.ts.map +1 -1
  100. package/dist/types/src/platform/policy/selectors_pb.d.ts +18 -0
  101. package/dist/types/src/platform/policy/selectors_pb.d.ts.map +1 -1
  102. package/dist/types/src/platform/policy/subjectmapping/subject_mapping_pb.d.ts.map +1 -1
  103. package/dist/types/src/platform/policy/unsafe/unsafe_pb.d.ts +18 -4
  104. package/dist/types/src/platform/policy/unsafe/unsafe_pb.d.ts.map +1 -1
  105. package/dist/types/src/platform.d.ts +21 -0
  106. package/dist/types/src/platform.d.ts.map +1 -1
  107. package/dist/types/src/policy/api.d.ts +2 -0
  108. package/dist/types/src/policy/api.d.ts.map +1 -1
  109. package/dist/types/src/policy/granter.d.ts +11 -6
  110. package/dist/types/src/policy/granter.d.ts.map +1 -1
  111. package/dist/types/src/seekable.d.ts +31 -0
  112. package/dist/types/src/seekable.d.ts.map +1 -1
  113. package/dist/types/src/utils.d.ts +61 -2
  114. package/dist/types/src/utils.d.ts.map +1 -1
  115. package/dist/types/src/version.d.ts +1 -1
  116. package/dist/types/tdf3/src/assertions.d.ts +4 -0
  117. package/dist/types/tdf3/src/assertions.d.ts.map +1 -1
  118. package/dist/types/tdf3/src/client/DecoratedReadableStream.d.ts +6 -0
  119. package/dist/types/tdf3/src/client/DecoratedReadableStream.d.ts.map +1 -1
  120. package/dist/types/tdf3/src/client/builders.d.ts +14 -0
  121. package/dist/types/tdf3/src/client/builders.d.ts.map +1 -1
  122. package/dist/types/tdf3/src/client/index.d.ts +25 -4
  123. package/dist/types/tdf3/src/client/index.d.ts.map +1 -1
  124. package/dist/types/tdf3/src/client/validation.d.ts +3 -3
  125. package/dist/types/tdf3/src/client/validation.d.ts.map +1 -1
  126. package/dist/types/tdf3/src/tdf.d.ts +3 -1
  127. package/dist/types/tdf3/src/tdf.d.ts.map +1 -1
  128. package/dist/types/tdf3/src/utils/unwrap.d.ts.map +1 -1
  129. package/dist/web/src/access/access-fetch.js +2 -1
  130. package/dist/web/src/access/access-rpc.js +11 -5
  131. package/dist/web/src/access/constants.js +3 -0
  132. package/dist/web/src/access.js +37 -3
  133. package/dist/web/src/auth/oidc-clientcredentials-provider.js +4 -2
  134. package/dist/web/src/auth/oidc-externaljwt-provider.js +5 -3
  135. package/dist/web/src/auth/oidc-refreshtoken-provider.js +19 -3
  136. package/dist/web/src/auth/oidc.js +9 -8
  137. package/dist/web/src/auth/providers.js +7 -1
  138. package/dist/web/src/index.js +2 -1
  139. package/dist/web/src/nanoclients.js +4 -4
  140. package/dist/web/src/nanotdf/Client.js +11 -7
  141. package/dist/web/src/opentdf.js +102 -13
  142. package/dist/web/src/platform/authorization/v2/authorization_pb.js +109 -0
  143. package/dist/web/src/platform/buf/validate/validate_pb.js +113 -169
  144. package/dist/web/src/platform/common/common_pb.js +15 -4
  145. package/dist/web/src/platform/entity/entity_pb.js +48 -0
  146. package/dist/web/src/platform/entityresolution/entity_resolution_pb.js +1 -1
  147. package/dist/web/src/platform/entityresolution/v2/entity_resolution_pb.js +46 -0
  148. package/dist/web/src/platform/google/api/annotations_pb.js +1 -1
  149. package/dist/web/src/platform/google/api/http_pb.js +3 -3
  150. package/dist/web/src/platform/kas/kas_pb.js +2 -2
  151. package/dist/web/src/platform/policy/attributes/attributes_pb.js +12 -2
  152. package/dist/web/src/platform/policy/kasregistry/key_access_server_registry_pb.js +55 -3
  153. package/dist/web/src/platform/policy/keymanagement/key_management_pb.js +2 -2
  154. package/dist/web/src/platform/policy/namespaces/namespaces_pb.js +30 -3
  155. package/dist/web/src/platform/policy/objects_pb.js +114 -41
  156. package/dist/web/src/platform/policy/obligations/obligations_pb.js +156 -0
  157. package/dist/web/src/platform/policy/registeredresources/registered_resources_pb.js +19 -14
  158. package/dist/web/src/platform/policy/resourcemapping/resource_mapping_pb.js +2 -3
  159. package/dist/web/src/platform/policy/selectors_pb.js +1 -1
  160. package/dist/web/src/platform/policy/subjectmapping/subject_mapping_pb.js +2 -3
  161. package/dist/web/src/platform/policy/unsafe/unsafe_pb.js +2 -4
  162. package/dist/web/src/platform.js +20 -3
  163. package/dist/web/src/policy/api.js +26 -7
  164. package/dist/web/src/policy/granter.js +75 -48
  165. package/dist/web/src/seekable.js +32 -1
  166. package/dist/web/src/utils.js +84 -3
  167. package/dist/web/src/version.js +1 -1
  168. package/dist/web/tdf3/src/assertions.js +38 -2
  169. package/dist/web/tdf3/src/client/DecoratedReadableStream.js +8 -1
  170. package/dist/web/tdf3/src/client/builders.js +13 -1
  171. package/dist/web/tdf3/src/client/index.js +215 -57
  172. package/dist/web/tdf3/src/client/validation.js +3 -3
  173. package/dist/web/tdf3/src/tdf.js +42 -9
  174. package/dist/web/tdf3/src/utils/unwrap.js +2 -2
  175. package/package.json +7 -5
  176. package/src/access/access-fetch.ts +1 -0
  177. package/src/access/access-rpc.ts +13 -4
  178. package/src/access/constants.ts +2 -0
  179. package/src/access.ts +54 -2
  180. package/src/auth/oidc-clientcredentials-provider.ts +4 -0
  181. package/src/auth/oidc-externaljwt-provider.ts +5 -1
  182. package/src/auth/oidc-refreshtoken-provider.ts +19 -1
  183. package/src/auth/oidc.ts +12 -7
  184. package/src/auth/providers.ts +6 -0
  185. package/src/index.ts +1 -0
  186. package/src/nanoclients.ts +3 -3
  187. package/src/nanotdf/Client.ts +28 -6
  188. package/src/opentdf.ts +205 -73
  189. package/src/platform/authorization/v2/authorization_pb.ts +503 -0
  190. package/src/platform/buf/validate/validate_pb.ts +529 -401
  191. package/src/platform/common/common_pb.ts +48 -3
  192. package/src/platform/entity/entity_pb.ts +154 -0
  193. package/src/platform/entityresolution/entity_resolution_pb.ts +4 -0
  194. package/src/platform/entityresolution/v2/entity_resolution_pb.ts +170 -0
  195. package/src/platform/google/api/annotations_pb.ts +1 -1
  196. package/src/platform/google/api/http_pb.ts +2 -2
  197. package/src/platform/kas/kas_pb.ts +6 -1
  198. package/src/platform/policy/attributes/attributes_pb.ts +46 -16
  199. package/src/platform/policy/kasregistry/key_access_server_registry_pb.ts +371 -27
  200. package/src/platform/policy/keymanagement/key_management_pb.ts +24 -2
  201. package/src/platform/policy/namespaces/namespaces_pb.ts +163 -7
  202. package/src/platform/policy/objects_pb.ts +474 -59
  203. package/src/platform/policy/obligations/obligations_pb.ts +788 -0
  204. package/src/platform/policy/registeredresources/registered_resources_pb.ts +80 -13
  205. package/src/platform/policy/resourcemapping/resource_mapping_pb.ts +1 -2
  206. package/src/platform/policy/selectors_pb.ts +18 -0
  207. package/src/platform/policy/subjectmapping/subject_mapping_pb.ts +1 -2
  208. package/src/platform/policy/unsafe/unsafe_pb.ts +21 -6
  209. package/src/platform.ts +29 -5
  210. package/src/policy/api.ts +37 -6
  211. package/src/policy/granter.ts +82 -56
  212. package/src/seekable.ts +31 -0
  213. package/src/utils.ts +88 -2
  214. package/src/version.ts +1 -1
  215. package/tdf3/src/assertions.ts +52 -1
  216. package/tdf3/src/client/DecoratedReadableStream.ts +9 -0
  217. package/tdf3/src/client/builders.ts +16 -0
  218. package/tdf3/src/client/index.ts +309 -73
  219. package/tdf3/src/client/validation.ts +2 -2
  220. package/tdf3/src/tdf.ts +53 -9
  221. package/tdf3/src/utils/unwrap.ts +2 -1
@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
35
35
  Object.defineProperty(exports, "__esModule", { value: true });
36
36
  exports.withHeaders = exports.HttpRequest = exports.EncryptParamsBuilder = exports.DecryptParamsBuilder = exports.Client = exports.resolveKasInfo = void 0;
37
37
  exports.createSessionKeys = createSessionKeys;
38
+ exports.findEntryInCache = findEntryInCache;
38
39
  const uuid_1 = require("uuid");
39
40
  const index_js_1 = require("../utils/index.js");
40
41
  const index_js_2 = require("../../../src/encodings/index.js");
@@ -58,10 +59,15 @@ const index_js_3 = require("../models/index.js");
58
59
  const granter_js_1 = require("../../../src/policy/granter.js");
59
60
  const api_js_1 = require("../../../src/policy/api.js");
60
61
  const seekable_js_1 = require("../../../src/seekable.js");
62
+ const objects_pb_js_1 = require("../../../src/platform/policy/objects_pb.js");
61
63
  const GLOBAL_BYTE_LIMIT = 64 * 1000 * 1000 * 1000; // 64 GB, see WS-9363.
62
64
  // No default config for now. Delegate to Virtru wrapper for endpoints.
63
65
  const defaultClientConfig = { oidcOrigin: '', cryptoService: defaultCryptoService };
64
66
  const getFirstTwoBytes = async (chunker) => new TextDecoder().decode(await chunker(0, 2));
67
+ async function algorithmFromPEM(pem) {
68
+ const k = await (0, utils_js_1.pemToCryptoPublicKey)(pem);
69
+ return (0, access_js_1.keyAlgorithmToPublicKeyAlgorithm)(k);
70
+ }
65
71
  // Convert a PEM string to a CryptoKey
66
72
  const resolveKasInfo = async (pem, uri, kid) => {
67
73
  const k = await (0, utils_js_1.pemToCryptoPublicKey)(pem);
@@ -165,6 +171,75 @@ function asPolicy(scope) {
165
171
  },
166
172
  };
167
173
  }
174
+ function findEntryInCache(cache, ...params) {
175
+ const [wantedKas, wantedAlgorithm, wantedKid] = params;
176
+ for (const item of cache) {
177
+ const [itemKas, itemAlgorithm, itemKid, itemKeyInfoPromise] = item;
178
+ if (itemKas !== wantedKas) {
179
+ continue;
180
+ }
181
+ // This makes undefined only match with undefined (base key).
182
+ // We could potentially consider any key a match if undefined algorithm?
183
+ if (itemAlgorithm !== wantedAlgorithm) {
184
+ continue;
185
+ }
186
+ if (wantedKid && itemKid !== wantedKid) {
187
+ continue;
188
+ }
189
+ return itemKeyInfoPromise;
190
+ }
191
+ return null;
192
+ }
193
+ const fetchKasKeyWithCache = (cache, ...params) => {
194
+ const cachedEntry = findEntryInCache(cache, ...params);
195
+ if (cachedEntry !== null) {
196
+ return cachedEntry;
197
+ }
198
+ const keyInfoPromise = (0, tdf_js_1.fetchKasPublicKey)(...params);
199
+ cache.push([...params, keyInfoPromise]);
200
+ return keyInfoPromise;
201
+ };
202
+ function algorithmEnumValueToString(algorithmEnumValue) {
203
+ switch (algorithmEnumValue) {
204
+ case objects_pb_js_1.Algorithm.RSA_2048:
205
+ return 'rsa:2048';
206
+ case objects_pb_js_1.Algorithm.RSA_4096:
207
+ return 'rsa:4096';
208
+ case objects_pb_js_1.Algorithm.EC_P256:
209
+ return 'ec:secp256r1';
210
+ case objects_pb_js_1.Algorithm.EC_P384:
211
+ return 'ec:secp384r1';
212
+ case objects_pb_js_1.Algorithm.EC_P521:
213
+ return 'ec:secp521r1';
214
+ case objects_pb_js_1.Algorithm.UNSPECIFIED:
215
+ // Not entirely sure undefined is correct here, but since we need to generate a key for our cache
216
+ // synchonously, it seems to be the best approach for now.
217
+ return undefined;
218
+ default:
219
+ return undefined;
220
+ }
221
+ }
222
+ const putKasKeyIntoCache = (cache, kasKey) => {
223
+ const algorithmString = algorithmEnumValueToString(kasKey.publicKey.algorithm);
224
+ const cachedEntry = findEntryInCache(cache, kasKey.kasUri, algorithmString, kasKey.publicKey.kid);
225
+ if (cachedEntry) {
226
+ return cachedEntry;
227
+ }
228
+ const keyInfoPromise = (async function () {
229
+ const keyPromise = (0, utils_js_1.pemToCryptoPublicKey)(kasKey.publicKey.pem);
230
+ const key = await keyPromise;
231
+ const algorithm = (0, access_js_1.keyAlgorithmToPublicKeyAlgorithm)(key);
232
+ return {
233
+ algorithm: algorithm,
234
+ key: keyPromise,
235
+ kid: kasKey.publicKey.kid,
236
+ publicKey: kasKey.publicKey.pem,
237
+ url: kasKey.kasUri,
238
+ };
239
+ })();
240
+ cache.push([kasKey.kasUri, algorithmString, kasKey.publicKey.kid, keyInfoPromise]);
241
+ return keyInfoPromise;
242
+ };
168
243
  class Client {
169
244
  /**
170
245
  * An abstraction for protecting and accessing data using TDF3 services.
@@ -177,7 +252,7 @@ class Client {
177
252
  * @param {String} [config.oidcOrigin] - Endpoint of authentication service
178
253
  */
179
254
  constructor(config) {
180
- this.kasKeys = {};
255
+ this.kasKeyInfoCache = [];
181
256
  const clientConfig = { ...defaultClientConfig, ...config };
182
257
  this.cryptoService = clientConfig.cryptoService;
183
258
  this.dpopEnabled = !!(clientConfig.dpopEnabled || clientConfig.dpopKeys);
@@ -210,6 +285,12 @@ class Client {
210
285
  throw new errors_js_1.ConfigurationError(`Invalid KAS endpoint [${this.kasEndpoint}]. When allowedKases is set, defaultKASEndpoint needs to be in the allow list`);
211
286
  }
212
287
  }
288
+ this.fulfillableObligationFQNs = config.fulfillableObligationFQNs?.length
289
+ ? config.fulfillableObligationFQNs
290
+ : [];
291
+ if (clientConfig.easEndpoint) {
292
+ this.easEndpoint = clientConfig.easEndpoint;
293
+ }
213
294
  this.authProvider = config.authProvider;
214
295
  this.clientConfig = clientConfig;
215
296
  this.clientId = clientConfig.clientId;
@@ -242,11 +323,10 @@ class Client {
242
323
  cryptoService: this.cryptoService,
243
324
  dpopKeys: clientConfig.dpopKeys,
244
325
  });
245
- if (clientConfig.kasPublicKey) {
246
- this.kasKeys[this.kasEndpoint] = [
247
- (0, exports.resolveKasInfo)(clientConfig.kasPublicKey, this.kasEndpoint),
248
- ];
249
- }
326
+ }
327
+ /** Necessary only for testing. A dependency-injection approach should be preferred, but that is difficult currently */
328
+ _doFetchKasKeyWithCache(...params) {
329
+ return fetchKasKeyWithCache(...params);
250
330
  }
251
331
  /**
252
332
  * Encrypt plaintext into TDF ciphertext. One of the core operations of the Virtru SDK.
@@ -271,45 +351,112 @@ class Client {
271
351
  throw new errors_js_1.ConfigurationError('html mode not supported');
272
352
  }
273
353
  const dpopKeys = await this.dpopKeys;
274
- const { autoconfigure, metadata, mimeType = 'unknown', windowSize = builders_js_1.DEFAULT_SEGMENT_SIZE, keyMiddleware = index_js_1.keyMiddleware, streamMiddleware = async (stream) => stream, tdfSpecVersion, wrappingKeyAlgorithm, } = opts;
354
+ const { autoconfigure, metadata, mimeType = 'unknown', windowSize = builders_js_1.DEFAULT_SEGMENT_SIZE, keyMiddleware = index_js_1.keyMiddleware, splitPlan: preconfiguredSplitPlan, streamMiddleware = async (stream) => stream, tdfSpecVersion, wrappingKeyAlgorithm, } = opts;
275
355
  const scope = opts.scope ?? { attributes: [], dissem: [] };
356
+ for (const attributeValue of scope.attributeValues || []) {
357
+ for (const kasKey of attributeValue.kasKeys) {
358
+ if (kasKey.publicKey !== undefined) {
359
+ await putKasKeyIntoCache(this.kasKeyInfoCache, {
360
+ // TypeScript is silly and cannot infer that publicKey is not undefined, without re-referencing it like this, even though we checked already.
361
+ ...kasKey,
362
+ publicKey: kasKey.publicKey,
363
+ });
364
+ }
365
+ }
366
+ }
276
367
  const policyObject = asPolicy(scope);
277
368
  (0, tdf_js_1.validatePolicyObject)(policyObject);
278
- let splitPlan = opts.splitPlan;
279
- if (!splitPlan && autoconfigure) {
280
- let avs = scope.attributeValues ?? [];
281
- const fqns = scope.attributes
282
- ? scope.attributes.map((attribute) => typeof attribute === 'string' ? attribute : attribute.attribute)
283
- : [];
284
- if (!avs.length && fqns.length) {
285
- // Hydrate avs from policy endpoint givnen the fqns
286
- if (!this.policyEndpoint) {
287
- throw new errors_js_1.ConfigurationError('policyEndpoint not set in TDF3 Client constructor');
288
- }
289
- avs = await (0, api_js_1.attributeFQNsAsValues)(this.policyEndpoint, this.authProvider, ...fqns);
369
+ const splitPlan = [];
370
+ if (preconfiguredSplitPlan) {
371
+ for (const preconfiguredSplit of preconfiguredSplitPlan) {
372
+ const kasPublicKeyInfo = await this._doFetchKasKeyWithCache(this.kasKeyInfoCache, preconfiguredSplit.kas, wrappingKeyAlgorithm, preconfiguredSplit.kid);
373
+ splitPlan.push({
374
+ kas: kasPublicKeyInfo.url,
375
+ kid: kasPublicKeyInfo.kid,
376
+ pem: kasPublicKeyInfo.publicKey,
377
+ sid: preconfiguredSplit.sid,
378
+ });
290
379
  }
291
- else if (scope.attributeValues) {
292
- avs = scope.attributeValues;
293
- if (!scope.attributes) {
294
- scope.attributes = avs.map(({ fqn }) => fqn);
380
+ }
381
+ else if (autoconfigure) {
382
+ const attributeValues = scope.attributeValues ?? [];
383
+ if (!scope.attributes) {
384
+ scope.attributes = attributeValues.map(({ fqn }) => fqn);
385
+ }
386
+ const attributeFQNs = (scope.attributes ?? []).map((attribute) => typeof attribute === 'string' ? attribute : attribute.attribute);
387
+ const fqnsWithoutValues = attributeFQNs.filter((fqn) => attributeValues.every((av) => av.fqn !== fqn));
388
+ if (fqnsWithoutValues.length) {
389
+ // Hydrate missing avs from policy endpoint given the fqns
390
+ if (!this.platformUrl) {
391
+ throw new errors_js_1.ConfigurationError('platformUrl not set in TDF3 Client constructor');
295
392
  }
393
+ const fetchedFQNValues = await (0, api_js_1.attributeFQNsAsValues)(this.platformUrl, this.authProvider, ...fqnsWithoutValues);
394
+ fetchedFQNValues.forEach((fetchedValue) => {
395
+ attributeValues.push(fetchedValue);
396
+ });
296
397
  }
297
- if (avs.length != (scope.attributes?.length || 0) ||
298
- !avs.map(({ fqn }) => fqn).every((a) => fqns.indexOf(a) >= 0)) {
299
- throw new errors_js_1.ConfigurationError(`Attribute mismatch between [${fqns}] and explicit values ${JSON.stringify(avs.map(({ fqn }) => fqn))}`);
398
+ const hasAllFQNs = attributeFQNs.every((fqn) => attributeValues.some((attributeValue) => attributeValue.fqn === fqn));
399
+ if (attributeFQNs.length != attributeValues.length || !hasAllFQNs) {
400
+ throw new errors_js_1.ConfigurationError(`Attribute mismatch between [${attributeFQNs}] and explicit values ${JSON.stringify(attributeValues.map(({ fqn }) => fqn))}`);
300
401
  }
301
- const detailedPlan = (0, granter_js_1.plan)(avs);
302
- splitPlan = detailedPlan.map((kat) => {
303
- const { kas, sid } = kat;
304
- const pubKey = kas.publicKey?.publicKey;
305
- if (pubKey?.case === 'cached' && pubKey.value.keys && !(kas.uri in this.kasKeys)) {
306
- const keys = pubKey.value.keys;
307
- if (keys?.length) {
308
- this.kasKeys[kas.uri] = keys.map((key) => (0, exports.resolveKasInfo)(key.pem, kas.uri, key.kid));
402
+ for (const attributeValue of attributeValues) {
403
+ for (const kasKey of attributeValue.kasKeys) {
404
+ if (kasKey.publicKey !== undefined) {
405
+ await putKasKeyIntoCache(this.kasKeyInfoCache, {
406
+ // TypeScript is silly and cannot infer that publicKey is not undefined, without re-referencing it like this, even though we checked already.
407
+ ...kasKey,
408
+ publicKey: kasKey.publicKey,
409
+ });
309
410
  }
310
411
  }
311
- return { kas: kas.uri, sid };
312
- });
412
+ }
413
+ const detailedPlan = (0, granter_js_1.plan)(attributeValues);
414
+ for (const item of detailedPlan) {
415
+ if ('kid' in item.kas) {
416
+ const pemAlgorithm = await algorithmFromPEM(item.kas.pem);
417
+ const kasPublicKeyInfo = await this._doFetchKasKeyWithCache(this.kasKeyInfoCache, item.kas.kasUri, pemAlgorithm, item.kas.kid);
418
+ splitPlan.push({
419
+ kas: kasPublicKeyInfo.url,
420
+ kid: kasPublicKeyInfo.kid,
421
+ pem: kasPublicKeyInfo.publicKey,
422
+ sid: item.sid,
423
+ });
424
+ continue;
425
+ }
426
+ if (!item.kas.publicKey) {
427
+ const kasPublicKeyInfo = await this._doFetchKasKeyWithCache(this.kasKeyInfoCache, item.kas.uri, wrappingKeyAlgorithm, undefined);
428
+ splitPlan.push({
429
+ kas: kasPublicKeyInfo.url,
430
+ kid: kasPublicKeyInfo.kid,
431
+ pem: kasPublicKeyInfo.publicKey,
432
+ sid: item.sid,
433
+ });
434
+ continue;
435
+ }
436
+ switch (item.kas.publicKey.publicKey.case) {
437
+ case 'remote':
438
+ const kasPublicKeyInfo = await this._doFetchKasKeyWithCache(this.kasKeyInfoCache, item.kas.publicKey.publicKey.value, wrappingKeyAlgorithm, undefined);
439
+ splitPlan.push({
440
+ kas: kasPublicKeyInfo.url,
441
+ kid: kasPublicKeyInfo.kid,
442
+ pem: kasPublicKeyInfo.publicKey,
443
+ sid: item.sid,
444
+ });
445
+ break;
446
+ case 'cached':
447
+ for (const cachedPublicKey of item.kas.publicKey.publicKey.value.keys) {
448
+ splitPlan.push({
449
+ kas: item.kas.uri,
450
+ kid: cachedPublicKey.kid,
451
+ pem: cachedPublicKey.pem,
452
+ sid: item.sid,
453
+ });
454
+ }
455
+ break;
456
+ default:
457
+ throw new Error(`Unknown public key type: ${item.kas.publicKey.publicKey.case}`);
458
+ }
459
+ }
313
460
  }
314
461
  // TODO: Refactor underlying builder to remove some of this unnecessary config.
315
462
  const maxByteLimit = GLOBAL_BYTE_LIMIT;
@@ -317,34 +464,39 @@ class Client {
317
464
  ? maxByteLimit
318
465
  : opts.byteLimit;
319
466
  const encryptionInformation = new index_js_3.SplitKey(new aes_gcm_cipher_js_1.AesGcmCipher(this.cryptoService));
320
- const splits = splitPlan?.length
321
- ? splitPlan
322
- : [{ kas: opts.defaultKASEndpoint ?? this.kasEndpoint }];
323
- encryptionInformation.keyAccess = await Promise.all(splits.map(async ({ kas, sid }) => {
324
- if (!(kas in this.kasKeys)) {
325
- this.kasKeys[kas] = [(0, tdf_js_1.fetchKasPublicKey)(kas, wrappingKeyAlgorithm)];
326
- }
327
- const kasPublicKey = await Promise.any(this.kasKeys[kas]);
328
- if (kasPublicKey.algorithm !== wrappingKeyAlgorithm) {
329
- console.warn(`Mismatched wrapping key algorithm: [${kasPublicKey.algorithm}] is not requested type, [${wrappingKeyAlgorithm}]`);
467
+ if (splitPlan.length === 0) {
468
+ const kasPublicKeyInfo = await this._doFetchKasKeyWithCache(this.kasKeyInfoCache, opts.defaultKASEndpoint ?? this.kasEndpoint, wrappingKeyAlgorithm, undefined);
469
+ splitPlan.push({
470
+ kas: kasPublicKeyInfo.url,
471
+ kid: kasPublicKeyInfo.kid,
472
+ pem: kasPublicKeyInfo.publicKey,
473
+ });
474
+ }
475
+ encryptionInformation.keyAccess = await Promise.all(splitPlan.map(async ({ kas, kid, pem, sid }) => {
476
+ const algorithm = await algorithmFromPEM(pem);
477
+ if (algorithm !== wrappingKeyAlgorithm) {
478
+ console.warn(`Mismatched wrapping key algorithm: [${algorithm}] is not requested type, [${wrappingKeyAlgorithm}]`);
330
479
  }
331
480
  let type;
332
- switch (kasPublicKey.algorithm) {
481
+ switch (algorithm) {
333
482
  case 'rsa:2048':
483
+ case 'rsa:4096':
334
484
  type = 'wrapped';
335
485
  break;
486
+ case 'ec:secp384r1':
487
+ case 'ec:secp521r1':
336
488
  case 'ec:secp256r1':
337
489
  type = 'ec-wrapped';
338
490
  break;
339
491
  default:
340
- throw new errors_js_1.ConfigurationError(`Unsupported algorithm ${kasPublicKey.algorithm}`);
492
+ throw new errors_js_1.ConfigurationError(`Unsupported algorithm ${algorithm}`);
341
493
  }
342
494
  return (0, tdf_js_1.buildKeyAccess)({
343
- alg: kasPublicKey.algorithm,
495
+ alg: algorithm,
344
496
  type,
345
- url: kasPublicKey.url,
346
- kid: kasPublicKey.kid,
347
- publicKey: kasPublicKey.publicKey,
497
+ url: kas,
498
+ kid: kid,
499
+ publicKey: pem,
348
500
  metadata,
349
501
  sid,
350
502
  });
@@ -367,6 +519,7 @@ class Client {
367
519
  keyForEncryption,
368
520
  keyForManifest,
369
521
  assertionConfigs: opts.assertionConfigs,
522
+ systemMetadataAssertion: opts.systemMetadataAssertion,
370
523
  tdfSpecVersion,
371
524
  };
372
525
  return streamMiddleware(await (0, tdf_js_1.writeStream)(ecfg));
@@ -379,10 +532,11 @@ class Client {
379
532
  * @param params.source A data stream object, one of remote, stream, buffer, etc. types.
380
533
  * @param params.eo Optional entity object (legacy AuthZ)
381
534
  * @param params.assertionVerificationKeys Optional verification keys for assertions.
535
+ * @param params.fulfillableObligationFQNs Optional fulfillable obligation value FQNs (overrides those on the Client)
382
536
  * @return a {@link https://nodejs.org/api/stream.html#stream_class_stream_readable|Readable} stream containing the decrypted plaintext.
383
537
  * @see DecryptParamsBuilder
384
538
  */
385
- async decrypt({ source, allowList, keyMiddleware = async (key) => key, streamMiddleware = async (stream) => stream, assertionVerificationKeys, noVerifyAssertions, concurrencyLimit = 1, wrappingKeyAlgorithm, }) {
539
+ async decrypt({ source, allowList, keyMiddleware = async (key) => key, streamMiddleware = async (stream) => stream, assertionVerificationKeys, noVerifyAssertions, concurrencyLimit = 1, wrappingKeyAlgorithm, fulfillableObligationFQNs = [], }) {
386
540
  const dpopKeys = await this.dpopKeys;
387
541
  if (!this.authProvider) {
388
542
  throw new errors_js_1.ConfigurationError('AuthProvider missing');
@@ -397,6 +551,10 @@ class Client {
397
551
  else {
398
552
  throw new errors_js_1.ConfigurationError('platformUrl is required when allowedKases is empty');
399
553
  }
554
+ const hasEmptyDecryptParamObligationsButGlobal = !fulfillableObligationFQNs.length && this.fulfillableObligationFQNs.length;
555
+ if (hasEmptyDecryptParamObligationsButGlobal) {
556
+ fulfillableObligationFQNs = this.fulfillableObligationFQNs;
557
+ }
400
558
  // Await in order to catch any errors from this call.
401
559
  // TODO: Write error event to stream and don't await.
402
560
  return await streamMiddleware(await (0, tdf_js_1.readStream)({
@@ -412,6 +570,7 @@ class Client {
412
570
  assertionVerificationKeys,
413
571
  noVerifyAssertions,
414
572
  wrappingKeyAlgorithm,
573
+ fulfillableObligations: fulfillableObligationFQNs,
415
574
  }));
416
575
  }
417
576
  /**
@@ -438,4 +597,4 @@ class Client {
438
597
  }
439
598
  }
440
599
  exports.Client = Client;
441
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../tdf3/src/client/index.ts"],"names":[],"mappings":"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"}
600
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../tdf3/src/client/index.ts"],"names":[],"mappings":"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"}
@@ -17,9 +17,9 @@ const IP_HOST_PORT = '([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}:[0-9]{1
17
17
  // validate host is one of those above
18
18
  const HOST = `(${HOST_PORT}|${WWW_HOST}|${IP_HOST_PORT})`;
19
19
  // validate attr name be like `/attr/<attr_name>`
20
- exports.ATTR_NAME = `(/${exports.ATTR_NAME_PROP_NAME}/[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]?)`;
20
+ exports.ATTR_NAME = `(/${exports.ATTR_NAME_PROP_NAME}/(%[0-9a-fA-F][0-9a-fA-F]|[a-zA-Z0-9])+((%[0-9a-fA-F][0-9a-fA-F]|[a-zA-Z0-9-])+[a-zA-Z0-9])?)`;
21
21
  // validate value pattern
22
- exports.ATTR_VALUE = `(/${exports.ATTR_VALUE_PROP_NAME}/[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]?)`;
22
+ exports.ATTR_VALUE = `(/${exports.ATTR_VALUE_PROP_NAME}/(%[0-9a-fA-F][0-9a-fA-F]|[a-zA-Z0-9])+((%[0-9a-fA-F][0-9a-fA-F]|[a-zA-Z0-9-])+[a-zA-Z0-9])?)`;
23
23
  // validate attribute authority e.g. https://example.com
24
24
  const ATTR_AUTHORITY_PATTERN = `(${SCHEME}${HOST})`;
25
25
  // validate attribute namespace e.g. https://example.com/attr/someattribute
@@ -60,4 +60,4 @@ function validateAttribute(attribute) {
60
60
  }
61
61
  return true;
62
62
  }
63
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3RkZjMvc3JjL2NsaWVudC92YWxpZGF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQW9EQSw4Q0EwQkM7QUE5RUQsc0RBQWtFO0FBRWxFLE1BQU0sWUFBWSxHQUFHLENBQUMsS0FBOEIsRUFBRSxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUM7QUFFdEUsUUFBQSxtQkFBbUIsR0FBRyxNQUFNLENBQUM7QUFDN0IsUUFBQSxvQkFBb0IsR0FBRyxPQUFPLENBQUM7QUFFNUMsc0VBQXNFO0FBQ3RFLE1BQU0sTUFBTSxHQUFHLGFBQWEsQ0FBQztBQUU3Qiw2Q0FBNkM7QUFDN0MsTUFBTSxTQUFTLEdBQUcsbUNBQW1DLENBQUM7QUFFdEQsOENBQThDO0FBQzlDLE1BQU0sUUFBUSxHQUFHLGdEQUFnRCxDQUFDO0FBRWxFLDZDQUE2QztBQUM3QyxNQUFNLFlBQVksR0FBRyxnRUFBZ0UsQ0FBQztBQUV0RixzQ0FBc0M7QUFDdEMsTUFBTSxJQUFJLEdBQUcsSUFBSSxTQUFTLElBQUksUUFBUSxJQUFJLFlBQVksR0FBRyxDQUFDO0FBRTFELGtEQUFrRDtBQUNyQyxRQUFBLFNBQVMsR0FBRyxLQUFLLDJCQUFtQix3Q0FBd0MsQ0FBQztBQUUxRix5QkFBeUI7QUFDWixRQUFBLFVBQVUsR0FBRyxLQUFLLDRCQUFvQix3Q0FBd0MsQ0FBQztBQUU1Rix5REFBeUQ7QUFDekQsTUFBTSxzQkFBc0IsR0FBRyxJQUFJLE1BQU0sR0FBRyxJQUFJLEdBQUcsQ0FBQztBQUVwRCwyRUFBMkU7QUFDM0UsTUFBTSxzQkFBc0IsR0FBRyxJQUFJLHNCQUFzQixHQUFHLGlCQUFTLEdBQUcsQ0FBQztBQUV6RSx1RkFBdUY7QUFDMUUsUUFBQSxzQkFBc0IsR0FBRyxLQUFLLHNCQUFzQixHQUFHLGtCQUFVLElBQUksQ0FBQztBQUU1RSxNQUFNLHVCQUF1QixHQUFHLENBQUMsSUFBYSxFQUFnQixFQUFFO0lBQ3JFLE1BQU0sUUFBUSxHQUFHLE9BQU8sSUFBSSxLQUFLLFFBQVEsQ0FBQztJQUMxQyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDZCxNQUFNLElBQUksb0NBQXdCLENBQUMsK0JBQStCLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDNUUsQ0FBQztJQUVELE1BQU0sRUFBRSxTQUFTLEVBQUUsR0FBRyxJQUErQixDQUFDO0lBQ3RELE1BQU0sUUFBUSxHQUFHLE9BQU8sU0FBUyxLQUFLLFFBQVEsQ0FBQztJQUMvQyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDZCxNQUFNLElBQUksb0NBQXdCLENBQUMsbUNBQW1DLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDaEYsQ0FBQztJQUVELE9BQU8saUJBQWlCLENBQUMsU0FBUyxDQUFDLENBQUM7QUFDdEMsQ0FBQyxDQUFDO0FBYlcsUUFBQSx1QkFBdUIsMkJBYWxDO0FBRUYsU0FBZ0IsaUJBQWlCLENBQUMsU0FBaUI7SUFDakQsSUFBSSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsOEJBQXNCLENBQUMsRUFBRSxDQUFDO1FBQzdDLE1BQU0sSUFBSSxvQ0FBd0IsQ0FBQyxtQ0FBbUMsU0FBUyxHQUFHLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDakcsQ0FBQztJQUVELE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSwyQkFBbUIsR0FBRyxDQUFDO0lBQ3BELE1BQU0saUJBQWlCLEdBQUcsSUFBSSw0QkFBb0IsR0FBRyxDQUFDO0lBQ3RELE1BQU0sYUFBYSxHQUFHLFlBQVksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLGlCQUFTLENBQUMsQ0FBQyxDQUFDO0lBQy9ELE1BQU0sY0FBYyxHQUFHLFlBQVksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLGtCQUFVLENBQUMsQ0FBQyxDQUFDO0lBRWpFLElBQUksQ0FBQyxhQUFhLEVBQUUsQ0FBQztRQUNuQixNQUFNLElBQUksb0NBQXdCLENBQUMsK0JBQStCLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDakYsQ0FBQztJQUVELElBQUksQ0FBQyxjQUFjLEVBQUUsQ0FBQztRQUNwQixNQUFNLElBQUksb0NBQXdCLENBQUMsZ0NBQWdDLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDbEYsQ0FBQztJQUVELE1BQU0sYUFBYSxHQUFHLGFBQWEsQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDbkUsTUFBTSxjQUFjLEdBQUcsY0FBYyxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUV0RSxJQUFJLGFBQWEsS0FBSyxjQUFjLEVBQUUsQ0FBQztRQUNyQyxNQUFNLElBQUksb0NBQXdCLENBQUMsZ0RBQWdELEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDbEcsQ0FBQztJQUVELE9BQU8sSUFBSSxDQUFDO0FBQ2QsQ0FBQyJ9
63
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3RkZjMvc3JjL2NsaWVudC92YWxpZGF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQW9EQSw4Q0EwQkM7QUE5RUQsc0RBQWtFO0FBRWxFLE1BQU0sWUFBWSxHQUFHLENBQUMsS0FBOEIsRUFBRSxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUM7QUFFdEUsUUFBQSxtQkFBbUIsR0FBRyxNQUFNLENBQUM7QUFDN0IsUUFBQSxvQkFBb0IsR0FBRyxPQUFPLENBQUM7QUFFNUMsc0VBQXNFO0FBQ3RFLE1BQU0sTUFBTSxHQUFHLGFBQWEsQ0FBQztBQUU3Qiw2Q0FBNkM7QUFDN0MsTUFBTSxTQUFTLEdBQUcsbUNBQW1DLENBQUM7QUFFdEQsOENBQThDO0FBQzlDLE1BQU0sUUFBUSxHQUFHLGdEQUFnRCxDQUFDO0FBRWxFLDZDQUE2QztBQUM3QyxNQUFNLFlBQVksR0FBRyxnRUFBZ0UsQ0FBQztBQUV0RixzQ0FBc0M7QUFDdEMsTUFBTSxJQUFJLEdBQUcsSUFBSSxTQUFTLElBQUksUUFBUSxJQUFJLFlBQVksR0FBRyxDQUFDO0FBRTFELGtEQUFrRDtBQUNyQyxRQUFBLFNBQVMsR0FBRyxLQUFLLDJCQUFtQiwrRkFBK0YsQ0FBQztBQUVqSix5QkFBeUI7QUFDWixRQUFBLFVBQVUsR0FBRyxLQUFLLDRCQUFvQiwrRkFBK0YsQ0FBQztBQUVuSix5REFBeUQ7QUFDekQsTUFBTSxzQkFBc0IsR0FBRyxJQUFJLE1BQU0sR0FBRyxJQUFJLEdBQUcsQ0FBQztBQUVwRCwyRUFBMkU7QUFDM0UsTUFBTSxzQkFBc0IsR0FBRyxJQUFJLHNCQUFzQixHQUFHLGlCQUFTLEdBQUcsQ0FBQztBQUV6RSx1RkFBdUY7QUFDMUUsUUFBQSxzQkFBc0IsR0FBRyxLQUFLLHNCQUFzQixHQUFHLGtCQUFVLElBQUksQ0FBQztBQUU1RSxNQUFNLHVCQUF1QixHQUFHLENBQUMsSUFBYSxFQUFnQixFQUFFO0lBQ3JFLE1BQU0sUUFBUSxHQUFHLE9BQU8sSUFBSSxLQUFLLFFBQVEsQ0FBQztJQUMxQyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDZCxNQUFNLElBQUksb0NBQXdCLENBQUMsK0JBQStCLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDNUUsQ0FBQztJQUVELE1BQU0sRUFBRSxTQUFTLEVBQUUsR0FBRyxJQUErQixDQUFDO0lBQ3RELE1BQU0sUUFBUSxHQUFHLE9BQU8sU0FBUyxLQUFLLFFBQVEsQ0FBQztJQUMvQyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDZCxNQUFNLElBQUksb0NBQXdCLENBQUMsbUNBQW1DLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDaEYsQ0FBQztJQUVELE9BQU8saUJBQWlCLENBQUMsU0FBUyxDQUFDLENBQUM7QUFDdEMsQ0FBQyxDQUFDO0FBYlcsUUFBQSx1QkFBdUIsMkJBYWxDO0FBRUYsU0FBZ0IsaUJBQWlCLENBQUMsU0FBaUI7SUFDakQsSUFBSSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsOEJBQXNCLENBQUMsRUFBRSxDQUFDO1FBQzdDLE1BQU0sSUFBSSxvQ0FBd0IsQ0FBQyxtQ0FBbUMsU0FBUyxHQUFHLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDakcsQ0FBQztJQUVELE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSwyQkFBbUIsR0FBRyxDQUFDO0lBQ3BELE1BQU0saUJBQWlCLEdBQUcsSUFBSSw0QkFBb0IsR0FBRyxDQUFDO0lBQ3RELE1BQU0sYUFBYSxHQUFHLFlBQVksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLGlCQUFTLENBQUMsQ0FBQyxDQUFDO0lBQy9ELE1BQU0sY0FBYyxHQUFHLFlBQVksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLGtCQUFVLENBQUMsQ0FBQyxDQUFDO0lBRWpFLElBQUksQ0FBQyxhQUFhLEVBQUUsQ0FBQztRQUNuQixNQUFNLElBQUksb0NBQXdCLENBQUMsK0JBQStCLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDakYsQ0FBQztJQUVELElBQUksQ0FBQyxjQUFjLEVBQUUsQ0FBQztRQUNwQixNQUFNLElBQUksb0NBQXdCLENBQUMsZ0NBQWdDLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDbEYsQ0FBQztJQUVELE1BQU0sYUFBYSxHQUFHLGFBQWEsQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDbkUsTUFBTSxjQUFjLEdBQUcsY0FBYyxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUV0RSxJQUFJLGFBQWEsS0FBSyxjQUFjLEVBQUUsQ0FBQztRQUNyQyxNQUFNLElBQUksb0NBQXdCLENBQUMsZ0RBQWdELEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDbEcsQ0FBQztJQUVELE9BQU8sSUFBSSxDQUFDO0FBQ2QsQ0FBQyJ9