@songtonyli/dsh-cli 0.1.81 → 0.1.83
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/README.md +1 -1
- package/bin/dsh.mjs +1 -1
- package/node_modules/@aws-sdk/core/dist-cjs/submodules/protocols/index.js +94 -1589
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/index.js +1 -7
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/AwsJsonRpcProtocol.js +1 -3
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/AwsRestJsonProtocol.js +1 -3
- package/node_modules/@aws-sdk/core/package.json +3 -3
- package/node_modules/@aws-sdk/credential-provider-env/package.json +4 -4
- package/node_modules/@aws-sdk/credential-provider-http/package.json +4 -4
- package/node_modules/@aws-sdk/credential-provider-ini/package.json +11 -11
- package/node_modules/@aws-sdk/credential-provider-login/package.json +5 -5
- package/node_modules/@aws-sdk/credential-provider-node/package.json +9 -9
- package/node_modules/@aws-sdk/credential-provider-process/package.json +4 -4
- package/node_modules/@aws-sdk/credential-provider-sso/package.json +6 -6
- package/node_modules/@aws-sdk/credential-provider-web-identity/package.json +5 -5
- package/node_modules/@aws-sdk/eventstream-handler-node/package.json +3 -3
- package/node_modules/@aws-sdk/middleware-eventstream/package.json +3 -3
- package/node_modules/@aws-sdk/middleware-websocket/package.json +4 -4
- package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/cognito-identity/index.js +1 -1
- package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/signin/index.js +1 -1
- package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sso/index.js +1 -1
- package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sso-oidc/index.js +1 -1
- package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sts/index.js +1 -1
- package/node_modules/@aws-sdk/nested-clients/package.json +5 -5
- package/node_modules/@aws-sdk/signature-v4-multi-region/package.json +2 -2
- package/node_modules/@aws-sdk/token-providers/dist-cjs/index.js +37 -19
- package/node_modules/@aws-sdk/token-providers/dist-es/fromSso.js +37 -19
- package/node_modules/@aws-sdk/token-providers/package.json +5 -5
- package/node_modules/@aws-sdk/types/package.json +1 -1
- package/node_modules/@deepseek-ai/dsh-app-boot/lib/index.js +18 -12
- package/node_modules/@deepseek-ai/dsh-client-modules/lib/index.js +1 -1
- package/node_modules/@deepseek-ai/dsh-client-ui-sidebar/lib/client.js +1 -1
- package/node_modules/@deepseek-ai/dsh-experimental-agent-team-profile/README.i18n.yaml +4 -4
- package/node_modules/@deepseek-ai/dsh-experimental-agent-team-profile/README.md +2 -2
- package/node_modules/@deepseek-ai/dsh-experimental-agent-team-profile/README.zh.md +2 -2
- package/node_modules/@deepseek-ai/dsh-subprocess-local/README.i18n.yaml +14 -14
- package/node_modules/@deepseek-ai/dsh-subprocess-local/README.md +7 -5
- package/node_modules/@deepseek-ai/dsh-subprocess-local/README.zh.md +7 -5
- package/node_modules/@deepseek-ai/dsh-subprocess-local/lib/index.js +15 -3
- package/node_modules/@deepseek-ai/dsh-subprocess-local/lib/runner-launch-f9xQyTek.js +1669 -0
- package/node_modules/@deepseek-ai/dsh-subprocess-local/lib/runner.js +1 -1
- package/node_modules/@deepseek-ai/dsh-tui-app/README.i18n.yaml +19 -16
- package/node_modules/@deepseek-ai/dsh-tui-app/README.md +38 -8
- package/node_modules/@deepseek-ai/dsh-tui-app/README.zh.md +38 -8
- package/node_modules/@deepseek-ai/dsh-tui-app/lib/index.js +8457 -7005
- package/node_modules/@opentelemetry/api/README.md +4 -23
- package/node_modules/@opentelemetry/api/dist/api/context.cjs +100 -0
- package/node_modules/@opentelemetry/api/dist/api/context.mjs +100 -0
- package/node_modules/@opentelemetry/api/dist/api/diag.cjs +68 -0
- package/node_modules/@opentelemetry/api/dist/api/diag.mjs +68 -0
- package/node_modules/@opentelemetry/api/dist/api/logs.cjs +59 -0
- package/node_modules/@opentelemetry/api/dist/api/logs.mjs +59 -0
- package/node_modules/@opentelemetry/api/dist/api/metrics.cjs +46 -0
- package/node_modules/@opentelemetry/api/dist/api/metrics.mjs +46 -0
- package/node_modules/@opentelemetry/api/dist/api/propagation.cjs +74 -0
- package/node_modules/@opentelemetry/api/dist/api/propagation.mjs +74 -0
- package/node_modules/@opentelemetry/api/dist/api/trace.cjs +62 -0
- package/node_modules/@opentelemetry/api/dist/api/trace.mjs +62 -0
- package/node_modules/@opentelemetry/api/dist/baggage/context-helpers.cjs +48 -0
- package/node_modules/@opentelemetry/api/dist/baggage/context-helpers.mjs +45 -0
- package/node_modules/@opentelemetry/api/dist/baggage/internal/baggage-impl.cjs +36 -0
- package/node_modules/@opentelemetry/api/dist/baggage/internal/baggage-impl.mjs +36 -0
- package/node_modules/@opentelemetry/api/dist/baggage/internal/symbol.cjs +9 -0
- package/node_modules/@opentelemetry/api/dist/baggage/internal/symbol.mjs +9 -0
- package/node_modules/@opentelemetry/api/dist/baggage/utils.cjs +37 -0
- package/node_modules/@opentelemetry/api/dist/baggage/utils.mjs +36 -0
- package/node_modules/@opentelemetry/api/dist/context/NoopContextManager.cjs +27 -0
- package/node_modules/@opentelemetry/api/dist/context/NoopContextManager.mjs +27 -0
- package/node_modules/@opentelemetry/api/dist/context/context.cjs +41 -0
- package/node_modules/@opentelemetry/api/dist/context/context.mjs +40 -0
- package/node_modules/@opentelemetry/api/dist/context-api.cjs +10 -0
- package/node_modules/@opentelemetry/api/dist/context-api.mjs +11 -0
- package/node_modules/@opentelemetry/api/dist/diag/ComponentLogger.cjs +40 -0
- package/node_modules/@opentelemetry/api/dist/diag/ComponentLogger.mjs +40 -0
- package/node_modules/@opentelemetry/api/dist/diag/consoleLogger.cjs +62 -0
- package/node_modules/@opentelemetry/api/dist/diag/consoleLogger.mjs +61 -0
- package/node_modules/@opentelemetry/api/dist/diag/internal/logLevelLogger.cjs +23 -0
- package/node_modules/@opentelemetry/api/dist/diag/internal/logLevelLogger.mjs +23 -0
- package/node_modules/@opentelemetry/api/dist/diag/types.cjs +32 -0
- package/node_modules/@opentelemetry/api/dist/diag/types.mjs +32 -0
- package/node_modules/@opentelemetry/api/dist/diag-api.cjs +14 -0
- package/node_modules/@opentelemetry/api/dist/diag-api.mjs +15 -0
- package/node_modules/@opentelemetry/api/dist/experimental/index.cjs +4 -0
- package/node_modules/@opentelemetry/api/dist/experimental/index.mjs +2 -0
- package/node_modules/@opentelemetry/api/dist/experimental/trace/SugaredTracer.cjs +88 -0
- package/node_modules/@opentelemetry/api/dist/experimental/trace/SugaredTracer.mjs +87 -0
- package/node_modules/@opentelemetry/api/dist/index.cjs +71 -0
- package/node_modules/@opentelemetry/api/dist/index.mjs +37 -0
- package/node_modules/@opentelemetry/api/dist/internal/global-utils.cjs +52 -0
- package/node_modules/@opentelemetry/api/dist/internal/global-utils.mjs +50 -0
- package/node_modules/@opentelemetry/api/dist/internal/semver.cjs +83 -0
- package/node_modules/@opentelemetry/api/dist/internal/semver.mjs +82 -0
- package/node_modules/@opentelemetry/api/dist/logs/LogRecord.cjs +33 -0
- package/node_modules/@opentelemetry/api/dist/logs/LogRecord.mjs +33 -0
- package/node_modules/@opentelemetry/api/dist/logs/NoopLogger.cjs +20 -0
- package/node_modules/@opentelemetry/api/dist/logs/NoopLogger.mjs +18 -0
- package/node_modules/@opentelemetry/api/dist/logs/NoopLoggerProvider.cjs +13 -0
- package/node_modules/@opentelemetry/api/dist/logs/NoopLoggerProvider.mjs +12 -0
- package/node_modules/@opentelemetry/api/dist/logs/ProxyLogger.cjs +36 -0
- package/node_modules/@opentelemetry/api/dist/logs/ProxyLogger.mjs +36 -0
- package/node_modules/@opentelemetry/api/dist/logs/ProxyLoggerProvider.cjs +36 -0
- package/node_modules/@opentelemetry/api/dist/logs/ProxyLoggerProvider.mjs +36 -0
- package/node_modules/@opentelemetry/api/dist/logs-api.cjs +11 -0
- package/node_modules/@opentelemetry/api/dist/logs-api.mjs +12 -0
- package/node_modules/@opentelemetry/api/dist/metrics/Metric.cjs +15 -0
- package/node_modules/@opentelemetry/api/dist/metrics/Metric.mjs +15 -0
- package/node_modules/@opentelemetry/api/dist/metrics/NoopMeter.cjs +116 -0
- package/node_modules/@opentelemetry/api/dist/metrics/NoopMeter.mjs +98 -0
- package/node_modules/@opentelemetry/api/dist/metrics/NoopMeterProvider.cjs +17 -0
- package/node_modules/@opentelemetry/api/dist/metrics/NoopMeterProvider.mjs +16 -0
- package/node_modules/@opentelemetry/api/dist/metrics-api.cjs +11 -0
- package/node_modules/@opentelemetry/api/dist/metrics-api.mjs +12 -0
- package/node_modules/@opentelemetry/api/dist/propagation/NoopTextMapPropagator.cjs +19 -0
- package/node_modules/@opentelemetry/api/dist/propagation/NoopTextMapPropagator.mjs +19 -0
- package/node_modules/@opentelemetry/api/dist/propagation/TextMapPropagator.cjs +26 -0
- package/node_modules/@opentelemetry/api/dist/propagation/TextMapPropagator.mjs +25 -0
- package/node_modules/@opentelemetry/api/dist/propagation-api.cjs +11 -0
- package/node_modules/@opentelemetry/api/dist/propagation-api.mjs +12 -0
- package/node_modules/@opentelemetry/api/dist/trace/NonRecordingSpan.cjs +45 -0
- package/node_modules/@opentelemetry/api/dist/trace/NonRecordingSpan.mjs +45 -0
- package/node_modules/@opentelemetry/api/dist/trace/NoopTracer.cjs +44 -0
- package/node_modules/@opentelemetry/api/dist/trace/NoopTracer.mjs +44 -0
- package/node_modules/@opentelemetry/api/dist/trace/NoopTracerProvider.cjs +17 -0
- package/node_modules/@opentelemetry/api/dist/trace/NoopTracerProvider.mjs +17 -0
- package/node_modules/@opentelemetry/api/dist/trace/ProxyTracer.cjs +37 -0
- package/node_modules/@opentelemetry/api/dist/trace/ProxyTracer.mjs +38 -0
- package/node_modules/@opentelemetry/api/dist/trace/ProxyTracerProvider.cjs +41 -0
- package/node_modules/@opentelemetry/api/dist/trace/ProxyTracerProvider.mjs +42 -0
- package/node_modules/@opentelemetry/api/dist/trace/SamplingResult.cjs +30 -0
- package/node_modules/@opentelemetry/api/dist/trace/SamplingResult.mjs +30 -0
- package/node_modules/@opentelemetry/api/dist/trace/context-utils.cjs +67 -0
- package/node_modules/@opentelemetry/api/dist/trace/context-utils.mjs +62 -0
- package/node_modules/@opentelemetry/api/dist/trace/internal/tracestate-impl.cjs +77 -0
- package/node_modules/@opentelemetry/api/dist/trace/internal/tracestate-impl.mjs +77 -0
- package/node_modules/@opentelemetry/api/dist/trace/internal/tracestate-validators.cjs +28 -0
- package/node_modules/@opentelemetry/api/dist/trace/internal/tracestate-validators.mjs +27 -0
- package/node_modules/@opentelemetry/api/dist/trace/internal/utils.cjs +13 -0
- package/node_modules/@opentelemetry/api/dist/trace/internal/utils.mjs +13 -0
- package/node_modules/@opentelemetry/api/dist/trace/invalid-span-constants.cjs +24 -0
- package/node_modules/@opentelemetry/api/dist/trace/invalid-span-constants.mjs +22 -0
- package/node_modules/@opentelemetry/api/dist/trace/span_kind.cjs +35 -0
- package/node_modules/@opentelemetry/api/dist/trace/span_kind.mjs +35 -0
- package/node_modules/@opentelemetry/api/dist/trace/spancontext-utils.cjs +151 -0
- package/node_modules/@opentelemetry/api/dist/trace/spancontext-utils.mjs +148 -0
- package/node_modules/@opentelemetry/api/dist/trace/status.cjs +26 -0
- package/node_modules/@opentelemetry/api/dist/trace/status.mjs +26 -0
- package/node_modules/@opentelemetry/api/dist/trace/trace_flags.cjs +15 -0
- package/node_modules/@opentelemetry/api/dist/trace/trace_flags.mjs +15 -0
- package/node_modules/@opentelemetry/api/dist/trace-api.cjs +11 -0
- package/node_modules/@opentelemetry/api/dist/trace-api.mjs +12 -0
- package/node_modules/@opentelemetry/api/dist/version.cjs +6 -0
- package/node_modules/@opentelemetry/api/dist/version.mjs +6 -0
- package/node_modules/@opentelemetry/api/package.json +32 -34
- package/node_modules/@shikijs/vscode-textmate/dist/index.js +46 -1
- package/node_modules/@shikijs/vscode-textmate/package.json +9 -9
- package/node_modules/@smithy/core/dist-cjs/submodules/client/index.js +15 -2
- package/node_modules/@smithy/core/dist-cjs/submodules/event-streams/index.browser.js +10 -0
- package/node_modules/@smithy/core/dist-cjs/submodules/event-streams/index.js +10 -0
- package/node_modules/@smithy/core/dist-cjs/submodules/protocols/index.js +5 -5
- package/node_modules/@smithy/core/dist-es/submodules/client/smithy-client/command.js +16 -2
- package/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-codec/HeaderMarshaller.js +10 -0
- package/node_modules/@smithy/core/dist-es/submodules/protocols/json/codec-v2/JsonShapeSerializer2.js +5 -5
- package/node_modules/@smithy/core/package.json +1 -1
- package/node_modules/execa/lib/convert/duplex.js +8 -4
- package/node_modules/execa/lib/convert/readable.js +3 -8
- package/node_modules/execa/lib/convert/writable.js +6 -5
- package/node_modules/execa/lib/io/input-sync.js +2 -1
- package/node_modules/execa/lib/io/max-buffer.js +2 -1
- package/node_modules/execa/lib/io/output-sync.js +2 -1
- package/node_modules/execa/lib/methods/create.js +7 -0
- package/node_modules/execa/lib/methods/node.js +1 -1
- package/node_modules/execa/lib/methods/script.js +3 -3
- package/node_modules/execa/lib/resolve/all-async.js +2 -1
- package/node_modules/execa/lib/resolve/wait-subprocess.js +6 -0
- package/node_modules/execa/lib/stdio/handle-async.js +3 -2
- package/node_modules/execa/lib/stdio/handle.js +8 -3
- package/node_modules/execa/lib/transform/generator.js +7 -0
- package/node_modules/execa/lib/transform/run-sync.js +17 -5
- package/node_modules/execa/package.json +1 -1
- package/node_modules/fast-uri/.github/workflows/release.yml +35 -0
- package/node_modules/fast-uri/README.md +8 -0
- package/node_modules/fast-uri/index.js +98 -18
- package/node_modules/fast-uri/lib/utils.js +52 -0
- package/node_modules/fast-uri/package.json +1 -1
- package/node_modules/fast-uri/test/host-delimiter-security.test.js +94 -0
- package/node_modules/fast-uri/test/relative-normalization-security.test.js +156 -0
- package/node_modules/fast-uri/test/reserved-path-normalization.test.js +32 -4
- package/node_modules/fast-uri/test/scheme-validation.test.js +53 -14
- package/node_modules/jose/README.md +2 -2
- package/node_modules/jose/dist/webapi/jwe/general/encrypt.js +3 -3
- package/node_modules/jose/dist/webapi/jwk/thumbprint.js +8 -8
- package/node_modules/jose/dist/webapi/jwks/local.js +2 -1
- package/node_modules/jose/dist/webapi/jwks/remote.js +4 -4
- package/node_modules/jose/dist/webapi/jws/general/sign.js +3 -3
- package/node_modules/jose/dist/webapi/jws/general/verify.js +3 -3
- package/node_modules/jose/dist/webapi/jwt/encrypt.js +2 -2
- package/node_modules/jose/dist/webapi/jwt/sign.js +2 -2
- package/node_modules/jose/dist/webapi/jwt/unsecured.js +3 -3
- package/node_modules/jose/dist/webapi/key/generate_secret.js +4 -4
- package/node_modules/jose/dist/webapi/lib/asn1.js +2 -2
- package/node_modules/jose/dist/webapi/lib/buffer_utils.js +4 -4
- package/node_modules/jose/dist/webapi/lib/content_encryption.js +8 -8
- package/node_modules/jose/dist/webapi/lib/jwe_decrypt.js +14 -14
- package/node_modules/jose/dist/webapi/lib/jwe_encrypt.js +3 -3
- package/node_modules/jose/dist/webapi/lib/jws_algorithms.js +2 -2
- package/node_modules/jose/dist/webapi/lib/jws_sign.js +11 -11
- package/node_modules/jose/dist/webapi/lib/jws_verify.js +19 -16
- package/node_modules/jose/dist/webapi/lib/jwt_claims_set.js +44 -43
- package/node_modules/jose/dist/webapi/lib/key.js +4 -4
- package/node_modules/jose/dist/webapi/lib/key_management.js +17 -17
- package/node_modules/jose/dist/webapi/lib/validate.js +10 -10
- package/node_modules/jose/dist/webapi/util/decode_jwt.js +12 -12
- package/node_modules/jose/dist/webapi/util/decode_protected_header.js +5 -5
- package/node_modules/jose/package.json +1 -1
- package/package.json +23 -23
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/JsonSettings.js +0 -1
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v1/JsonCodec.js +0 -20
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v1/JsonSettings.js +0 -1
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v1/JsonShapeDeserializer.js +0 -160
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v1/JsonShapeSerializer.js +0 -193
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v2/JsonBytesStringAdapter.js +0 -103
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v2/JsonCodec2.js +0 -20
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v2/JsonShapeDeserializer2.js +0 -200
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v2/JsonShapeSerializer2.js +0 -519
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/detectBufferParsing.js +0 -18
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/jsonReplacer.js +0 -46
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/jsonReviver.js +0 -121
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/needsReviver.js +0 -41
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/parseJsonBody.js +0 -89
- package/node_modules/@opentelemetry/api/build/esm/api/context.js +0 -68
- package/node_modules/@opentelemetry/api/build/esm/api/diag.js +0 -80
- package/node_modules/@opentelemetry/api/build/esm/api/metrics.js +0 -46
- package/node_modules/@opentelemetry/api/build/esm/api/propagation.js +0 -76
- package/node_modules/@opentelemetry/api/build/esm/api/trace.js +0 -66
- package/node_modules/@opentelemetry/api/build/esm/baggage/context-helpers.js +0 -45
- package/node_modules/@opentelemetry/api/build/esm/baggage/internal/baggage-impl.js +0 -40
- package/node_modules/@opentelemetry/api/build/esm/baggage/internal/symbol.js +0 -9
- package/node_modules/@opentelemetry/api/build/esm/baggage/types.js +0 -6
- package/node_modules/@opentelemetry/api/build/esm/baggage/utils.js +0 -36
- package/node_modules/@opentelemetry/api/build/esm/common/Attributes.js +0 -6
- package/node_modules/@opentelemetry/api/build/esm/common/Exception.js +0 -6
- package/node_modules/@opentelemetry/api/build/esm/common/Time.js +0 -2
- package/node_modules/@opentelemetry/api/build/esm/context/NoopContextManager.js +0 -23
- package/node_modules/@opentelemetry/api/build/esm/context/context.js +0 -48
- package/node_modules/@opentelemetry/api/build/esm/context/types.js +0 -6
- package/node_modules/@opentelemetry/api/build/esm/context-api.js +0 -13
- package/node_modules/@opentelemetry/api/build/esm/diag/ComponentLogger.js +0 -43
- package/node_modules/@opentelemetry/api/build/esm/diag/consoleLogger.js +0 -69
- package/node_modules/@opentelemetry/api/build/esm/diag/internal/logLevelLogger.js +0 -30
- package/node_modules/@opentelemetry/api/build/esm/diag/internal/noopLogger.js +0 -20
- package/node_modules/@opentelemetry/api/build/esm/diag/types.js +0 -30
- package/node_modules/@opentelemetry/api/build/esm/diag-api.js +0 -17
- package/node_modules/@opentelemetry/api/build/esm/experimental/index.js +0 -10
- package/node_modules/@opentelemetry/api/build/esm/experimental/trace/SugaredOptions.js +0 -6
- package/node_modules/@opentelemetry/api/build/esm/experimental/trace/SugaredTracer.js +0 -88
- package/node_modules/@opentelemetry/api/build/esm/index.js +0 -43
- package/node_modules/@opentelemetry/api/build/esm/internal/global-utils.js +0 -54
- package/node_modules/@opentelemetry/api/build/esm/internal/semver.js +0 -107
- package/node_modules/@opentelemetry/api/build/esm/metrics/Meter.js +0 -6
- package/node_modules/@opentelemetry/api/build/esm/metrics/MeterProvider.js +0 -6
- package/node_modules/@opentelemetry/api/build/esm/metrics/Metric.js +0 -15
- package/node_modules/@opentelemetry/api/build/esm/metrics/NoopMeter.js +0 -104
- package/node_modules/@opentelemetry/api/build/esm/metrics/NoopMeterProvider.js +0 -16
- package/node_modules/@opentelemetry/api/build/esm/metrics-api.js +0 -14
- package/node_modules/@opentelemetry/api/build/esm/propagation/NoopTextMapPropagator.js +0 -19
- package/node_modules/@opentelemetry/api/build/esm/propagation/TextMapPropagator.js +0 -33
- package/node_modules/@opentelemetry/api/build/esm/propagation-api.js +0 -14
- package/node_modules/@opentelemetry/api/build/esm/trace/NonRecordingSpan.js +0 -54
- package/node_modules/@opentelemetry/api/build/esm/trace/NoopTracer.js +0 -64
- package/node_modules/@opentelemetry/api/build/esm/trace/NoopTracerProvider.js +0 -17
- package/node_modules/@opentelemetry/api/build/esm/trace/ProxyTracer.js +0 -42
- package/node_modules/@opentelemetry/api/build/esm/trace/ProxyTracerProvider.js +0 -42
- package/node_modules/@opentelemetry/api/build/esm/trace/Sampler.js +0 -6
- package/node_modules/@opentelemetry/api/build/esm/trace/SamplingResult.js +0 -30
- package/node_modules/@opentelemetry/api/build/esm/trace/SpanOptions.js +0 -6
- package/node_modules/@opentelemetry/api/build/esm/trace/attributes.js +0 -6
- package/node_modules/@opentelemetry/api/build/esm/trace/context-utils.js +0 -62
- package/node_modules/@opentelemetry/api/build/esm/trace/internal/tracestate-impl.js +0 -90
- package/node_modules/@opentelemetry/api/build/esm/trace/internal/tracestate-validators.js +0 -30
- package/node_modules/@opentelemetry/api/build/esm/trace/internal/utils.js +0 -12
- package/node_modules/@opentelemetry/api/build/esm/trace/invalid-span-constants.js +0 -22
- package/node_modules/@opentelemetry/api/build/esm/trace/link.js +0 -6
- package/node_modules/@opentelemetry/api/build/esm/trace/span.js +0 -6
- package/node_modules/@opentelemetry/api/build/esm/trace/span_context.js +0 -6
- package/node_modules/@opentelemetry/api/build/esm/trace/span_kind.js +0 -35
- package/node_modules/@opentelemetry/api/build/esm/trace/spancontext-utils.js +0 -59
- package/node_modules/@opentelemetry/api/build/esm/trace/status.js +0 -26
- package/node_modules/@opentelemetry/api/build/esm/trace/trace_flags.js +0 -15
- package/node_modules/@opentelemetry/api/build/esm/trace/trace_state.js +0 -6
- package/node_modules/@opentelemetry/api/build/esm/trace/tracer.js +0 -6
- package/node_modules/@opentelemetry/api/build/esm/trace/tracer_options.js +0 -6
- package/node_modules/@opentelemetry/api/build/esm/trace/tracer_provider.js +0 -6
- package/node_modules/@opentelemetry/api/build/esm/trace-api.js +0 -14
- package/node_modules/@opentelemetry/api/build/esm/version.js +0 -7
- package/node_modules/@opentelemetry/api/build/esnext/api/context.js +0 -68
- package/node_modules/@opentelemetry/api/build/esnext/api/diag.js +0 -80
- package/node_modules/@opentelemetry/api/build/esnext/api/metrics.js +0 -46
- package/node_modules/@opentelemetry/api/build/esnext/api/propagation.js +0 -76
- package/node_modules/@opentelemetry/api/build/esnext/api/trace.js +0 -66
- package/node_modules/@opentelemetry/api/build/esnext/baggage/context-helpers.js +0 -45
- package/node_modules/@opentelemetry/api/build/esnext/baggage/internal/baggage-impl.js +0 -40
- package/node_modules/@opentelemetry/api/build/esnext/baggage/internal/symbol.js +0 -9
- package/node_modules/@opentelemetry/api/build/esnext/baggage/types.js +0 -6
- package/node_modules/@opentelemetry/api/build/esnext/baggage/utils.js +0 -36
- package/node_modules/@opentelemetry/api/build/esnext/common/Attributes.js +0 -6
- package/node_modules/@opentelemetry/api/build/esnext/common/Exception.js +0 -6
- package/node_modules/@opentelemetry/api/build/esnext/common/Time.js +0 -2
- package/node_modules/@opentelemetry/api/build/esnext/context/NoopContextManager.js +0 -23
- package/node_modules/@opentelemetry/api/build/esnext/context/context.js +0 -48
- package/node_modules/@opentelemetry/api/build/esnext/context/types.js +0 -6
- package/node_modules/@opentelemetry/api/build/esnext/context-api.js +0 -13
- package/node_modules/@opentelemetry/api/build/esnext/diag/ComponentLogger.js +0 -43
- package/node_modules/@opentelemetry/api/build/esnext/diag/consoleLogger.js +0 -69
- package/node_modules/@opentelemetry/api/build/esnext/diag/internal/logLevelLogger.js +0 -30
- package/node_modules/@opentelemetry/api/build/esnext/diag/internal/noopLogger.js +0 -20
- package/node_modules/@opentelemetry/api/build/esnext/diag/types.js +0 -30
- package/node_modules/@opentelemetry/api/build/esnext/diag-api.js +0 -17
- package/node_modules/@opentelemetry/api/build/esnext/experimental/index.js +0 -10
- package/node_modules/@opentelemetry/api/build/esnext/experimental/trace/SugaredOptions.js +0 -6
- package/node_modules/@opentelemetry/api/build/esnext/experimental/trace/SugaredTracer.js +0 -88
- package/node_modules/@opentelemetry/api/build/esnext/index.js +0 -43
- package/node_modules/@opentelemetry/api/build/esnext/internal/global-utils.js +0 -54
- package/node_modules/@opentelemetry/api/build/esnext/internal/semver.js +0 -107
- package/node_modules/@opentelemetry/api/build/esnext/metrics/Meter.js +0 -6
- package/node_modules/@opentelemetry/api/build/esnext/metrics/MeterProvider.js +0 -6
- package/node_modules/@opentelemetry/api/build/esnext/metrics/Metric.js +0 -15
- package/node_modules/@opentelemetry/api/build/esnext/metrics/NoopMeter.js +0 -104
- package/node_modules/@opentelemetry/api/build/esnext/metrics/NoopMeterProvider.js +0 -16
- package/node_modules/@opentelemetry/api/build/esnext/metrics-api.js +0 -14
- package/node_modules/@opentelemetry/api/build/esnext/propagation/NoopTextMapPropagator.js +0 -19
- package/node_modules/@opentelemetry/api/build/esnext/propagation/TextMapPropagator.js +0 -33
- package/node_modules/@opentelemetry/api/build/esnext/propagation-api.js +0 -14
- package/node_modules/@opentelemetry/api/build/esnext/trace/NonRecordingSpan.js +0 -54
- package/node_modules/@opentelemetry/api/build/esnext/trace/NoopTracer.js +0 -64
- package/node_modules/@opentelemetry/api/build/esnext/trace/NoopTracerProvider.js +0 -17
- package/node_modules/@opentelemetry/api/build/esnext/trace/ProxyTracer.js +0 -42
- package/node_modules/@opentelemetry/api/build/esnext/trace/ProxyTracerProvider.js +0 -42
- package/node_modules/@opentelemetry/api/build/esnext/trace/Sampler.js +0 -6
- package/node_modules/@opentelemetry/api/build/esnext/trace/SamplingResult.js +0 -30
- package/node_modules/@opentelemetry/api/build/esnext/trace/SpanOptions.js +0 -6
- package/node_modules/@opentelemetry/api/build/esnext/trace/attributes.js +0 -6
- package/node_modules/@opentelemetry/api/build/esnext/trace/context-utils.js +0 -62
- package/node_modules/@opentelemetry/api/build/esnext/trace/internal/tracestate-impl.js +0 -90
- package/node_modules/@opentelemetry/api/build/esnext/trace/internal/tracestate-validators.js +0 -30
- package/node_modules/@opentelemetry/api/build/esnext/trace/internal/utils.js +0 -12
- package/node_modules/@opentelemetry/api/build/esnext/trace/invalid-span-constants.js +0 -22
- package/node_modules/@opentelemetry/api/build/esnext/trace/link.js +0 -6
- package/node_modules/@opentelemetry/api/build/esnext/trace/span.js +0 -6
- package/node_modules/@opentelemetry/api/build/esnext/trace/span_context.js +0 -6
- package/node_modules/@opentelemetry/api/build/esnext/trace/span_kind.js +0 -35
- package/node_modules/@opentelemetry/api/build/esnext/trace/spancontext-utils.js +0 -59
- package/node_modules/@opentelemetry/api/build/esnext/trace/status.js +0 -26
- package/node_modules/@opentelemetry/api/build/esnext/trace/trace_flags.js +0 -15
- package/node_modules/@opentelemetry/api/build/esnext/trace/trace_state.js +0 -6
- package/node_modules/@opentelemetry/api/build/esnext/trace/tracer.js +0 -6
- package/node_modules/@opentelemetry/api/build/esnext/trace/tracer_options.js +0 -6
- package/node_modules/@opentelemetry/api/build/esnext/trace/tracer_provider.js +0 -6
- package/node_modules/@opentelemetry/api/build/esnext/trace-api.js +0 -14
- package/node_modules/@opentelemetry/api/build/esnext/version.js +0 -7
- package/node_modules/@opentelemetry/api/build/src/api/context.js +0 -72
- package/node_modules/@opentelemetry/api/build/src/api/diag.js +0 -84
- package/node_modules/@opentelemetry/api/build/src/api/metrics.js +0 -50
- package/node_modules/@opentelemetry/api/build/src/api/propagation.js +0 -80
- package/node_modules/@opentelemetry/api/build/src/api/trace.js +0 -70
- package/node_modules/@opentelemetry/api/build/src/baggage/context-helpers.js +0 -52
- package/node_modules/@opentelemetry/api/build/src/baggage/internal/baggage-impl.js +0 -44
- package/node_modules/@opentelemetry/api/build/src/baggage/internal/symbol.js +0 -12
- package/node_modules/@opentelemetry/api/build/src/baggage/types.js +0 -7
- package/node_modules/@opentelemetry/api/build/src/baggage/utils.js +0 -41
- package/node_modules/@opentelemetry/api/build/src/common/Attributes.js +0 -7
- package/node_modules/@opentelemetry/api/build/src/common/Exception.js +0 -7
- package/node_modules/@opentelemetry/api/build/src/common/Time.js +0 -3
- package/node_modules/@opentelemetry/api/build/src/context/NoopContextManager.js +0 -27
- package/node_modules/@opentelemetry/api/build/src/context/context.js +0 -52
- package/node_modules/@opentelemetry/api/build/src/context/types.js +0 -7
- package/node_modules/@opentelemetry/api/build/src/context-api.js +0 -16
- package/node_modules/@opentelemetry/api/build/src/diag/ComponentLogger.js +0 -47
- package/node_modules/@opentelemetry/api/build/src/diag/consoleLogger.js +0 -73
- package/node_modules/@opentelemetry/api/build/src/diag/internal/logLevelLogger.js +0 -34
- package/node_modules/@opentelemetry/api/build/src/diag/internal/noopLogger.js +0 -24
- package/node_modules/@opentelemetry/api/build/src/diag/types.js +0 -33
- package/node_modules/@opentelemetry/api/build/src/diag-api.js +0 -20
- package/node_modules/@opentelemetry/api/build/src/experimental/index.js +0 -15
- package/node_modules/@opentelemetry/api/build/src/experimental/trace/SugaredOptions.js +0 -7
- package/node_modules/@opentelemetry/api/build/src/experimental/trace/SugaredTracer.js +0 -93
- package/node_modules/@opentelemetry/api/build/src/index.js +0 -71
- package/node_modules/@opentelemetry/api/build/src/internal/global-utils.js +0 -60
- package/node_modules/@opentelemetry/api/build/src/internal/semver.js +0 -111
- package/node_modules/@opentelemetry/api/build/src/metrics/Meter.js +0 -7
- package/node_modules/@opentelemetry/api/build/src/metrics/MeterProvider.js +0 -7
- package/node_modules/@opentelemetry/api/build/src/metrics/Metric.js +0 -18
- package/node_modules/@opentelemetry/api/build/src/metrics/NoopMeter.js +0 -118
- package/node_modules/@opentelemetry/api/build/src/metrics/NoopMeterProvider.js +0 -20
- package/node_modules/@opentelemetry/api/build/src/metrics-api.js +0 -17
- package/node_modules/@opentelemetry/api/build/src/propagation/NoopTextMapPropagator.js +0 -23
- package/node_modules/@opentelemetry/api/build/src/propagation/TextMapPropagator.js +0 -36
- package/node_modules/@opentelemetry/api/build/src/propagation-api.js +0 -17
- package/node_modules/@opentelemetry/api/build/src/trace/NonRecordingSpan.js +0 -58
- package/node_modules/@opentelemetry/api/build/src/trace/NoopTracer.js +0 -68
- package/node_modules/@opentelemetry/api/build/src/trace/NoopTracerProvider.js +0 -21
- package/node_modules/@opentelemetry/api/build/src/trace/ProxyTracer.js +0 -46
- package/node_modules/@opentelemetry/api/build/src/trace/ProxyTracerProvider.js +0 -46
- package/node_modules/@opentelemetry/api/build/src/trace/Sampler.js +0 -7
- package/node_modules/@opentelemetry/api/build/src/trace/SamplingResult.js +0 -33
- package/node_modules/@opentelemetry/api/build/src/trace/SpanOptions.js +0 -7
- package/node_modules/@opentelemetry/api/build/src/trace/attributes.js +0 -7
- package/node_modules/@opentelemetry/api/build/src/trace/context-utils.js +0 -71
- package/node_modules/@opentelemetry/api/build/src/trace/internal/tracestate-impl.js +0 -94
- package/node_modules/@opentelemetry/api/build/src/trace/internal/tracestate-validators.js +0 -35
- package/node_modules/@opentelemetry/api/build/src/trace/internal/utils.js +0 -16
- package/node_modules/@opentelemetry/api/build/src/trace/invalid-span-constants.js +0 -25
- package/node_modules/@opentelemetry/api/build/src/trace/link.js +0 -7
- package/node_modules/@opentelemetry/api/build/src/trace/span.js +0 -7
- package/node_modules/@opentelemetry/api/build/src/trace/span_context.js +0 -7
- package/node_modules/@opentelemetry/api/build/src/trace/span_kind.js +0 -38
- package/node_modules/@opentelemetry/api/build/src/trace/spancontext-utils.js +0 -66
- package/node_modules/@opentelemetry/api/build/src/trace/status.js +0 -29
- package/node_modules/@opentelemetry/api/build/src/trace/trace_flags.js +0 -18
- package/node_modules/@opentelemetry/api/build/src/trace/trace_state.js +0 -7
- package/node_modules/@opentelemetry/api/build/src/trace/tracer.js +0 -7
- package/node_modules/@opentelemetry/api/build/src/trace/tracer_options.js +0 -7
- package/node_modules/@opentelemetry/api/build/src/trace/tracer_provider.js +0 -7
- package/node_modules/@opentelemetry/api/build/src/trace-api.js +0 -17
- package/node_modules/@opentelemetry/api/build/src/version.js +0 -10
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { decrypt, generateCek } from "./content_encryption.js";
|
|
2
|
-
import { decodeBase64url,
|
|
2
|
+
import { decodeBase64url, encodeAsciiMember, parseJoseHeader, isDisjoint, isObject, validateCrit, validateAlgorithms, JWE_RECOGNIZED } from "./validate.js";
|
|
3
3
|
import { JOSEAlgNotAllowed, JOSENotSupported, JWEInvalid } from "../util/errors.js";
|
|
4
4
|
import { decryptKeyManagement } from "./key_management.js";
|
|
5
5
|
import { decoder } from "./buffer_utils.js";
|
|
@@ -59,13 +59,13 @@ function checkRecipient(jwe) {
|
|
|
59
59
|
}
|
|
60
60
|
function shareJWE(jwe) {
|
|
61
61
|
const { protected: encodedProtected, ciphertext, iv, tag, aad } = jwe;
|
|
62
|
-
let
|
|
63
|
-
return encodedProtected !== void 0 && (
|
|
64
|
-
|
|
62
|
+
let protectedHeader;
|
|
63
|
+
return encodedProtected !== void 0 && (protectedHeader = parseJoseHeader(encodedProtected, JWEInvalid, "JWE Protected Header is invalid")), [
|
|
64
|
+
protectedHeader,
|
|
65
65
|
decodeBase64url(ciphertext, "ciphertext", JWEInvalid),
|
|
66
66
|
iv !== void 0 ? decodeBase64url(iv, "iv", JWEInvalid) : void 0,
|
|
67
67
|
tag !== void 0 ? decodeBase64url(tag, "tag", JWEInvalid) : void 0,
|
|
68
|
-
|
|
68
|
+
encodeAsciiMember((encodedProtected ?? "") + (aad !== void 0 ? `.${aad}` : ""), "aad", JWEInvalid)
|
|
69
69
|
];
|
|
70
70
|
}
|
|
71
71
|
function prepareDecrypt(options) {
|
|
@@ -78,16 +78,16 @@ function prepareDecrypt(options) {
|
|
|
78
78
|
];
|
|
79
79
|
}
|
|
80
80
|
async function decryptJWE(jwe, shared, key, token = shareJWE(jwe)) {
|
|
81
|
-
const [
|
|
81
|
+
const [protectedHeader, ciphertext, iv, tag, additionalAuthenticatedData] = token, { header, unprotected, aad } = jwe;
|
|
82
82
|
let joseHeader;
|
|
83
83
|
if (header !== void 0 || unprotected !== void 0) {
|
|
84
|
-
if (!isDisjoint(
|
|
84
|
+
if (!isDisjoint(protectedHeader, header, unprotected))
|
|
85
85
|
throw new JWEInvalid("JWE Protected, JWE Unprotected Header, and JWE Per-Recipient Unprotected Header Parameter names must be disjoint");
|
|
86
|
-
joseHeader = { ...
|
|
86
|
+
joseHeader = { ...protectedHeader, ...header, ...unprotected };
|
|
87
87
|
} else
|
|
88
|
-
joseHeader =
|
|
88
|
+
joseHeader = protectedHeader ?? {};
|
|
89
89
|
const [keyManagementAlgorithms, contentEncryptionAlgorithms, crit, maxPBES2Count, maxDecompressedLength] = shared, { encrypted_key: encodedKey } = jwe;
|
|
90
|
-
validateCrit(JWEInvalid, JWE_RECOGNIZED, crit,
|
|
90
|
+
validateCrit(JWEInvalid, JWE_RECOGNIZED, crit, protectedHeader, joseHeader), validateZip(joseHeader, protectedHeader);
|
|
91
91
|
const { alg, enc } = joseHeader;
|
|
92
92
|
if (typeof alg != "string" || !alg)
|
|
93
93
|
throw new JWEInvalid("missing JWE Algorithm (alg) in JWE Header");
|
|
@@ -122,13 +122,13 @@ async function decryptJWE(jwe, shared, key, token = shareJWE(jwe)) {
|
|
|
122
122
|
encryptedKey = new Uint8Array();
|
|
123
123
|
}
|
|
124
124
|
let resolvedKey = !1;
|
|
125
|
-
typeof key == "function" && (key = await key(
|
|
125
|
+
typeof key == "function" && (key = await key(protectedHeader, jwe), resolvedKey = !0);
|
|
126
126
|
const algEntry = selected ?? jweAlgorithm(alg);
|
|
127
127
|
isJWECEKTransport(algEntry) && encryptedKey === void 0 && (encryptedKey = new Uint8Array());
|
|
128
128
|
const k = await prepareKey(algEntry.mode === "direct-encryption" ? encEntry : algEntry, key, "decrypt");
|
|
129
129
|
let plaintext;
|
|
130
130
|
if (algEntry.mode === "integrated-encryption")
|
|
131
|
-
plaintext = await algEntry.decrypt(k, encryptedKey, ciphertext,
|
|
131
|
+
plaintext = await algEntry.decrypt(k, encryptedKey, ciphertext, additionalAuthenticatedData, protectedHeader, joseHeader);
|
|
132
132
|
else {
|
|
133
133
|
const encryption = encEntry;
|
|
134
134
|
let cek;
|
|
@@ -139,7 +139,7 @@ async function decryptJWE(jwe, shared, key, token = shareJWE(jwe)) {
|
|
|
139
139
|
throw err;
|
|
140
140
|
cek = generateCek(encryption);
|
|
141
141
|
}
|
|
142
|
-
plaintext = await decrypt(encryption, cek, ciphertext, iv, tag,
|
|
142
|
+
plaintext = await decrypt(encryption, cek, ciphertext, iv, tag, additionalAuthenticatedData);
|
|
143
143
|
}
|
|
144
144
|
if (joseHeader.zip === "DEF") {
|
|
145
145
|
const decompressionLimit = maxDecompressedLength ?? 25e4;
|
|
@@ -153,7 +153,7 @@ async function decryptJWE(jwe, shared, key, token = shareJWE(jwe)) {
|
|
|
153
153
|
}
|
|
154
154
|
return {
|
|
155
155
|
plaintext,
|
|
156
|
-
...
|
|
156
|
+
...protectedHeader && { protectedHeader },
|
|
157
157
|
...aad !== void 0 && {
|
|
158
158
|
additionalAuthenticatedData: decodeBase64url(aad, "aad", JWEInvalid)
|
|
159
159
|
},
|
|
@@ -48,17 +48,17 @@ async function encryptJWE(input, checked, key) {
|
|
|
48
48
|
const algEntry = selected ?? jweAlgorithm(joseHeader.alg);
|
|
49
49
|
let encryptedKey, parameters, cek;
|
|
50
50
|
algEntry.mode === "integrated-encryption" ? cek = await prepareKey(algEntry, key, "encrypt") : [cek, encryptedKey, parameters] = await encryptKeyManagement(algEntry, encEntry, key, joseHeader, providedCek, keyManagementParameters), parameters && (unprotectedParameters ? unprotectedHeader = unprotectedHeader ? { ...unprotectedHeader, ...parameters } : parameters : protectedHeader = protectedHeader ? { ...protectedHeader, ...parameters } : parameters, checkDisjoint(protectedHeader, unprotectedHeader, sharedUnprotectedHeader));
|
|
51
|
-
const
|
|
51
|
+
const encodedProtectedHeader = protectedHeader ? b64u(JSON.stringify(protectedHeader)) : "", encodedAad = aad?.byteLength ? b64u(aad) : void 0, additionalAuthenticatedData = encode(encodedAad ? `${encodedProtectedHeader}.${encodedAad}` : encodedProtectedHeader);
|
|
52
52
|
let plaintext = inputPlaintext;
|
|
53
53
|
joseHeader.zip === "DEF" && (plaintext = await compress(plaintext).catch((cause) => {
|
|
54
54
|
throw new JWEInvalid("Failed to compress plaintext", { cause });
|
|
55
55
|
}));
|
|
56
56
|
let ciphertext, tag, iv;
|
|
57
|
-
algEntry.mode === "integrated-encryption" ? [encryptedKey, ciphertext] = await algEntry.encrypt(cek, plaintext,
|
|
57
|
+
algEntry.mode === "integrated-encryption" ? [encryptedKey, ciphertext] = await algEntry.encrypt(cek, plaintext, additionalAuthenticatedData, protectedHeader, joseHeader, keyManagementParameters) : { ciphertext, tag, iv } = await encrypt(encEntry, plaintext, cek, inputIv, additionalAuthenticatedData);
|
|
58
58
|
const jwe = {
|
|
59
59
|
ciphertext: b64u(ciphertext)
|
|
60
60
|
};
|
|
61
|
-
return iv && (jwe.iv = b64u(iv)), tag && (jwe.tag = b64u(tag)), encryptedKey?.byteLength && (jwe.encrypted_key = b64u(encryptedKey)),
|
|
61
|
+
return iv && (jwe.iv = b64u(iv)), tag && (jwe.tag = b64u(tag)), encryptedKey?.byteLength && (jwe.encrypted_key = b64u(encryptedKey)), encodedAad && (jwe.aad = encodedAad), protectedHeader && (jwe.protected = encodedProtectedHeader), sharedUnprotectedHeader && (jwe.unprotected = sharedUnprotectedHeader), unprotectedHeader && (jwe.header = unprotectedHeader), jwe;
|
|
62
62
|
}
|
|
63
63
|
async function createJWE(input, key, options) {
|
|
64
64
|
return encryptJWE(input, checkEncryptHeaders(input, options), key);
|
|
@@ -5,10 +5,10 @@ import { JWSInvalid } from "../util/errors.js";
|
|
|
5
5
|
import { concat, encode, encoder } from "./buffer_utils.js";
|
|
6
6
|
import { prepareKey, rawKey, checkModulusLength } from "./key.js";
|
|
7
7
|
async function createSignature(input, key, rejectUnencoded) {
|
|
8
|
-
let [payload, protectedHeader, unprotectedHeader, crit] = input,
|
|
8
|
+
let [payload, protectedHeader, unprotectedHeader, crit] = input, encodedProtectedHeader = "";
|
|
9
9
|
if (protectedHeader !== void 0) {
|
|
10
10
|
const normalized = serializeJoseHeader(JWSInvalid, protectedHeader);
|
|
11
|
-
protectedHeader = normalized[0],
|
|
11
|
+
protectedHeader = normalized[0], encodedProtectedHeader = b64u(normalized[1]);
|
|
12
12
|
}
|
|
13
13
|
if (unprotectedHeader !== void 0 && (unprotectedHeader = serializeJoseHeader(JWSInvalid, unprotectedHeader)[0]), !protectedHeader && !unprotectedHeader)
|
|
14
14
|
throw new JWSInvalid("either setProtectedHeader or setUnprotectedHeader must be called before #sign()");
|
|
@@ -22,19 +22,19 @@ async function createSignature(input, key, rejectUnencoded) {
|
|
|
22
22
|
if (typeof alg != "string" || !alg)
|
|
23
23
|
throw new JWSInvalid('JWS "alg" (Algorithm) Header Parameter missing or invalid');
|
|
24
24
|
const entry = jwsAlgorithm(alg);
|
|
25
|
-
let
|
|
25
|
+
let encodedPayload = "", signingPayload = payload, signingInput;
|
|
26
26
|
if (b64) {
|
|
27
|
-
const
|
|
28
|
-
|
|
27
|
+
const encodedPayloadCache = input[4];
|
|
28
|
+
encodedPayloadCache ? (encodedPayload = encodedPayloadCache[0] ??= b64u(payload), signingPayload = encodedPayloadCache[1] ??= encode(encodedPayload)) : (encodedPayload = b64u(payload), signingInput = encoder.encode(`${encodedProtectedHeader}.${encodedPayload}`));
|
|
29
29
|
}
|
|
30
|
-
|
|
31
|
-
const
|
|
32
|
-
entry.minRsaBits && checkModulusLength(entry.alg,
|
|
30
|
+
signingInput ??= concat(encode(encodedProtectedHeader), encode("."), signingPayload);
|
|
31
|
+
const signingKey = await rawKey(await prepareKey(entry, key, "sign"), entry.subtle, "sign");
|
|
32
|
+
entry.minRsaBits && checkModulusLength(entry.alg, signingKey);
|
|
33
33
|
const jws = {
|
|
34
|
-
signature: b64u(new Uint8Array(await crypto.subtle.sign(entry.signing,
|
|
35
|
-
payload:
|
|
34
|
+
signature: b64u(new Uint8Array(await crypto.subtle.sign(entry.signing, signingKey, signingInput))),
|
|
35
|
+
payload: encodedPayload
|
|
36
36
|
};
|
|
37
|
-
return protectedHeader && (jws.protected =
|
|
37
|
+
return protectedHeader && (jws.protected = encodedProtectedHeader), unprotectedHeader && (jws.header = unprotectedHeader), [jws, b64];
|
|
38
38
|
}
|
|
39
39
|
async function createCompactSignature(payload, protectedHeader, crit, key, rejectUnencoded) {
|
|
40
40
|
const [jws] = await createSignature([payload, protectedHeader, void 0, crit], key, rejectUnencoded);
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import { jwsAlgorithm } from "./jws_algorithms.js";
|
|
2
2
|
import { JOSEAlgNotAllowed, JWSInvalid, JWSSignatureVerificationFailed } from "../util/errors.js";
|
|
3
3
|
import { concat, decoder, encoder, encode } from "./buffer_utils.js";
|
|
4
|
-
import { decodeBase64url,
|
|
4
|
+
import { decodeBase64url, encodeAsciiMember, parseJoseHeader, isDisjoint, isObject, validateB64, validateCrit, validateAlgorithms, JWS_RECOGNIZED } from "./validate.js";
|
|
5
5
|
import { prepareKey, rawKey, checkModulusLength } from "./key.js";
|
|
6
6
|
function snapshotJws(jws, sharedPayload) {
|
|
7
|
-
const
|
|
7
|
+
const encodedProtectedHeader = jws.protected, inputHeader = jws.header, header = isObject(inputHeader) ? { ...inputHeader } : inputHeader;
|
|
8
8
|
let payload = sharedPayload ? sharedPayload[0] : jws.payload;
|
|
9
9
|
!sharedPayload && payload instanceof Uint8Array && (payload = new Uint8Array(payload));
|
|
10
10
|
const signature = jws.signature, snapshot = { payload, signature };
|
|
11
|
-
if (
|
|
11
|
+
if (encodedProtectedHeader !== void 0 && (snapshot.protected = encodedProtectedHeader), inputHeader !== void 0 && (snapshot.header = header), encodedProtectedHeader === void 0 && header === void 0)
|
|
12
12
|
throw new JWSInvalid('Flattened JWS must have either of the "protected" or "header" members');
|
|
13
|
-
if (
|
|
13
|
+
if (encodedProtectedHeader !== void 0 && typeof encodedProtectedHeader != "string")
|
|
14
14
|
throw new JWSInvalid("JWS Protected Header incorrect type");
|
|
15
15
|
if (payload === void 0)
|
|
16
16
|
throw new JWSInvalid("JWS Payload missing");
|
|
@@ -23,8 +23,8 @@ function snapshotJws(jws, sharedPayload) {
|
|
|
23
23
|
function prepareVerify(options) {
|
|
24
24
|
return [options && validateAlgorithms("algorithms", options.algorithms), options?.crit];
|
|
25
25
|
}
|
|
26
|
-
function parseProtectedHeader(
|
|
27
|
-
return
|
|
26
|
+
function parseProtectedHeader(encodedProtectedHeader) {
|
|
27
|
+
return encodedProtectedHeader === void 0 ? {} : parseJoseHeader(encodedProtectedHeader, JWSInvalid, "JWS Protected Header is invalid");
|
|
28
28
|
}
|
|
29
29
|
function encodeJsonUnencodedPayload(payload) {
|
|
30
30
|
const invalid = /[\p{Cs}\p{Cn}]/u.exec(payload)?.[0];
|
|
@@ -35,15 +35,17 @@ function encodeJsonUnencodedPayload(payload) {
|
|
|
35
35
|
function encodeCompactUnencodedPayload(payload) {
|
|
36
36
|
try {
|
|
37
37
|
return encode(payload);
|
|
38
|
-
} catch {
|
|
39
|
-
throw new JWSInvalid("JWS Compact Serialization payload must use only ASCII characters"
|
|
38
|
+
} catch (cause) {
|
|
39
|
+
throw new JWSInvalid("JWS Compact Serialization payload must use only ASCII characters", {
|
|
40
|
+
cause
|
|
41
|
+
});
|
|
40
42
|
}
|
|
41
43
|
}
|
|
42
44
|
async function verifySignature(jws, shared, key, encodeUnencodedPayload, parsedProtected) {
|
|
43
|
-
const { protected:
|
|
44
|
-
if (!isDisjoint(
|
|
45
|
+
const { protected: encodedProtectedHeader, header, payload: inputPayload } = jws, protectedHeader = parsedProtected ?? parseProtectedHeader(encodedProtectedHeader);
|
|
46
|
+
if (!isDisjoint(protectedHeader, header))
|
|
45
47
|
throw new JWSInvalid("JWS Protected and JWS Unprotected Header Parameter names must be disjoint");
|
|
46
|
-
const joseHeader = { ...
|
|
48
|
+
const joseHeader = { ...protectedHeader, ...header }, b64 = validateB64(protectedHeader, validateCrit(JWSInvalid, JWS_RECOGNIZED, shared[1], protectedHeader, joseHeader)), { alg } = joseHeader;
|
|
47
49
|
if (typeof alg != "string" || !alg)
|
|
48
50
|
throw new JWSInvalid('JWS "alg" (Algorithm) Header Parameter missing or invalid');
|
|
49
51
|
if (shared[0] && !shared[0].has(alg))
|
|
@@ -55,18 +57,19 @@ async function verifySignature(jws, shared, key, encodeUnencodedPayload, parsedP
|
|
|
55
57
|
throw new JWSInvalid("JWS Payload must be a string or an Uint8Array instance");
|
|
56
58
|
const signingPayload = b64 || typeof inputPayload != "string" ? inputPayload : encodeUnencodedPayload(inputPayload);
|
|
57
59
|
let resolvedKey = !1;
|
|
58
|
-
typeof key == "function" && (key = await key(
|
|
59
|
-
const entry = jwsAlgorithm(alg),
|
|
60
|
+
typeof key == "function" && (key = await key(protectedHeader, jws), resolvedKey = !0);
|
|
61
|
+
const entry = jwsAlgorithm(alg), signingInput = concat(encodedProtectedHeader !== void 0 ? encode(encodedProtectedHeader) : new Uint8Array(), encode("."), typeof signingPayload == "string" ? shared[2] ??= encodeAsciiMember(signingPayload, "payload", JWSInvalid) : signingPayload), signature = decodeBase64url(jws.signature, "signature", JWSInvalid), verificationKey = await prepareKey(entry, key, "verify"), cryptoKey = await rawKey(verificationKey, entry.subtle, "verify");
|
|
60
62
|
entry.minRsaBits && checkModulusLength(entry.alg, cryptoKey);
|
|
61
63
|
let verified = !1;
|
|
62
64
|
try {
|
|
63
|
-
verified = await crypto.subtle.verify(entry.signing, cryptoKey, signature,
|
|
64
|
-
} catch {
|
|
65
|
+
verified = await crypto.subtle.verify(entry.signing, cryptoKey, signature, signingInput);
|
|
66
|
+
} catch (cause) {
|
|
67
|
+
throw new JWSSignatureVerificationFailed(void 0, { cause });
|
|
65
68
|
}
|
|
66
69
|
if (!verified)
|
|
67
70
|
throw new JWSSignatureVerificationFailed();
|
|
68
71
|
const result = { payload: typeof signingPayload == "string" ? decodeBase64url(signingPayload, "payload", JWSInvalid) : signingPayload };
|
|
69
|
-
return
|
|
72
|
+
return encodedProtectedHeader !== void 0 && (result.protectedHeader = protectedHeader), header !== void 0 && (result.unprotectedHeader = header), resolvedKey ? [{ ...result, key: verificationKey }, b64] : [result, b64];
|
|
70
73
|
}
|
|
71
74
|
async function verifyCompact(jws, shared, key) {
|
|
72
75
|
if (jws instanceof Uint8Array && (jws = decoder.decode(jws)), typeof jws != "string")
|
|
@@ -16,8 +16,8 @@ function secs(str) {
|
|
|
16
16
|
typeof str != "string" && invalidDuration();
|
|
17
17
|
const matched = REGEX.exec(str);
|
|
18
18
|
(!matched || matched[4] && matched[1]) && invalidDuration();
|
|
19
|
-
const value = parseFloat(matched[2]),
|
|
20
|
-
return Number.isFinite(
|
|
19
|
+
const value = parseFloat(matched[2]), durationSeconds = Math.round(value * multipliers[matched[3][0].toLowerCase()]);
|
|
20
|
+
return Number.isFinite(durationSeconds) || invalidDuration(), matched[1] === "-" || matched[4] === "ago" ? -durationSeconds : durationSeconds;
|
|
21
21
|
}
|
|
22
22
|
function validateInput(label, input) {
|
|
23
23
|
if (!Number.isFinite(input))
|
|
@@ -39,34 +39,35 @@ const normalizeTyp = (value) => {
|
|
|
39
39
|
const normalized = value.toLowerCase();
|
|
40
40
|
return value.includes("/") ? normalized : `application/${normalized}`;
|
|
41
41
|
}, checkAudiencePresence = (audPayload, audOption) => typeof audPayload == "string" ? audOption.includes(audPayload) : Array.isArray(audPayload) ? audOption.some((aud) => audPayload.includes(aud)) : !1;
|
|
42
|
-
function validateNumericDate(
|
|
43
|
-
const value =
|
|
42
|
+
function validateNumericDate(claimsSet, claim, required = !1) {
|
|
43
|
+
const value = claimsSet[claim];
|
|
44
44
|
if (!(value === void 0 && !required)) {
|
|
45
45
|
if (typeof value != "number")
|
|
46
|
-
throw new JWTClaimValidationFailed(`"${claim}" claim must be a number`,
|
|
46
|
+
throw new JWTClaimValidationFailed(`"${claim}" claim must be a number`, claimsSet, claim, "invalid");
|
|
47
47
|
return value;
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
|
-
function unexpectedClaim(
|
|
51
|
-
throw new JWTClaimValidationFailed(`unexpected "${claim}" claim value`,
|
|
50
|
+
function unexpectedClaim(claimsSet, claim) {
|
|
51
|
+
throw new JWTClaimValidationFailed(`unexpected "${claim}" claim value`, claimsSet, claim, checkFailed);
|
|
52
52
|
}
|
|
53
|
-
function validateClaimsSet(protectedHeader,
|
|
54
|
-
let
|
|
53
|
+
function validateClaimsSet(protectedHeader, claimsSetBytes, options = {}) {
|
|
54
|
+
let claimsSet;
|
|
55
55
|
try {
|
|
56
|
-
|
|
57
|
-
} catch {
|
|
56
|
+
claimsSet = JSON.parse(strictDecoder.decode(claimsSetBytes));
|
|
57
|
+
} catch (cause) {
|
|
58
|
+
throw new JWTInvalid("JWT Claims Set must be a top-level JSON object", { cause });
|
|
58
59
|
}
|
|
59
|
-
if (!isObject(
|
|
60
|
+
if (!isObject(claimsSet))
|
|
60
61
|
throw new JWTInvalid("JWT Claims Set must be a top-level JSON object");
|
|
61
62
|
const { typ } = options;
|
|
62
63
|
if (typ !== void 0 && (typeof protectedHeader.typ != "string" || normalizeTyp(protectedHeader.typ) !== normalizeTyp(typ)))
|
|
63
|
-
throw new JWTClaimValidationFailed('unexpected "typ" JWT header value',
|
|
64
|
+
throw new JWTClaimValidationFailed('unexpected "typ" JWT header value', claimsSet, "typ", checkFailed);
|
|
64
65
|
const { requiredClaims = [], issuer, subject, audience, maxTokenAge } = options, presenceCheck = [...requiredClaims];
|
|
65
66
|
maxTokenAge !== void 0 && presenceCheck.push("iat"), audience !== void 0 && presenceCheck.push("aud"), subject !== void 0 && presenceCheck.push("sub"), issuer !== void 0 && presenceCheck.push("iss");
|
|
66
67
|
for (const claim of new Set(presenceCheck.reverse()))
|
|
67
|
-
if (!Object.hasOwn(
|
|
68
|
-
throw new JWTClaimValidationFailed(`missing required "${claim}" claim`,
|
|
69
|
-
issuer !== void 0 && !(Array.isArray(issuer) ? issuer : [issuer]).includes(
|
|
68
|
+
if (!Object.hasOwn(claimsSet, claim))
|
|
69
|
+
throw new JWTClaimValidationFailed(`missing required "${claim}" claim`, claimsSet, claim, "missing");
|
|
70
|
+
issuer !== void 0 && !(Array.isArray(issuer) ? issuer : [issuer]).includes(claimsSet.iss) && unexpectedClaim(claimsSet, "iss"), subject !== void 0 && claimsSet.sub !== subject && unexpectedClaim(claimsSet, "sub"), audience !== void 0 && !checkAudiencePresence(claimsSet.aud, typeof audience == "string" ? [audience] : audience) && unexpectedClaim(claimsSet, "aud");
|
|
70
71
|
const { clockTolerance } = options;
|
|
71
72
|
let tolerance = 0;
|
|
72
73
|
if (typeof clockTolerance == "string")
|
|
@@ -77,70 +78,70 @@ function validateClaimsSet(protectedHeader, encodedPayload, options = {}) {
|
|
|
77
78
|
tolerance = clockTolerance;
|
|
78
79
|
}
|
|
79
80
|
validateInput("clockTolerance option", tolerance);
|
|
80
|
-
const { currentDate } = options, now = validateInput("currentDate option", epoch(currentDate === void 0 ? /* @__PURE__ */ new Date() : currentDate)), iat = validateNumericDate(
|
|
81
|
+
const { currentDate } = options, now = validateInput("currentDate option", epoch(currentDate === void 0 ? /* @__PURE__ */ new Date() : currentDate)), iat = validateNumericDate(claimsSet, "iat", maxTokenAge !== void 0), nbf = validateNumericDate(claimsSet, "nbf");
|
|
81
82
|
if (nbf !== void 0 && nbf > now + tolerance)
|
|
82
|
-
throw new JWTClaimValidationFailed('"nbf" claim timestamp check failed',
|
|
83
|
-
const exp = validateNumericDate(
|
|
83
|
+
throw new JWTClaimValidationFailed('"nbf" claim timestamp check failed', claimsSet, "nbf", checkFailed);
|
|
84
|
+
const exp = validateNumericDate(claimsSet, "exp");
|
|
84
85
|
if (exp !== void 0 && exp <= now - tolerance)
|
|
85
|
-
throw new JWTExpired('"exp" claim timestamp check failed',
|
|
86
|
+
throw new JWTExpired('"exp" claim timestamp check failed', claimsSet, "exp", checkFailed);
|
|
86
87
|
if (maxTokenAge !== void 0) {
|
|
87
88
|
const age = now - iat, max = validateInput("maxTokenAge option", typeof maxTokenAge == "number" ? maxTokenAge : secs(maxTokenAge));
|
|
88
89
|
if (age - tolerance > max)
|
|
89
|
-
throw new JWTExpired('"iat" claim timestamp check failed (too far in the past)',
|
|
90
|
+
throw new JWTExpired('"iat" claim timestamp check failed (too far in the past)', claimsSet, "iat", checkFailed);
|
|
90
91
|
if (age < -tolerance)
|
|
91
|
-
throw new JWTClaimValidationFailed('"iat" claim timestamp check failed (it should be in the past)',
|
|
92
|
+
throw new JWTClaimValidationFailed('"iat" claim timestamp check failed (it should be in the past)', claimsSet, "iat", checkFailed);
|
|
92
93
|
}
|
|
93
|
-
return
|
|
94
|
+
return claimsSet;
|
|
94
95
|
}
|
|
95
|
-
let
|
|
96
|
-
function
|
|
97
|
-
return
|
|
96
|
+
let producerClaimsSets;
|
|
97
|
+
function producerClaimsSet(producer) {
|
|
98
|
+
return producerClaimsSets.get(producer);
|
|
98
99
|
}
|
|
99
|
-
function
|
|
100
|
-
const
|
|
100
|
+
function jwtClaimsSetBytes(producer) {
|
|
101
|
+
const claimsSet = producerClaimsSet(producer);
|
|
101
102
|
for (const claim of ["iat", "nbf", "exp"]) {
|
|
102
|
-
const value =
|
|
103
|
+
const value = claimsSet[claim];
|
|
103
104
|
if (typeof value == "number" && !Number.isFinite(value))
|
|
104
105
|
throw new TypeError(`"${claim}" claim must be a finite number`);
|
|
105
106
|
}
|
|
106
|
-
return encoder.encode(JSON.stringify(
|
|
107
|
+
return encoder.encode(JSON.stringify(claimsSet));
|
|
107
108
|
}
|
|
108
109
|
function jwtClaim(producer, claim) {
|
|
109
|
-
return
|
|
110
|
+
return producerClaimsSet(producer)[claim];
|
|
110
111
|
}
|
|
111
112
|
class JWTClaimsBuilder {
|
|
112
|
-
constructor(
|
|
113
|
-
if (!isObject(
|
|
113
|
+
constructor(claimsSet = {}) {
|
|
114
|
+
if (!isObject(claimsSet))
|
|
114
115
|
throw new TypeError("JWT Claims Set MUST be an object");
|
|
115
|
-
(
|
|
116
|
+
(producerClaimsSets ||= /* @__PURE__ */ new WeakMap()).set(this, structuredClone(claimsSet));
|
|
116
117
|
}
|
|
117
118
|
setIssuer(value) {
|
|
118
|
-
return validateStringClaim("iss", value),
|
|
119
|
+
return validateStringClaim("iss", value), producerClaimsSet(this).iss = value, this;
|
|
119
120
|
}
|
|
120
121
|
setSubject(value) {
|
|
121
|
-
return validateStringClaim("sub", value),
|
|
122
|
+
return validateStringClaim("sub", value), producerClaimsSet(this).sub = value, this;
|
|
122
123
|
}
|
|
123
124
|
setAudience(value) {
|
|
124
|
-
return validateAudienceClaim(value),
|
|
125
|
+
return validateAudienceClaim(value), producerClaimsSet(this).aud = value, this;
|
|
125
126
|
}
|
|
126
127
|
setJti(value) {
|
|
127
|
-
return validateStringClaim("jti", value),
|
|
128
|
+
return validateStringClaim("jti", value), producerClaimsSet(this).jti = value, this;
|
|
128
129
|
}
|
|
129
130
|
setNotBefore(value) {
|
|
130
|
-
return
|
|
131
|
+
return producerClaimsSet(this).nbf = numericDate(value, "setNotBefore"), this;
|
|
131
132
|
}
|
|
132
133
|
setExpirationTime(value) {
|
|
133
|
-
return
|
|
134
|
+
return producerClaimsSet(this).exp = numericDate(value, "setExpirationTime"), this;
|
|
134
135
|
}
|
|
135
136
|
setIssuedAt(value) {
|
|
136
|
-
const
|
|
137
|
-
return value === void 0 ?
|
|
137
|
+
const claimsSet = producerClaimsSet(this);
|
|
138
|
+
return value === void 0 ? claimsSet.iat = epoch(/* @__PURE__ */ new Date()) : typeof value == "string" ? claimsSet.iat = validateInput("setIssuedAt", epoch(/* @__PURE__ */ new Date()) + secs(value)) : claimsSet.iat = numericDate(value, "setIssuedAt"), this;
|
|
138
139
|
}
|
|
139
140
|
}
|
|
140
141
|
export {
|
|
141
142
|
JWTClaimsBuilder,
|
|
142
143
|
jwtClaim,
|
|
143
|
-
|
|
144
|
+
jwtClaimsSetBytes,
|
|
144
145
|
secs,
|
|
145
146
|
validateClaimsSet
|
|
146
147
|
};
|
|
@@ -17,15 +17,15 @@ const tag = (key) => key[Symbol.toStringTag], jwkMatchesOp = (entry, key, usage)
|
|
|
17
17
|
}
|
|
18
18
|
};
|
|
19
19
|
async function prepareKey(entry, key, usage) {
|
|
20
|
-
const { alg, secret } = entry,
|
|
20
|
+
const { alg, secret } = entry, requiresPrivateKey = usage === "decrypt" || usage === "sign";
|
|
21
21
|
if (secret && key instanceof Uint8Array)
|
|
22
22
|
return key;
|
|
23
23
|
let normalized, keyObject;
|
|
24
24
|
if (isObject(key)) {
|
|
25
25
|
if (normalized = normalizeJwk(key), typeof normalized.kty != "string")
|
|
26
26
|
throw invalidKeyType(alg, key, secret);
|
|
27
|
-
if (!(secret ? normalized.kty === "oct" && typeof normalized.k == "string" : normalized.kty !== "oct" && (
|
|
28
|
-
throw new TypeError(secret ? 'JSON Web Key for symmetric algorithms must have JWK "kty" (Key Type) equal to "oct" and the JWK "k" (Key Value) present' : `JSON Web Key for this operation must be a ${
|
|
27
|
+
if (!(secret ? normalized.kty === "oct" && typeof normalized.k == "string" : normalized.kty !== "oct" && (requiresPrivateKey ? normalized.kty === "AKP" && typeof normalized.priv == "string" || typeof normalized.d == "string" : normalized.d === void 0 && normalized.priv === void 0)))
|
|
28
|
+
throw new TypeError(secret ? 'JSON Web Key for symmetric algorithms must have JWK "kty" (Key Type) equal to "oct" and the JWK "k" (Key Value) present' : `JSON Web Key for this operation must be a ${requiresPrivateKey ? "private" : "public"} JWK`);
|
|
29
29
|
if (jwkMatchesOp(entry, normalized, usage), normalized.kty === "oct")
|
|
30
30
|
return decode(normalized.k);
|
|
31
31
|
if (!Object.isFrozen(key)) {
|
|
@@ -35,7 +35,7 @@ async function prepareKey(entry, key, usage) {
|
|
|
35
35
|
} else {
|
|
36
36
|
if (!isKeyLike(key))
|
|
37
37
|
throw invalidKeyType(alg, key, secret);
|
|
38
|
-
const expectedType = secret ? "secret" :
|
|
38
|
+
const expectedType = secret ? "secret" : requiresPrivateKey ? "private" : "public";
|
|
39
39
|
if (key.type !== expectedType && (secret || ["secret", "public", "private"].includes(key.type)))
|
|
40
40
|
throw new TypeError(`${tag(key)} instances must be of type "${expectedType}" for the ${alg} algorithm`);
|
|
41
41
|
if (isCryptoKey(key))
|
|
@@ -26,32 +26,32 @@ async function deriveKey(p2s, alg, p2c, key) {
|
|
|
26
26
|
throw new JWEInvalid("PBES2 Salt Input must be 8 or more octets");
|
|
27
27
|
if (!Number.isSafeInteger(p2c) || Math.sign(p2c) !== 1)
|
|
28
28
|
throw new JWEInvalid("PBES2 Count Input must be a positive integer");
|
|
29
|
-
const salt = concat(encode(alg), Uint8Array.of(0), p2s),
|
|
29
|
+
const salt = concat(encode(alg), Uint8Array.of(0), p2s), keyLengthBits = parseInt(alg.slice(13, 16), 10), subtleAlg = {
|
|
30
30
|
hash: `SHA-${alg.slice(8, 11)}`,
|
|
31
31
|
iterations: p2c,
|
|
32
32
|
name: "PBKDF2",
|
|
33
33
|
salt
|
|
34
34
|
}, cryptoKey = await rawKey(key, jweAlgorithm(alg).subtle, "deriveBits");
|
|
35
|
-
return new Uint8Array(await crypto.subtle.deriveBits(subtleAlg, cryptoKey,
|
|
35
|
+
return new Uint8Array(await crypto.subtle.deriveBits(subtleAlg, cryptoKey, keyLengthBits));
|
|
36
36
|
}
|
|
37
37
|
function lengthAndInput(input) {
|
|
38
38
|
return concat(uint32be(input.length), input);
|
|
39
39
|
}
|
|
40
|
-
async function concatKdf(Z,
|
|
41
|
-
const dkLen =
|
|
40
|
+
async function concatKdf(Z, keyDataLength, OtherInfo) {
|
|
41
|
+
const dkLen = keyDataLength >> 3, hashLen = 32, reps = Math.ceil(dkLen / hashLen), dk = new Uint8Array(reps * hashLen);
|
|
42
42
|
for (let i = 1; i <= reps; i++) {
|
|
43
43
|
const hashResult = await digest("sha256", concat(uint32be(i), Z, OtherInfo));
|
|
44
44
|
dk.set(hashResult, (i - 1) * hashLen);
|
|
45
45
|
}
|
|
46
46
|
return dk.slice(0, dkLen);
|
|
47
47
|
}
|
|
48
|
-
async function ecdhesDeriveKey(publicKey, privateKey,
|
|
48
|
+
async function ecdhesDeriveKey(publicKey, privateKey, algorithmId, keyDataLength, apu = new Uint8Array(), apv = new Uint8Array()) {
|
|
49
49
|
checkEcdhCryptoKey(publicKey), checkEcdhCryptoKey(privateKey, "deriveBits");
|
|
50
|
-
const otherInfo = concat(lengthAndInput(encode(
|
|
50
|
+
const otherInfo = concat(lengthAndInput(encode(algorithmId)), lengthAndInput(apu), lengthAndInput(apv), uint32be(keyDataLength)), Z = new Uint8Array(await crypto.subtle.deriveBits({
|
|
51
51
|
name: publicKey.algorithm.name,
|
|
52
52
|
public: publicKey
|
|
53
53
|
}, privateKey, publicKey.algorithm.name === "X25519" ? 256 : Math.ceil(parseInt(publicKey.algorithm.namedCurve.slice(-3), 10) / 8) << 3));
|
|
54
|
-
return concatKdf(Z,
|
|
54
|
+
return concatKdf(Z, keyDataLength, otherInfo);
|
|
55
55
|
}
|
|
56
56
|
function assertEcdhKey(key) {
|
|
57
57
|
assertCryptoKey(key);
|
|
@@ -100,10 +100,10 @@ async function decryptKeyManagement(entry, enc, key, encryptedKey, joseHeader, m
|
|
|
100
100
|
assertEcdhKey(key);
|
|
101
101
|
const ephemeralPublicKey = await jwkToKey(entry, epk), partyUInfo = partyInfo(joseHeader, "apu"), partyVInfo = partyInfo(joseHeader, "apv");
|
|
102
102
|
checkPartyInfo(partyUInfo, partyVInfo);
|
|
103
|
-
const
|
|
103
|
+
const derivedKey = await ecdhesDeriveKey(ephemeralPublicKey, key, direct ? enc.alg : alg, direct ? enc.cekBits : parseInt(alg.slice(-5, -2), 10), partyUInfo, partyVInfo);
|
|
104
104
|
if (direct)
|
|
105
|
-
return
|
|
106
|
-
key =
|
|
105
|
+
return derivedKey;
|
|
106
|
+
key = derivedKey;
|
|
107
107
|
break;
|
|
108
108
|
}
|
|
109
109
|
case "RSA-OAEP":
|
|
@@ -153,19 +153,19 @@ async function encryptKeyManagement(entry, enc, inputKey, joseHeader, providedCe
|
|
|
153
153
|
providedApu !== void 0 && assertUint8Array(providedApu, '"apu"'), providedApv !== void 0 && assertUint8Array(providedApv, '"apv"');
|
|
154
154
|
const apu = providedApu ?? partyInfo(joseHeader, "apu"), apv = providedApv ?? partyInfo(joseHeader, "apv");
|
|
155
155
|
checkPartyInfo(apu, apv);
|
|
156
|
-
let
|
|
157
|
-
providedParameters.epk !== void 0 ?
|
|
156
|
+
let ephemeralPrivateKey;
|
|
157
|
+
providedParameters.epk !== void 0 ? ephemeralPrivateKey = await prepareKey(entry, providedParameters.epk, "decrypt") : ephemeralPrivateKey = (await crypto.subtle.generateKey(key.algorithm, !0, ["deriveBits"])).privateKey;
|
|
158
158
|
const subtle = crypto.subtle;
|
|
159
|
-
let exportableEpk =
|
|
159
|
+
let exportableEpk = ephemeralPrivateKey;
|
|
160
160
|
if (!exportableEpk.extractable) {
|
|
161
161
|
if (typeof subtle.getPublicKey != "function")
|
|
162
162
|
throw new TypeError('CryptoKey for "epk" must be extractable');
|
|
163
|
-
exportableEpk = await subtle.getPublicKey(
|
|
163
|
+
exportableEpk = await subtle.getPublicKey(ephemeralPrivateKey, []);
|
|
164
164
|
}
|
|
165
|
-
const { x, y, crv, kty } = await subtle.exportKey("jwk", exportableEpk), direct = mode === "direct-key-agreement",
|
|
165
|
+
const { x, y, crv, kty } = await subtle.exportKey("jwk", exportableEpk), direct = mode === "direct-key-agreement", derivedKey = await ecdhesDeriveKey(key, ephemeralPrivateKey, direct ? enc.alg : alg, direct ? enc.cekBits : parseInt(alg.slice(-5, -2), 10), apu, apv), epk = { x, crv, kty };
|
|
166
166
|
if (kty === "EC" && (epk.y = y), parameters = { epk }, providedApu !== void 0 && (parameters.apu = b64u(providedApu)), providedApv !== void 0 && (parameters.apv = b64u(providedApv)), direct)
|
|
167
|
-
return [
|
|
168
|
-
key =
|
|
167
|
+
return [derivedKey, void 0, parameters];
|
|
168
|
+
key = derivedKey;
|
|
169
169
|
break;
|
|
170
170
|
}
|
|
171
171
|
case "RSA-OAEP": {
|
|
@@ -32,23 +32,23 @@ function assertNotSet(value, name) {
|
|
|
32
32
|
function decodeBase64url(value, label, ErrorClass) {
|
|
33
33
|
try {
|
|
34
34
|
return decode(value);
|
|
35
|
-
} catch {
|
|
36
|
-
throw new ErrorClass(`Failed to base64url decode the ${label}
|
|
35
|
+
} catch (cause) {
|
|
36
|
+
throw new ErrorClass(`Failed to base64url decode the ${label}`, { cause });
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
|
-
function
|
|
39
|
+
function encodeAsciiMember(value, label, ErrorClass) {
|
|
40
40
|
try {
|
|
41
41
|
return encode(value);
|
|
42
|
-
} catch {
|
|
43
|
-
throw new ErrorClass(`The ${label} is not a valid base64url string
|
|
42
|
+
} catch (cause) {
|
|
43
|
+
throw new ErrorClass(`The ${label} is not a valid base64url string`, { cause });
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
|
-
function parseJoseHeader(
|
|
46
|
+
function parseJoseHeader(encodedProtectedHeader, ErrorClass, message) {
|
|
47
47
|
let parsed;
|
|
48
48
|
try {
|
|
49
|
-
parsed = JSON.parse(strictDecoder.decode(decode(
|
|
50
|
-
} catch {
|
|
51
|
-
throw new ErrorClass(message);
|
|
49
|
+
parsed = JSON.parse(strictDecoder.decode(decode(encodedProtectedHeader)));
|
|
50
|
+
} catch (cause) {
|
|
51
|
+
throw new ErrorClass(message, { cause });
|
|
52
52
|
}
|
|
53
53
|
if (!isObject(parsed))
|
|
54
54
|
throw new ErrorClass(message);
|
|
@@ -109,7 +109,7 @@ export {
|
|
|
109
109
|
assertNotSet,
|
|
110
110
|
assertUint8Array,
|
|
111
111
|
decodeBase64url,
|
|
112
|
-
|
|
112
|
+
encodeAsciiMember,
|
|
113
113
|
isDisjoint,
|
|
114
114
|
isJwkSet,
|
|
115
115
|
isObject,
|
|
@@ -5,28 +5,28 @@ import { JWTInvalid } from "./errors.js";
|
|
|
5
5
|
function decodeJwt(jwt) {
|
|
6
6
|
if (typeof jwt != "string")
|
|
7
7
|
throw new JWTInvalid("JWTs must use Compact JWS serialization, JWT must be a string");
|
|
8
|
-
const { 1:
|
|
8
|
+
const { 1: encodedPayload, length } = jwt.split(".");
|
|
9
9
|
if (length === 5)
|
|
10
10
|
throw new JWTInvalid("Only JWTs using Compact JWS serialization can be decoded");
|
|
11
11
|
if (length !== 3)
|
|
12
12
|
throw new JWTInvalid("Invalid JWT");
|
|
13
|
-
if (!
|
|
13
|
+
if (!encodedPayload)
|
|
14
14
|
throw new JWTInvalid("JWTs must contain a payload");
|
|
15
|
-
let
|
|
15
|
+
let claimsSetBytes;
|
|
16
16
|
try {
|
|
17
|
-
|
|
18
|
-
} catch {
|
|
19
|
-
throw new JWTInvalid("Failed to base64url decode the payload");
|
|
17
|
+
claimsSetBytes = b64u(encodedPayload);
|
|
18
|
+
} catch (cause) {
|
|
19
|
+
throw new JWTInvalid("Failed to base64url decode the payload", { cause });
|
|
20
20
|
}
|
|
21
|
-
let
|
|
21
|
+
let claimsSet;
|
|
22
22
|
try {
|
|
23
|
-
|
|
24
|
-
} catch {
|
|
25
|
-
throw new JWTInvalid("Failed to parse the decoded payload as JSON");
|
|
23
|
+
claimsSet = JSON.parse(strictDecoder.decode(claimsSetBytes));
|
|
24
|
+
} catch (cause) {
|
|
25
|
+
throw new JWTInvalid("Failed to parse the decoded payload as JSON", { cause });
|
|
26
26
|
}
|
|
27
|
-
if (!isObject(
|
|
27
|
+
if (!isObject(claimsSet))
|
|
28
28
|
throw new JWTInvalid("Invalid JWT Claims Set");
|
|
29
|
-
return
|
|
29
|
+
return claimsSet;
|
|
30
30
|
}
|
|
31
31
|
export {
|
|
32
32
|
decodeJwt
|
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
import { parseJoseHeader } from "../lib/validate.js";
|
|
2
2
|
function decodeProtectedHeader(token) {
|
|
3
|
-
let
|
|
3
|
+
let encodedProtectedHeader;
|
|
4
4
|
if (typeof token == "string") {
|
|
5
5
|
const parts = token.split(".");
|
|
6
|
-
(parts.length === 3 || parts.length === 5) && ([
|
|
6
|
+
(parts.length === 3 || parts.length === 5) && ([encodedProtectedHeader] = parts);
|
|
7
7
|
} else if (typeof token == "object" && token)
|
|
8
8
|
if ("protected" in token)
|
|
9
|
-
|
|
9
|
+
encodedProtectedHeader = token.protected;
|
|
10
10
|
else
|
|
11
11
|
throw new TypeError("Token does not contain a Protected Header");
|
|
12
12
|
const invalid = "Invalid Token or Protected Header formatting";
|
|
13
|
-
if (typeof
|
|
13
|
+
if (typeof encodedProtectedHeader != "string" || !encodedProtectedHeader)
|
|
14
14
|
throw new TypeError(invalid);
|
|
15
|
-
return parseJoseHeader(
|
|
15
|
+
return parseJoseHeader(encodedProtectedHeader, TypeError, invalid);
|
|
16
16
|
}
|
|
17
17
|
export {
|
|
18
18
|
decodeProtectedHeader
|