@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.
- package/dist/cjs/src/access/access-fetch.js +2 -1
- package/dist/cjs/src/access/access-rpc.js +11 -5
- package/dist/cjs/src/access/constants.js +6 -0
- package/dist/cjs/src/access.js +39 -4
- package/dist/cjs/src/auth/oidc-clientcredentials-provider.js +4 -2
- package/dist/cjs/src/auth/oidc-externaljwt-provider.js +5 -3
- package/dist/cjs/src/auth/oidc-refreshtoken-provider.js +19 -3
- package/dist/cjs/src/auth/oidc.js +9 -8
- package/dist/cjs/src/auth/providers.js +7 -1
- package/dist/cjs/src/index.js +4 -2
- package/dist/cjs/src/nanoclients.js +4 -4
- package/dist/cjs/src/nanotdf/Client.js +10 -6
- package/dist/cjs/src/opentdf.js +102 -13
- package/dist/cjs/src/platform/authorization/v2/authorization_pb.js +112 -0
- package/dist/cjs/src/platform/buf/validate/validate_pb.js +114 -170
- package/dist/cjs/src/platform/common/common_pb.js +16 -5
- package/dist/cjs/src/platform/entity/entity_pb.js +51 -0
- package/dist/cjs/src/platform/entityresolution/entity_resolution_pb.js +1 -1
- package/dist/cjs/src/platform/entityresolution/v2/entity_resolution_pb.js +49 -0
- package/dist/cjs/src/platform/google/api/annotations_pb.js +1 -1
- package/dist/cjs/src/platform/google/api/http_pb.js +3 -3
- package/dist/cjs/src/platform/kas/kas_pb.js +2 -2
- package/dist/cjs/src/platform/policy/attributes/attributes_pb.js +12 -2
- package/dist/cjs/src/platform/policy/kasregistry/key_access_server_registry_pb.js +57 -4
- package/dist/cjs/src/platform/policy/keymanagement/key_management_pb.js +2 -2
- package/dist/cjs/src/platform/policy/namespaces/namespaces_pb.js +31 -4
- package/dist/cjs/src/platform/policy/objects_pb.js +116 -42
- package/dist/cjs/src/platform/policy/obligations/obligations_pb.js +159 -0
- package/dist/cjs/src/platform/policy/registeredresources/registered_resources_pb.js +20 -15
- package/dist/cjs/src/platform/policy/resourcemapping/resource_mapping_pb.js +2 -3
- package/dist/cjs/src/platform/policy/selectors_pb.js +1 -1
- package/dist/cjs/src/platform/policy/subjectmapping/subject_mapping_pb.js +2 -3
- package/dist/cjs/src/platform/policy/unsafe/unsafe_pb.js +2 -4
- package/dist/cjs/src/platform.js +20 -3
- package/dist/cjs/src/policy/api.js +27 -7
- package/dist/cjs/src/policy/granter.js +75 -48
- package/dist/cjs/src/seekable.js +32 -1
- package/dist/cjs/src/utils.js +85 -3
- package/dist/cjs/src/version.js +1 -1
- package/dist/cjs/tdf3/src/assertions.js +39 -2
- package/dist/cjs/tdf3/src/client/DecoratedReadableStream.js +8 -1
- package/dist/cjs/tdf3/src/client/builders.js +13 -1
- package/dist/cjs/tdf3/src/client/index.js +213 -54
- package/dist/cjs/tdf3/src/client/validation.js +3 -3
- package/dist/cjs/tdf3/src/tdf.js +42 -9
- package/dist/cjs/tdf3/src/utils/unwrap.js +2 -2
- package/dist/types/src/access/access-fetch.d.ts +1 -0
- package/dist/types/src/access/access-fetch.d.ts.map +1 -1
- package/dist/types/src/access/access-rpc.d.ts +2 -1
- package/dist/types/src/access/access-rpc.d.ts.map +1 -1
- package/dist/types/src/access/constants.d.ts +3 -0
- package/dist/types/src/access/constants.d.ts.map +1 -0
- package/dist/types/src/access.d.ts +30 -1
- package/dist/types/src/access.d.ts.map +1 -1
- package/dist/types/src/auth/oidc-clientcredentials-provider.d.ts +1 -1
- package/dist/types/src/auth/oidc-clientcredentials-provider.d.ts.map +1 -1
- package/dist/types/src/auth/oidc-externaljwt-provider.d.ts +1 -1
- package/dist/types/src/auth/oidc-externaljwt-provider.d.ts.map +1 -1
- package/dist/types/src/auth/oidc-refreshtoken-provider.d.ts +15 -1
- package/dist/types/src/auth/oidc-refreshtoken-provider.d.ts.map +1 -1
- package/dist/types/src/auth/oidc.d.ts +4 -0
- package/dist/types/src/auth/oidc.d.ts.map +1 -1
- package/dist/types/src/auth/providers.d.ts.map +1 -1
- package/dist/types/src/index.d.ts +1 -0
- package/dist/types/src/index.d.ts.map +1 -1
- package/dist/types/src/nanotdf/Client.d.ts +8 -1
- package/dist/types/src/nanotdf/Client.d.ts.map +1 -1
- package/dist/types/src/opentdf.d.ts +137 -6
- package/dist/types/src/opentdf.d.ts.map +1 -1
- package/dist/types/src/platform/authorization/v2/authorization_pb.d.ts +439 -0
- package/dist/types/src/platform/authorization/v2/authorization_pb.d.ts.map +1 -0
- package/dist/types/src/platform/buf/validate/validate_pb.d.ts +495 -370
- package/dist/types/src/platform/buf/validate/validate_pb.d.ts.map +1 -1
- package/dist/types/src/platform/common/common_pb.d.ts +36 -0
- package/dist/types/src/platform/common/common_pb.d.ts.map +1 -1
- package/dist/types/src/platform/entity/entity_pb.d.ts +130 -0
- package/dist/types/src/platform/entity/entity_pb.d.ts.map +1 -0
- package/dist/types/src/platform/entityresolution/entity_resolution_pb.d.ts +4 -0
- package/dist/types/src/platform/entityresolution/entity_resolution_pb.d.ts.map +1 -1
- package/dist/types/src/platform/entityresolution/v2/entity_resolution_pb.d.ts +136 -0
- package/dist/types/src/platform/entityresolution/v2/entity_resolution_pb.d.ts.map +1 -0
- package/dist/types/src/platform/google/api/http_pb.d.ts.map +1 -1
- package/dist/types/src/platform/kas/kas_pb.d.ts +5 -0
- package/dist/types/src/platform/kas/kas_pb.d.ts.map +1 -1
- package/dist/types/src/platform/policy/attributes/attributes_pb.d.ts +44 -13
- package/dist/types/src/platform/policy/attributes/attributes_pb.d.ts.map +1 -1
- package/dist/types/src/platform/policy/kasregistry/key_access_server_registry_pb.d.ts +329 -24
- package/dist/types/src/platform/policy/kasregistry/key_access_server_registry_pb.d.ts.map +1 -1
- package/dist/types/src/platform/policy/keymanagement/key_management_pb.d.ts +20 -1
- package/dist/types/src/platform/policy/keymanagement/key_management_pb.d.ts.map +1 -1
- package/dist/types/src/platform/policy/namespaces/namespaces_pb.d.ts +143 -5
- package/dist/types/src/platform/policy/namespaces/namespaces_pb.d.ts.map +1 -1
- package/dist/types/src/platform/policy/objects_pb.d.ts +382 -33
- package/dist/types/src/platform/policy/objects_pb.d.ts.map +1 -1
- package/dist/types/src/platform/policy/obligations/obligations_pb.d.ts +670 -0
- package/dist/types/src/platform/policy/obligations/obligations_pb.d.ts.map +1 -0
- package/dist/types/src/platform/policy/registeredresources/registered_resources_pb.d.ts +67 -0
- package/dist/types/src/platform/policy/registeredresources/registered_resources_pb.d.ts.map +1 -1
- package/dist/types/src/platform/policy/resourcemapping/resource_mapping_pb.d.ts.map +1 -1
- package/dist/types/src/platform/policy/selectors_pb.d.ts +18 -0
- package/dist/types/src/platform/policy/selectors_pb.d.ts.map +1 -1
- package/dist/types/src/platform/policy/subjectmapping/subject_mapping_pb.d.ts.map +1 -1
- package/dist/types/src/platform/policy/unsafe/unsafe_pb.d.ts +18 -4
- package/dist/types/src/platform/policy/unsafe/unsafe_pb.d.ts.map +1 -1
- package/dist/types/src/platform.d.ts +21 -0
- package/dist/types/src/platform.d.ts.map +1 -1
- package/dist/types/src/policy/api.d.ts +2 -0
- package/dist/types/src/policy/api.d.ts.map +1 -1
- package/dist/types/src/policy/granter.d.ts +11 -6
- package/dist/types/src/policy/granter.d.ts.map +1 -1
- package/dist/types/src/seekable.d.ts +31 -0
- package/dist/types/src/seekable.d.ts.map +1 -1
- package/dist/types/src/utils.d.ts +61 -2
- package/dist/types/src/utils.d.ts.map +1 -1
- package/dist/types/src/version.d.ts +1 -1
- package/dist/types/tdf3/src/assertions.d.ts +4 -0
- package/dist/types/tdf3/src/assertions.d.ts.map +1 -1
- package/dist/types/tdf3/src/client/DecoratedReadableStream.d.ts +6 -0
- package/dist/types/tdf3/src/client/DecoratedReadableStream.d.ts.map +1 -1
- package/dist/types/tdf3/src/client/builders.d.ts +14 -0
- package/dist/types/tdf3/src/client/builders.d.ts.map +1 -1
- package/dist/types/tdf3/src/client/index.d.ts +25 -4
- package/dist/types/tdf3/src/client/index.d.ts.map +1 -1
- package/dist/types/tdf3/src/client/validation.d.ts +3 -3
- package/dist/types/tdf3/src/client/validation.d.ts.map +1 -1
- package/dist/types/tdf3/src/tdf.d.ts +3 -1
- package/dist/types/tdf3/src/tdf.d.ts.map +1 -1
- package/dist/types/tdf3/src/utils/unwrap.d.ts.map +1 -1
- package/dist/web/src/access/access-fetch.js +2 -1
- package/dist/web/src/access/access-rpc.js +11 -5
- package/dist/web/src/access/constants.js +3 -0
- package/dist/web/src/access.js +37 -3
- package/dist/web/src/auth/oidc-clientcredentials-provider.js +4 -2
- package/dist/web/src/auth/oidc-externaljwt-provider.js +5 -3
- package/dist/web/src/auth/oidc-refreshtoken-provider.js +19 -3
- package/dist/web/src/auth/oidc.js +9 -8
- package/dist/web/src/auth/providers.js +7 -1
- package/dist/web/src/index.js +2 -1
- package/dist/web/src/nanoclients.js +4 -4
- package/dist/web/src/nanotdf/Client.js +11 -7
- package/dist/web/src/opentdf.js +102 -13
- package/dist/web/src/platform/authorization/v2/authorization_pb.js +109 -0
- package/dist/web/src/platform/buf/validate/validate_pb.js +113 -169
- package/dist/web/src/platform/common/common_pb.js +15 -4
- package/dist/web/src/platform/entity/entity_pb.js +48 -0
- package/dist/web/src/platform/entityresolution/entity_resolution_pb.js +1 -1
- package/dist/web/src/platform/entityresolution/v2/entity_resolution_pb.js +46 -0
- package/dist/web/src/platform/google/api/annotations_pb.js +1 -1
- package/dist/web/src/platform/google/api/http_pb.js +3 -3
- package/dist/web/src/platform/kas/kas_pb.js +2 -2
- package/dist/web/src/platform/policy/attributes/attributes_pb.js +12 -2
- package/dist/web/src/platform/policy/kasregistry/key_access_server_registry_pb.js +55 -3
- package/dist/web/src/platform/policy/keymanagement/key_management_pb.js +2 -2
- package/dist/web/src/platform/policy/namespaces/namespaces_pb.js +30 -3
- package/dist/web/src/platform/policy/objects_pb.js +114 -41
- package/dist/web/src/platform/policy/obligations/obligations_pb.js +156 -0
- package/dist/web/src/platform/policy/registeredresources/registered_resources_pb.js +19 -14
- package/dist/web/src/platform/policy/resourcemapping/resource_mapping_pb.js +2 -3
- package/dist/web/src/platform/policy/selectors_pb.js +1 -1
- package/dist/web/src/platform/policy/subjectmapping/subject_mapping_pb.js +2 -3
- package/dist/web/src/platform/policy/unsafe/unsafe_pb.js +2 -4
- package/dist/web/src/platform.js +20 -3
- package/dist/web/src/policy/api.js +26 -7
- package/dist/web/src/policy/granter.js +75 -48
- package/dist/web/src/seekable.js +32 -1
- package/dist/web/src/utils.js +84 -3
- package/dist/web/src/version.js +1 -1
- package/dist/web/tdf3/src/assertions.js +38 -2
- package/dist/web/tdf3/src/client/DecoratedReadableStream.js +8 -1
- package/dist/web/tdf3/src/client/builders.js +13 -1
- package/dist/web/tdf3/src/client/index.js +215 -57
- package/dist/web/tdf3/src/client/validation.js +3 -3
- package/dist/web/tdf3/src/tdf.js +42 -9
- package/dist/web/tdf3/src/utils/unwrap.js +2 -2
- package/package.json +7 -5
- package/src/access/access-fetch.ts +1 -0
- package/src/access/access-rpc.ts +13 -4
- package/src/access/constants.ts +2 -0
- package/src/access.ts +54 -2
- package/src/auth/oidc-clientcredentials-provider.ts +4 -0
- package/src/auth/oidc-externaljwt-provider.ts +5 -1
- package/src/auth/oidc-refreshtoken-provider.ts +19 -1
- package/src/auth/oidc.ts +12 -7
- package/src/auth/providers.ts +6 -0
- package/src/index.ts +1 -0
- package/src/nanoclients.ts +3 -3
- package/src/nanotdf/Client.ts +28 -6
- package/src/opentdf.ts +205 -73
- package/src/platform/authorization/v2/authorization_pb.ts +503 -0
- package/src/platform/buf/validate/validate_pb.ts +529 -401
- package/src/platform/common/common_pb.ts +48 -3
- package/src/platform/entity/entity_pb.ts +154 -0
- package/src/platform/entityresolution/entity_resolution_pb.ts +4 -0
- package/src/platform/entityresolution/v2/entity_resolution_pb.ts +170 -0
- package/src/platform/google/api/annotations_pb.ts +1 -1
- package/src/platform/google/api/http_pb.ts +2 -2
- package/src/platform/kas/kas_pb.ts +6 -1
- package/src/platform/policy/attributes/attributes_pb.ts +46 -16
- package/src/platform/policy/kasregistry/key_access_server_registry_pb.ts +371 -27
- package/src/platform/policy/keymanagement/key_management_pb.ts +24 -2
- package/src/platform/policy/namespaces/namespaces_pb.ts +163 -7
- package/src/platform/policy/objects_pb.ts +474 -59
- package/src/platform/policy/obligations/obligations_pb.ts +788 -0
- package/src/platform/policy/registeredresources/registered_resources_pb.ts +80 -13
- package/src/platform/policy/resourcemapping/resource_mapping_pb.ts +1 -2
- package/src/platform/policy/selectors_pb.ts +18 -0
- package/src/platform/policy/subjectmapping/subject_mapping_pb.ts +1 -2
- package/src/platform/policy/unsafe/unsafe_pb.ts +21 -6
- package/src/platform.ts +29 -5
- package/src/policy/api.ts +37 -6
- package/src/policy/granter.ts +82 -56
- package/src/seekable.ts +31 -0
- package/src/utils.ts +88 -2
- package/src/version.ts +1 -1
- package/tdf3/src/assertions.ts +52 -1
- package/tdf3/src/client/DecoratedReadableStream.ts +9 -0
- package/tdf3/src/client/builders.ts +16 -0
- package/tdf3/src/client/index.ts +309 -73
- package/tdf3/src/client/validation.ts +2 -2
- package/tdf3/src/tdf.ts +53 -9
- package/tdf3/src/utils/unwrap.ts +2 -1
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { v4 } from 'uuid';
|
|
2
|
-
import {
|
|
2
|
+
import { keyMiddleware as defaultKeyMiddleware, streamToBuffer, ZipReader, } from '../utils/index.js';
|
|
3
3
|
import { base64 } from '../../../src/encodings/index.js';
|
|
4
|
-
import { buildKeyAccess, fetchKasPublicKey, loadTDFStream,
|
|
4
|
+
import { buildKeyAccess, fetchKasPublicKey, loadTDFStream, readStream, validatePolicyObject, writeStream, } from '../tdf.js';
|
|
5
5
|
import { unwrapHtml } from '../utils/unwrap.js';
|
|
6
6
|
import { OIDCRefreshTokenProvider } from '../../../src/auth/oidc-refreshtoken-provider.js';
|
|
7
7
|
import { OIDCExternalJwtProvider } from '../../../src/auth/oidc-externaljwt-provider.js';
|
|
8
8
|
import { HttpRequest, withHeaders } from '../../../src/auth/auth.js';
|
|
9
9
|
import { getPlatformUrlFromKasEndpoint, pemToCryptoPublicKey, rstrip, validateSecureUrl, } from '../../../src/utils.js';
|
|
10
|
-
import {
|
|
10
|
+
import { DecryptParamsBuilder, DEFAULT_SEGMENT_SIZE, EncryptParamsBuilder, } from './builders.js';
|
|
11
11
|
import { fetchKeyAccessServers, keyAlgorithmToPublicKeyAlgorithm, OriginAllowList, } from '../../../src/access.js';
|
|
12
12
|
import { ConfigurationError } from '../../../src/errors.js';
|
|
13
13
|
import { AesGcmCipher } from '../ciphers/aes-gcm-cipher.js';
|
|
@@ -17,10 +17,15 @@ import { SplitKey, } from '../models/index.js';
|
|
|
17
17
|
import { plan } from '../../../src/policy/granter.js';
|
|
18
18
|
import { attributeFQNsAsValues } from '../../../src/policy/api.js';
|
|
19
19
|
import { fromBuffer, fromSource } from '../../../src/seekable.js';
|
|
20
|
+
import { Algorithm } from '../../../src/platform/policy/objects_pb.js';
|
|
20
21
|
const GLOBAL_BYTE_LIMIT = 64 * 1000 * 1000 * 1000; // 64 GB, see WS-9363.
|
|
21
22
|
// No default config for now. Delegate to Virtru wrapper for endpoints.
|
|
22
23
|
const defaultClientConfig = { oidcOrigin: '', cryptoService: defaultCryptoService };
|
|
23
24
|
const getFirstTwoBytes = async (chunker) => new TextDecoder().decode(await chunker(0, 2));
|
|
25
|
+
async function algorithmFromPEM(pem) {
|
|
26
|
+
const k = await pemToCryptoPublicKey(pem);
|
|
27
|
+
return keyAlgorithmToPublicKeyAlgorithm(k);
|
|
28
|
+
}
|
|
24
29
|
// Convert a PEM string to a CryptoKey
|
|
25
30
|
export const resolveKasInfo = async (pem, uri, kid) => {
|
|
26
31
|
const k = await pemToCryptoPublicKey(pem);
|
|
@@ -123,6 +128,75 @@ function asPolicy(scope) {
|
|
|
123
128
|
},
|
|
124
129
|
};
|
|
125
130
|
}
|
|
131
|
+
export function findEntryInCache(cache, ...params) {
|
|
132
|
+
const [wantedKas, wantedAlgorithm, wantedKid] = params;
|
|
133
|
+
for (const item of cache) {
|
|
134
|
+
const [itemKas, itemAlgorithm, itemKid, itemKeyInfoPromise] = item;
|
|
135
|
+
if (itemKas !== wantedKas) {
|
|
136
|
+
continue;
|
|
137
|
+
}
|
|
138
|
+
// This makes undefined only match with undefined (base key).
|
|
139
|
+
// We could potentially consider any key a match if undefined algorithm?
|
|
140
|
+
if (itemAlgorithm !== wantedAlgorithm) {
|
|
141
|
+
continue;
|
|
142
|
+
}
|
|
143
|
+
if (wantedKid && itemKid !== wantedKid) {
|
|
144
|
+
continue;
|
|
145
|
+
}
|
|
146
|
+
return itemKeyInfoPromise;
|
|
147
|
+
}
|
|
148
|
+
return null;
|
|
149
|
+
}
|
|
150
|
+
const fetchKasKeyWithCache = (cache, ...params) => {
|
|
151
|
+
const cachedEntry = findEntryInCache(cache, ...params);
|
|
152
|
+
if (cachedEntry !== null) {
|
|
153
|
+
return cachedEntry;
|
|
154
|
+
}
|
|
155
|
+
const keyInfoPromise = fetchKasPublicKey(...params);
|
|
156
|
+
cache.push([...params, keyInfoPromise]);
|
|
157
|
+
return keyInfoPromise;
|
|
158
|
+
};
|
|
159
|
+
function algorithmEnumValueToString(algorithmEnumValue) {
|
|
160
|
+
switch (algorithmEnumValue) {
|
|
161
|
+
case Algorithm.RSA_2048:
|
|
162
|
+
return 'rsa:2048';
|
|
163
|
+
case Algorithm.RSA_4096:
|
|
164
|
+
return 'rsa:4096';
|
|
165
|
+
case Algorithm.EC_P256:
|
|
166
|
+
return 'ec:secp256r1';
|
|
167
|
+
case Algorithm.EC_P384:
|
|
168
|
+
return 'ec:secp384r1';
|
|
169
|
+
case Algorithm.EC_P521:
|
|
170
|
+
return 'ec:secp521r1';
|
|
171
|
+
case Algorithm.UNSPECIFIED:
|
|
172
|
+
// Not entirely sure undefined is correct here, but since we need to generate a key for our cache
|
|
173
|
+
// synchonously, it seems to be the best approach for now.
|
|
174
|
+
return undefined;
|
|
175
|
+
default:
|
|
176
|
+
return undefined;
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
const putKasKeyIntoCache = (cache, kasKey) => {
|
|
180
|
+
const algorithmString = algorithmEnumValueToString(kasKey.publicKey.algorithm);
|
|
181
|
+
const cachedEntry = findEntryInCache(cache, kasKey.kasUri, algorithmString, kasKey.publicKey.kid);
|
|
182
|
+
if (cachedEntry) {
|
|
183
|
+
return cachedEntry;
|
|
184
|
+
}
|
|
185
|
+
const keyInfoPromise = (async function () {
|
|
186
|
+
const keyPromise = pemToCryptoPublicKey(kasKey.publicKey.pem);
|
|
187
|
+
const key = await keyPromise;
|
|
188
|
+
const algorithm = keyAlgorithmToPublicKeyAlgorithm(key);
|
|
189
|
+
return {
|
|
190
|
+
algorithm: algorithm,
|
|
191
|
+
key: keyPromise,
|
|
192
|
+
kid: kasKey.publicKey.kid,
|
|
193
|
+
publicKey: kasKey.publicKey.pem,
|
|
194
|
+
url: kasKey.kasUri,
|
|
195
|
+
};
|
|
196
|
+
})();
|
|
197
|
+
cache.push([kasKey.kasUri, algorithmString, kasKey.publicKey.kid, keyInfoPromise]);
|
|
198
|
+
return keyInfoPromise;
|
|
199
|
+
};
|
|
126
200
|
export class Client {
|
|
127
201
|
/**
|
|
128
202
|
* An abstraction for protecting and accessing data using TDF3 services.
|
|
@@ -135,7 +209,7 @@ export class Client {
|
|
|
135
209
|
* @param {String} [config.oidcOrigin] - Endpoint of authentication service
|
|
136
210
|
*/
|
|
137
211
|
constructor(config) {
|
|
138
|
-
this.
|
|
212
|
+
this.kasKeyInfoCache = [];
|
|
139
213
|
const clientConfig = { ...defaultClientConfig, ...config };
|
|
140
214
|
this.cryptoService = clientConfig.cryptoService;
|
|
141
215
|
this.dpopEnabled = !!(clientConfig.dpopEnabled || clientConfig.dpopKeys);
|
|
@@ -168,6 +242,12 @@ export class Client {
|
|
|
168
242
|
throw new ConfigurationError(`Invalid KAS endpoint [${this.kasEndpoint}]. When allowedKases is set, defaultKASEndpoint needs to be in the allow list`);
|
|
169
243
|
}
|
|
170
244
|
}
|
|
245
|
+
this.fulfillableObligationFQNs = config.fulfillableObligationFQNs?.length
|
|
246
|
+
? config.fulfillableObligationFQNs
|
|
247
|
+
: [];
|
|
248
|
+
if (clientConfig.easEndpoint) {
|
|
249
|
+
this.easEndpoint = clientConfig.easEndpoint;
|
|
250
|
+
}
|
|
171
251
|
this.authProvider = config.authProvider;
|
|
172
252
|
this.clientConfig = clientConfig;
|
|
173
253
|
this.clientId = clientConfig.clientId;
|
|
@@ -200,11 +280,10 @@ export class Client {
|
|
|
200
280
|
cryptoService: this.cryptoService,
|
|
201
281
|
dpopKeys: clientConfig.dpopKeys,
|
|
202
282
|
});
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
}
|
|
283
|
+
}
|
|
284
|
+
/** Necessary only for testing. A dependency-injection approach should be preferred, but that is difficult currently */
|
|
285
|
+
_doFetchKasKeyWithCache(...params) {
|
|
286
|
+
return fetchKasKeyWithCache(...params);
|
|
208
287
|
}
|
|
209
288
|
/**
|
|
210
289
|
* Encrypt plaintext into TDF ciphertext. One of the core operations of the Virtru SDK.
|
|
@@ -229,45 +308,112 @@ export class Client {
|
|
|
229
308
|
throw new ConfigurationError('html mode not supported');
|
|
230
309
|
}
|
|
231
310
|
const dpopKeys = await this.dpopKeys;
|
|
232
|
-
const { autoconfigure, metadata, mimeType = 'unknown', windowSize = DEFAULT_SEGMENT_SIZE, keyMiddleware = defaultKeyMiddleware, streamMiddleware = async (stream) => stream, tdfSpecVersion, wrappingKeyAlgorithm, } = opts;
|
|
311
|
+
const { autoconfigure, metadata, mimeType = 'unknown', windowSize = DEFAULT_SEGMENT_SIZE, keyMiddleware = defaultKeyMiddleware, splitPlan: preconfiguredSplitPlan, streamMiddleware = async (stream) => stream, tdfSpecVersion, wrappingKeyAlgorithm, } = opts;
|
|
233
312
|
const scope = opts.scope ?? { attributes: [], dissem: [] };
|
|
313
|
+
for (const attributeValue of scope.attributeValues || []) {
|
|
314
|
+
for (const kasKey of attributeValue.kasKeys) {
|
|
315
|
+
if (kasKey.publicKey !== undefined) {
|
|
316
|
+
await putKasKeyIntoCache(this.kasKeyInfoCache, {
|
|
317
|
+
// TypeScript is silly and cannot infer that publicKey is not undefined, without re-referencing it like this, even though we checked already.
|
|
318
|
+
...kasKey,
|
|
319
|
+
publicKey: kasKey.publicKey,
|
|
320
|
+
});
|
|
321
|
+
}
|
|
322
|
+
}
|
|
323
|
+
}
|
|
234
324
|
const policyObject = asPolicy(scope);
|
|
235
325
|
validatePolicyObject(policyObject);
|
|
236
|
-
|
|
237
|
-
if (
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
}
|
|
247
|
-
avs = await attributeFQNsAsValues(this.policyEndpoint, this.authProvider, ...fqns);
|
|
326
|
+
const splitPlan = [];
|
|
327
|
+
if (preconfiguredSplitPlan) {
|
|
328
|
+
for (const preconfiguredSplit of preconfiguredSplitPlan) {
|
|
329
|
+
const kasPublicKeyInfo = await this._doFetchKasKeyWithCache(this.kasKeyInfoCache, preconfiguredSplit.kas, wrappingKeyAlgorithm, preconfiguredSplit.kid);
|
|
330
|
+
splitPlan.push({
|
|
331
|
+
kas: kasPublicKeyInfo.url,
|
|
332
|
+
kid: kasPublicKeyInfo.kid,
|
|
333
|
+
pem: kasPublicKeyInfo.publicKey,
|
|
334
|
+
sid: preconfiguredSplit.sid,
|
|
335
|
+
});
|
|
248
336
|
}
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
337
|
+
}
|
|
338
|
+
else if (autoconfigure) {
|
|
339
|
+
const attributeValues = scope.attributeValues ?? [];
|
|
340
|
+
if (!scope.attributes) {
|
|
341
|
+
scope.attributes = attributeValues.map(({ fqn }) => fqn);
|
|
342
|
+
}
|
|
343
|
+
const attributeFQNs = (scope.attributes ?? []).map((attribute) => typeof attribute === 'string' ? attribute : attribute.attribute);
|
|
344
|
+
const fqnsWithoutValues = attributeFQNs.filter((fqn) => attributeValues.every((av) => av.fqn !== fqn));
|
|
345
|
+
if (fqnsWithoutValues.length) {
|
|
346
|
+
// Hydrate missing avs from policy endpoint given the fqns
|
|
347
|
+
if (!this.platformUrl) {
|
|
348
|
+
throw new ConfigurationError('platformUrl not set in TDF3 Client constructor');
|
|
253
349
|
}
|
|
350
|
+
const fetchedFQNValues = await attributeFQNsAsValues(this.platformUrl, this.authProvider, ...fqnsWithoutValues);
|
|
351
|
+
fetchedFQNValues.forEach((fetchedValue) => {
|
|
352
|
+
attributeValues.push(fetchedValue);
|
|
353
|
+
});
|
|
254
354
|
}
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
throw new ConfigurationError(`Attribute mismatch between [${
|
|
355
|
+
const hasAllFQNs = attributeFQNs.every((fqn) => attributeValues.some((attributeValue) => attributeValue.fqn === fqn));
|
|
356
|
+
if (attributeFQNs.length != attributeValues.length || !hasAllFQNs) {
|
|
357
|
+
throw new ConfigurationError(`Attribute mismatch between [${attributeFQNs}] and explicit values ${JSON.stringify(attributeValues.map(({ fqn }) => fqn))}`);
|
|
258
358
|
}
|
|
259
|
-
const
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
359
|
+
for (const attributeValue of attributeValues) {
|
|
360
|
+
for (const kasKey of attributeValue.kasKeys) {
|
|
361
|
+
if (kasKey.publicKey !== undefined) {
|
|
362
|
+
await putKasKeyIntoCache(this.kasKeyInfoCache, {
|
|
363
|
+
// TypeScript is silly and cannot infer that publicKey is not undefined, without re-referencing it like this, even though we checked already.
|
|
364
|
+
...kasKey,
|
|
365
|
+
publicKey: kasKey.publicKey,
|
|
366
|
+
});
|
|
267
367
|
}
|
|
268
368
|
}
|
|
269
|
-
|
|
270
|
-
|
|
369
|
+
}
|
|
370
|
+
const detailedPlan = plan(attributeValues);
|
|
371
|
+
for (const item of detailedPlan) {
|
|
372
|
+
if ('kid' in item.kas) {
|
|
373
|
+
const pemAlgorithm = await algorithmFromPEM(item.kas.pem);
|
|
374
|
+
const kasPublicKeyInfo = await this._doFetchKasKeyWithCache(this.kasKeyInfoCache, item.kas.kasUri, pemAlgorithm, item.kas.kid);
|
|
375
|
+
splitPlan.push({
|
|
376
|
+
kas: kasPublicKeyInfo.url,
|
|
377
|
+
kid: kasPublicKeyInfo.kid,
|
|
378
|
+
pem: kasPublicKeyInfo.publicKey,
|
|
379
|
+
sid: item.sid,
|
|
380
|
+
});
|
|
381
|
+
continue;
|
|
382
|
+
}
|
|
383
|
+
if (!item.kas.publicKey) {
|
|
384
|
+
const kasPublicKeyInfo = await this._doFetchKasKeyWithCache(this.kasKeyInfoCache, item.kas.uri, wrappingKeyAlgorithm, undefined);
|
|
385
|
+
splitPlan.push({
|
|
386
|
+
kas: kasPublicKeyInfo.url,
|
|
387
|
+
kid: kasPublicKeyInfo.kid,
|
|
388
|
+
pem: kasPublicKeyInfo.publicKey,
|
|
389
|
+
sid: item.sid,
|
|
390
|
+
});
|
|
391
|
+
continue;
|
|
392
|
+
}
|
|
393
|
+
switch (item.kas.publicKey.publicKey.case) {
|
|
394
|
+
case 'remote':
|
|
395
|
+
const kasPublicKeyInfo = await this._doFetchKasKeyWithCache(this.kasKeyInfoCache, item.kas.publicKey.publicKey.value, wrappingKeyAlgorithm, undefined);
|
|
396
|
+
splitPlan.push({
|
|
397
|
+
kas: kasPublicKeyInfo.url,
|
|
398
|
+
kid: kasPublicKeyInfo.kid,
|
|
399
|
+
pem: kasPublicKeyInfo.publicKey,
|
|
400
|
+
sid: item.sid,
|
|
401
|
+
});
|
|
402
|
+
break;
|
|
403
|
+
case 'cached':
|
|
404
|
+
for (const cachedPublicKey of item.kas.publicKey.publicKey.value.keys) {
|
|
405
|
+
splitPlan.push({
|
|
406
|
+
kas: item.kas.uri,
|
|
407
|
+
kid: cachedPublicKey.kid,
|
|
408
|
+
pem: cachedPublicKey.pem,
|
|
409
|
+
sid: item.sid,
|
|
410
|
+
});
|
|
411
|
+
}
|
|
412
|
+
break;
|
|
413
|
+
default:
|
|
414
|
+
throw new Error(`Unknown public key type: ${item.kas.publicKey.publicKey.case}`);
|
|
415
|
+
}
|
|
416
|
+
}
|
|
271
417
|
}
|
|
272
418
|
// TODO: Refactor underlying builder to remove some of this unnecessary config.
|
|
273
419
|
const maxByteLimit = GLOBAL_BYTE_LIMIT;
|
|
@@ -275,34 +421,39 @@ export class Client {
|
|
|
275
421
|
? maxByteLimit
|
|
276
422
|
: opts.byteLimit;
|
|
277
423
|
const encryptionInformation = new SplitKey(new AesGcmCipher(this.cryptoService));
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
}
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
424
|
+
if (splitPlan.length === 0) {
|
|
425
|
+
const kasPublicKeyInfo = await this._doFetchKasKeyWithCache(this.kasKeyInfoCache, opts.defaultKASEndpoint ?? this.kasEndpoint, wrappingKeyAlgorithm, undefined);
|
|
426
|
+
splitPlan.push({
|
|
427
|
+
kas: kasPublicKeyInfo.url,
|
|
428
|
+
kid: kasPublicKeyInfo.kid,
|
|
429
|
+
pem: kasPublicKeyInfo.publicKey,
|
|
430
|
+
});
|
|
431
|
+
}
|
|
432
|
+
encryptionInformation.keyAccess = await Promise.all(splitPlan.map(async ({ kas, kid, pem, sid }) => {
|
|
433
|
+
const algorithm = await algorithmFromPEM(pem);
|
|
434
|
+
if (algorithm !== wrappingKeyAlgorithm) {
|
|
435
|
+
console.warn(`Mismatched wrapping key algorithm: [${algorithm}] is not requested type, [${wrappingKeyAlgorithm}]`);
|
|
288
436
|
}
|
|
289
437
|
let type;
|
|
290
|
-
switch (
|
|
438
|
+
switch (algorithm) {
|
|
291
439
|
case 'rsa:2048':
|
|
440
|
+
case 'rsa:4096':
|
|
292
441
|
type = 'wrapped';
|
|
293
442
|
break;
|
|
443
|
+
case 'ec:secp384r1':
|
|
444
|
+
case 'ec:secp521r1':
|
|
294
445
|
case 'ec:secp256r1':
|
|
295
446
|
type = 'ec-wrapped';
|
|
296
447
|
break;
|
|
297
448
|
default:
|
|
298
|
-
throw new ConfigurationError(`Unsupported algorithm ${
|
|
449
|
+
throw new ConfigurationError(`Unsupported algorithm ${algorithm}`);
|
|
299
450
|
}
|
|
300
451
|
return buildKeyAccess({
|
|
301
|
-
alg:
|
|
452
|
+
alg: algorithm,
|
|
302
453
|
type,
|
|
303
|
-
url:
|
|
304
|
-
kid:
|
|
305
|
-
publicKey:
|
|
454
|
+
url: kas,
|
|
455
|
+
kid: kid,
|
|
456
|
+
publicKey: pem,
|
|
306
457
|
metadata,
|
|
307
458
|
sid,
|
|
308
459
|
});
|
|
@@ -325,6 +476,7 @@ export class Client {
|
|
|
325
476
|
keyForEncryption,
|
|
326
477
|
keyForManifest,
|
|
327
478
|
assertionConfigs: opts.assertionConfigs,
|
|
479
|
+
systemMetadataAssertion: opts.systemMetadataAssertion,
|
|
328
480
|
tdfSpecVersion,
|
|
329
481
|
};
|
|
330
482
|
return streamMiddleware(await writeStream(ecfg));
|
|
@@ -337,10 +489,11 @@ export class Client {
|
|
|
337
489
|
* @param params.source A data stream object, one of remote, stream, buffer, etc. types.
|
|
338
490
|
* @param params.eo Optional entity object (legacy AuthZ)
|
|
339
491
|
* @param params.assertionVerificationKeys Optional verification keys for assertions.
|
|
492
|
+
* @param params.fulfillableObligationFQNs Optional fulfillable obligation value FQNs (overrides those on the Client)
|
|
340
493
|
* @return a {@link https://nodejs.org/api/stream.html#stream_class_stream_readable|Readable} stream containing the decrypted plaintext.
|
|
341
494
|
* @see DecryptParamsBuilder
|
|
342
495
|
*/
|
|
343
|
-
async decrypt({ source, allowList, keyMiddleware = async (key) => key, streamMiddleware = async (stream) => stream, assertionVerificationKeys, noVerifyAssertions, concurrencyLimit = 1, wrappingKeyAlgorithm, }) {
|
|
496
|
+
async decrypt({ source, allowList, keyMiddleware = async (key) => key, streamMiddleware = async (stream) => stream, assertionVerificationKeys, noVerifyAssertions, concurrencyLimit = 1, wrappingKeyAlgorithm, fulfillableObligationFQNs = [], }) {
|
|
344
497
|
const dpopKeys = await this.dpopKeys;
|
|
345
498
|
if (!this.authProvider) {
|
|
346
499
|
throw new ConfigurationError('AuthProvider missing');
|
|
@@ -355,6 +508,10 @@ export class Client {
|
|
|
355
508
|
else {
|
|
356
509
|
throw new ConfigurationError('platformUrl is required when allowedKases is empty');
|
|
357
510
|
}
|
|
511
|
+
const hasEmptyDecryptParamObligationsButGlobal = !fulfillableObligationFQNs.length && this.fulfillableObligationFQNs.length;
|
|
512
|
+
if (hasEmptyDecryptParamObligationsButGlobal) {
|
|
513
|
+
fulfillableObligationFQNs = this.fulfillableObligationFQNs;
|
|
514
|
+
}
|
|
358
515
|
// Await in order to catch any errors from this call.
|
|
359
516
|
// TODO: Write error event to stream and don't await.
|
|
360
517
|
return await streamMiddleware(await readStream({
|
|
@@ -370,6 +527,7 @@ export class Client {
|
|
|
370
527
|
assertionVerificationKeys,
|
|
371
528
|
noVerifyAssertions,
|
|
372
529
|
wrappingKeyAlgorithm,
|
|
530
|
+
fulfillableObligations: fulfillableObligationFQNs,
|
|
373
531
|
}));
|
|
374
532
|
}
|
|
375
533
|
/**
|
|
@@ -396,4 +554,4 @@ export class Client {
|
|
|
396
554
|
}
|
|
397
555
|
}
|
|
398
556
|
export { DecryptParamsBuilder, EncryptParamsBuilder, HttpRequest, withHeaders };
|
|
399
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../tdf3/src/client/index.ts"],"names":[],"mappings":"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"}
|
|
557
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../tdf3/src/client/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAC1B,OAAO,EACL,aAAa,IAAI,oBAAoB,EACrC,cAAc,EACd,SAAS,GACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,EACL,cAAc,EAEd,iBAAiB,EACjB,aAAa,EACb,UAAU,EACV,oBAAoB,EACpB,WAAW,GACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAC;AAC3F,OAAO,EAAE,uBAAuB,EAAE,MAAM,gDAAgD,CAAC;AAEzF,OAAO,EAAqB,WAAW,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxF,OAAO,EACL,6BAA6B,EAC7B,oBAAoB,EACpB,MAAM,EACN,iBAAiB,GAClB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAEL,oBAAoB,EAGpB,oBAAoB,EAGpB,oBAAoB,GAGrB,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,qBAAqB,EAErB,gCAAgC,EAChC,eAAe,GAChB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,KAAK,oBAAoB,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAIL,QAAQ,GACT,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,gCAAgC,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAgB,UAAU,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAChF,OAAO,EAAE,SAAS,EAAgB,MAAM,4CAA4C,CAAC;AAErF,MAAM,iBAAiB,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,sBAAsB;AAEzE,uEAAuE;AACvE,MAAM,mBAAmB,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,aAAa,EAAE,oBAAoB,EAAE,CAAC;AAEpF,MAAM,gBAAgB,GAAG,KAAK,EAAE,OAAgB,EAAE,EAAE,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,MAAM,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAEnG,KAAK,UAAU,gBAAgB,CAAC,GAAW;IACzC,MAAM,CAAC,GAAc,MAAM,oBAAoB,CAAC,GAAG,CAAC,CAAC;IACrD,OAAO,gCAAgC,CAAC,CAAC,CAAC,CAAC;AAC7C,CAAC;AAED,sCAAsC;AACtC,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EACjC,GAAW,EACX,GAAW,EACX,GAAY,EACe,EAAE;IAC7B,MAAM,CAAC,GAAc,MAAM,oBAAoB,CAAC,GAAG,CAAC,CAAC;IACrD,MAAM,SAAS,GAAG,gCAAgC,CAAC,CAAC,CAAC,CAAC;IACtD,OAAO;QACL,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QACvB,SAAS,EAAE,GAAG;QACd,GAAG,EAAE,GAAG;QACR,SAAS;QACT,GAAG,EAAE,GAAG;KACT,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,KAAK,EAAE,MAAqB,EAAE,EAAE;IACpD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;IACjD,CAAC;IACD,wBAAwB;IACxB,sDAAsD;IACtD,IAAI,cAAuB,CAAC;IAC5B,IAAI,GAAG,GAAG,IAAI,CAAC;IACf,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,KAAK,QAAQ;YACX,GAAG,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC5C,cAAc,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;YACjC,MAAM;QACR,KAAK,QAAQ;YACX,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC;YACtB,cAAc,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;YACjC,MAAM;QACR,KAAK,SAAS;YACZ,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC;YACjC,MAAM;QACR;YACE,cAAc,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,KAAK,GAAW,MAAM,gBAAgB,CAAC,cAAc,CAAC,CAAC;IAC7D,oCAAoC;IACpC,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,OAAO,cAAc,CAAC;IACxB,CAAC;IACD,uBAAuB;IACvB,mEAAmE;IACnE,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,MAAM,cAAc,EAAE,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;IACnC,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC,CAAC;AA4CF;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EACtC,YAAY;AACZ,iDAAiD;AACjD,aAAa,EACb,QAAQ,GAKT;IACC,IAAI,WAA0B,CAAC;IAC/B,IAAI,QAAQ,EAAE,CAAC;QACb,WAAW,GAAG,MAAM,QAAQ,CAAC;IAC/B,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,sBAAsB,EAAE,CAAC;QAC1D,mFAAmF;QACnF,WAAW,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,gFAAgF;IAChF,mDAAmD;IACnD,uFAAuF;IACvF,4FAA4F;IAC5F,wFAAwF;IACxF,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,YAAY,EAAE,qBAAqB,CAAC,WAAW,CAAC,CAAC;IACzD,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED;;GAEG;AACH,SAAS,QAAQ,CAAC,KAAY;IAC5B,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;QACvB,sCAAsC;QACtC,OAAO,KAAK,CAAC,YAAY,CAAC;IAC5B,CAAC;IACD,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC;IACxC,IAAI,cAAiC,CAAC;IACtC,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;QAC1B,cAAc,GAAG,KAAK,CAAC,eAAe;aACnC,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;aAC1B,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAmB,EAAE;YAChC,OAAO,EAAE,SAAS,EAAE,GAAI,EAAE,CAAC;QAC7B,CAAC,CAAC,CAAC;IACP,CAAC;SAAM,CAAC;QACN,cAAc,GAAG,CAAC,KAAK,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAC1D,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS,CAC1D,CAAC;IACJ,CAAC;IACD,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE;YACJ,cAAc;YACd,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,EAAE;SAC3B;KACF,CAAC;AACJ,CAAC;AAOD,MAAM,UAAU,gBAAgB,CAC9B,KAAsB,EACtB,GAAG,MAA4C;IAE/C,MAAM,CAAC,SAAS,EAAE,eAAe,EAAE,SAAS,CAAC,GAAG,MAAM,CAAC;IACvD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,kBAAkB,CAAC,GAAG,IAAI,CAAC;QACnE,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,SAAS;QACX,CAAC;QACD,6DAA6D;QAC7D,wEAAwE;QACxE,IAAI,aAAa,KAAK,eAAe,EAAE,CAAC;YACtC,SAAS;QACX,CAAC;QACD,IAAI,SAAS,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YACvC,SAAS;QACX,CAAC;QACD,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,oBAAoB,GAAG,CAC3B,KAAsB,EACtB,GAAG,MAA4C,EACT,EAAE;IACxC,MAAM,WAAW,GAAG,gBAAgB,CAAC,KAAK,EAAE,GAAG,MAAM,CAAC,CAAC;IACvD,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;QACzB,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,MAAM,cAAc,GAAG,iBAAiB,CAAC,GAAG,MAAM,CAAC,CAAC;IACpD,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;IACxC,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAEF,SAAS,0BAA0B,CAAC,kBAA6B;IAC/D,QAAQ,kBAAkB,EAAE,CAAC;QAC3B,KAAK,SAAS,CAAC,QAAQ;YACrB,OAAO,UAAU,CAAC;QACpB,KAAK,SAAS,CAAC,QAAQ;YACrB,OAAO,UAAU,CAAC;QACpB,KAAK,SAAS,CAAC,OAAO;YACpB,OAAO,cAAc,CAAC;QACxB,KAAK,SAAS,CAAC,OAAO;YACpB,OAAO,cAAc,CAAC;QACxB,KAAK,SAAS,CAAC,OAAO;YACpB,OAAO,cAAc,CAAC;QACxB,KAAK,SAAS,CAAC,WAAW;YACxB,iGAAiG;YACjG,0DAA0D;YAC1D,OAAO,SAAS,CAAC;QACnB;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC;AAED,MAAM,kBAAkB,GAAG,CACzB,KAAsB,EACtB,MAEC,EACqC,EAAE;IACxC,MAAM,eAAe,GAAG,0BAA0B,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAC/E,MAAM,WAAW,GAAG,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAClG,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,MAAM,cAAc,GAAG,CAAC,KAAK;QAC3B,MAAM,UAAU,GAAG,oBAAoB,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC9D,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC;QAC7B,MAAM,SAAS,GAAG,gCAAgC,CAAC,GAAG,CAAC,CAAC;QACxD,OAAO;YACL,SAAS,EAAE,SAAS;YACpB,GAAG,EAAE,UAAU;YACf,GAAG,EAAE,MAAM,CAAC,SAAS,CAAC,GAAG;YACzB,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,GAAG;YAC/B,GAAG,EAAE,MAAM,CAAC,MAAM;SACnB,CAAC;IACJ,CAAC,CAAC,EAAE,CAAC;IACL,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC;IACnF,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAEF,MAAM,OAAO,MAAM;IAqDjB;;;;;;;;;OASG;IACH,YAAY,MAAoB;QA/BvB,oBAAe,GAAoB,EAAE,CAAC;QAgC7C,MAAM,YAAY,GAAG,EAAE,GAAG,mBAAmB,EAAE,GAAG,MAAM,EAAE,CAAC;QAC3D,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC,aAAa,CAAC;QAChD,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,WAAW,IAAI,YAAY,CAAC,QAAQ,CAAC,CAAC;QAEzE,YAAY,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;QAEpE,IAAI,YAAY,CAAC,WAAW,EAAE,CAAC;YAC7B,IAAI,CAAC,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC;QAC9C,CAAC;aAAM,CAAC;YACN,kDAAkD;YAClD,IAAI,CAAC,YAAY,CAAC,iBAAiB,EAAE,CAAC;gBACpC,MAAM,IAAI,kBAAkB,CAAC,0BAA0B,CAAC,CAAC;YAC3D,CAAC;YACD,IAAI,CAAC,WAAW,GAAG,YAAY,CAAC,iBAAiB,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAC7E,CAAC;QACD,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QAEjD,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,kBAAkB,CAAC,yBAAyB,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QAC7E,CAAC;QAED,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YACvB,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;QACxC,CAAC;QAED,IAAI,YAAY,CAAC,cAAc,EAAE,CAAC;YAChC,IAAI,CAAC,cAAc,GAAG,6BAA6B,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;QACnF,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC;QACnD,IAAI,YAAY,CAAC,YAAY,EAAE,CAAC;YAC9B,IAAI,CAAC,YAAY,GAAG,IAAI,eAAe,CACrC,YAAY,CAAC,YAAY,EACzB,CAAC,CAAC,YAAY,CAAC,eAAe,CAC/B,CAAC;YACF,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;gBACzC,8JAA8J;gBAC9J,MAAM,IAAI,kBAAkB,CAC1B,yBAAyB,IAAI,CAAC,WAAW,+EAA+E,CACzH,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,CAAC,yBAAyB,GAAG,MAAM,CAAC,yBAAyB,EAAE,MAAM;YACvE,CAAC,CAAC,MAAM,CAAC,yBAAyB;YAClC,CAAC,CAAC,EAAE,CAAC;QAEP,IAAI,YAAY,CAAC,WAAW,EAAE,CAAC;YAC7B,IAAI,CAAC,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC;QAC9C,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACxC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QAEjC,IAAI,CAAC,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC;QACtC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;gBAC3B,MAAM,IAAI,kBAAkB,CAAC,kDAAkD,CAAC,CAAC;YACnF,CAAC;YAED,0FAA0F;YAC1F,0EAA0E;YAC1E,0GAA0G;YAC1G,gFAAgF;YAChF,IAAI,YAAY,CAAC,YAAY,EAAE,CAAC;gBAC9B,IAAI,CAAC,YAAY,GAAG,IAAI,wBAAwB,CAAC;oBAC/C,QAAQ,EAAE,YAAY,CAAC,QAAQ;oBAC/B,YAAY,EAAE,YAAY,CAAC,YAAY;oBACvC,UAAU,EAAE,YAAY,CAAC,UAAU;iBACpC,CAAC,CAAC;YACL,CAAC;iBAAM,IAAI,YAAY,CAAC,WAAW,EAAE,CAAC;gBACpC,0GAA0G;gBAC1G,IAAI,CAAC,YAAY,GAAG,IAAI,uBAAuB,CAAC;oBAC9C,QAAQ,EAAE,YAAY,CAAC,QAAQ;oBAC/B,WAAW,EAAE,YAAY,CAAC,WAAW;oBACrC,UAAU,EAAE,YAAY,CAAC,UAAU;iBACpC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,IAAI,CAAC,QAAQ,GAAG,iBAAiB,CAAC;YAChC,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,QAAQ,EAAE,YAAY,CAAC,QAAQ;SAChC,CAAC,CAAC;IACL,CAAC;IAED,uHAAuH;IACvH,uBAAuB,CACrB,GAAG,MAA+C;QAElD,OAAO,oBAAoB,CAAC,GAAG,MAAM,CAAC,CAAC;IACzC,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACH,KAAK,CAAC,OAAO,CAAC,IAAmB;QAC/B,IAAI,IAAI,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;YAC3B,MAAM,IAAI,kBAAkB,CAAC,2BAA2B,CAAC,CAAC;QAC5D,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,MAAM,IAAI,kBAAkB,CAAC,yBAAyB,CAAC,CAAC;QAC1D,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC;QACrC,MAAM,EACJ,aAAa,EACb,QAAQ,EACR,QAAQ,GAAG,SAAS,EACpB,UAAU,GAAG,oBAAoB,EACjC,aAAa,GAAG,oBAAoB,EACpC,SAAS,EAAE,sBAAsB,EACjC,gBAAgB,GAAG,KAAK,EAAE,MAA+B,EAAE,EAAE,CAAC,MAAM,EACpE,cAAc,EACd,oBAAoB,GACrB,GAAG,IAAI,CAAC;QACT,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;QAE3D,KAAK,MAAM,cAAc,IAAI,KAAK,CAAC,eAAe,IAAI,EAAE,EAAE,CAAC;YACzD,KAAK,MAAM,MAAM,IAAI,cAAc,CAAC,OAAO,EAAE,CAAC;gBAC5C,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;oBACnC,MAAM,kBAAkB,CAAC,IAAI,CAAC,eAAe,EAAE;wBAC7C,6IAA6I;wBAC7I,GAAG,MAAM;wBACT,SAAS,EAAE,MAAM,CAAC,SAAS;qBAC5B,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QACrC,oBAAoB,CAAC,YAAY,CAAC,CAAC;QAEnC,MAAM,SAAS,GAKT,EAAE,CAAC;QACT,IAAI,sBAAsB,EAAE,CAAC;YAC3B,KAAK,MAAM,kBAAkB,IAAI,sBAAsB,EAAE,CAAC;gBACxD,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CACzD,IAAI,CAAC,eAAe,EACpB,kBAAkB,CAAC,GAAG,EACtB,oBAAoB,EACpB,kBAAkB,CAAC,GAAG,CACvB,CAAC;gBACF,SAAS,CAAC,IAAI,CAAC;oBACb,GAAG,EAAE,gBAAgB,CAAC,GAAG;oBACzB,GAAG,EAAE,gBAAgB,CAAC,GAAG;oBACzB,GAAG,EAAE,gBAAgB,CAAC,SAAS;oBAC/B,GAAG,EAAE,kBAAkB,CAAC,GAAG;iBAC5B,CAAC,CAAC;YACL,CAAC;QACH,CAAC;aAAM,IAAI,aAAa,EAAE,CAAC;YACzB,MAAM,eAAe,GAAG,KAAK,CAAC,eAAe,IAAI,EAAE,CAAC;YACpD,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;gBACtB,KAAK,CAAC,UAAU,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;YAC3D,CAAC;YACD,MAAM,aAAa,GAAG,CAAC,KAAK,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAC/D,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAChE,CAAC;YACF,MAAM,iBAAiB,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CACrD,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,CAC9C,CAAC;YAEF,IAAI,iBAAiB,CAAC,MAAM,EAAE,CAAC;gBAC7B,0DAA0D;gBAC1D,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;oBACtB,MAAM,IAAI,kBAAkB,CAAC,gDAAgD,CAAC,CAAC;gBACjF,CAAC;gBACD,MAAM,gBAAgB,GAAG,MAAM,qBAAqB,CAClD,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,YAA4B,EACjC,GAAG,iBAAiB,CACrB,CAAC;gBACF,gBAAgB,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;oBACxC,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBACrC,CAAC,CAAC,CAAC;YACL,CAAC;YAED,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAC7C,eAAe,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,KAAK,GAAG,CAAC,CACrE,CAAC;YACF,IAAI,aAAa,CAAC,MAAM,IAAI,eAAe,CAAC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;gBAClE,MAAM,IAAI,kBAAkB,CAC1B,+BAA+B,aAAa,yBAAyB,IAAI,CAAC,SAAS,CACjF,eAAe,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,CACtC,EAAE,CACJ,CAAC;YACJ,CAAC;YAED,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE,CAAC;gBAC7C,KAAK,MAAM,MAAM,IAAI,cAAc,CAAC,OAAO,EAAE,CAAC;oBAC5C,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;wBACnC,MAAM,kBAAkB,CAAC,IAAI,CAAC,eAAe,EAAE;4BAC7C,6IAA6I;4BAC7I,GAAG,MAAM;4BACT,SAAS,EAAE,MAAM,CAAC,SAAS;yBAC5B,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;YACH,CAAC;YAED,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC;YAC3C,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;gBAChC,IAAI,KAAK,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;oBACtB,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBAC1D,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CACzD,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,GAAG,CAAC,MAAM,EACf,YAAY,EACZ,IAAI,CAAC,GAAG,CAAC,GAAG,CACb,CAAC;oBACF,SAAS,CAAC,IAAI,CAAC;wBACb,GAAG,EAAE,gBAAgB,CAAC,GAAG;wBACzB,GAAG,EAAE,gBAAgB,CAAC,GAAG;wBACzB,GAAG,EAAE,gBAAgB,CAAC,SAAS;wBAC/B,GAAG,EAAE,IAAI,CAAC,GAAG;qBACd,CAAC,CAAC;oBACH,SAAS;gBACX,CAAC;gBAED,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;oBACxB,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CACzD,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,GAAG,CAAC,GAAG,EACZ,oBAAoB,EACpB,SAAS,CACV,CAAC;oBACF,SAAS,CAAC,IAAI,CAAC;wBACb,GAAG,EAAE,gBAAgB,CAAC,GAAG;wBACzB,GAAG,EAAE,gBAAgB,CAAC,GAAG;wBACzB,GAAG,EAAE,gBAAgB,CAAC,SAAS;wBAC/B,GAAG,EAAE,IAAI,CAAC,GAAG;qBACd,CAAC,CAAC;oBACH,SAAS;gBACX,CAAC;gBAED,QAAQ,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;oBAC1C,KAAK,QAAQ;wBACX,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CACzD,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,EAClC,oBAAoB,EACpB,SAAS,CACV,CAAC;wBACF,SAAS,CAAC,IAAI,CAAC;4BACb,GAAG,EAAE,gBAAgB,CAAC,GAAG;4BACzB,GAAG,EAAE,gBAAgB,CAAC,GAAG;4BACzB,GAAG,EAAE,gBAAgB,CAAC,SAAS;4BAC/B,GAAG,EAAE,IAAI,CAAC,GAAG;yBACd,CAAC,CAAC;wBACH,MAAM;oBAER,KAAK,QAAQ;wBACX,KAAK,MAAM,eAAe,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;4BACtE,SAAS,CAAC,IAAI,CAAC;gCACb,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG;gCACjB,GAAG,EAAE,eAAe,CAAC,GAAG;gCACxB,GAAG,EAAE,eAAe,CAAC,GAAG;gCACxB,GAAG,EAAE,IAAI,CAAC,GAAG;6BACd,CAAC,CAAC;wBACL,CAAC;wBACD,MAAM;oBAER;wBACE,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;gBACrF,CAAC;YACH,CAAC;QACH,CAAC;QAED,+EAA+E;QAE/E,MAAM,YAAY,GAAG,iBAAiB,CAAC;QACvC,MAAM,SAAS,GACb,IAAI,CAAC,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,GAAG,YAAY;YAClF,CAAC,CAAC,YAAY;YACd,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;QACrB,MAAM,qBAAqB,GAAG,IAAI,QAAQ,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;QACjF,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3B,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CACzD,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC,WAAW,EAC3C,oBAAoB,EACpB,SAAS,CACV,CAAC;YACF,SAAS,CAAC,IAAI,CAAC;gBACb,GAAG,EAAE,gBAAgB,CAAC,GAAG;gBACzB,GAAG,EAAE,gBAAgB,CAAC,GAAG;gBACzB,GAAG,EAAE,gBAAgB,CAAC,SAAS;aAChC,CAAC,CAAC;QACL,CAAC;QACD,qBAAqB,CAAC,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CACjD,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;YAC7C,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,CAAC;YAC9C,IAAI,SAAS,KAAK,oBAAoB,EAAE,CAAC;gBACvC,OAAO,CAAC,IAAI,CACV,uCAAuC,SAAS,6BAA6B,oBAAoB,GAAG,CACrG,CAAC;YACJ,CAAC;YACD,IAAI,IAAmB,CAAC;YACxB,QAAQ,SAAS,EAAE,CAAC;gBAClB,KAAK,UAAU,CAAC;gBAChB,KAAK,UAAU;oBACb,IAAI,GAAG,SAAS,CAAC;oBACjB,MAAM;gBACR,KAAK,cAAc,CAAC;gBACpB,KAAK,cAAc,CAAC;gBACpB,KAAK,cAAc;oBACjB,IAAI,GAAG,YAAY,CAAC;oBACpB,MAAM;gBACR;oBACE,MAAM,IAAI,kBAAkB,CAAC,yBAAyB,SAAS,EAAE,CAAC,CAAC;YACvE,CAAC;YACD,OAAO,cAAc,CAAC;gBACpB,GAAG,EAAE,SAAS;gBACd,IAAI;gBACJ,GAAG,EAAE,GAAG;gBACR,GAAG,EAAE,GAAG;gBACR,SAAS,EAAE,GAAG;gBACd,QAAQ;gBACR,GAAG;aACJ,CAAC,CAAC;QACL,CAAC,CAAC,CACH,CAAC;QACF,MAAM,EAAE,gBAAgB,EAAE,cAAc,EAAE,GAAG,MAAO,aAAsC,EAAE,CAAC;QAC7F,MAAM,IAAI,GAAyB;YACjC,SAAS,EAAE,IAAI,CAAC,YAAY;YAC5B,SAAS;YACT,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,QAAQ;YACR,qBAAqB;YACrB,kBAAkB,EAAE,UAAU;YAC9B,kBAAkB,EAAE,OAAO;YAC3B,yBAAyB,EAAE,MAAM;YACjC,aAAa,EAAE,IAAI,CAAC,MAAM;YAC1B,QAAQ;YACR,MAAM,EAAE,YAAY;YACpB,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,eAAe,EAAE,IAAI,CAAC,YAAY,CAAC,eAAe;YAClD,gBAAgB;YAChB,cAAc;YACd,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,uBAAuB,EAAE,IAAI,CAAC,uBAAuB;YACrD,cAAc;SACf,CAAC;QAEF,OAAQ,gBAA4C,CAAC,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;IAChF,CAAC;IAED;;;;;;;;;;;OAWG;IACH,KAAK,CAAC,OAAO,CAAC,EACZ,MAAM,EACN,SAAS,EACT,aAAa,GAAG,KAAK,EAAE,GAAW,EAAE,EAAE,CAAC,GAAG,EAC1C,gBAAgB,GAAG,KAAK,EAAE,MAA+B,EAAE,EAAE,CAAC,MAAM,EACpE,yBAAyB,EACzB,kBAAkB,EAClB,gBAAgB,GAAG,CAAC,EACpB,oBAAoB,EACpB,yBAAyB,GAAG,EAAE,GAChB;QACd,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC;QACrC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,MAAM,IAAI,kBAAkB,CAAC,sBAAsB,CAAC,CAAC;QACvD,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACpC,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC;QAChC,CAAC;aAAM,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YAC5B,SAAS,GAAG,MAAM,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/E,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,kBAAkB,CAAC,oDAAoD,CAAC,CAAC;QACrF,CAAC;QAED,MAAM,wCAAwC,GAC5C,CAAC,yBAAyB,CAAC,MAAM,IAAI,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC;QAC7E,IAAI,wCAAwC,EAAE,CAAC;YAC7C,yBAAyB,GAAG,IAAI,CAAC,yBAAyB,CAAC;QAC7D,CAAC;QAED,qDAAqD;QACrD,qDAAqD;QACrD,OAAO,MAAO,gBAA4C,CACxD,MAAM,UAAU,CAAC;YACf,SAAS;YACT,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,OAAO;YACP,gBAAgB;YAChB,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,QAAQ;YACR,uBAAuB,EAAE,IAAI,CAAC,YAAY,CAAC,uBAAuB;YAClE,aAAa;YACb,eAAe,EAAE,IAAI,CAAC,YAAY,CAAC,eAAe;YAClD,yBAAyB;YACzB,kBAAkB;YAClB,oBAAoB;YACpB,sBAAsB,EAAE,yBAAyB;SAClD,CAAC,CACH,CAAC;IACJ,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,WAAW,CAAC,EAAE,MAAM,EAA6B;QACrD,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;QACzC,MAAM,gBAAgB,GAAG,MAAM,SAAS,CAAC,mBAAmB,EAAE,CAAC;QAC/D,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;QAClF,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,EAAE,MAAM,EAA6B;QACvD,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC;QAC5C,OAAO,aAAa,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;CACF;AAID,OAAO,EAAE,oBAAoB,EAAiB,oBAAoB,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC"}
|
|
@@ -13,9 +13,9 @@ const IP_HOST_PORT = '([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}:[0-9]{1
|
|
|
13
13
|
// validate host is one of those above
|
|
14
14
|
const HOST = `(${HOST_PORT}|${WWW_HOST}|${IP_HOST_PORT})`;
|
|
15
15
|
// validate attr name be like `/attr/<attr_name>`
|
|
16
|
-
export const ATTR_NAME = `(/${ATTR_NAME_PROP_NAME}/[a-zA-Z0-9][a-zA-Z0-9-]
|
|
16
|
+
export const ATTR_NAME = `(/${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])?)`;
|
|
17
17
|
// validate value pattern
|
|
18
|
-
export const ATTR_VALUE = `(/${ATTR_VALUE_PROP_NAME}/[a-zA-Z0-9][a-zA-Z0-9-]
|
|
18
|
+
export const ATTR_VALUE = `(/${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])?)`;
|
|
19
19
|
// validate attribute authority e.g. https://example.com
|
|
20
20
|
const ATTR_AUTHORITY_PATTERN = `(${SCHEME}${HOST})`;
|
|
21
21
|
// validate attribute namespace e.g. https://example.com/attr/someattribute
|
|
@@ -55,4 +55,4 @@ export function validateAttribute(attribute) {
|
|
|
55
55
|
}
|
|
56
56
|
return true;
|
|
57
57
|
}
|
|
58
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3RkZjMvc3JjL2NsaWVudC92YWxpZGF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRWxFLE1BQU0sWUFBWSxHQUFHLENBQUMsS0FBOEIsRUFBRSxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUM7QUFFbkYsTUFBTSxDQUFDLE1BQU0sbUJBQW1CLEdBQUcsTUFBTSxDQUFDO0FBQzFDLE1BQU0sQ0FBQyxNQUFNLG9CQUFvQixHQUFHLE9BQU8sQ0FBQztBQUU1QyxzRUFBc0U7QUFDdEUsTUFBTSxNQUFNLEdBQUcsYUFBYSxDQUFDO0FBRTdCLDZDQUE2QztBQUM3QyxNQUFNLFNBQVMsR0FBRyxtQ0FBbUMsQ0FBQztBQUV0RCw4Q0FBOEM7QUFDOUMsTUFBTSxRQUFRLEdBQUcsZ0RBQWdELENBQUM7QUFFbEUsNkNBQTZDO0FBQzdDLE1BQU0sWUFBWSxHQUFHLGdFQUFnRSxDQUFDO0FBRXRGLHNDQUFzQztBQUN0QyxNQUFNLElBQUksR0FBRyxJQUFJLFNBQVMsSUFBSSxRQUFRLElBQUksWUFBWSxHQUFHLENBQUM7QUFFMUQsa0RBQWtEO0FBQ2xELE1BQU0sQ0FBQyxNQUFNLFNBQVMsR0FBRyxLQUFLLG1CQUFtQiwrRkFBK0YsQ0FBQztBQUVqSix5QkFBeUI7QUFDekIsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHLEtBQUssb0JBQW9CLCtGQUErRixDQUFDO0FBRW5KLHlEQUF5RDtBQUN6RCxNQUFNLHNCQUFzQixHQUFHLElBQUksTUFBTSxHQUFHLElBQUksR0FBRyxDQUFDO0FBRXBELDJFQUEyRTtBQUMzRSxNQUFNLHNCQUFzQixHQUFHLElBQUksc0JBQXNCLEdBQUcsU0FBUyxHQUFHLENBQUM7QUFFekUsdUZBQXVGO0FBQ3ZGLE1BQU0sQ0FBQyxNQUFNLHNCQUFzQixHQUFHLEtBQUssc0JBQXNCLEdBQUcsVUFBVSxJQUFJLENBQUM7QUFFbkYsTUFBTSxDQUFDLE1BQU0sdUJBQXVCLEdBQUcsQ0FBQyxJQUFhLEVBQWdCLEVBQUU7SUFDckUsTUFBTSxRQUFRLEdBQUcsT0FBTyxJQUFJLEtBQUssUUFBUSxDQUFDO0lBQzFDLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUNkLE1BQU0sSUFBSSx3QkFBd0IsQ0FBQywrQkFBK0IsRUFBRSxJQUFJLENBQUMsQ0FBQztJQUM1RSxDQUFDO0lBRUQsTUFBTSxFQUFFLFNBQVMsRUFBRSxHQUFHLElBQStCLENBQUM7SUFDdEQsTUFBTSxRQUFRLEdBQUcsT0FBTyxTQUFTLEtBQUssUUFBUSxDQUFDO0lBQy9DLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUNkLE1BQU0sSUFBSSx3QkFBd0IsQ0FBQyxtQ0FBbUMsRUFBRSxJQUFJLENBQUMsQ0FBQztJQUNoRixDQUFDO0lBRUQsT0FBTyxpQkFBaUIsQ0FBQyxTQUFTLENBQUMsQ0FBQztBQUN0QyxDQUFDLENBQUM7QUFFRixNQUFNLFVBQVUsaUJBQWlCLENBQUMsU0FBaUI7SUFDakQsSUFBSSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsc0JBQXNCLENBQUMsRUFBRSxDQUFDO1FBQzdDLE1BQU0sSUFBSSx3QkFBd0IsQ0FBQyxtQ0FBbUMsU0FBUyxHQUFHLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDakcsQ0FBQztJQUVELE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSxtQkFBbUIsR0FBRyxDQUFDO0lBQ3BELE1BQU0saUJBQWlCLEdBQUcsSUFBSSxvQkFBb0IsR0FBRyxDQUFDO0lBQ3RELE1BQU0sYUFBYSxHQUFHLFlBQVksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUM7SUFDL0QsTUFBTSxjQUFjLEdBQUcsWUFBWSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztJQUVqRSxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUM7UUFDbkIsTUFBTSxJQUFJLHdCQUF3QixDQUFDLCtCQUErQixFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQ2pGLENBQUM7SUFFRCxJQUFJLENBQUMsY0FBYyxFQUFFLENBQUM7UUFDcEIsTUFBTSxJQUFJLHdCQUF3QixDQUFDLGdDQUFnQyxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQ2xGLENBQUM7SUFFRCxNQUFNLGFBQWEsR0FBRyxhQUFhLENBQUMsS0FBSyxDQUFDLGdCQUFnQixDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ25FLE1BQU0sY0FBYyxHQUFHLGNBQWMsQ0FBQyxLQUFLLENBQUMsaUJBQWlCLENBQUMsTUFBTSxDQUFDLENBQUM7SUFFdEUsSUFBSSxhQUFhLEtBQUssY0FBYyxFQUFFLENBQUM7UUFDckMsTUFBTSxJQUFJLHdCQUF3QixDQUFDLGdEQUFnRCxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQ2xHLENBQUM7SUFFRCxPQUFPLElBQUksQ0FBQztBQUNkLENBQUMifQ==
|