[PM-25521] Move importer metadata to native code (#16695)

* Add importer metadata to native code

* Impl napi code in ts

* Impl napi code in ts

* Fix clippy

* Fix clippy

* remove ts util tests

* Check for installed browsers

* PR fixes

* test fix

* fix clippy

* fix tests

* Bug fix

* clippy fix

* Correct tests

* fix clippy

* fix clippy

* Correct tests

* Correct tests

* [PM-25521] Wire up loading metadata on desktop (#16813)

* Initial commit

* Fix issues regarding now unused feature flag

* Fixed ts-strict issues

---------

Co-authored-by: Daniel James Smith <[email protected]>
Co-authored-by: adudek-bw <[email protected]>

* Remove logic to skip Brave as that now happens via the native code

* Define default capabilities which can be overwritten by specifc client/platform

* Fix DI issues

* Do not overwrite existing importers, just add new ones or update existing ones

* feat: [PM-25521] return metadata directly (not as JSON) (#16882)

* feat: return metadata directly (not as JSON)

* Fix broken builds

Move getMetaData into chromium_importer
Remove chromium_importer_metadata and any related service
Parse object from native instead of json

* Run cargo fmt

* Fix cargo dependency sort order

* Use exposed type from NAPI instead of redefining it.

* Run cargo fmt

---------

Co-authored-by: Daniel James Smith <[email protected]>

* Only enable chromium loader for installed and supported browsers

---------

Co-authored-by: Daniel James Smith <[email protected]>
Co-authored-by: Daniel James Smith <[email protected]>
Co-authored-by: Andreas Coroiu <[email protected]>

Author: 3 people

apps/browser/src/background/main.background.ts

@@ -221,8 +221,10 @@ import {
   UsernameGenerationServiceAbstraction,
 } from "@bitwarden/generator-legacy";
 import {
+  DefaultImportMetadataService,
   ImportApiService,
   ImportApiServiceAbstraction,
+  ImportMetadataServiceAbstraction,
   ImportService,
   ImportServiceAbstraction,
 } from "@bitwarden/importer-core";
@@ -368,6 +370,7 @@ export default class MainBackground {
   authService: AuthServiceAbstraction;
   loginEmailService: LoginEmailServiceAbstraction;
   importApiService: ImportApiServiceAbstraction;
+  importMetadataService: ImportMetadataServiceAbstraction;
   importService: ImportServiceAbstraction;
   exportApiService: VaultExportApiService;
   exportService: VaultExportServiceAbstraction;
@@ -1088,6 +1091,18 @@ export default class MainBackground {
 
     this.importApiService = new ImportApiService(this.apiService);
 
+    this.importMetadataService = new DefaultImportMetadataService(
+      createSystemServiceProvider(
+        new KeyServiceLegacyEncryptorProvider(this.encryptService, this.keyService),
+        this.stateProvider,
+        this.policyService,
+        buildExtensionRegistry(),
+        this.logService,
+        this.platformUtilsService,
+        this.configService,
+      ),
+    );
+
     this.importService = new ImportService(
       this.cipherService,
       this.folderService,
@@ -1099,15 +1114,6 @@ export default class MainBackground {
       this.pinService,
       this.accountService,
       this.restrictedItemTypesService,
-      createSystemServiceProvider(
-        new KeyServiceLegacyEncryptorProvider(this.encryptService, this.keyService),
-        this.stateProvider,
-        this.policyService,
-        buildExtensionRegistry(),
-        this.logService,
-        this.platformUtilsService,
-        this.configService,
-      ),
     );
 
     this.individualVaultExportService = new IndividualVaultExportService(

apps/browser/src/tools/popup/settings/import/import-browser-v2.component.ts

@@ -4,7 +4,16 @@ import { Router } from "@angular/router";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { AsyncActionsModule, ButtonModule, DialogModule } from "@bitwarden/components";
-import { ImportComponent } from "@bitwarden/importer-ui";
+import {
+  DefaultImportMetadataService,
+  ImportMetadataServiceAbstraction,
+} from "@bitwarden/importer-core";
+import {
+  ImportComponent,
+  ImporterProviders,
+  SYSTEM_SERVICE_PROVIDER,
+} from "@bitwarden/importer-ui";
+import { safeProvider } from "@bitwarden/ui-common";
 
 import { PopOutComponent } from "../../../../platform/popup/components/pop-out.component";
 import { PopupFooterComponent } from "../../../../platform/popup/layout/popup-footer.component";
@@ -25,6 +34,14 @@ import { PopupPageComponent } from "../../../../platform/popup/layout/popup-page
     PopupHeaderComponent,
     PopOutComponent,
   ],
+  providers: [
+    ...ImporterProviders,
+    safeProvider({
+      provide: ImportMetadataServiceAbstraction,
+      useClass: DefaultImportMetadataService,
+      deps: [SYSTEM_SERVICE_PROVIDER],
+    }),
+  ],
 })
 export class ImportBrowserV2Component {
   protected disabled = false;

apps/cli/src/service-container/service-container.ts

@@ -151,8 +151,10 @@ import {
   PasswordGenerationServiceAbstraction,
 } from "@bitwarden/generator-legacy";
 import {
+  DefaultImportMetadataService,
   ImportApiService,
   ImportApiServiceAbstraction,
+  ImportMetadataServiceAbstraction,
   ImportService,
   ImportServiceAbstraction,
 } from "@bitwarden/importer-core";
@@ -252,6 +254,7 @@ export class ServiceContainer {
   auditService: AuditService;
   importService: ImportServiceAbstraction;
   importApiService: ImportApiServiceAbstraction;
+  importMetadataService: ImportMetadataServiceAbstraction;
   exportService: VaultExportServiceAbstraction;
   vaultExportApiService: VaultExportApiService;
   individualExportService: IndividualVaultExportServiceAbstraction;
@@ -845,6 +848,18 @@ export class ServiceContainer {
 
     this.importApiService = new ImportApiService(this.apiService);
 
+    this.importMetadataService = new DefaultImportMetadataService(
+      createSystemServiceProvider(
+        new KeyServiceLegacyEncryptorProvider(this.encryptService, this.keyService),
+        this.stateProvider,
+        this.policyService,
+        buildExtensionRegistry(),
+        this.logService,
+        this.platformUtilsService,
+        this.configService,
+      ),
+    );
+
     this.importService = new ImportService(
       this.cipherService,
       this.folderService,
@@ -856,15 +871,6 @@ export class ServiceContainer {
       this.pinService,
       this.accountService,
       this.restrictedItemTypesService,
-      createSystemServiceProvider(
-        new KeyServiceLegacyEncryptorProvider(this.encryptService, this.keyService),
-        this.stateProvider,
-        this.policyService,
-        buildExtensionRegistry(),
-        this.logService,
-        this.platformUtilsService,
-        this.configService,
-      ),
     );
 
     this.individualExportService = new IndividualVaultExportService(

apps/desktop/desktop_native/Cargo.lock

@@ -14,6 +14,8 @@ base64 = { workspace = true }
 cbc = { workspace = true, features = ["alloc"] }
 hex = { workspace = true }
 homedir = { workspace = true }
+napi = { workspace = true }
+napi-derive = { workspace = true }
 pbkdf2 = "=0.12.2"
 rand = { workspace = true }
 rusqlite = { version = "=0.37.0", features = ["bundled"] }

apps/desktop/desktop_native/bitwarden_chromium_importer/Cargo.toml

@@ -11,7 +11,7 @@ use rusqlite::{params, Connection};
 #[cfg_attr(target_os = "linux", path = "linux.rs")]
 #[cfg_attr(target_os = "windows", path = "windows.rs")]
 #[cfg_attr(target_os = "macos", path = "macos.rs")]
-mod platform;
+pub mod platform;
 
 //
 // Public API
@@ -50,18 +50,26 @@ pub enum LoginImportResult {
     Failure(LoginImportFailure),
 }
 
-// TODO: Make thus async
-pub fn get_installed_browsers() -> Result<Vec<String>> {
-    let mut browsers = Vec::with_capacity(SUPPORTED_BROWSER_MAP.len());
+pub trait InstalledBrowserRetriever {
+    fn get_installed_browsers() -> Result<Vec<String>>;
+}
+
+pub struct DefaultInstalledBrowserRetriever {}
+
+impl InstalledBrowserRetriever for DefaultInstalledBrowserRetriever {
+    // TODO: Make thus async
+    fn get_installed_browsers() -> Result<Vec<String>> {
+        let mut browsers = Vec::with_capacity(SUPPORTED_BROWSER_MAP.len());
 
-    for (browser, config) in SUPPORTED_BROWSER_MAP.iter() {
-        let data_dir = get_browser_data_dir(config)?;
-        if data_dir.exists() {
-            browsers.push((*browser).to_string());
+        for (browser, config) in SUPPORTED_BROWSER_MAP.iter() {
+            let data_dir = get_browser_data_dir(config)?;
+            if data_dir.exists() {
+                browsers.push((*browser).to_string());
+            }
         }
-    }
 
-    Ok(browsers)
+        Ok(browsers)
+    }
 }
 
 // TODO: Make thus async
@@ -104,13 +112,13 @@ pub async fn import_logins(
 // Private
 //
 
-#[derive(Debug)]
-struct BrowserConfig {
-    name: &'static str,
-    data_dir: &'static str,
+#[derive(Debug, Clone, Copy)]
+pub struct BrowserConfig {
+    pub name: &'static str,
+    pub data_dir: &'static str,
 }
 
-static SUPPORTED_BROWSER_MAP: LazyLock<
+pub static SUPPORTED_BROWSER_MAP: LazyLock<
     std::collections::HashMap<&'static str, &'static BrowserConfig>,
 > = LazyLock::new(|| {
     platform::SUPPORTED_BROWSERS
@@ -132,12 +140,12 @@ fn get_browser_data_dir(config: &BrowserConfig) -> Result<PathBuf> {
 //
 
 #[async_trait]
-trait CryptoService: Send {
+pub trait CryptoService: Send {
     async fn decrypt_to_string(&mut self, encrypted: &[u8]) -> Result<String>;
 }
 
 #[derive(serde::Deserialize, Clone)]
-struct LocalState {
+pub struct LocalState {
     profile: AllProfiles,
     #[allow(dead_code)]
     os_crypt: Option<OsCrypt>,

apps/desktop/desktop_native/bitwarden_chromium_importer/src/chromium.rs

@@ -1 +1,8 @@
+#[macro_use]
+extern crate napi_derive;
+
 pub mod chromium;
+pub mod metadata;
+pub mod util;
+
+pub use crate::chromium::platform::SUPPORTED_BROWSERS as PLATFORM_SUPPORTED_BROWSERS;

apps/desktop/desktop_native/bitwarden_chromium_importer/src/lib.rs

@@ -6,7 +6,7 @@ use oo7::XDG_SCHEMA_ATTRIBUTE;
 
 use crate::chromium::{BrowserConfig, CryptoService, LocalState};
 
-mod util;
+use crate::util;
 
 //
 // Public API

apps/desktop/desktop_native/bitwarden_chromium_importer/src/linux.rs

@@ -4,7 +4,7 @@ use security_framework::passwords::get_generic_password;
 
 use crate::chromium::{BrowserConfig, CryptoService, LocalState};
 
-mod util;
+use crate::util;
 
 //
 // Public API