Merge branch 'km/cose-signatures' of github.com:bitwarden/sdk-internal into km/cose-signatures

Author: quexten

Cargo.lock

@@ -27,6 +27,7 @@ bitwarden-crypto = { path = "crates/bitwarden-crypto", version = "=1.0.0" }
 bitwarden-exporters = { path = "crates/bitwarden-exporters", version = "=1.0.0" }
 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-sm = { path = "bitwarden_license/bitwarden-sm", version = "=1.0.0" }
 bitwarden-ssh = { path = "crates/bitwarden-ssh", version = "=1.0.0" }
@@ -63,6 +64,12 @@ 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"
 
+# 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.
+# https://github.com/RustCrypto/formats/pull/1625
+[patch.crates-io]
+pkcs5 = { git = "https://github.com/bitwarden/rustcrypto-formats.git", rev = "2b27c63034217dd126bbf5ed874da51b84f8c705" }
+
 [workspace.lints.clippy]
 unused_async = "deny"
 unwrap_used = "deny"

Cargo.toml

@@ -9,57 +9,57 @@ use crate::{
     },
 };
 
-pub struct ClientProjects<'a> {
-    pub client: &'a Client,
+pub struct ClientProjects {
+    pub client: Client,
 }
 
-impl<'a> ClientProjects<'a> {
-    pub fn new(client: &'a Client) -> Self {
+impl ClientProjects {
+    pub fn new(client: Client) -> Self {
         Self { client }
     }
 
     pub async fn get(
         &self,
         input: &ProjectGetRequest,
     ) -> Result<ProjectResponse, SecretsManagerError> {
-        get_project(self.client, input).await
+        get_project(&self.client, input).await
     }
 
     pub async fn create(
         &self,
         input: &ProjectCreateRequest,
     ) -> Result<ProjectResponse, SecretsManagerError> {
-        create_project(self.client, input).await
+        create_project(&self.client, input).await
     }
 
     pub async fn list(
         &self,
         input: &ProjectsListRequest,
     ) -> Result<ProjectsResponse, SecretsManagerError> {
-        list_projects(self.client, input).await
+        list_projects(&self.client, input).await
     }
 
     pub async fn update(
         &self,
         input: &ProjectPutRequest,
     ) -> Result<ProjectResponse, SecretsManagerError> {
-        update_project(self.client, input).await
+        update_project(&self.client, input).await
     }
 
     pub async fn delete(
         &self,
         input: ProjectsDeleteRequest,
     ) -> Result<ProjectsDeleteResponse, SecretsManagerError> {
-        delete_projects(self.client, input).await
+        delete_projects(&self.client, input).await
     }
 }
 
-pub trait ClientProjectsExt<'a> {
-    fn projects(&'a self) -> ClientProjects<'a>;
+pub trait ClientProjectsExt {
+    fn projects(&self) -> ClientProjects;
 }
 
-impl<'a> ClientProjectsExt<'a> for Client {
-    fn projects(&'a self) -> ClientProjects<'a> {
-        ClientProjects::new(self)
+impl ClientProjectsExt for Client {
+    fn projects(&self) -> ClientProjects {
+        ClientProjects::new(self.clone())
     }
 }

bitwarden_license/bitwarden-sm/src/client_projects.rs

@@ -12,78 +12,78 @@ use crate::{
     },
 };
 
-pub struct ClientSecrets<'a> {
-    client: &'a Client,
+pub struct ClientSecrets {
+    client: Client,
 }
 
-impl<'a> ClientSecrets<'a> {
-    pub fn new(client: &'a Client) -> Self {
+impl ClientSecrets {
+    pub fn new(client: Client) -> Self {
         Self { client }
     }
 
     pub async fn get(
         &self,
         input: &SecretGetRequest,
     ) -> Result<SecretResponse, SecretsManagerError> {
-        get_secret(self.client, input).await
+        get_secret(&self.client, input).await
     }
 
     pub async fn get_by_ids(
         &self,
         input: SecretsGetRequest,
     ) -> Result<SecretsResponse, SecretsManagerError> {
-        get_secrets_by_ids(self.client, input).await
+        get_secrets_by_ids(&self.client, input).await
     }
 
     pub async fn create(
         &self,
         input: &SecretCreateRequest,
     ) -> Result<SecretResponse, SecretsManagerError> {
-        create_secret(self.client, input).await
+        create_secret(&self.client, input).await
     }
 
     pub async fn list(
         &self,
         input: &SecretIdentifiersRequest,
     ) -> Result<SecretIdentifiersResponse, SecretsManagerError> {
-        list_secrets(self.client, input).await
+        list_secrets(&self.client, input).await
     }
 
     pub async fn list_by_project(
         &self,
         input: &SecretIdentifiersByProjectRequest,
     ) -> Result<SecretIdentifiersResponse, SecretsManagerError> {
-        list_secrets_by_project(self.client, input).await
+        list_secrets_by_project(&self.client, input).await
     }
 
     pub async fn update(
         &self,
         input: &SecretPutRequest,
     ) -> Result<SecretResponse, SecretsManagerError> {
-        update_secret(self.client, input).await
+        update_secret(&self.client, input).await
     }
 
     pub async fn delete(
         &self,
         input: SecretsDeleteRequest,
     ) -> Result<SecretsDeleteResponse, SecretsManagerError> {
-        delete_secrets(self.client, input).await
+        delete_secrets(&self.client, input).await
     }
 
     pub async fn sync(
         &self,
         input: &SecretsSyncRequest,
     ) -> Result<SecretsSyncResponse, SecretsManagerError> {
-        sync_secrets(self.client, input).await
+        sync_secrets(&self.client, input).await
     }
 }
 
-pub trait ClientSecretsExt<'a> {
-    fn secrets(&'a self) -> ClientSecrets<'a>;
+pub trait ClientSecretsExt {
+    fn secrets(&self) -> ClientSecrets;
 }
 
-impl<'a> ClientSecretsExt<'a> for Client {
-    fn secrets(&'a self) -> ClientSecrets<'a> {
-        ClientSecrets::new(self)
+impl ClientSecretsExt for Client {
+    fn secrets(&self) -> ClientSecrets {
+        ClientSecrets::new(self.clone())
     }
 }

bitwarden_license/bitwarden-sm/src/client_secrets.rs

@@ -1,9 +1,13 @@
 use clap::ValueEnum;
 
+/// Color configuration for the CLI
 #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, ValueEnum, Debug)]
 pub enum Color {
+    /// Force colors off
     No,
+    /// Force colors on
     Yes,
+    /// Automatically detect if colors are supported in the terminal.
     Auto,
 }
 

crates/bitwarden-cli/src/color.rs

@@ -19,8 +19,8 @@ internal = ["dep:zxcvbn"]
 no-memory-hardening = [
     "bitwarden-crypto/no-memory-hardening"
 ] # Disable memory hardening features
-uniffi = ["bitwarden-crypto/uniffi", "dep:uniffi"] # Uniffi bindings
 secrets = [] # Secrets manager API
+uniffi = ["bitwarden-crypto/uniffi", "dep:uniffi"] # Uniffi bindings
 wasm = [
     "bitwarden-error/wasm",
     "dep:wasm-bindgen",

crates/bitwarden-core/Cargo.toml

@@ -1,7 +1,17 @@
 # Bitwarden Core
 
-Contains core functionality used by the feature crates.
+Contains core functionality used by the feature crates. For an introduction to the Bitwarden SDK and
+the `bitwarden-core` create please refer to the
+[SDK Architecture](https://contributing.bitwarden.com/architecture/sdk/) documentation.
 
 <div class="warning">
 Generally you should <b>not</b> find yourself needing to edit this crate! When possible, please use the feature crates instead.
 </div>
+
+## Features
+
+- `internal` - Internal unstable APIs that should only be consumed by internal Bitwarden clients.
+- `no-memory-hardening` - Disables `bitwarden-crypto` memory hardening.
+- `secrets` - Secrets Manager specific functionality.
+- `uniffi` - Mobile bindings.
+- `wasm` - WebAssembly bindings.

crates/bitwarden-core/README.md

@@ -1,3 +1,7 @@
+//! Admin console module for Bitwarden Core.
+//!
+//! Contains policies.
+
 mod policy;
 
 pub use policy::Policy;