[PM-12436] replace node keytar

.github/actions/setup-node-env/action.yml

@@ -1,5 +1,5 @@
 name: "Setup Node Environment"
-description: "Sets up Node.js with npm cache and installs node-gyp"
+description: "Sets up Node.js with npm cache"
 inputs:
   node-version:
     description: "Node.js version to use"
@@ -18,17 +18,3 @@ runs:
         cache: "npm"
         cache-dependency-path: "**/package-lock.json"
         node-version: ${{ inputs.node-version }}
-
-    - name: Update NPM and install node-gyp (Unix)
-      if: inputs.platform != 'Windows'
-      shell: bash
-      run: |
-        npm install -g node-gyp
-        node-gyp install "$(node -v)"
-
-    - name: Update NPM and install node-gyp (Windows)
-      if: inputs.platform == 'Windows'
-      shell: pwsh
-      run: |
-        npm install -g node-gyp
-        node-gyp install $(node -v)

.github/workflows/build-pr.yml

@@ -6,6 +6,8 @@ on:
     paths:
       - 'src/**'
       - 'src-cli/**'
+      - 'libs/**'
+      - 'native/**'
       - 'jslib/**'
       - 'resources/**'
       - 'scripts/**'
@@ -14,6 +16,7 @@ on:
       - 'tsconfig.json'
       - 'angular.json'
       - '.github/workflows/build-pr.yml'
+      - '.github/actions/**'
       - '!*.md'
       - '!*.txt'
 

.github/workflows/build-target.yml

@@ -12,6 +12,8 @@ on:
     paths:
       - 'src/**'
       - 'src-cli/**'
+      - 'libs/**'
+      - 'native/**'
       - 'jslib/**'
       - 'resources/**'
       - 'scripts/**'
@@ -21,6 +23,7 @@ on:
       - 'angular.json'
       - '.github/workflows/build.yml'
       - '.github/workflows/build-target.yml'
+      - '.github/actions/**'
       - '!*.md'
       - '!*.txt'
 

.github/workflows/build.yml

@@ -71,26 +71,25 @@ jobs:
           node-version: ${{ env._NODE_VERSION }}
           platform: Linux
 
-      - name: Keytar
-        run: |
-          keytarVersion=$(cat package.json | jq -r '.dependencies.keytar')
-          keytarTar="keytar-v$keytarVersion-napi-v3-linux-x64.tar"
-
-          keytarTarGz="$keytarTar.gz"
-          keytarUrl="https://github.com/atom/node-keytar/releases/download/v$keytarVersion/$keytarTarGz"
+      - name: Set up Rust
+        uses: dtolnay/rust-toolchain@29eef336d9b2848a0b548edc03f92a220660cdb8 # stable
 
-          mkdir -p ./keytar/linux
-          wget "$keytarUrl" -O "./keytar/linux/$keytarTarGz"
-          tar -xvf "./keytar/linux/$keytarTarGz" -C ./keytar/linux
+      - name: Set up system dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install libdbus-1-dev libsecret-1-dev pkg-config
 
       - name: Install
         run: npm ci
 
+      - name: Build native module
+        run: npm run build:native:release
+
       - name: Package CLI
         run: npm run dist:cli:lin
 
       - name: Zip
-        run: zip -j "dist-cli/bwdc-linux-$_PACKAGE_VERSION.zip" "dist-cli/linux/bwdc" "keytar/linux/build/Release/keytar.node"
+        run: zip -j "dist-cli/bwdc-linux-$_PACKAGE_VERSION.zip" "dist-cli/linux/bwdc" "node_modules/dc-native/dc_native.linux-x64-gnu.node"
 
       - name: Version Test
         run: |
@@ -145,26 +144,20 @@ jobs:
           node-version: ${{ env._NODE_VERSION }}
           platform: macOS
 
-      - name: Keytar
-        run: |
-          keytarVersion=$(cat package.json | jq -r '.dependencies.keytar')
-          keytarTar="keytar-v$keytarVersion-napi-v3-darwin-x64.tar"
-
-          keytarTarGz="$keytarTar.gz"
-          keytarUrl="https://github.com/atom/node-keytar/releases/download/v$keytarVersion/$keytarTarGz"
-
-          mkdir -p ./keytar/macos
-          wget "$keytarUrl" -O "./keytar/macos/$keytarTarGz"
-          tar -xvf "./keytar/macos/$keytarTarGz" -C ./keytar/macos
+      - name: Set up Rust
+        uses: dtolnay/rust-toolchain@29eef336d9b2848a0b548edc03f92a220660cdb8 # stable
 
       - name: Install
         run: npm ci
 
