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/src | |
| 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/src')
| -rw-r--r-- | license-generator/src/errors.rs | 3 | ||||
| -rw-r--r-- | license-generator/src/request.rs | 7 | 
2 files changed, 7 insertions, 3 deletions
| diff --git a/license-generator/src/errors.rs b/license-generator/src/errors.rs index 0a28341..0799c3e 100644 --- a/license-generator/src/errors.rs +++ b/license-generator/src/errors.rs @@ -1,5 +1,6 @@  use log;  use mysql; +use paddle;  error_chain! {      foreign_links { @@ -8,5 +9,7 @@ error_chain! {          Log(log::SetLoggerError);          MySql(mysql::error::Error); + +        Paddle(paddle::errors::Error);      }  } diff --git a/license-generator/src/request.rs b/license-generator/src/request.rs index 103656c..94e5b8d 100644 --- a/license-generator/src/request.rs +++ b/license-generator/src/request.rs @@ -1,14 +1,15 @@  use paddle; +use errors::*;  use params; -pub fn verified(req_params: &str) -> bool { +pub fn verified(req_params: &str) -> Result<bool> {      let mut p = params::parse(&req_params);      let signature = p.remove("p_signature");      let pem = include_bytes!("../private/paddle.pubkey.asc");      match signature { -        Some(signature) => paddle::verify_signature(pem, &signature, p), -        None => false, +        Some(signature) => Ok(paddle::verify_signature(pem, &signature, p)?), +        None => Ok(false),      }  } | 
