Merge branch 'master' into dependabot/npm_and_yarn/stream_mem_stress_…

…test/express-4.19.2
aws · Aug 29, 2024 · 7299039 · 7299039
2 parents a5d064c + 66882b9
commit 7299039
Show file tree

Hide file tree

Showing 67 changed files with 9,404 additions and 20,906 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -80,6 +80,9 @@ module.exports = {
     '@typescript-eslint/ban-ts-comment': ['error', { 'ts-ignore': false }],
     // This rule fights with Prettier and no-semi
     '@typescript-eslint/no-extra-semi': 'off',
+    // Added in later versions of @typescript-eslint
+    '@typescript-eslint/explicit-module-boundary-types': 'off',
+    '@typescript-eslint/no-unused-vars': 'off',
   },
   // This is a good rule,
   // but in many tests,

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,67 @@
+# This workflow performs tests in JavaScript.
+name: ESDK JavaScript CI Tests 
+
+on: [pull_request, workflow_call]
+
+jobs:
+  CI:
+    strategy:
+      matrix:
+          node: [16, 18.x, 20.x, 22.x, latest]
+      fail-fast: false
+    runs-on: codebuild-AWS-ESDK-JS-Release-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-5.0-large
+    permissions:
+      id-token: write
+      contents: read
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true 
+      - uses: actions/setup-node@v4
+        with:
+          node-version: ${{matrix.node}}
+      - name: Configure AWS Credentials for Tests
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-region: us-west-2
+          role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-MPL-Dafny-Role-us-west-2
+          role-session-name: JavaScriptTests 
+      - name: Test Coverage Node ${{matrix.node}}
+        env: 
+          NODE_OPTIONS: "--max-old-space-size=4096"
+        run: |
+          npm ci
+          npm run build
+          npm run coverage-node
+      - name: Test Coverage Browser ${{matrix.node}}
+        env: 
+          NODE_OPTIONS: "--max-old-space-size=4096"
+        run: |
+          npm run coverage-browser
+      - name: Test compliance
+        env: 
+          NODE_OPTIONS: "--max-old-space-size=4096"
+        run: |
+          npm run lint
+          npm run test_conditions
+      - name: Run Test Vectors Node ${{matrix.node}}
+        env:
+          NODE_OPTIONS: "--max-old-space-size=4096"
+          NPM_CONFIG_UNSAFE_PERM: true
+          PUBLISH_LOCAL: true
+        run: |
+          npm run verdaccio-publish
+          npm run verdaccio-node-decrypt
+          npm run verdaccio-node-encrypt
+      - name: Run Test Vectors Browser node ${{matrix.node}} 
+        env:
+          NODE_OPTIONS: "--max-old-space-size=4096"
+          NPM_CONFIG_UNSAFE_PERM: true
+          PUBLISH_LOCAL: true
+        run: |
+          npm run verdaccio-publish
+          npm run verdaccio-browser-decrypt
+          npm run verdaccio-browser-encrypt
diff --git a/.github/workflows/daily_ci.yml b/.github/workflows/daily_ci.yml
@@ -0,0 +1,12 @@
+# This workflow runs every weekday at 15:00 UTC (8AM PDT)
+name: Daily CI
+
+on:
+  schedule:
+    - cron: "00 15 * * 1-5"
+
+jobs:
+  DAILY_CI:
+    # Don't run the cron builds on forks
+    if: github.event_name != 'schedule' || github.repository_owner == 'aws'
+    uses: ./.github/workflows/ci.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.1](https://github.com/awslabs/aws-encryption-sdk-javascript/compare/v4.0.0...v4.0.1) (2024-07-30)
+
+### Bug Fixes
+
+- Add CVE-2023-46809 option to integration node ([#1424](https://github.com/awslabs/aws-encryption-sdk-javascript/issues/1424)) ([84a7034](https://github.com/awslabs/aws-encryption-sdk-javascript/commit/84a703440aa7313ad0c779e50b7c052aa8dd5e7b))
+- **CI:** npx_verdaccio ([#1190](https://github.com/awslabs/aws-encryption-sdk-javascript/issues/1190)) ([1051f19](https://github.com/awslabs/aws-encryption-sdk-javascript/commit/1051f19578ba54bc476a30dedf5779576cf46d9f))
+
 # [4.0.0](https://github.com/awslabs/aws-encryption-sdk-javascript/compare/v3.2.2...v4.0.0) (2023-07-17)
 
 - feat!: Remove AWS SDK V2 Dependency (#1180) ([1d74248](https://github.com/awslabs/aws-encryption-sdk-javascript/commit/1d742489b436748a656ecc2abce00e99353d1d62)), closes [#1180](https://github.com/awslabs/aws-encryption-sdk-javascript/issues/1180)

diff --git a/karma.conf.js b/karma.conf.js
@@ -127,6 +127,8 @@ function createCredentialPreprocessor() {
     // This will affect the generated (ES5) JS
     const regionCode = `var defaultRegion = '${region}';`
     const credentialsCode = `var credentials = ${JSON.stringify(credentials)};`
+    // See: https://github.com/aws/aws-sdk-js-v3/issues/5890
+    const expirationNeedsToBeDate = `credentials.expiration = new Date(credentials.expiration);`
     const isBrowser = `var isBrowser = true;`
     const contents = content.split('\n')
     let idx = -1
@@ -137,7 +139,7 @@ function createCredentialPreprocessor() {
         break
       }
     }
-    contents.splice(idx + 1, 0, regionCode, credentialsCode, isBrowser)
+    contents.splice(idx + 1, 0, regionCode, credentialsCode, expirationNeedsToBeDate, isBrowser)
     done(contents.join('\n'))
   }
 }
diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
   "packages": ["modules/*"],
-  "version": "4.0.0",
+  "version": "4.0.1",
   "command": {
     "bootstrap": {
       "nohoist": ["typedoc"]

diff --git a/modules/cache-material/CHANGELOG.md b/modules/cache-material/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.1](https://github.com/aws/aws-encryption-sdk-javascript/compare/v4.0.0...v4.0.1) (2024-07-30)
+
+**Note:** Version bump only for package @aws-crypto/cache-material
+
 # [4.0.0](https://github.com/aws/aws-encryption-sdk-javascript/compare/v3.2.2...v4.0.0) (2023-07-17)
 
 **Note:** Version bump only for package @aws-crypto/cache-material

diff --git a/modules/cache-material/package.json b/modules/cache-material/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-crypto/cache-material",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "scripts": {
     "prepublishOnly": "npm run build",
     "build": "tsc -b tsconfig.json && tsc -b tsconfig.module.json",

diff --git a/modules/caching-materials-manager-browser/CHANGELOG.md b/modules/caching-materials-manager-browser/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.1](https://github.com/aws/aws-encryption-sdk-javascript/compare/v4.0.0...v4.0.1) (2024-07-30)
+
+**Note:** Version bump only for package @aws-crypto/caching-materials-manager-browser
+
 # [4.0.0](https://github.com/aws/aws-encryption-sdk-javascript/compare/v3.2.2...v4.0.0) (2023-07-17)
 
 **Note:** Version bump only for package @aws-crypto/caching-materials-manager-browser

diff --git a/modules/caching-materials-manager-browser/package.json b/modules/caching-materials-manager-browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-crypto/caching-materials-manager-browser",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "scripts": {
     "prepublishOnly": "npm run build",
     "build": "tsc -b tsconfig.json && tsc -b tsconfig.module.json",
@@ -22,7 +22,7 @@
     "@aws-crypto/material-management-browser": "file:../material-management-browser",
     "@aws-crypto/serialize": "file:../serialize",
     "@aws-crypto/web-crypto-backend": "file:../web-crypto-backend",
-    "@aws-sdk/util-base64-browser": "3.209.0",
+    "@aws-sdk/util-base64": "^3.374.0",
     "@aws-sdk/util-utf8-browser": "3.259.0",
     "tslib": "^2.2.0"
   },

diff --git a/modules/caching-materials-manager-node/CHANGELOG.md b/modules/caching-materials-manager-node/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.1](https://github.com/aws/aws-encryption-sdk-javascript/compare/v4.0.0...v4.0.1) (2024-07-30)
+
+**Note:** Version bump only for package @aws-crypto/caching-materials-manager-node
+
 # [4.0.0](https://github.com/aws/aws-encryption-sdk-javascript/compare/v3.2.2...v4.0.0) (2023-07-17)
 
 **Note:** Version bump only for package @aws-crypto/caching-materials-manager-node

diff --git a/modules/caching-materials-manager-node/package.json b/modules/caching-materials-manager-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-crypto/caching-materials-manager-node",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "scripts": {
     "prepublishOnly": "npm run build",
     "build": "tsc -b tsconfig.json && tsc -b tsconfig.module.json",

diff --git a/modules/client-browser/CHANGELOG.md b/modules/client-browser/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.1](https://github.com/aws/aws-encryption-sdk-javascript/compare/v4.0.0...v4.0.1) (2024-07-30)
+
+**Note:** Version bump only for package @aws-crypto/client-browser
+
 # [4.0.0](https://github.com/aws/aws-encryption-sdk-javascript/compare/v3.2.2...v4.0.0) (2023-07-17)
 
 **Note:** Version bump only for package @aws-crypto/client-browser

diff --git a/modules/client-browser/package.json b/modules/client-browser/package.json
@@ -9,7 +9,7 @@
     "CSE",
     "aws"
   ],
-  "version": "4.0.0",
+  "version": "4.0.1",
   "scripts": {
     "build": "tsc -b tsconfig.json",
     "lint": "run-s lint-*",

diff --git a/modules/client-node/CHANGELOG.md b/modules/client-node/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.1](https://github.com/aws/aws-encryption-sdk-javascript/compare/v4.0.0...v4.0.1) (2024-07-30)
+
+**Note:** Version bump only for package @aws-crypto/client-node
+
 # [4.0.0](https://github.com/aws/aws-encryption-sdk-javascript/compare/v3.2.2...v4.0.0) (2023-07-17)
 
 **Note:** Version bump only for package @aws-crypto/client-node

diff --git a/modules/client-node/package.json b/modules/client-node/package.json
@@ -9,7 +9,7 @@
     "CSE",
     "aws"
   ],
-  "version": "4.0.0",
+  "version": "4.0.1",
   "scripts": {
     "build": "tsc -b tsconfig.json",
     "lint": "run-s lint-*",

diff --git a/modules/decrypt-browser/CHANGELOG.md b/modules/decrypt-browser/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.1](https://github.com/aws/aws-encryption-sdk-javascript/compare/v4.0.0...v4.0.1) (2024-07-30)
+
+**Note:** Version bump only for package @aws-crypto/decrypt-browser
+
 # [4.0.0](https://github.com/aws/aws-encryption-sdk-javascript/compare/v3.2.2...v4.0.0) (2023-07-17)
 
 **Note:** Version bump only for package @aws-crypto/decrypt-browser

diff --git a/modules/decrypt-browser/package.json b/modules/decrypt-browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-crypto/decrypt-browser",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "scripts": {
     "prepublishOnly": "tsc -p tsconfig.json && tsc -p tsconfig.module.json",
     "lint": "run-s lint-*",

diff --git a/modules/decrypt-node/CHANGELOG.md b/modules/decrypt-node/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.1](https://github.com/aws/aws-encryption-sdk-javascript/compare/v4.0.0...v4.0.1) (2024-07-30)
+
+**Note:** Version bump only for package @aws-crypto/decrypt-node
+
 # [4.0.0](https://github.com/aws/aws-encryption-sdk-javascript/compare/v3.2.2...v4.0.0) (2023-07-17)
 
 **Note:** Version bump only for package @aws-crypto/decrypt-node

diff --git a/modules/decrypt-node/package.json b/modules/decrypt-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-crypto/decrypt-node",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "scripts": {
     "prepublishOnly": "npm run build",
     "build": "tsc -b tsconfig.json && tsc -b tsconfig.module.json",

diff --git a/modules/encrypt-browser/CHANGELOG.md b/modules/encrypt-browser/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.1](https://github.com/aws/aws-encryption-sdk-javascript/compare/v4.0.0...v4.0.1) (2024-07-30)
+
+**Note:** Version bump only for package @aws-crypto/encrypt-browser
+
 # [4.0.0](https://github.com/aws/aws-encryption-sdk-javascript/compare/v3.2.2...v4.0.0) (2023-07-17)
 
 **Note:** Version bump only for package @aws-crypto/encrypt-browser

diff --git a/modules/encrypt-browser/package.json b/modules/encrypt-browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-crypto/encrypt-browser",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "scripts": {
     "prepublishOnly": "tsc -p tsconfig.json && tsc -p tsconfig.module.json",
     "lint": "run-s lint-*",

diff --git a/modules/encrypt-node/CHANGELOG.md b/modules/encrypt-node/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.1](https://github.com/aws/aws-encryption-sdk-javascript/compare/v4.0.0...v4.0.1) (2024-07-30)
+
+**Note:** Version bump only for package @aws-crypto/encrypt-node
+
 # [4.0.0](https://github.com/aws/aws-encryption-sdk-javascript/compare/v3.2.2...v4.0.0) (2023-07-17)
 
 **Note:** Version bump only for package @aws-crypto/encrypt-node

diff --git a/modules/encrypt-node/package.json b/modules/encrypt-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-crypto/encrypt-node",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "scripts": {
     "prepublishOnly": "tsc -p tsconfig.json && tsc -p tsconfig.module.json",
     "lint": "run-s lint-*",
@@ -20,7 +20,7 @@
     "@aws-crypto/material-management-node": "file:../material-management-node",
     "@aws-crypto/serialize": "file:../serialize",
     "@types/duplexify": "^3.6.0",
-    "duplexify": "^4.1.1",
+    "duplexify": "^4.1.3",
     "readable-stream": "^3.6.0",
     "tslib": "^2.2.0"
   },

diff --git a/modules/example-browser/CHANGELOG.md b/modules/example-browser/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.1](https://github.com/aws/aws-encryption-sdk-javascript/compare/v4.0.0...v4.0.1) (2024-07-30)
+
+**Note:** Version bump only for package @aws-crypto/example-browser
+
 # [4.0.0](https://github.com/aws/aws-encryption-sdk-javascript/compare/v3.2.2...v4.0.0) (2023-07-17)
 
 **Note:** Version bump only for package @aws-crypto/example-browser

diff --git a/modules/example-browser/package.json b/modules/example-browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-crypto/example-browser",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "scripts": {
     "prepublishOnly": "npm run build",
     "build": "tsc -b tsconfig.json && tsc -b tsconfig.module.json",
@@ -26,7 +26,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@aws-crypto/client-browser": "file:../client-browser",
-    "@aws-sdk/util-base64-browser": "3.209.0",
+    "@aws-sdk/util-base64": "^3.374.0",
     "@types/chai": "^4.2.11",
     "chai": "^4.2.0",
     "karma": "^6.3.17",

diff --git a/modules/example-node/CHANGELOG.md b/modules/example-node/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.1](https://github.com/aws/aws-encryption-sdk-javascript/compare/v4.0.0...v4.0.1) (2024-07-30)
+
+**Note:** Version bump only for package @aws-crypto/example-node
+
 # [4.0.0](https://github.com/aws/aws-encryption-sdk-javascript/compare/v3.2.2...v4.0.0) (2023-07-17)
 
 **Note:** Version bump only for package @aws-crypto/example-node

diff --git a/modules/example-node/package.json b/modules/example-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-crypto/example-node",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "scripts": {
     "prepublishOnly": "npm run build",
     "build": "tsc -b tsconfig.json && tsc -b tsconfig.module.json",

diff --git a/modules/integration-browser/CHANGELOG.md b/modules/integration-browser/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.1](https://github.com/aws/aws-encryption-sdk-javascript/compare/v4.0.0...v4.0.1) (2024-07-30)
+
+**Note:** Version bump only for package @aws-crypto/integration-browser
+
 # [4.0.0](https://github.com/aws/aws-encryption-sdk-javascript/compare/v3.2.2...v4.0.0) (2023-07-17)
 
 - feat!: Remove AWS SDK V2 Dependency (#1180) ([1d74248](https://github.com/aws/aws-encryption-sdk-javascript/commit/1d742489b436748a656ecc2abce00e99353d1d62)), closes [#1180](https://github.com/aws/aws-encryption-sdk-javascript/issues/1180)