policy: define custom errors and ditch anyhow

crates/keystore/src/encrypter.rs

@@ -19,6 +19,7 @@ use base64ct::{Base64, Encoding};
 use chacha20poly1305::{ChaCha20Poly1305, KeyInit};
 use cookie::Key;
 use generic_array::GenericArray;
+use thiserror::Error;
 
 /// Helps encrypting and decrypting data
 #[derive(Clone)]
@@ -33,6 +34,14 @@ impl From<Encrypter> for Key {
     }
 }
 
+#[derive(Debug, Error)]
+#[error("Decryption error")]
+pub enum DecryptError {
+    Aead(#[from] aead::Error),
+    Base64(#[from] base64ct::Error),
+    Shape,
+}
+
 impl Encrypter {
     /// Creates an [`Encrypter`] out of an encryption key
     #[must_use]
@@ -50,7 +59,7 @@ impl Encrypter {
     /// # Errors
     ///
     /// Will return `Err` when the payload failed to encrypt
-    pub fn encrypt(&self, nonce: &[u8; 12], decrypted: &[u8]) -> anyhow::Result<Vec<u8>> {
+    pub fn encrypt(&self, nonce: &[u8; 12], decrypted: &[u8]) -> Result<Vec<u8>, aead::Error> {
         let nonce = GenericArray::from_slice(&nonce[..]);
         let encrypted = self.aead.encrypt(nonce, decrypted)?;
         Ok(encrypted)
@@ -61,7 +70,7 @@ impl Encrypter {
     /// # Errors
     ///
     /// Will return `Err` when the payload failed to decrypt
-    pub fn decrypt(&self, nonce: &[u8; 12], encrypted: &[u8]) -> anyhow::Result<Vec<u8>> {
+    pub fn decrypt(&self, nonce: &[u8; 12], encrypted: &[u8]) -> Result<Vec<u8>, aead::Error> {
         let nonce = GenericArray::from_slice(&nonce[..]);
         let encrypted = self.aead.decrypt(nonce, encrypted)?;
         Ok(encrypted)
@@ -72,7 +81,7 @@ impl Encrypter {
     /// # Errors
     ///
     /// Will return `Err` when the payload failed to encrypt
-    pub fn encryt_to_string(&self, decrypted: &[u8]) -> anyhow::Result<String> {
+    pub fn encryt_to_string(&self, decrypted: &[u8]) -> Result<String, aead::Error> {
         let nonce = rand::random();
         let encrypted = self.encrypt(&nonce, decrypted)?;
         let encrypted = [&nonce[..], &encrypted].concat();
@@ -85,17 +94,16 @@ impl Encrypter {
     /// # Errors
     ///
     /// Will return `Err` when the payload failed to decrypt
-    pub fn decrypt_string(&self, encrypted: &str) -> anyhow::Result<Vec<u8>> {
+    pub fn decrypt_string(&self, encrypted: &str) -> Result<Vec<u8>, DecryptError> {
         let encrypted = Base64::decode_vec(encrypted)?;
 
         let nonce: &[u8; 12] = encrypted
             .get(0..12)
-            .ok_or_else(|| anyhow::anyhow!("invalid payload serialization"))?
-            .try_into()?;
+            .ok_or(DecryptError::Shape)?
+            .try_into()
+            .map_err(|_| DecryptError::Shape)?;
 
-        let payload = encrypted
-            .get(12..)
-            .ok_or_else(|| anyhow::anyhow!("invalid payload serialization"))?;
+        let payload = encrypted.get(12..).ok_or(DecryptError::Shape)?;
 
         let decrypted_client_secret = self.decrypt(nonce, payload)?;
 

crates/keystore/src/lib.rs

@@ -43,7 +43,9 @@ use thiserror::Error;
 
 mod encrypter;
 
-pub use self::encrypter::Encrypter;
+pub use aead;
+
+pub use self::encrypter::{DecryptError, Encrypter};
 
 /// Error type used when a key could not be loaded
 #[derive(Debug, Error)]