diff options
author | Teddy Wing | 2018-11-10 15:26:42 +0100 |
---|---|---|
committer | Teddy Wing | 2018-11-10 15:26:42 +0100 |
commit | be3cbacd6d5b5195b7b63816179eb6b3743a2157 (patch) | |
tree | 70c09e9992444322bbd5e9ee9f52a401d6e93a14 /license-generator/paddle/src/lib.rs | |
parent | e594577e14812ff4a7ca26dd2ffb506efc469b68 (diff) | |
download | dome-key-web-be3cbacd6d5b5195b7b63816179eb6b3743a2157.tar.bz2 |
paddle::verify_signature(): Remove `unwrap`s
Return a `Result` from the function to pass errors through.
Diffstat (limited to 'license-generator/paddle/src/lib.rs')
-rw-r--r-- | license-generator/paddle/src/lib.rs | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/license-generator/paddle/src/lib.rs b/license-generator/paddle/src/lib.rs index 11fd87f..bdebf1c 100644 --- a/license-generator/paddle/src/lib.rs +++ b/license-generator/paddle/src/lib.rs @@ -1,5 +1,17 @@ +#[macro_use] +extern crate error_chain; extern crate openssl; +pub mod errors { + use openssl; + + error_chain! { + foreign_links { + Openssl(openssl::error::ErrorStack); + } + } +} + use std::fmt::Display; use std::ops::Deref; @@ -8,21 +20,27 @@ use openssl::pkey::PKey; use openssl::rsa::Rsa; use openssl::sign::Verifier; +use errors::*; + // https://paddle.com/docs/reference-verifying-webhooks/ -pub fn verify_signature<'a, S, I>(pem: &[u8], signature: &str, params: I) -> bool +pub fn verify_signature<'a, S, I>( + pem: &[u8], + signature: &str, + params: I, +) -> Result<bool> where S: AsRef<str> + Deref<Target = str> + Display, I: IntoIterator<Item = (S, S)> + PartialOrd, { - let rsa = Rsa::public_key_from_pem(pem).unwrap(); - let pkey = PKey::from_rsa(rsa).unwrap(); - let mut verifier = Verifier::new(MessageDigest::sha1(), &pkey).unwrap(); - verifier.update(signature.as_bytes()).unwrap(); + let rsa = Rsa::public_key_from_pem(pem)?; + let pkey = PKey::from_rsa(rsa)?; + let mut verifier = Verifier::new(MessageDigest::sha1(), &pkey)?; + verifier.update(signature.as_bytes())?; let signature = php_serialize(params); - verifier.verify(signature.as_ref()).unwrap() + Ok(verifier.verify(signature.as_ref())?) } fn php_serialize<'a, S, I>(pairs: I) -> String |