@opentdf/sdk 0.4.0-beta.4 → 0.4.0-beta.40
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 +16 -1
- 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/opentdf.js +66 -12
- 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 +16 -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 +57 -3
- package/dist/cjs/tdf3/src/assertions.js +39 -2
- package/dist/cjs/tdf3/src/client/builders.js +13 -1
- package/dist/cjs/tdf3/src/client/index.js +200 -53
- package/dist/cjs/tdf3/src/client/validation.js +3 -3
- package/dist/cjs/tdf3/src/tdf.js +20 -2
- package/dist/cjs/tdf3/src/utils/unwrap.js +2 -2
- package/dist/types/src/access.d.ts +15 -0
- 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/opentdf.d.ts +126 -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 +16 -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 +56 -2
- package/dist/types/src/utils.d.ts.map +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/builders.d.ts +12 -0
- package/dist/types/tdf3/src/client/builders.d.ts.map +1 -1
- package/dist/types/tdf3/src/client/index.d.ts +11 -3
- 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 +2 -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.js +16 -1
- 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/opentdf.js +66 -12
- 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 +16 -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 +57 -3
- package/dist/web/tdf3/src/assertions.js +38 -2
- package/dist/web/tdf3/src/client/builders.js +13 -1
- package/dist/web/tdf3/src/client/index.js +202 -56
- package/dist/web/tdf3/src/client/validation.js +3 -3
- package/dist/web/tdf3/src/tdf.js +20 -2
- package/dist/web/tdf3/src/utils/unwrap.js +2 -2
- package/package.json +7 -5
- package/src/access.ts +15 -0
- 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/opentdf.ts +149 -72
- 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 +19 -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 +56 -2
- package/tdf3/src/assertions.ts +52 -1
- package/tdf3/src/client/builders.ts +15 -0
- package/tdf3/src/client/index.ts +279 -73
- package/tdf3/src/client/validation.ts +2 -2
- package/tdf3/src/tdf.ts +26 -2
- package/tdf3/src/utils/unwrap.ts +2 -1
|
@@ -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==
|
package/dist/web/tdf3/src/tdf.js
CHANGED
|
@@ -34,7 +34,13 @@ function mailbox() {
|
|
|
34
34
|
* If we have KAS url but not public key we can fetch it from KAS, fetching
|
|
35
35
|
* the value from `${kas}/kas_public_key`.
|
|
36
36
|
*/
|
|
37
|
-
export async function fetchKasPublicKey(kas, algorithm) {
|
|
37
|
+
export async function fetchKasPublicKey(kas, algorithm, kid) {
|
|
38
|
+
if (kid) {
|
|
39
|
+
// Some specific thing for fetching a key by kid?
|
|
40
|
+
// Currently this is just "using" `kid` so TypeScript doesn't complain and
|
|
41
|
+
// we can use the type for our cache parameters.
|
|
42
|
+
// So this empty `if` is actually doing something.
|
|
43
|
+
}
|
|
38
44
|
return fetchKasPubKeyV2(kas, algorithm);
|
|
39
45
|
}
|
|
40
46
|
export async function extractPemFromKeyString(keyString, alg) {
|
|
@@ -273,6 +279,18 @@ export async function writeStream(cfg) {
|
|
|
273
279
|
manifest.encryptionInformation.integrityInformation.segments = segmentInfos;
|
|
274
280
|
manifest.encryptionInformation.method.isStreamable = true;
|
|
275
281
|
const signedAssertions = [];
|
|
282
|
+
if (cfg.systemMetadataAssertion) {
|
|
283
|
+
const systemMetadataConfigBase = assertions.getSystemMetadataAssertionConfig();
|
|
284
|
+
const signingKeyForSystemMetadata = {
|
|
285
|
+
alg: 'HS256', // Default algorithm, can be configured if needed
|
|
286
|
+
key: new Uint8Array(cfg.keyForEncryption.unwrappedKeyBinary.asArrayBuffer()),
|
|
287
|
+
};
|
|
288
|
+
signedAssertions.push(await assertions.CreateAssertion(aggregateHash, {
|
|
289
|
+
...systemMetadataConfigBase, // Spread the properties from the base config
|
|
290
|
+
signingKey: signingKeyForSystemMetadata, // Add the signing key
|
|
291
|
+
}, cfg.tdfSpecVersion // Pass the TDF spec version
|
|
292
|
+
));
|
|
293
|
+
}
|
|
276
294
|
if (cfg.assertionConfigs && cfg.assertionConfigs.length > 0) {
|
|
277
295
|
await Promise.all(cfg.assertionConfigs.map(async (assertionConfig) => {
|
|
278
296
|
// Create assertion using the assertionConfig values
|
|
@@ -670,4 +688,4 @@ async function concatenateUint8Array(uint8arrays) {
|
|
|
670
688
|
const buffer = await blob.arrayBuffer();
|
|
671
689
|
return new Uint8Array(buffer);
|
|
672
690
|
}
|
|
673
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tdf.js","sourceRoot":"","sources":["../../../../tdf3/src/tdf.ts"],"names":[],"mappings":"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"}
|
|
691
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tdf.js","sourceRoot":"","sources":["../../../../tdf3/src/tdf.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { decodeArrayBuffer } from '../../../src/encodings/base64.js';
|
|
|
2
2
|
import { InvalidFileError } from '../../../src/errors.js';
|
|
3
3
|
export function unwrapHtml(htmlPayload) {
|
|
4
4
|
const html = new TextDecoder().decode(htmlPayload);
|
|
5
|
-
const payloadRe = /<input
|
|
5
|
+
const payloadRe = /<input\s+[^>]*id=(?:['"]?)data-input(?:['"]?)[^>]*value=(?:['"]?)([a-zA-Z0-9+/=\-_]+)(?:['"]?)/;
|
|
6
6
|
const reResult = payloadRe.exec(html);
|
|
7
7
|
if (!reResult) {
|
|
8
8
|
throw new InvalidFileError('Payload is missing');
|
|
@@ -15,4 +15,4 @@ export function unwrapHtml(htmlPayload) {
|
|
|
15
15
|
throw new InvalidFileError('There was a problem extracting the TDF3 payload', e);
|
|
16
16
|
}
|
|
17
17
|
}
|
|
18
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidW53cmFwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vdGRmMy9zcmMvdXRpbHMvdW53cmFwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ3JFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTFELE1BQU0sVUFBVSxVQUFVLENBQUMsV0FBdUI7SUFDaEQsTUFBTSxJQUFJLEdBQUcsSUFBSSxXQUFXLEVBQUUsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDbkQsTUFBTSxTQUFTLEdBQ2IsZ0dBQWdHLENBQUM7SUFDbkcsTUFBTSxRQUFRLEdBQUcsU0FBUyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUN0QyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDZCxNQUFNLElBQUksZ0JBQWdCLENBQUMsb0JBQW9CLENBQUMsQ0FBQztJQUNuRCxDQUFDO0lBQ0QsTUFBTSxhQUFhLEdBQUcsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2xDLElBQUksQ0FBQztRQUNILE9BQU8sSUFBSSxVQUFVLENBQUMsaUJBQWlCLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztJQUMxRCxDQUFDO0lBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztRQUNYLE1BQU0sSUFBSSxnQkFBZ0IsQ0FBQyxpREFBaUQsRUFBRSxDQUFDLENBQUMsQ0FBQztJQUNuRixDQUFDO0FBQ0gsQ0FBQyJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opentdf/sdk",
|
|
3
|
-
"version": "0.4.0-beta.
|
|
3
|
+
"version": "0.4.0-beta.40",
|
|
4
4
|
"description": "OpenTDF for the Web",
|
|
5
5
|
"homepage": "https://github.com/opentdf/web-sdk",
|
|
6
6
|
"bugs": {
|
|
@@ -69,7 +69,8 @@
|
|
|
69
69
|
"build:watch": "tsc --watch",
|
|
70
70
|
"clean": "rm -rf {build,coverage,dist,tests/mocha/dist}",
|
|
71
71
|
"coverage:merge": "for x in mocha wtr; do cp coverage/$x/coverage-final.json coverage/$x.json; done; nyc report --reporter text --reporter lcov -t coverage --lines 75 --statements 75 --branches 70 --functions 65 --check-coverage >coverage/coverage.txt",
|
|
72
|
-
"doc": "typedoc --out dist/docs src/index.ts",
|
|
72
|
+
"doc": "typedoc --out dist/docs src/index.ts --customCss ./typedoc-theme.css",
|
|
73
|
+
"doc:md": "typedoc --plugin typedoc-plugin-markdown --out dist/docs-md src/index.ts",
|
|
73
74
|
"format": "prettier --write \"{src,tdf3,tests}/**/*.ts\"",
|
|
74
75
|
"license-check": "license-checker-rseidelsohn --production --onlyAllow 'Apache-2.0; BSD; CC-BY-4.0; ISC; MIT'",
|
|
75
76
|
"lint": "eslint ./src/**/*.ts ./tdf3/**/*.ts ./tests/**/*.ts",
|
|
@@ -93,8 +94,8 @@
|
|
|
93
94
|
"uuid": "~11.1.0"
|
|
94
95
|
},
|
|
95
96
|
"devDependencies": {
|
|
96
|
-
"@bufbuild/buf": "
|
|
97
|
-
"@bufbuild/protoc-gen-es": "
|
|
97
|
+
"@bufbuild/buf": "1.52.1",
|
|
98
|
+
"@bufbuild/protoc-gen-es": "2.2.5",
|
|
98
99
|
"@eslint/js": "^9.21.0",
|
|
99
100
|
"@esm-bundle/chai": "~4.3.4-fix.0",
|
|
100
101
|
"@types/buffer-crc32": "^0.2.4",
|
|
@@ -133,7 +134,8 @@
|
|
|
133
134
|
"process": "^0.11.10",
|
|
134
135
|
"sinon": "~19.0.2",
|
|
135
136
|
"tsconfig-paths": "^4.2.0",
|
|
136
|
-
"typedoc": "^0.
|
|
137
|
+
"typedoc": "^0.28.5",
|
|
138
|
+
"typedoc-plugin-markdown": "^4.7.0",
|
|
137
139
|
"typescript": "^5.8.2",
|
|
138
140
|
"typescript-eslint": "^8.26.0",
|
|
139
141
|
"webpack": "^5.98.0",
|
package/src/access.ts
CHANGED
|
@@ -136,6 +136,12 @@ export async function noteInvalidPublicKey(url: URL, r: Promise<CryptoKey>): Pro
|
|
|
136
136
|
}
|
|
137
137
|
}
|
|
138
138
|
|
|
139
|
+
/**
|
|
140
|
+
* Fetches the key access servers for a given platform URL.
|
|
141
|
+
* @param platformUrl The platform URL to fetch key access servers for.
|
|
142
|
+
* @param authProvider The authentication provider to use for the request.
|
|
143
|
+
* @returns A promise that resolves to an OriginAllowList.
|
|
144
|
+
*/
|
|
139
145
|
export async function fetchKeyAccessServers(
|
|
140
146
|
platformUrl: string,
|
|
141
147
|
authProvider: AuthProvider
|
|
@@ -190,6 +196,15 @@ const origin = (u: string): string => {
|
|
|
190
196
|
}
|
|
191
197
|
};
|
|
192
198
|
|
|
199
|
+
/**
|
|
200
|
+
* Manages a list of origins that are allowed to access the Key Access Server (KAS).
|
|
201
|
+
* @origins A list of origins that are allowed to access the KAS.
|
|
202
|
+
* @allowAll If true, all origins are allowed to access the KAS.
|
|
203
|
+
* If false, only the origins in the list are allowed to access the KAS.
|
|
204
|
+
* @description This class is used to manage a list of origins that are allowed to access the KAS.
|
|
205
|
+
* It validates the URLs and provides a method to check if a given URL is allowed.
|
|
206
|
+
* It is used to ensure that only authorized origins can access the KAS.
|
|
207
|
+
*/
|
|
193
208
|
export class OriginAllowList {
|
|
194
209
|
origins: string[];
|
|
195
210
|
allowAll: boolean;
|
|
@@ -9,6 +9,8 @@ export class OIDCClientCredentialsProvider implements AuthProvider {
|
|
|
9
9
|
clientId,
|
|
10
10
|
clientSecret,
|
|
11
11
|
oidcOrigin,
|
|
12
|
+
oidcTokenEndpoint,
|
|
13
|
+
oidcUserInfoEndpoint,
|
|
12
14
|
}: Partial<ClientSecretCredentials> & Omit<ClientSecretCredentials, 'exchange'>) {
|
|
13
15
|
if (!clientId || !clientSecret) {
|
|
14
16
|
throw new ConfigurationError('clientId & clientSecret required for client credentials flow');
|
|
@@ -19,6 +21,8 @@ export class OIDCClientCredentialsProvider implements AuthProvider {
|
|
|
19
21
|
clientId,
|
|
20
22
|
clientSecret,
|
|
21
23
|
oidcOrigin,
|
|
24
|
+
oidcTokenEndpoint,
|
|
25
|
+
oidcUserInfoEndpoint,
|
|
22
26
|
});
|
|
23
27
|
}
|
|
24
28
|
|
|
@@ -10,6 +10,8 @@ export class OIDCExternalJwtProvider implements AuthProvider {
|
|
|
10
10
|
clientId,
|
|
11
11
|
externalJwt,
|
|
12
12
|
oidcOrigin,
|
|
13
|
+
oidcTokenEndpoint,
|
|
14
|
+
oidcUserInfoEndpoint,
|
|
13
15
|
}: Partial<ExternalJwtCredentials> & Omit<ExternalJwtCredentials, 'exchange'>) {
|
|
14
16
|
if (!clientId || !externalJwt) {
|
|
15
17
|
throw new ConfigurationError('external JWT exchange reequires client id and jwt');
|
|
@@ -18,8 +20,10 @@ export class OIDCExternalJwtProvider implements AuthProvider {
|
|
|
18
20
|
this.oidcAuth = new AccessToken({
|
|
19
21
|
exchange: 'external',
|
|
20
22
|
clientId,
|
|
21
|
-
oidcOrigin,
|
|
22
23
|
externalJwt,
|
|
24
|
+
oidcOrigin,
|
|
25
|
+
oidcTokenEndpoint,
|
|
26
|
+
oidcUserInfoEndpoint,
|
|
23
27
|
});
|
|
24
28
|
|
|
25
29
|
this.externalJwt = externalJwt;
|
|
@@ -2,6 +2,20 @@ import { ConfigurationError } from '../errors.js';
|
|
|
2
2
|
import { type AuthProvider, type HttpRequest } from './auth.js';
|
|
3
3
|
import { AccessToken, type RefreshTokenCredentials } from './oidc.js';
|
|
4
4
|
|
|
5
|
+
/**
|
|
6
|
+
* An AuthProvider that uses an OIDC refresh token to obtain an access token.
|
|
7
|
+
* It exchanges the refresh token for an access token and uses that to augment HTTP requests with credentials.
|
|
8
|
+
* @example
|
|
9
|
+
* ```ts
|
|
10
|
+
* import { OIDCRefreshTokenProvider } from '@opentdf/sdk';
|
|
11
|
+
* await AuthProviders.refreshAuthProvider({
|
|
12
|
+
clientId: 'my-client-id',
|
|
13
|
+
exchange: 'refresh',
|
|
14
|
+
refreshToken: 'refresh-token-from-oidc-provider',
|
|
15
|
+
oidcOrigin: 'https://example.oidc.provider.com',
|
|
16
|
+
});
|
|
17
|
+
```
|
|
18
|
+
*/
|
|
5
19
|
export class OIDCRefreshTokenProvider implements AuthProvider {
|
|
6
20
|
oidcAuth: AccessToken;
|
|
7
21
|
refreshToken?: string;
|
|
@@ -10,6 +24,8 @@ export class OIDCRefreshTokenProvider implements AuthProvider {
|
|
|
10
24
|
clientId,
|
|
11
25
|
refreshToken,
|
|
12
26
|
oidcOrigin,
|
|
27
|
+
oidcTokenEndpoint,
|
|
28
|
+
oidcUserInfoEndpoint,
|
|
13
29
|
}: Partial<RefreshTokenCredentials> & Omit<RefreshTokenCredentials, 'exchange'>) {
|
|
14
30
|
if (!clientId || !refreshToken) {
|
|
15
31
|
throw new ConfigurationError('refresh token or client id missing');
|
|
@@ -18,8 +34,10 @@ export class OIDCRefreshTokenProvider implements AuthProvider {
|
|
|
18
34
|
this.oidcAuth = new AccessToken({
|
|
19
35
|
exchange: 'refresh',
|
|
20
36
|
clientId,
|
|
21
|
-
refreshToken
|
|
37
|
+
refreshToken,
|
|
22
38
|
oidcOrigin,
|
|
39
|
+
oidcTokenEndpoint,
|
|
40
|
+
oidcUserInfoEndpoint,
|
|
23
41
|
});
|
|
24
42
|
this.refreshToken = refreshToken;
|
|
25
43
|
}
|
package/src/auth/oidc.ts
CHANGED
|
@@ -12,6 +12,8 @@ export type CommonCredentials = {
|
|
|
12
12
|
clientId: string;
|
|
13
13
|
/** The endpoint of the OIDC IdP to authenticate against, ex. 'https://virtru.com/auth' */
|
|
14
14
|
oidcOrigin: string;
|
|
15
|
+
oidcTokenEndpoint?: string;
|
|
16
|
+
oidcUserInfoEndpoint?: string;
|
|
15
17
|
/** Whether or not DPoP is enabled. */
|
|
16
18
|
dpopEnabled?: boolean;
|
|
17
19
|
|
|
@@ -89,6 +91,8 @@ export class AccessToken {
|
|
|
89
91
|
data?: AccessTokenResponse;
|
|
90
92
|
|
|
91
93
|
baseUrl: string;
|
|
94
|
+
tokenEndpoint: string;
|
|
95
|
+
userInfoEndpoint: string;
|
|
92
96
|
|
|
93
97
|
signingKey?: CryptoKeyPair;
|
|
94
98
|
|
|
@@ -119,6 +123,9 @@ export class AccessToken {
|
|
|
119
123
|
this.config = cfg;
|
|
120
124
|
this.request = request;
|
|
121
125
|
this.baseUrl = rstrip(cfg.oidcOrigin, '/');
|
|
126
|
+
this.tokenEndpoint = cfg.oidcTokenEndpoint || `${this.baseUrl}/protocol/openid-connect/token`;
|
|
127
|
+
this.userInfoEndpoint =
|
|
128
|
+
cfg.oidcUserInfoEndpoint || `${this.baseUrl}/protocol/openid-connect/userinfo`;
|
|
122
129
|
this.signingKey = cfg.signingKey;
|
|
123
130
|
}
|
|
124
131
|
|
|
@@ -128,21 +135,20 @@ export class AccessToken {
|
|
|
128
135
|
* @returns
|
|
129
136
|
*/
|
|
130
137
|
async info(accessToken: string): Promise<unknown> {
|
|
131
|
-
const url = `${this.baseUrl}/protocol/openid-connect/userinfo`;
|
|
132
138
|
const headers = {
|
|
133
139
|
...this.extraHeaders,
|
|
134
140
|
Authorization: `Bearer ${accessToken}`,
|
|
135
141
|
} as Record<string, string>;
|
|
136
142
|
if (this.config.dpopEnabled && this.signingKey) {
|
|
137
|
-
headers.DPoP = await dpopFn(this.signingKey,
|
|
143
|
+
headers.DPoP = await dpopFn(this.signingKey, this.userInfoEndpoint, 'POST');
|
|
138
144
|
}
|
|
139
|
-
const response = await (this.request || fetch)(
|
|
145
|
+
const response = await (this.request || fetch)(this.userInfoEndpoint, {
|
|
140
146
|
headers,
|
|
141
147
|
});
|
|
142
148
|
if (!response.ok) {
|
|
143
149
|
console.error(await response.text());
|
|
144
150
|
throw new TdfError(
|
|
145
|
-
`auth info fail: GET [${
|
|
151
|
+
`auth info fail: GET [${this.userInfoEndpoint}] => ${response.status} ${response.statusText}`
|
|
146
152
|
);
|
|
147
153
|
}
|
|
148
154
|
|
|
@@ -171,7 +177,6 @@ export class AccessToken {
|
|
|
171
177
|
}
|
|
172
178
|
|
|
173
179
|
async accessTokenLookup(cfg: OIDCCredentials) {
|
|
174
|
-
const url = `${this.baseUrl}/protocol/openid-connect/token`;
|
|
175
180
|
let body;
|
|
176
181
|
switch (cfg.exchange) {
|
|
177
182
|
case 'client':
|
|
@@ -198,11 +203,11 @@ export class AccessToken {
|
|
|
198
203
|
};
|
|
199
204
|
break;
|
|
200
205
|
}
|
|
201
|
-
const response = await this.doPost(
|
|
206
|
+
const response = await this.doPost(this.tokenEndpoint, body);
|
|
202
207
|
if (!response.ok) {
|
|
203
208
|
console.error(await response.text());
|
|
204
209
|
throw new TdfError(
|
|
205
|
-
`token/code exchange fail: POST [${
|
|
210
|
+
`token/code exchange fail: POST [${this.tokenEndpoint}] => ${response.status} ${response.statusText}`
|
|
206
211
|
);
|
|
207
212
|
}
|
|
208
213
|
return response.json();
|
package/src/auth/providers.ts
CHANGED
|
@@ -36,6 +36,8 @@ export const clientSecretAuthProvider = async (
|
|
|
36
36
|
clientId: clientConfig.clientId,
|
|
37
37
|
clientSecret: clientConfig.clientSecret,
|
|
38
38
|
oidcOrigin: clientConfig.oidcOrigin,
|
|
39
|
+
oidcTokenEndpoint: clientConfig.oidcTokenEndpoint,
|
|
40
|
+
oidcUserInfoEndpoint: clientConfig.oidcUserInfoEndpoint,
|
|
39
41
|
});
|
|
40
42
|
};
|
|
41
43
|
|
|
@@ -62,6 +64,8 @@ export const externalAuthProvider = async (
|
|
|
62
64
|
clientId: clientConfig.clientId,
|
|
63
65
|
externalJwt: clientConfig.externalJwt,
|
|
64
66
|
oidcOrigin: clientConfig.oidcOrigin,
|
|
67
|
+
oidcTokenEndpoint: clientConfig.oidcTokenEndpoint,
|
|
68
|
+
oidcUserInfoEndpoint: clientConfig.oidcUserInfoEndpoint,
|
|
65
69
|
});
|
|
66
70
|
};
|
|
67
71
|
|
|
@@ -86,6 +90,8 @@ export const refreshAuthProvider = async (
|
|
|
86
90
|
clientId: clientConfig.clientId,
|
|
87
91
|
refreshToken: clientConfig.refreshToken,
|
|
88
92
|
oidcOrigin: clientConfig.oidcOrigin,
|
|
93
|
+
oidcTokenEndpoint: clientConfig.oidcTokenEndpoint,
|
|
94
|
+
oidcUserInfoEndpoint: clientConfig.oidcUserInfoEndpoint,
|
|
89
95
|
});
|
|
90
96
|
};
|
|
91
97
|
|
package/src/index.ts
CHANGED
|
@@ -2,6 +2,7 @@ export { type AuthProvider, type HttpMethod, HttpRequest, withHeaders } from './
|
|
|
2
2
|
export * as AuthProviders from './auth/providers.js';
|
|
3
3
|
export { attributeFQNsAsValues } from './policy/api.js';
|
|
4
4
|
export { version, clientType, tdfSpecVersion } from './version.js';
|
|
5
|
+
export { PlatformClient, type PlatformClientOptions, type PlatformServices } from './platform.js';
|
|
5
6
|
export * from './opentdf.js';
|
|
6
7
|
export * from './seekable.js';
|
|
7
8
|
export * from '../tdf3/src/models/index.js';
|