Fix remaining error lints and tweak rule (#458)

- Enable dylint in CI and pre-commit.
- Fix remaining violations.
- Tweak linter to avoid catching `Error` variants in non error enums.

Author: Hinton

.github/workflows/lint.yml

@@ -92,6 +92,12 @@ jobs:
       - name: Cargo udeps
         run: cargo +"${{ steps.nightly-toolchain.outputs.RUST_NIGHTLY_TOOLCHAIN }}" udeps --workspace --all-features
 
+      - name: Install cargo-dylint
+        run: cargo install cargo-dylint dylint-link --version 4.1.0 --locked
+
+      - name: Cargo dylint
+        run: cargo dylint --all -- --all-features --all-targets
+
       - name: Set up Node
         uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
         with:

README.md

@@ -127,6 +127,7 @@ versions. Here are the cli tools we use:
 - Nightly [cargo fmt](https://github.com/rust-lang/rustfmt) and
   [cargo udeps](https://github.com/est31/cargo-udeps)
 - [rust clippy](https://github.com/rust-lang/rust-clippy)
+- [cargo dylint](https://github.com/trailofbits/dylint)
 - [cargo sort](https://github.com/DevinR528/cargo-sort)
 - [prettier](https://github.com/prettier/prettier)
 
@@ -140,6 +141,7 @@ export RUSTFLAGS="-D warnings"
 cargo +nightly fmt --check
 cargo +nightly udeps --workspace --all-features
 cargo clippy --all-features --all-targets
+cargo dylint --all -- --all-features --all-targets
 cargo sort --workspace --check
 npm run lint
 ```

crates/bitwarden-core/src/auth/access_token.rs

@@ -1,7 +1,7 @@
 use std::{fmt::Debug, str::FromStr};
 
 use bitwarden_crypto::{derive_shareable_key, SymmetricCryptoKey};
-use bitwarden_encoding::{NotB64Encoded, B64};
+use bitwarden_encoding::{NotB64EncodedError, B64};
 use thiserror::Error;
 use uuid::Uuid;
 use zeroize::Zeroizing;
@@ -19,7 +19,7 @@ pub enum AccessTokenInvalidError {
     InvalidUuid,
 
     #[error("Error decoding base64: {0}")]
-    InvalidBase64(#[from] NotB64Encoded),
+    InvalidBase64(#[from] NotB64EncodedError),
 
     #[error("Invalid base64 length: expected {expected}, got {got}")]
     InvalidBase64Length { expected: usize, got: usize },

crates/bitwarden-core/src/auth/jwt_token.rs

@@ -1,6 +1,6 @@
 use std::str::FromStr;
 
-use bitwarden_encoding::{B64Url, NotB64UrlEncoded};
+use bitwarden_encoding::{B64Url, NotB64UrlEncodedError};
 use thiserror::Error;
 
 /// A Bitwarden secrets manager JWT Token.
@@ -31,7 +31,7 @@ pub enum JwtTokenParseError {
     #[error("JWT token parse error: {0}")]
     Parse(#[from] serde_json::Error),
     #[error("JWT token decode error: {0}")]
-    Decode(#[from] NotB64UrlEncoded),
+    Decode(#[from] NotB64UrlEncodedError),
 
     #[error("JWT token has an invalid number of parts")]
     InvalidParts,

crates/bitwarden-crypto/src/enc_string/symmetric.rs

@@ -6,7 +6,7 @@ use serde::Deserialize;
 
 use super::{check_length, from_b64, from_b64_vec, split_enc_string};
 use crate::{
-    error::{CryptoError, EncStringParseError, Result, UnsupportedOperation},
+    error::{CryptoError, EncStringParseError, Result, UnsupportedOperationError},
     Aes256CbcHmacKey, ContentFormat, KeyDecryptable, KeyEncryptable, KeyEncryptableWithContentType,
     SymmetricCryptoKey, Utf8Bytes, XChaCha20Poly1305Key,
 };
@@ -294,7 +294,7 @@ impl KeyEncryptableWithContentType<SymmetricCryptoKey, EncString> for &[u8] {
                 EncString::encrypt_xchacha20_poly1305(self, inner_key, content_format)
             }
             SymmetricCryptoKey::Aes256CbcKey(_) => Err(CryptoError::OperationNotSupported(
-                UnsupportedOperation::EncryptionNotImplementedForKey,
+                UnsupportedOperationError::EncryptionNotImplementedForKey,
             )),
         }
     }

crates/bitwarden-crypto/src/error.rs

@@ -1,6 +1,6 @@
 use std::fmt::Debug;
 
-use bitwarden_encoding::NotB64Encoded;
+use bitwarden_encoding::NotB64EncodedError;
 use bitwarden_error::bitwarden_error;
 use thiserror::Error;
 use uuid::Uuid;
@@ -45,13 +45,13 @@ pub enum CryptoError {
     Fingerprint(#[from] FingerprintError),
 
     #[error("Argon2 error, {0}")]
-    ArgonError(#[from] argon2::Error),
+    Argon(#[from] argon2::Error),
 
     #[error("Number is zero")]
     ZeroNumber,
 
     #[error("Unsupported operation, {0}")]
-    OperationNotSupported(UnsupportedOperation),
+    OperationNotSupported(UnsupportedOperationError),
 
     #[error("Key algorithm does not match encrypted data type")]
     WrongKeyType,
@@ -73,7 +73,7 @@ pub enum CryptoError {
 }
 
 #[derive(Debug, Error)]
-pub enum UnsupportedOperation {
+pub enum UnsupportedOperationError {
     #[error("Encryption is not implemented for key")]
     EncryptionNotImplementedForKey,
 }
@@ -87,7 +87,7 @@ pub enum EncStringParseError {
     #[error("Invalid asymmetric type, got type {enc_type} with {parts} parts")]
     InvalidTypeAsymm { enc_type: String, parts: usize },
     #[error("Error decoding base64: {0}")]
-    InvalidBase64(#[from] NotB64Encoded),
+    InvalidBase64(#[from] NotB64EncodedError),
     #[error("Invalid length: expected {expected}, got {got}")]
     InvalidLength { expected: usize, got: usize },
     #[error("Invalid encoding {0}")]

crates/bitwarden-crypto/src/keys/master_key.rs

@@ -155,7 +155,7 @@ pub(super) fn decrypt_user_key(
         }
         EncString::Cose_Encrypt0_B64 { .. } => {
             return Err(CryptoError::OperationNotSupported(
-                crate::error::UnsupportedOperation::EncryptionNotImplementedForKey,
+                crate::error::UnsupportedOperationError::EncryptionNotImplementedForKey,
             ));
         }
     };

crates/bitwarden-crypto/src/rsa.rs

@@ -6,7 +6,7 @@ use rsa::{
 use sha1::Sha1;
 
 use crate::{
-    error::{Result, RsaError, UnsupportedOperation},
+    error::{Result, RsaError, UnsupportedOperationError},
     CryptoError, EncString, SymmetricCryptoKey,
 };
 
@@ -41,10 +41,10 @@ pub(crate) fn make_key_pair(key: &SymmetricCryptoKey) -> Result<RsaKeyPair> {
             EncString::encrypt_aes256_hmac(pkcs.as_bytes(), key)
         }
         SymmetricCryptoKey::XChaCha20Poly1305Key(_) => Err(CryptoError::OperationNotSupported(
-            UnsupportedOperation::EncryptionNotImplementedForKey,
+            UnsupportedOperationError::EncryptionNotImplementedForKey,
         )),
         SymmetricCryptoKey::Aes256CbcKey(_) => Err(CryptoError::OperationNotSupported(
-            UnsupportedOperation::EncryptionNotImplementedForKey,
+            UnsupportedOperationError::EncryptionNotImplementedForKey,
         )),
     }?;
 

crates/bitwarden-crypto/src/store/context.rs

@@ -8,7 +8,7 @@ use zeroize::Zeroizing;
 
 use super::KeyStoreInner;
 use crate::{
-    derive_shareable_key, error::UnsupportedOperation, signing, store::backend::StoreBackend,
+    derive_shareable_key, error::UnsupportedOperationError, signing, store::backend::StoreBackend,
     AsymmetricCryptoKey, BitwardenLegacyKeyBytes, ContentFormat, CryptoError, EncString, KeyId,
     KeyIds, PublicKeyEncryptionAlgorithm, Result, RotatedUserKeys, Signature, SignatureAlgorithm,
     SignedObject, SignedPublicKey, SignedPublicKeyMessage, SigningKey, SymmetricCryptoKey,
@@ -236,7 +236,7 @@ impl<Ids: KeyIds> KeyStoreContext<'_, Ids> {
                 )
             }
             _ => Err(CryptoError::OperationNotSupported(
-                UnsupportedOperation::EncryptionNotImplementedForKey,
+                UnsupportedOperationError::EncryptionNotImplementedForKey,
             )),
         }
     }
@@ -503,7 +503,7 @@ impl<Ids: KeyIds> KeyStoreContext<'_, Ids> {
         let key = self.get_symmetric_key(key)?;
         match key {
             SymmetricCryptoKey::Aes256CbcKey(_) => Err(CryptoError::OperationNotSupported(
-                UnsupportedOperation::EncryptionNotImplementedForKey,
+                UnsupportedOperationError::EncryptionNotImplementedForKey,
             )),
             SymmetricCryptoKey::Aes256CbcHmacKey(key) => EncString::encrypt_aes256_hmac(data, key),
             SymmetricCryptoKey::XChaCha20Poly1305Key(key) => {

crates/bitwarden-encoding/src/b64.rs

@@ -86,7 +86,7 @@ impl std::fmt::Display for B64 {
 /// An error returned when a string is not base64 decodable.
 #[derive(Debug, Error)]
 #[error("Data isn't base64 encoded")]
-pub struct NotB64Encoded;
+pub struct NotB64EncodedError;
 
 const BASE64_PERMISSIVE: data_encoding::Encoding = data_encoding_macro::new_encoding! {
     symbols: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",
@@ -96,27 +96,27 @@ const BASE64_PERMISSIVE: data_encoding::Encoding = data_encoding_macro::new_enco
 const BASE64_PADDING: &str = "=";
 
 impl TryFrom<String> for B64 {
-    type Error = NotB64Encoded;
+    type Error = NotB64EncodedError;
 
     fn try_from(value: String) -> Result<Self, Self::Error> {
         Self::try_from(value.as_str())
     }
 }
 
 impl TryFrom<&str> for B64 {
-    type Error = NotB64Encoded;
+    type Error = NotB64EncodedError;
 
     fn try_from(value: &str) -> Result<Self, Self::Error> {
         let sane_string = value.trim_end_matches(BASE64_PADDING);
         BASE64_PERMISSIVE
             .decode(sane_string.as_bytes())
             .map(Self)
-            .map_err(|_| NotB64Encoded)
+            .map_err(|_| NotB64EncodedError)
     }
 }
 
 impl FromStr for B64 {
-    type Err = NotB64Encoded;
+    type Err = NotB64EncodedError;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         Self::try_from(s)
@@ -224,7 +224,7 @@ mod tests {
 
     #[test]
     fn test_not_b64_encoded_error_display() {
-        let error = NotB64Encoded;
+        let error = NotB64EncodedError;
         assert_eq!(error.to_string(), "Data isn't base64 encoded");
     }