fix/error: handle crypto error of ring with error chain

drahnr · drahnr · commit ba3e8b12136f · 2020-03-21T17:45:13.000+01:00
diff --git a/src/cache/gcs.rs b/src/cache/gcs.rs
@@ -312,12 +312,14 @@ fn sign_rsa(
     alg: &'static dyn signature::RsaEncoding,
 ) -> Result<String> {
     let key_pair = signature::RsaKeyPair::from_pkcs8(key)
+        .map_err(|e| -> Error { Error::from(e) })
         .chain_err(|| "failed to deserialize rsa key")?;
 
     let mut signature = vec![0; key_pair.public_modulus_len()];
     let rng = ring::rand::SystemRandom::new();
     key_pair
         .sign(alg, &rng, signing_input.as_bytes(), &mut signature)
+        .map_err(|e| -> Error { Error::from(e) })
         .chain_err(|| "failed to sign JWT claim")?;
 
     Ok(base64::encode_config(&signature, base64::URL_SAFE_NO_PAD))
diff --git a/src/errors.rs b/src/errors.rs
@@ -61,6 +61,23 @@ error_chain! {
         Which(err: which::Error) {
             display("{}", err)
         }
+        CryptoError(msg : String) {
+            display("Cryptographic ops failed: {}", msg)
+        }
+    }
+}
+
+
+
+impl From<ring::error::Unspecified> for Error {
+    fn from(e: ring::error::Unspecified) -> Self {
+        Error::from(ErrorKind::CryptoError(e.to_string()))
+    }
+}
+
+impl From<ring::error::KeyRejected> for Error {
+    fn from(e: ring::error::KeyRejected) -> Self {
+        Error::from(ErrorKind::CryptoError(e.to_string()))
     }
 }
 