+      - name: Build native module
+        run: npm run build:native:release
+
       - name: Package CLI
         run: npm run dist:cli:mac
 
       - name: Zip
-        run: zip -j "dist-cli/bwdc-macos-$_PACKAGE_VERSION.zip" "dist-cli/macos/bwdc" "keytar/macos/build/Release/keytar.node"
+        run: zip -j "dist-cli/bwdc-macos-$_PACKAGE_VERSION.zip" "dist-cli/macos/bwdc" "node_modules/dc-native/dc_native.darwin-x64.node"
 
       - name: Version Test
         run: |
@@ -215,31 +208,23 @@ jobs:
           node-version: ${{ env._NODE_VERSION }}
           platform: Windows
 
-      - name: Keytar
-        shell: pwsh
-        run: |
-          $keytarVersion = (Get-Content -Raw -Path ./package.json | ConvertFrom-Json).dependencies.keytar
-          $keytarTar = "keytar-v${keytarVersion}-napi-v3-{0}-x64.tar"
-          $keytarTarGz = "${keytarTar}.gz"
-          $keytarUrl = "https://github.com/atom/node-keytar/releases/download/v${keytarVersion}/${keytarTarGz}"
-
-          New-Item -ItemType directory -Path ./keytar/windows | Out-Null
-
-          Invoke-RestMethod -Uri $($keytarUrl -f "win32") -OutFile "./keytar/windows/$($keytarTarGz -f "win32")"
-
-          7z e "./keytar/windows/$($keytarTarGz -f "win32")" -o"./keytar/windows"
-
-          7z e "./keytar/windows/$($keytarTar -f "win32")" -o"./keytar/windows"
+      - name: Set up Rust
+        uses: dtolnay/rust-toolchain@29eef336d9b2848a0b548edc03f92a220660cdb8 # stable
+        with:
+          targets: x86_64-pc-windows-msvc
 
       - name: Install
         run: npm ci
 
+      - name: Build native module
+        run: npm run build:native:release
+
       - name: Package CLI
         run: npm run dist:cli:win
 
       - name: Zip
-        shell: pwsh
-        run: 7z a .\dist-cli\bwdc-windows-$env:_PACKAGE_VERSION.zip .\dist-cli\windows\bwdc.exe .\keytar\windows\keytar.node
+        shell: cmd
+        run: 7z a .\dist-cli\bwdc-windows-%_PACKAGE_VERSION%.zip .\dist-cli\windows\bwdc.exe .\node_modules\dc-native\dc_native.win32-x64-msvc.node
 
       - name: Version Test
         shell: pwsh
@@ -286,6 +271,11 @@ jobs:
           node-version: ${{ env._NODE_VERSION }}
           platform: Windows
 
+      - name: Set up Rust
+        uses: dtolnay/rust-toolchain@29eef336d9b2848a0b548edc03f92a220660cdb8 # stable
+        with:
+          targets: x86_64-pc-windows-msvc
+
       - name: Print environment
         run: |
           node --version
@@ -381,10 +371,13 @@ jobs:
           node-version: ${{ env._NODE_VERSION }}
           platform: Linux
 
+      - name: Set up Rust
+        uses: dtolnay/rust-toolchain@29eef336d9b2848a0b548edc03f92a220660cdb8 # stable
+
       - name: Set up environment
         run: |
           sudo apt-get update
-          sudo apt-get -y install pkg-config libxss-dev libsecret-1-dev
+          sudo apt-get -y install pkg-config libxss-dev libsecret-1-dev libdbus-1-dev
           sudo apt-get -y install rpm
 
       - name: NPM Install
@@ -437,6 +430,9 @@ jobs:
           node-version: ${{ env._NODE_VERSION }}
           platform: macOS
 
+      - name: Set up Rust
+        uses: dtolnay/rust-toolchain@29eef336d9b2848a0b548edc03f92a220660cdb8 # stable
+
       - name: Print environment
         run: |
           node --version

.github/workflows/test.yml

@@ -40,6 +40,9 @@ jobs:
           cache-dependency-path: '**/package-lock.json'
           node-version: ${{ steps.retrieve-node-version.outputs.node_version }}
 
+      - name: Build native module
+        run: npm run build:native
+
       - name: Install Node dependencies
         run: npm ci
 

.gitignore

@@ -32,6 +32,10 @@ build
 build-cli
 .angular/cache
 
