Merge branch 'main' into ps/PM-33229-cli-session-rehydration

Author: dani-garcia

.github/CODEOWNERS

@@ -40,7 +40,9 @@ crates/bitwarden-collections/** @bitwarden/team-admin-console-dev
 crates/bitwarden-crypto/** @bitwarden/team-key-management-dev
 crates/bitwarden-exporters/** @bitwarden/team-tools-dev @bitwarden/team-platform-dev
 crates/bitwarden-generators/** @bitwarden/team-tools-dev @bitwarden/team-platform-dev
+crates/bitwarden-importers/** @bitwarden/team-tools-dev @bitwarden/team-platform-dev
 crates/bitwarden-organization-crypto/** @bitwarden/team-key-management-dev
+crates/bitwarden-organization-invite-link/** @bitwarden/team-admin-console-dev
 crates/bitwarden-organizations/** @bitwarden/team-admin-console-dev
 crates/bitwarden-policies/** @bitwarden/team-admin-console-dev
 crates/bitwarden-sensitive-value/** @bitwarden/team-key-management-dev

.github/renovate.json5

@@ -75,6 +75,12 @@
       commitMessagePrefix: "[deps] Autofill:",
       reviewers: ["team:team-autofill-dev"],
     },
+    {
+      matchManagers: ["cargo"],
+      matchPackageNames: ["keepass"],
+      commitMessagePrefix: "[deps] Tools:",
+      reviewers: ["team:team-tools-dev"],
+    },
     {
       matchManagers: ["cargo"],
       matchPackageNames: [

Cargo.lock

@@ -41,10 +41,12 @@ bitwarden-ffi = { path = "crates/bitwarden-ffi", version = "=3.0.0" }
 bitwarden-ffi-macro = { path = "crates/bitwarden-ffi-macro", version = "=3.0.0" }
 bitwarden-fido = { path = "crates/bitwarden-fido", version = "=3.0.0" }
 bitwarden-generators = { path = "crates/bitwarden-generators", version = "=3.0.0" }
+bitwarden-importers = { path = "crates/bitwarden-importers", version = "=3.0.0" }
 bitwarden-ipc = { path = "crates/bitwarden-ipc", version = "=3.0.0" }
 bitwarden-logging = { path = "crates/bitwarden-logging", version = "=3.0.0" }
 bitwarden-logging-macro = { path = "crates/bitwarden-logging-macro", version = "=3.0.0" }
 bitwarden-organization-crypto = { path = "crates/bitwarden-organization-crypto", version = "=3.0.0" }
+bitwarden-organization-invite-link = { path = "crates/bitwarden-organization-invite-link", version = "=3.0.0" }
 bitwarden-organizations = { path = "crates/bitwarden-organizations", version = "=3.0.0" }
 bitwarden-pm = { path = "crates/bitwarden-pm", version = "=3.0.0" }
 bitwarden-policies = { path = "crates/bitwarden-policies", version = "=3.0.0" }
@@ -77,6 +79,7 @@ futures = ">=0.3.31, <0.4"
 hmac = "0.13.0"
 http = ">=1.4.0, <2.0"
 js-sys = { version = ">=0.3.72, <0.4" }
+keepass = { version = ">=0.13.7, <0.14", default-features = false }
 mockall = { version = ">=0.13.1, <0.15" }
 password-rules-parser = ">=1.1.0, <2"
 proc-macro2 = ">=1.0.89, <2"

Cargo.toml

@@ -65,6 +65,7 @@ bitwarden-core-macro = { workspace = true }
 bitwarden-crypto = { workspace = true }
 bitwarden-encoding = { workspace = true }
 bitwarden-error = { workspace = true }
+bitwarden-logging = { workspace = true }
 bitwarden-state = { workspace = true }
 bitwarden-state-bridge-macro = { workspace = true }
 bitwarden-test = { workspace = true, optional = true }

crates/bitwarden-core/Cargo.toml

@@ -7,7 +7,7 @@ use bitwarden_crypto::UnsignedSharedKey;
 use bitwarden_error::bitwarden_error;
 use thiserror::Error;
 #[cfg(feature = "internal")]
-use tracing::{info, instrument};
+use tracing::info;
 
 #[cfg(any(feature = "secrets", feature = "internal"))]
 use crate::OrganizationId;
@@ -82,7 +82,7 @@ impl EncryptionSettings {
     }
 
     #[cfg(feature = "internal")]
-    #[instrument(err, skip_all)]
+    #[bitwarden_logging::instrument(err)]
     pub(crate) fn set_org_keys(
         org_enc_keys: Vec<(OrganizationId, UnsignedSharedKey)>,
         store: &KeyStore<KeySlotIds>,