mirror of
https://git.asonix.dog/asonix/http-signature-normalization.git
synced 2024-11-13 05:01:17 +00:00
Use Failure in more places
This commit is contained in:
parent
3a502055bf
commit
c468513d5a
3 changed files with 21 additions and 64 deletions
|
@ -1,5 +1,6 @@
|
|||
use actix::System;
|
||||
use actix_web::client::Client;
|
||||
use failure::Fail;
|
||||
use futures::future::{lazy, Future};
|
||||
use http_signature_normalization_actix::prelude::*;
|
||||
use sha2::{Digest, Sha256};
|
||||
|
@ -31,10 +32,13 @@ fn main() {
|
|||
.unwrap();
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
#[derive(Debug, Fail)]
|
||||
pub enum MyError {
|
||||
Convert(ToStrError),
|
||||
Header(InvalidHeaderValue),
|
||||
#[fail(display = "Failed to read header, {}", _0)]
|
||||
Convert(#[cause] ToStrError),
|
||||
|
||||
#[fail(display = "Failed to create header, {}", _0)]
|
||||
Header(#[cause] InvalidHeaderValue),
|
||||
}
|
||||
|
||||
impl From<ToStrError> for MyError {
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
use actix::System;
|
||||
use actix_web::{web, App, HttpRequest, HttpServer, ResponseError};
|
||||
use failure::Fail;
|
||||
use http_signature_normalization_actix::{prelude::*, verify::Algorithm};
|
||||
use sha2::{Digest, Sha256};
|
||||
use std::fmt;
|
||||
|
||||
fn index((req, config): (HttpRequest, web::Data<Config>)) -> Result<&'static str, MyError> {
|
||||
let unverified = req.begin_verify(&config)?;
|
||||
|
@ -37,37 +37,15 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||
Ok(())
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
#[derive(Debug, Fail)]
|
||||
enum MyError {
|
||||
Verify(VerifyError),
|
||||
#[fail(display = "Failed to verify, {}", _0)]
|
||||
Verify(#[cause] VerifyError),
|
||||
|
||||
#[fail(display = "Unsupported algorithm")]
|
||||
Algorithm,
|
||||
}
|
||||
|
||||
impl fmt::Display for MyError {
|
||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||
match *self {
|
||||
MyError::Verify(ref e) => write!(f, "Verify Error, {}", e),
|
||||
MyError::Algorithm => write!(f, "Unsupported algorithm"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl std::error::Error for MyError {
|
||||
fn description(&self) -> &str {
|
||||
match *self {
|
||||
MyError::Verify(ref e) => e.description(),
|
||||
MyError::Algorithm => "Unsupported algorithm",
|
||||
}
|
||||
}
|
||||
|
||||
fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
|
||||
match *self {
|
||||
MyError::Verify(ref e) => Some(e),
|
||||
MyError::Algorithm => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl ResponseError for MyError {
|
||||
// default 500
|
||||
}
|
||||
|
|
|
@ -3,11 +3,8 @@ use actix_web::http::{
|
|||
uri::PathAndQuery,
|
||||
Method,
|
||||
};
|
||||
use std::{
|
||||
collections::BTreeMap,
|
||||
error::Error,
|
||||
fmt::{self, Display},
|
||||
};
|
||||
use failure::Fail;
|
||||
use std::{collections::BTreeMap, fmt::Display};
|
||||
|
||||
mod sign;
|
||||
|
||||
|
@ -55,10 +52,13 @@ pub struct Config {
|
|||
pub config: http_signature_normalization::Config,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
#[derive(Debug, Fail)]
|
||||
pub enum VerifyError {
|
||||
Sig(http_signature_normalization::VerifyError),
|
||||
Header(ToStrError),
|
||||
#[fail(display = "Signature error, {}", _0)]
|
||||
Sig(#[cause] http_signature_normalization::VerifyError),
|
||||
|
||||
#[fail(display = "Failed to read header, {}", _0)]
|
||||
Header(#[cause] ToStrError),
|
||||
}
|
||||
|
||||
impl Config {
|
||||
|
@ -107,31 +107,6 @@ impl Config {
|
|||
}
|
||||
}
|
||||
|
||||
impl fmt::Display for VerifyError {
|
||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||
match *self {
|
||||
VerifyError::Sig(ref e) => write!(f, "Sig error, {}", e),
|
||||
VerifyError::Header(ref e) => write!(f, "Header error, {}", e),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Error for VerifyError {
|
||||
fn description(&self) -> &str {
|
||||
match *self {
|
||||
VerifyError::Sig(ref e) => e.description(),
|
||||
VerifyError::Header(ref e) => e.description(),
|
||||
}
|
||||
}
|
||||
|
||||
fn source(&self) -> Option<&(dyn Error + 'static)> {
|
||||
match *self {
|
||||
VerifyError::Sig(ref e) => Some(e),
|
||||
VerifyError::Header(ref e) => Some(e),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl From<http_signature_normalization::VerifyError> for VerifyError {
|
||||
fn from(e: http_signature_normalization::VerifyError) -> Self {
|
||||
VerifyError::Sig(e)
|
||||
|
|
Loading…
Reference in a new issue