+# Rust build artifacts
+native/target
+native/*.node
+
 # Testing
 coverage*
 junit.xml*

.nvmrc

@@ -1 +1 @@
-v20
+v22

.prettierignore

@@ -8,3 +8,6 @@ src/locales
 
 # Github Workflows
 .github/workflows 
+
+# Native module (auto-generated)
+native

docker-compose.yml

@@ -16,3 +16,22 @@ services:
     ports:
       - "1389:1389"
       - "1636:1636"
+    healthcheck:
+      test:
+        [
+          "CMD",
+          "ldapsearch",
+          "-x",
+          "-H",
+          "ldap://localhost:1389",
+          "-b",
+          "dc=bitwarden,dc=com",
+          "-D",
+          "cn=admin,dc=bitwarden,dc=com",
+          "-w",
+          "admin",
+        ]
+      interval: 5s
+      timeout: 10s
+      retries: 10
+      start_period: 15s

electron-builder.json

@@ -11,6 +11,7 @@
     "app": "build"
   },
   "afterSign": "scripts/notarize.js",
+  "asarUnpack": ["node_modules/dc-native/*.node"],
   "mac": {
     "artifactName": "Bitwarden-Connector-${version}-mac.${ext}",
     "category": "public.app-category.productivity",

eslint.config.mjs

@@ -19,10 +19,12 @@ export default [
       "build/**",
       "build-cli/**",
       "coverage/**",
+      "coverage-ldap/**",
       "**/*.cjs",
       "eslint.config.mjs",
       "scripts/**/*.js",
       "**/node_modules/**",
+      "native/**",
     ],
   },
 
@@ -35,6 +37,7 @@ export default [
       parser: tsParser,
       parserOptions: {
         project: ["./tsconfig.eslint.json"],
+        tsconfigRootDir: import.meta.dirname,
       },
       globals: {
         ...globals.browser,

libs/constants.ts

@@ -0,0 +1 @@
+export const APPLICATION_NAME = "Bitwarden Directory Connector";

libs/enums/stateVersion.ts

@@ -4,5 +4,6 @@ export enum StateVersion {
   Three = 3, // Fix migration of users' premium status
   Four = 4, // Fix 'Never Lock' option by removing stale data
   Five = 5, // New state service implementation
-  Latest = Five,
+  Six = 6, // Migrate Windows Credential Manager entries from keytar (UTF-8) to desktop_core (UTF-16)
+  Latest = Six,
 }

libs/models/state.model.ts

@@ -39,6 +39,11 @@ export const StorageKeys = {
   // TODO: Remove when jslib cleanup PR is merged
   appId: "appId",
   anonymousAppId: "anonymousAppId",
+
+  userDelta: "userDeltaToken",
+  groupDelta: "groupDeltaToken",
+  lastUserSync: "lastUserSync",
+  lastGroupSync: "lastGroupSync",
 };
 
 export const SecureStorageKeys = {
@@ -52,12 +57,6 @@ export const SecureStorageKeys = {
   okta: "secretOkta",
   oneLogin: "secretOneLogin",
 
-  // Sync metadata
-  userDelta: "userDeltaToken",
-  groupDelta: "groupDeltaToken",
-  lastUserSync: "lastUserSync",
-  lastGroupSync: "lastGroupSync",
-
   // Authentication tokens
   accessToken: "accessToken",
   refreshToken: "refreshToken",

libs/services/baseLowdbStorage.service.ts

@@ -10,6 +10,8 @@ import { NodeUtils } from "@/libs/utils/nodeUtils";
 import { sequentialize } from "@/libs/utils/sequentialize";
 import { Utils } from "@/libs/utils/utils";
 
+import { SecureStorageKey, StorageKey } from "../models/state.model";
+
 export class LowdbStorageService implements StorageService {
   protected dataFilePath: string;
   private db: lowdb.LowdbSync<any>;
@@ -92,7 +94,7 @@ export class LowdbStorageService implements StorageService {
     this.ready = true;
   }
 
-  async get<T>(key: string): Promise<T> {
+  async get<T>(key: StorageKey | SecureStorageKey): Promise<T> {
     await this.waitForReady();
     return this.lockDbFile(() => {
       this.readForNoCache();
@@ -105,11 +107,11 @@ export class LowdbStorageService implements StorageService {
     });
   }
 
-  has(key: string): Promise<boolean> {
+  has(key: StorageKey | SecureStorageKey): Promise<boolean> {
     return this.get(key).then((v) => v != null);
   }
 
-  async save(key: string, obj: any): Promise<any> {
+  async save(key: StorageKey | SecureStorageKey, obj: any): Promise<any> {
     await this.waitForReady();
     return this.lockDbFile(() => {
       this.readForNoCache();
@@ -119,7 +121,7 @@ export class LowdbStorageService implements StorageService {
     });
   }
 
-  async remove(key: string): Promise<any> {
+  async remove(key: StorageKey | SecureStorageKey): Promise<any> {
     await this.waitForReady();
     return this.lockDbFile(() => {
       this.readForNoCache();