sample_other

Author: Sajjon

crates/core/src/logic/encryption/encrypted_app_password.rs

@@ -1,4 +1,4 @@
-use crate::prelude::*;
+use crate::{logic::Salt, prelude::*};
 
 use secrecy::{ExposeSecret, SecretString};
 use serde::{Deserialize, Serialize};
@@ -27,23 +27,36 @@ impl HasSample for SecretString {
     fn sample() -> Self {
         Self::from("encryption password")
     }
+
     fn sample_other() -> Self {
         Self::from("another encryption password")
     }
 }
+
 impl HasSample for EncryptedAppPassword {
     fn sample() -> Self {
-        Self::new_by_deriving_and_encrypting(
-            SecretString::from("super secret"),
-            SecretString::sample(),
-            &Salt::sample(),
+        // SecretString::from("super secret"),
+        // SecretString::sample(),
+        // Salt::sample()
+        Self(
+            hex::decode(
+                "3219e571fbb18265b1fb3f36a75c8e7ef4feef52892a5be25d0b9a92154c5de6456cdfe66aa70070",
+            )
+            .unwrap(),
         )
     }
+
     fn sample_other() -> Self {
-        Self::new_by_deriving_and_encrypting(
-            SecretString::from("another super secret"),
-            SecretString::sample_other(),
-            &Salt::sample(),
+        // Self::new_by_deriving_and_encrypting(
+        //     SecretString::from("another super secret"),
+        //     SecretString::sample_other(),
+        //     &Salt::sample_other(),
+        // )
+        Self(
+            hex::decode(
+                "5b4d6fb8f3bc35af4168b6a0e593e69bedc75a9a062b77a36d6d01cbec06faaaaa3b89fbfd4b5b077c0ae0775de5ac1d",
+            )
+            .unwrap(),
         )
     }
 }
@@ -86,12 +99,25 @@ impl EncryptedAppPassword {
 mod tests {
     use super::*;
 
+    type Sut = EncryptedAppPassword;
+
+    #[test]
+    fn equality() {
+        assert_eq!(Sut::sample(), Sut::sample());
+        assert_eq!(Sut::sample_other(), Sut::sample_other());
+    }
+
+    #[test]
+    fn inequality() {
+        assert_ne!(Sut::sample(), Sut::sample_other());
+    }
+
     #[test]
     fn test_encrypted_app_password() {
         let app_password = SecretString::from("my_secret_app_password");
         let encryption_pwd = SecretString::from("open sesame");
         let salt = Salt::sample();
-        let encrypted = EncryptedAppPassword::new_by_deriving_and_encrypting(
+        let encrypted = Sut::new_by_deriving_and_encrypting(
             app_password.clone(),
             encryption_pwd.clone(),
             &salt,

crates/core/src/logic/encryption/mod.rs

@@ -3,9 +3,11 @@ mod aes_gcm_sealed_box;
 mod encrypted_app_password;
 mod encryption_key;
 mod pb_hkdf;
+mod salt;
 
 pub use aes_gcm_256::*;
 pub use aes_gcm_sealed_box::*;
 pub use encrypted_app_password::*;
 pub use encryption_key::*;
 pub use pb_hkdf::*;
+pub use salt::*;

crates/core/src/logic/encryption/pb_hkdf.rs

@@ -1,50 +1,12 @@
-use crate::prelude::*;
+use crate::{logic::Salt, prelude::*};
 use hkdf::Hkdf;
 use secrecy::{ExposeSecret, SecretString};
-use serde_with::serde_as;
 use sha2::Sha256;
-use zeroize::{Zeroize, ZeroizeOnDrop};
 
 /// A simple `HKDF` based scheme using UTF8 encoding of the password as input.
 #[derive(Clone, Default, PartialEq, Eq, Hash)]
 pub struct PbHkdfSha256;
 
-#[serde_as]
-#[derive(
-    Clone,
-    Debug,
-    PartialEq,
-    Eq,
-    Hash,
-    From,
-    Deref,
-    AsRef,
-    Serialize,
-    Deserialize,
-    Zeroize,
-    ZeroizeOnDrop,
-)]
-#[serde(transparent)]
-pub struct Salt(#[serde_as(as = "serde_with::hex::Hex")] [u8; 16]);
-impl Salt {
-    /// Uses CSPRNG (safe) to generate a salt.
-    pub fn generate() -> Self {
-        use rand::RngCore;
-        let mut salt = [0u8; 16];
-        rand::rng().fill_bytes(&mut salt);
-        Self(salt)
-    }
-}
-
-impl HasSample for Salt {
-    fn sample() -> Self {
-        Self([0xab; 16])
-    }
-    fn sample_other() -> Self {
-        Self([0xcd; 16])
-    }
-}
-
 impl PbHkdfSha256 {
     const INFO: &'static [u8] = b"klirr email encryption";
     fn derive_key_with_ikm_salt_info(
@@ -74,27 +36,16 @@ mod tests {
     use super::*;
     use hex::encode as hex_encode;
 
+    type Sut = PbHkdfSha256;
+
     #[test]
     fn test_kdf() {
         let ikm = "open sesame";
-        let salt = Salt([0u8; 16]); // Use a fixed salt for deterministic test
-        let derived = PbHkdfSha256::derive_key(ikm, &salt);
+        let salt = Salt::from([0u8; 16]); // Use a fixed salt for deterministic test
+        let derived = Sut::derive_key(ikm, &salt);
         assert_eq!(
             hex_encode(*derived),
             "ce81a9fdee0e4db76e31d9b49ad2d5b09b45647bc56682d62110fbf32c2903b1"
         );
     }
-
-    #[test]
-    fn test_salt_generate() {
-        let salt1 = Salt::generate();
-        let salt2 = Salt::generate();
-
-        // Generated salts should be different
-        assert_ne!(salt1, salt2);
-
-        // Salt should not be all zeros
-        assert_ne!(salt1.0, [0u8; 16]);
-        assert_ne!(salt2.0, [0u8; 16]);
-    }
 }

crates/core/src/logic/encryption/salt.rs

@@ -0,0 +1,76 @@
+use serde_with::serde_as;
+use zeroize::{Zeroize, ZeroizeOnDrop};
+
+use crate::prelude::*;
+
+/// A cryptographically secure random salt used for key derivation.
+/// It is used to ensure that the derived keys are unique even if the
+/// input key material is the same.
+#[serde_as]
+#[derive(
+    Clone,
+    Debug,
+    PartialEq,
+    Eq,
+    Hash,
+    From,
+    Deref,
+    AsRef,
+    Serialize,
+    Deserialize,
+    Zeroize,
+    ZeroizeOnDrop,
+)]
+#[serde(transparent)]
+pub struct Salt(#[serde_as(as = "serde_with::hex::Hex")] [u8; 16]);
+
+impl Salt {
+    /// Uses CSPRNG (safe) to generate a salt.
+    pub fn generate() -> Self {
+        use rand::RngCore;
+        let mut salt = [0u8; 16];
+        rand::rng().fill_bytes(&mut salt);
+        Self(salt)
+    }
+}
+
+impl HasSample for Salt {
+    fn sample() -> Self {
+        Self([0xab; 16])
+    }
+
+    fn sample_other() -> Self {
+        Self([0xcd; 16])
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    type Sut = Salt;
+
+    #[test]
+    fn equality() {
+        assert_eq!(Sut::sample(), Sut::sample());
+        assert_eq!(Sut::sample_other(), Sut::sample_other());
+    }
+
+    #[test]
+    fn inequality() {
+        assert_ne!(Sut::sample(), Sut::sample_other());
+    }
+
+    #[test]
+    fn test_salt_generate() {
+        let salt1 = Salt::generate();
+        let salt2 = Salt::generate();
+
+        // Generated salts should be different
+        assert_ne!(salt1, salt2);
+
+        // Salt should not be all zeros
+        assert_ne!(*salt1, [0u8; 16]);
+        assert_ne!(*salt2, [0u8; 16]);
+    }
+}

crates/core/src/models/cost.rs

@@ -17,3 +17,21 @@ impl HasSample for Cost {
         Self::from(dec!(500.0))
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    type Sut = Cost;
+
+    #[test]
+    fn equality() {
+        assert_eq!(Sut::sample(), Sut::sample());
+        assert_eq!(Sut::sample_other(), Sut::sample_other());
+    }
+
+    #[test]
+    fn inequality() {
+        assert_ne!(Sut::sample(), Sut::sample_other());
+    }
+}

crates/core/src/models/data/data.rs

@@ -153,6 +153,7 @@ impl<Period: IsPeriod + HasSample> HasSample for Data<Period> {
             .expensed_periods(ExpensedPeriods::sample())
             .build()
     }
+
     fn sample_other() -> Self {
         Data::builder()
             .information(ProtoInvoiceInfo::sample_other())
@@ -172,14 +173,27 @@ mod tests {
     use super::*;
     use test_log::test;
 
+    type Sut = Data<YearAndMonth>;
+
+    #[test]
+    fn equality() {
+        assert_eq!(Sut::sample(), Sut::sample());
+        assert_eq!(Sut::sample_other(), Sut::sample_other());
+    }
+
+    #[test]
+    fn inequality() {
+        assert_ne!(Sut::sample(), Sut::sample_other());
+    }
+
     #[test]
     fn test_serialization_sample() {
-        assert_ron_snapshot!(Data::<YearAndMonth>::sample())
+        assert_ron_snapshot!(Sut::sample())
     }
 
     #[test]
     fn test_worked_days_when_ooo_is_greater_than_0() {
-        let sut = Data::sample();
+        let sut = Sut::sample();
         let partial = sut
             .to_partial(
                 ValidInput::builder()

crates/core/src/models/data/submodels/company_information.rs

@@ -29,6 +29,7 @@ impl HasSample for CompanyInformation {
     fn sample() -> Self {
         Self::sample_client()
     }
+
     fn sample_other() -> Self {
         Self::sample_vendor()
     }
@@ -55,3 +56,21 @@ impl CompanyInformation {
             .build()
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    type Sut = CompanyInformation;
+
+    #[test]
+    fn equality() {
+        assert_eq!(Sut::sample(), Sut::sample());
+        assert_eq!(Sut::sample_other(), Sut::sample_other());
+    }
+
+    #[test]
+    fn inequality() {
+        assert_ne!(Sut::sample(), Sut::sample_other());
+    }
+}