@opentdf/sdk 0.3.0 → 0.3.2-beta.2277
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.
- package/dist/cjs/src/access.js +46 -1
- package/dist/cjs/src/nanotdf/Client.js +12 -6
- package/dist/cjs/src/opentdf.js +37 -6
- package/dist/cjs/src/version.js +1 -1
- package/dist/cjs/tdf3/src/assertions.js +5 -5
- package/dist/cjs/tdf3/src/client/index.js +20 -11
- package/dist/cjs/tdf3/src/tdf.js +19 -6
- package/dist/types/src/access.d.ts +1 -0
- package/dist/types/src/access.d.ts.map +1 -1
- package/dist/types/src/nanotdf/Client.d.ts +3 -1
- package/dist/types/src/nanotdf/Client.d.ts.map +1 -1
- package/dist/types/src/opentdf.d.ts +5 -1
- package/dist/types/src/opentdf.d.ts.map +1 -1
- package/dist/types/src/version.d.ts +1 -1
- package/dist/types/tdf3/src/assertions.d.ts +1 -1
- package/dist/types/tdf3/src/assertions.d.ts.map +1 -1
- package/dist/types/tdf3/src/client/index.d.ts +8 -3
- package/dist/types/tdf3/src/client/index.d.ts.map +1 -1
- package/dist/types/tdf3/src/models/manifest.d.ts +1 -1
- package/dist/types/tdf3/src/models/manifest.d.ts.map +1 -1
- package/dist/types/tdf3/src/tdf.d.ts.map +1 -1
- package/dist/web/src/access.js +45 -1
- package/dist/web/src/nanotdf/Client.js +13 -7
- package/dist/web/src/opentdf.js +38 -7
- package/dist/web/src/version.js +1 -1
- package/dist/web/tdf3/src/assertions.js +5 -5
- package/dist/web/tdf3/src/client/index.js +21 -12
- package/dist/web/tdf3/src/tdf.js +19 -6
- package/package.json +1 -1
- package/src/access.ts +48 -0
- package/src/nanotdf/Client.ts +22 -6
- package/src/opentdf.ts +58 -8
- package/src/version.ts +1 -1
- package/tdf3/src/assertions.ts +4 -4
- package/tdf3/src/client/index.ts +30 -11
- package/tdf3/src/models/manifest.ts +2 -1
- package/tdf3/src/tdf.ts +27 -10
package/dist/cjs/src/access.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.OriginAllowList = exports.publicKeyAlgorithmToJwa = exports.keyAlgorithmToPublicKeyAlgorithm = exports.isPublicKeyAlgorithm = void 0;
|
|
4
4
|
exports.fetchWrappedKey = fetchWrappedKey;
|
|
5
|
+
exports.fetchKeyAccessServers = fetchKeyAccessServers;
|
|
5
6
|
exports.fetchECKasPubKey = fetchECKasPubKey;
|
|
6
7
|
exports.fetchKasPubKey = fetchKasPubKey;
|
|
7
8
|
const errors_js_1 = require("./errors.js");
|
|
@@ -102,6 +103,50 @@ async function noteInvalidPublicKey(url, r) {
|
|
|
102
103
|
throw e;
|
|
103
104
|
}
|
|
104
105
|
}
|
|
106
|
+
async function fetchKeyAccessServers(platformUrl, authProvider) {
|
|
107
|
+
let nextOffset = 0;
|
|
108
|
+
const allServers = [];
|
|
109
|
+
do {
|
|
110
|
+
const req = await authProvider.withCreds({
|
|
111
|
+
url: `${platformUrl}/policy.kasregistry.KeyAccessServerRegistryService/ListKeyAccessServers`,
|
|
112
|
+
method: 'POST',
|
|
113
|
+
headers: {
|
|
114
|
+
'Content-Type': 'application/json',
|
|
115
|
+
},
|
|
116
|
+
body: JSON.stringify({
|
|
117
|
+
pagination: {
|
|
118
|
+
offset: nextOffset,
|
|
119
|
+
},
|
|
120
|
+
}),
|
|
121
|
+
});
|
|
122
|
+
let response;
|
|
123
|
+
try {
|
|
124
|
+
response = await fetch(req.url, {
|
|
125
|
+
method: req.method,
|
|
126
|
+
headers: req.headers,
|
|
127
|
+
body: req.body,
|
|
128
|
+
mode: 'cors',
|
|
129
|
+
cache: 'no-cache',
|
|
130
|
+
credentials: 'same-origin',
|
|
131
|
+
redirect: 'follow',
|
|
132
|
+
referrerPolicy: 'no-referrer',
|
|
133
|
+
});
|
|
134
|
+
}
|
|
135
|
+
catch (e) {
|
|
136
|
+
throw new errors_js_1.NetworkError(`unable to fetch kas list from [${req.url}]`, e);
|
|
137
|
+
}
|
|
138
|
+
if (response.ok) {
|
|
139
|
+
const { keyAccessServers = [], pagination = {} } = await response.json();
|
|
140
|
+
allServers.push(...keyAccessServers);
|
|
141
|
+
nextOffset = pagination.nextOffset || 0;
|
|
142
|
+
}
|
|
143
|
+
} while (nextOffset > 0);
|
|
144
|
+
if (!allServers.length) {
|
|
145
|
+
throw new errors_js_1.ConfigurationError('There are no available KAS');
|
|
146
|
+
}
|
|
147
|
+
const serverUrls = allServers.map((server) => server.uri);
|
|
148
|
+
return new OriginAllowList(serverUrls, false);
|
|
149
|
+
}
|
|
105
150
|
/**
|
|
106
151
|
* If we have KAS url but not public key we can fetch it from KAS, fetching
|
|
107
152
|
* the value from `${kas}/kas_public_key`.
|
|
@@ -188,4 +233,4 @@ class OriginAllowList {
|
|
|
188
233
|
}
|
|
189
234
|
}
|
|
190
235
|
exports.OriginAllowList = OriginAllowList;
|
|
191
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
236
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"access.js","sourceRoot":"","sources":["../../../src/access.ts"],"names":[],"mappings":"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"}
|
|
@@ -146,7 +146,6 @@ class Client {
|
|
|
146
146
|
// TODO Disallow http KAS. For now just log as error
|
|
147
147
|
(0, utils_js_1.validateSecureUrl)(kasUrl);
|
|
148
148
|
this.kasUrl = kasUrl;
|
|
149
|
-
this.allowedKases = new access_js_1.OriginAllowList([kasUrl]);
|
|
150
149
|
this.dpopEnabled = dpopEnabled;
|
|
151
150
|
if (ephemeralKeyPair) {
|
|
152
151
|
this.ephemeralKeyPair = Promise.resolve(ephemeralKeyPair);
|
|
@@ -157,12 +156,15 @@ class Client {
|
|
|
157
156
|
this.iv = 1;
|
|
158
157
|
}
|
|
159
158
|
else {
|
|
160
|
-
const { allowedKases, ignoreAllowList, authProvider, dpopEnabled, dpopKeys, ephemeralKeyPair, kasEndpoint, } = optsOrOldAuthProvider;
|
|
159
|
+
const { allowedKases, ignoreAllowList, authProvider, dpopEnabled, dpopKeys, ephemeralKeyPair, kasEndpoint, platformUrl, } = optsOrOldAuthProvider;
|
|
161
160
|
this.authProvider = enwrapAuthProvider(authProvider);
|
|
162
161
|
// TODO Disallow http KAS. For now just log as error
|
|
163
162
|
(0, utils_js_1.validateSecureUrl)(kasEndpoint);
|
|
164
163
|
this.kasUrl = kasEndpoint;
|
|
165
|
-
this.
|
|
164
|
+
this.platformUrl = platformUrl;
|
|
165
|
+
if (allowedKases?.length || ignoreAllowList) {
|
|
166
|
+
this.allowedKases = new access_js_1.OriginAllowList(allowedKases || [], ignoreAllowList);
|
|
167
|
+
}
|
|
166
168
|
this.dpopEnabled = !!dpopEnabled;
|
|
167
169
|
if (dpopKeys) {
|
|
168
170
|
this.requestSignerKeyPair = dpopKeys;
|
|
@@ -197,8 +199,12 @@ class Client {
|
|
|
197
199
|
* @param clientVersion version of the client, as SemVer
|
|
198
200
|
*/
|
|
199
201
|
async rewrapKey(nanoTdfHeader, kasRewrapUrl, magicNumberVersion, clientVersion) {
|
|
200
|
-
|
|
201
|
-
|
|
202
|
+
let allowedKases = this.allowedKases;
|
|
203
|
+
if (!allowedKases) {
|
|
204
|
+
allowedKases = await (0, access_js_1.fetchKeyAccessServers)(this.platformUrl, this.authProvider);
|
|
205
|
+
}
|
|
206
|
+
if (!allowedKases.allows(kasRewrapUrl)) {
|
|
207
|
+
throw new errors_js_1.UnsafeUrlError(`request URL ∉ ${allowedKases.origins};`, kasRewrapUrl);
|
|
202
208
|
}
|
|
203
209
|
const ephemeralKeyPair = await this.ephemeralKeyPair;
|
|
204
210
|
const requestSignerKeyPair = await this.requestSignerKeyPair;
|
|
@@ -298,4 +304,4 @@ Client.SDK_INITIAL_RELEASE = '0.0.0';
|
|
|
298
304
|
Client.INITIAL_RELEASE_IV_SIZE = 3;
|
|
299
305
|
Client.IV_SIZE = 12;
|
|
300
306
|
exports.default = Client;
|
|
301
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
307
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Client.js","sourceRoot":"","sources":["../../../../src/nanotdf/Client.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/src/opentdf.js
CHANGED
|
@@ -75,11 +75,17 @@ class RewrapCache {
|
|
|
75
75
|
exports.RewrapCache = RewrapCache;
|
|
76
76
|
// SDK for dealing with OpenTDF data and policy services.
|
|
77
77
|
class OpenTDF {
|
|
78
|
-
constructor({ authProvider, dpopKeys, defaultCreateOptions, defaultReadOptions, disableDPoP, policyEndpoint, rewrapCacheOptions, }) {
|
|
78
|
+
constructor({ authProvider, dpopKeys, defaultCreateOptions, defaultReadOptions, disableDPoP, policyEndpoint, rewrapCacheOptions, platformUrl, }) {
|
|
79
79
|
this.authProvider = authProvider;
|
|
80
80
|
this.defaultCreateOptions = defaultCreateOptions || {};
|
|
81
81
|
this.defaultReadOptions = defaultReadOptions || {};
|
|
82
82
|
this.dpopEnabled = !!disableDPoP;
|
|
83
|
+
if (platformUrl) {
|
|
84
|
+
this.platformUrl = platformUrl;
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
console.warn("Warning: 'platformUrl' is required for security to ensure the SDK uses the platform-configured Key Access Server list");
|
|
88
|
+
}
|
|
83
89
|
this.policyEndpoint = policyEndpoint || '';
|
|
84
90
|
this.rewrapCache = new RewrapCache(rewrapCacheOptions);
|
|
85
91
|
this.tdf3Client = new index_js_2.Client({
|
|
@@ -98,8 +104,14 @@ class OpenTDF {
|
|
|
98
104
|
}, true, ['sign', 'verify']);
|
|
99
105
|
}
|
|
100
106
|
async createNanoTDF(opts) {
|
|
101
|
-
opts = {
|
|
102
|
-
|
|
107
|
+
opts = {
|
|
108
|
+
...this.defaultCreateOptions,
|
|
109
|
+
...opts,
|
|
110
|
+
};
|
|
111
|
+
const collection = await this.createNanoTDFCollection({
|
|
112
|
+
...opts,
|
|
113
|
+
platformUrl: this.platformUrl,
|
|
114
|
+
});
|
|
103
115
|
try {
|
|
104
116
|
return await collection.encrypt(opts.source);
|
|
105
117
|
}
|
|
@@ -130,7 +142,7 @@ class OpenTDF {
|
|
|
130
142
|
splitPlan: opts.splitPlan,
|
|
131
143
|
windowSize: opts.windowSize,
|
|
132
144
|
wrappingKeyAlgorithm: opts.wrappingKeyAlgorithm,
|
|
133
|
-
tdfSpecVersion: opts.tdfSpecVersion
|
|
145
|
+
tdfSpecVersion: opts.tdfSpecVersion,
|
|
134
146
|
});
|
|
135
147
|
const stream = oldStream.stream;
|
|
136
148
|
stream.manifest = Promise.resolve(oldStream.manifest);
|
|
@@ -170,6 +182,9 @@ class UnknownTypeReader {
|
|
|
170
182
|
this.state = 'resolving';
|
|
171
183
|
const chunker = await (0, seekable_js_1.fromSource)(this.opts.source);
|
|
172
184
|
const prefix = await chunker(0, 3);
|
|
185
|
+
if (!this.opts.platformUrl && this.outer.platformUrl) {
|
|
186
|
+
this.opts.platformUrl = this.outer.platformUrl;
|
|
187
|
+
}
|
|
173
188
|
if (prefix[0] === 0x50 && prefix[1] === 0x4b) {
|
|
174
189
|
this.state = 'loaded';
|
|
175
190
|
return new ZTDFReader(this.outer.tdf3Client, this.opts, chunker);
|
|
@@ -215,6 +230,11 @@ class NanoTDFReader {
|
|
|
215
230
|
this.opts = opts;
|
|
216
231
|
this.chunker = chunker;
|
|
217
232
|
this.rewrapCache = rewrapCache;
|
|
233
|
+
if (!this.opts.ignoreAllowlist &&
|
|
234
|
+
!this.outer.platformUrl &&
|
|
235
|
+
!this.opts.allowedKASEndpoints?.length) {
|
|
236
|
+
throw new errors_js_1.ConfigurationError('platformUrl is required when allowedKasEndpoints is empty');
|
|
237
|
+
}
|
|
218
238
|
// lazily load the container
|
|
219
239
|
this.container = new Promise(async (resolve, reject) => {
|
|
220
240
|
try {
|
|
@@ -242,6 +262,7 @@ class NanoTDFReader {
|
|
|
242
262
|
dpopEnabled: this.outer.dpopEnabled,
|
|
243
263
|
dpopKeys: this.outer.dpopKeys,
|
|
244
264
|
kasEndpoint: this.opts.allowedKASEndpoints?.[0] || 'https://disallow.all.invalid',
|
|
265
|
+
platformUrl: this.outer.platformUrl,
|
|
245
266
|
});
|
|
246
267
|
// TODO: The version number should be fetched from the API
|
|
247
268
|
const version = '0.0.1';
|
|
@@ -283,12 +304,21 @@ class ZTDFReader {
|
|
|
283
304
|
}
|
|
284
305
|
async decrypt() {
|
|
285
306
|
const { assertionVerificationKeys, noVerify: noVerifyAssertions, wrappingKeyAlgorithm, } = this.opts;
|
|
286
|
-
|
|
307
|
+
if (!this.opts.ignoreAllowlist && !this.opts.allowedKASEndpoints && !this.opts.platformUrl) {
|
|
308
|
+
throw new errors_js_1.ConfigurationError('platformUrl is required when allowedKasEndpoints is empty');
|
|
309
|
+
}
|
|
287
310
|
const dpopKeys = await this.client.dpopKeys;
|
|
288
311
|
const { authProvider, cryptoService } = this.client;
|
|
289
312
|
if (!authProvider) {
|
|
290
313
|
throw new errors_js_1.ConfigurationError('authProvider is required');
|
|
291
314
|
}
|
|
315
|
+
let allowList;
|
|
316
|
+
if (this.opts.allowedKASEndpoints?.length || this.opts.ignoreAllowlist) {
|
|
317
|
+
allowList = new access_js_1.OriginAllowList(this.opts.allowedKASEndpoints || [], this.opts.ignoreAllowlist);
|
|
318
|
+
}
|
|
319
|
+
else if (this.opts.platformUrl) {
|
|
320
|
+
allowList = await (0, access_js_1.fetchKeyAccessServers)(this.opts.platformUrl, authProvider);
|
|
321
|
+
}
|
|
292
322
|
const overview = await this.overview;
|
|
293
323
|
const oldStream = await (0, tdf_js_1.decryptStreamFrom)({
|
|
294
324
|
allowList,
|
|
@@ -357,6 +387,7 @@ class Collection {
|
|
|
357
387
|
authProvider,
|
|
358
388
|
kasEndpoint: opts.defaultKASEndpoint ?? 'https://disallow.all.invalid',
|
|
359
389
|
maxKeyIterations: opts.maxKeyIterations,
|
|
390
|
+
platformUrl: opts.platformUrl,
|
|
360
391
|
});
|
|
361
392
|
}
|
|
362
393
|
async encrypt(source) {
|
|
@@ -379,4 +410,4 @@ class Collection {
|
|
|
379
410
|
delete this.client;
|
|
380
411
|
}
|
|
381
412
|
}
|
|
382
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"opentdf.js","sourceRoot":"","sources":["../../../src/opentdf.ts"],"names":[],"mappings":"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"}
|
|
413
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"opentdf.js","sourceRoot":"","sources":["../../../src/opentdf.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/src/version.js
CHANGED
|
@@ -4,7 +4,7 @@ exports.tdfSpecVersion = exports.clientType = exports.version = void 0;
|
|
|
4
4
|
/**
|
|
5
5
|
* Exposes the released version number of the `@opentdf/sdk` package
|
|
6
6
|
*/
|
|
7
|
-
exports.version = '0.3.
|
|
7
|
+
exports.version = '0.3.2';
|
|
8
8
|
/**
|
|
9
9
|
* A string name used to label requests as coming from this library client.
|
|
10
10
|
*/
|
|
@@ -107,7 +107,7 @@ async function verify(thiz, aggregateHash, key, isLegacyTDF) {
|
|
|
107
107
|
/**
|
|
108
108
|
* Creates an Assertion object with the specified properties.
|
|
109
109
|
*/
|
|
110
|
-
async function CreateAssertion(aggregateHash, assertionConfig,
|
|
110
|
+
async function CreateAssertion(aggregateHash, assertionConfig, targetVersion) {
|
|
111
111
|
if (!assertionConfig.signingKey) {
|
|
112
112
|
throw new errors_js_1.ConfigurationError('Assertion signing key is required');
|
|
113
113
|
}
|
|
@@ -122,7 +122,7 @@ async function CreateAssertion(aggregateHash, assertionConfig, tdfSpecVersion) {
|
|
|
122
122
|
};
|
|
123
123
|
const assertionHash = await hash(a);
|
|
124
124
|
let encodedHash;
|
|
125
|
-
switch (
|
|
125
|
+
switch (targetVersion || '4.3.0') {
|
|
126
126
|
case '4.2.2':
|
|
127
127
|
if (typeof aggregateHash !== 'string') {
|
|
128
128
|
throw new errors_js_1.ConfigurationError('Aggregate hash must be a string for TDF spec version 4.2.2');
|
|
@@ -131,13 +131,13 @@ async function CreateAssertion(aggregateHash, assertionConfig, tdfSpecVersion) {
|
|
|
131
131
|
break;
|
|
132
132
|
case '4.3.0':
|
|
133
133
|
if (typeof aggregateHash === 'string') {
|
|
134
|
-
throw new errors_js_1.ConfigurationError('Aggregate hash must be a typed array for TDF spec version 4.
|
|
134
|
+
throw new errors_js_1.ConfigurationError('Aggregate hash must be a typed array for TDF spec version 4.3.0');
|
|
135
135
|
}
|
|
136
136
|
const combinedHash = concatenateUint8Arrays(aggregateHash, new Uint8Array(index_js_1.hex.decodeArrayBuffer(assertionHash)));
|
|
137
137
|
encodedHash = index_js_1.base64.encodeArrayBuffer(combinedHash);
|
|
138
138
|
break;
|
|
139
139
|
default:
|
|
140
|
-
throw new errors_js_1.ConfigurationError(`Unsupported TDF spec version: ${
|
|
140
|
+
throw new errors_js_1.ConfigurationError(`Unsupported TDF spec version: [${targetVersion}]`);
|
|
141
141
|
}
|
|
142
142
|
return await sign(a, assertionHash, encodedHash, assertionConfig.signingKey);
|
|
143
143
|
}
|
|
@@ -148,4 +148,4 @@ function concatenateUint8Arrays(array1, array2) {
|
|
|
148
148
|
combinedArray.set(array2, array1.length);
|
|
149
149
|
return combinedArray;
|
|
150
150
|
}
|
|
151
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
151
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXNzZXJ0aW9ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3RkZjMvc3JjL2Fzc2VydGlvbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUE0Q0Esb0JBS0M7QUFpQ0QsOENBbUJDO0FBU0Qsd0JBMENDO0FBUUQsMENBNkNDO0FBN01ELHlEQUFtRDtBQUNuRCwrQkFBMEM7QUFDMUMsMkRBQTJEO0FBQzNELG1EQUEyRjtBQW9DM0Y7Ozs7R0FJRztBQUNJLEtBQUssVUFBVSxJQUFJLENBQUMsQ0FBWTtJQUNyQyxNQUFNLE1BQU0sR0FBRyxJQUFBLGtDQUFjLEVBQUMsQ0FBQyxFQUFFLEVBQUUsT0FBTyxFQUFFLENBQUMsU0FBUyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBRXJGLE1BQU0sSUFBSSxHQUFHLE1BQU0sTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFLElBQUksV0FBVyxFQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7SUFDckYsT0FBTyxjQUFHLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLENBQUM7QUFDckMsQ0FBQztBQUVEOzs7Ozs7O0dBT0c7QUFDSCxLQUFLLFVBQVUsSUFBSSxDQUNqQixJQUFlLEVBQ2YsYUFBcUIsRUFDckIsR0FBVyxFQUNYLEdBQWlCO0lBRWpCLE1BQU0sT0FBTyxHQUFxQjtRQUNoQyxhQUFhO1FBQ2IsWUFBWSxFQUFFLEdBQUc7S0FDbEIsQ0FBQztJQUVGLElBQUksS0FBYSxDQUFDO0lBQ2xCLElBQUksQ0FBQztRQUNILEtBQUssR0FBRyxNQUFNLElBQUksY0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDLGtCQUFrQixDQUFDLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDeEYsQ0FB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
|
|
@@ -193,6 +193,12 @@ class Client {
|
|
|
193
193
|
this.kasEndpoint = clientConfig.keyRewrapEndpoint.replace(/\/rewrap$/, '');
|
|
194
194
|
}
|
|
195
195
|
this.kasEndpoint = (0, utils_js_1.rstrip)(this.kasEndpoint, '/');
|
|
196
|
+
if (!(0, utils_js_1.validateSecureUrl)(this.kasEndpoint)) {
|
|
197
|
+
throw new errors_js_1.ConfigurationError(`Invalid KAS endpoint [${this.kasEndpoint}]`);
|
|
198
|
+
}
|
|
199
|
+
if (config.platformUrl) {
|
|
200
|
+
this.platformUrl = config.platformUrl;
|
|
201
|
+
}
|
|
196
202
|
if (clientConfig.policyEndpoint) {
|
|
197
203
|
this.policyEndpoint = (0, utils_js_1.rstrip)(clientConfig.policyEndpoint, '/');
|
|
198
204
|
}
|
|
@@ -202,15 +208,10 @@ class Client {
|
|
|
202
208
|
const kasOrigin = new URL(this.kasEndpoint).origin;
|
|
203
209
|
if (clientConfig.allowedKases) {
|
|
204
210
|
this.allowedKases = new access_js_1.OriginAllowList(clientConfig.allowedKases, !!clientConfig.ignoreAllowList);
|
|
205
|
-
if (!
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
}
|
|
209
|
-
else {
|
|
210
|
-
if (!(0, utils_js_1.validateSecureUrl)(this.kasEndpoint)) {
|
|
211
|
-
throw new errors_js_1.ConfigurationError(`Invalid KAS endpoint [${this.kasEndpoint}]; to force, please list it among allowedKases`);
|
|
211
|
+
if (!this.allowedKases.allows(kasOrigin)) {
|
|
212
|
+
// TODO PR: ask if in this cases it makes more sense to add defaultKASEndpoint to the allow list if the allowList is not empty but doesn't have the defaultKas
|
|
213
|
+
throw new errors_js_1.ConfigurationError(`Invalid KAS endpoint [${this.kasEndpoint}]. When allowedKases is set, defaultKASEndpoint needs to be in the allow list`);
|
|
212
214
|
}
|
|
213
|
-
this.allowedKases = new access_js_1.OriginAllowList([kasOrigin], !!clientConfig.ignoreAllowList);
|
|
214
215
|
}
|
|
215
216
|
this.authProvider = config.authProvider;
|
|
216
217
|
this.clientConfig = clientConfig;
|
|
@@ -273,7 +274,7 @@ class Client {
|
|
|
273
274
|
throw new errors_js_1.ConfigurationError('html mode not supported');
|
|
274
275
|
}
|
|
275
276
|
const dpopKeys = await this.dpopKeys;
|
|
276
|
-
const { autoconfigure, metadata, mimeType = 'unknown', windowSize = builders_js_1.DEFAULT_SEGMENT_SIZE, keyMiddleware = index_js_1.keyMiddleware, streamMiddleware = async (stream) => stream, wrappingKeyAlgorithm = 'rsa:2048', } = opts;
|
|
277
|
+
const { autoconfigure, metadata, mimeType = 'unknown', windowSize = builders_js_1.DEFAULT_SEGMENT_SIZE, keyMiddleware = index_js_1.keyMiddleware, streamMiddleware = async (stream) => stream, tdfSpecVersion, wrappingKeyAlgorithm = 'rsa:2048', } = opts;
|
|
277
278
|
const scope = opts.scope ?? { attributes: [], dissem: [] };
|
|
278
279
|
const policyObject = asPolicy(scope);
|
|
279
280
|
(0, tdf_js_1.validatePolicyObject)(policyObject);
|
|
@@ -318,6 +319,7 @@ class Client {
|
|
|
318
319
|
? maxByteLimit
|
|
319
320
|
: opts.byteLimit;
|
|
320
321
|
const encryptionInformation = new index_js_3.SplitKey(new aes_gcm_cipher_js_1.AesGcmCipher(this.cryptoService));
|
|
322
|
+
// TODO KAS: check here
|
|
321
323
|
const splits = splitPlan?.length
|
|
322
324
|
? splitPlan
|
|
323
325
|
: [{ kas: opts.defaultKASEndpoint ?? this.kasEndpoint }];
|
|
@@ -368,6 +370,7 @@ class Client {
|
|
|
368
370
|
keyForEncryption,
|
|
369
371
|
keyForManifest,
|
|
370
372
|
assertionConfigs: opts.assertionConfigs,
|
|
373
|
+
tdfSpecVersion,
|
|
371
374
|
};
|
|
372
375
|
return streamMiddleware(await (0, tdf_js_1.writeStream)(ecfg));
|
|
373
376
|
}
|
|
@@ -388,9 +391,15 @@ class Client {
|
|
|
388
391
|
throw new errors_js_1.ConfigurationError('AuthProvider missing');
|
|
389
392
|
}
|
|
390
393
|
const chunker = await makeChunkable(source);
|
|
391
|
-
if (!allowList) {
|
|
394
|
+
if (!allowList && this.allowedKases) {
|
|
392
395
|
allowList = this.allowedKases;
|
|
393
396
|
}
|
|
397
|
+
else if (this.platformUrl) {
|
|
398
|
+
allowList = await (0, access_js_1.fetchKeyAccessServers)(this.platformUrl, this.authProvider);
|
|
399
|
+
}
|
|
400
|
+
else {
|
|
401
|
+
throw new errors_js_1.ConfigurationError('platformUrl is required when allowedKases is empty');
|
|
402
|
+
}
|
|
394
403
|
// Await in order to catch any errors from this call.
|
|
395
404
|
// TODO: Write error event to stream and don't await.
|
|
396
405
|
return await streamMiddleware(await (0, tdf_js_1.readStream)({
|
|
@@ -432,4 +441,4 @@ class Client {
|
|
|
432
441
|
}
|
|
433
442
|
}
|
|
434
443
|
exports.Client = Client;
|
|
435
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../tdf3/src/client/index.ts"],"names":[],"mappings":"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"}
|
|
444
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../tdf3/src/client/index.ts"],"names":[],"mappings":"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"}
|