Merge branch 'main' into km/cose-content-format

Author: quexten

.cargo/config.toml

@@ -6,6 +6,7 @@ rustflags = ["--cfg", "aes_armv8"]
 
 [target.wasm32-unknown-unknown]
 rustflags = ['--cfg', 'getrandom_backend="wasm_js"']
+runner = 'wasm-bindgen-test-runner'
 
 # Enable support for 16k pages on Android, JNA is using these same flags
 # https://android-developers.googleblog.com/2024/08/adding-16-kb-page-size-to-android.html

.github/workflows/build-wasm-internal.yml

@@ -25,8 +25,10 @@ jobs:
 
       - name: Set version (PR)
         if: ${{ github.event_name == 'pull_request' }}
+        env:
+          PR_HEAD_REF: "${{ github.event.pull_request.head.ref }}"
         run: |
-          echo REF_NAME="${{ github.event.pull_request.head.ref }}" >> $GITHUB_ENV
+          echo REF_NAME="$PR_HEAD_REF" >> $GITHUB_ENV
           echo SHA="${{ github.event.pull_request.head.sha }}" >> $GITHUB_ENV
 
       - name: Set env variables (Branch/Tag)
@@ -58,6 +60,9 @@ jobs:
           RUST_TOOLCHAIN="$(grep -oP '^channel.*"(\K.*?)(?=")' ../../rust-toolchain.toml)"
           echo "RUST_TOOLCHAIN=${RUST_TOOLCHAIN}" | tee -a "${GITHUB_OUTPUT}"
 
+      - name: NPM setup
+        run: npm ci
+
       - name: Install rust
         uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0 # stable
         with:

.github/workflows/publish-wasm-internal.yml

@@ -42,13 +42,16 @@ jobs:
 
       - name: Version output
         id: version-output
+        env:
+          BRANCH: "${{ github.head_ref || github.ref_name }}"
         run: |
           if [ -z ${{ inputs.version }} ]; then
-            BRANCH=${{ github.head_ref || github.ref_name }}
             VERSION=0.2.0-${BRANCH/\//-}.${{ github.run_number }}
             echo "version=$VERSION" >> $GITHUB_OUTPUT
+            echo "### NPM Version: $VERSION" >> $GITHUB_STEP_SUMMARY
           else
             echo "version=${{ inputs.version }}" >> $GITHUB_OUTPUT
+            echo "### NPM Version: ${{ inputs.version }}" >> $GITHUB_STEP_SUMMARY
           fi
 
   npm:

.github/workflows/rust-test.yml

@@ -45,6 +45,37 @@ jobs:
       - name: Test
         run: cargo test --workspace --all-features
 
+  test-wasm:
+    name: WASM
+    runs-on: ubuntu-24.04
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Set Rust Toolchain
+        id: toolchain
+        shell: bash
+        run: |
+          RUST_TOOLCHAIN="$(grep -oP '^channel.*"(\K.*?)(?=")' rust-toolchain.toml)"
+          echo "RUST_TOOLCHAIN=${RUST_TOOLCHAIN}" | tee -a "${GITHUB_OUTPUT}"
+
+      - name: Install rust
+        uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0 # stable
+        with:
+          toolchain: "${{ steps.toolchain.outputs.RUST_TOOLCHAIN }}"
+          targets: wasm32-unknown-unknown
+          components: rust-src
+
+      - name: Cache cargo registry
+        uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
+
+      - name: Install wasm-bindgen-cli
+        run: cargo install wasm-bindgen-cli --version 0.2.100
+
+      - name: Test WASM
+        run: cargo test --target wasm32-unknown-unknown -p bitwarden-wasm-internal -p bitwarden-threading -p bitwarden-error --all-features
+
   coverage:
     name: Coverage
     runs-on: ubuntu-24.04

.github/workflows/scan.yml

@@ -7,8 +7,14 @@ on:
       - "main"
       - "rc"
       - "hotfix-rc"
+  pull_request:
+    types: [opened, synchronize, reopened]
+    branches-ignore:
+      - main
   pull_request_target:
-    types: [opened, synchronize]
+    types: [opened, synchronize, reopened]
+    branches:
+      - "main"
 
 jobs:
   check-run:

.vscode/settings.json

@@ -8,6 +8,8 @@
     "cloc",
     "COSE",
     "dealloc",
+    "Decapsulates",
+    "decapsulation",
     "decryptable",
     "dylib",
     "encryptable",
@@ -20,7 +22,9 @@
     "repr",
     "reprompt",
     "reqwest",
+    "rotateable",
     "schemars",
+    "spki",
     "totp",
     "uniffi",
     "wordlist",

Cargo.lock

@@ -29,6 +29,7 @@ bitwarden-fido = { path = "crates/bitwarden-fido", version = "=1.0.0" }
 bitwarden-generators = { path = "crates/bitwarden-generators", version = "=1.0.0" }
 bitwarden-ipc = { path = "crates/bitwarden-ipc", version = "=1.0.0" }
 bitwarden-send = { path = "crates/bitwarden-send", version = "=1.0.0" }
+bitwarden-threading = { path = "crates/bitwarden-threading", version = "=1.0.0" }
 bitwarden-sm = { path = "bitwarden_license/bitwarden-sm", version = "=1.0.0" }
 bitwarden-ssh = { path = "crates/bitwarden-ssh", version = "=1.0.0" }
 bitwarden-vault = { path = "crates/bitwarden-vault", version = "=1.0.0" }
@@ -50,7 +51,7 @@ reqwest = { version = ">=0.12.5, <0.13", features = [
 schemars = { version = ">=0.8.9, <0.9", features = ["uuid1", "chrono"] }
 serde = { version = ">=1.0, <2.0", features = ["derive"] }
 serde_json = ">=1.0.96, <2.0"
-serde_qs = ">=0.12.0, <0.15"
+serde_qs = ">=0.12.0, <0.16"
 serde_repr = ">=0.1.12, <0.2"
 thiserror = ">=1.0.40, <3"
 tokio = { version = "1.36.0", features = ["macros"] }
@@ -63,6 +64,7 @@ validator = { version = ">=0.18.1, <0.20", features = ["derive"] }
 wasm-bindgen = { version = ">=0.2.91, <0.3", features = ["serde-serialize"] }
 js-sys = { version = ">=0.3.72, <0.4" }
 wasm-bindgen-futures = "0.4.41"
+wasm-bindgen-test = "0.3.45"
 
 # There is an incompatibility when using pkcs5 and chacha20 on wasm builds. This can be removed once a new
 # rustcrypto-formats crate version is released since the fix has been upstreamed.

Cargo.toml

@@ -34,4 +34,4 @@ workspace = true
 [dev-dependencies]
 serde.workspace = true
 trybuild = "1.0.101"
-wasm-bindgen-test = "0.3.45"
+wasm-bindgen-test = { workspace = true }

crates/bitwarden-error/Cargo.toml

@@ -0,0 +1,2 @@
+[target.wasm32-unknown-unknown]
+runner = 'wasm-bindgen-test-runner'