Compare commits
3 commits
369a1e8a96
...
47d07e7f1f
Author | SHA1 | Date | |
---|---|---|---|
asonix | 47d07e7f1f | ||
asonix | b89acf7918 | ||
asonix | bf8e0e5f69 |
|
@ -1,7 +1,7 @@
|
|||
[package]
|
||||
name = "http-signature-normalization-actix"
|
||||
description = "An HTTP Signatures library that leaves the signing to you"
|
||||
version = "0.10.4"
|
||||
version = "0.11.0"
|
||||
authors = ["asonix <asonix@asonix.dog>"]
|
||||
license = "AGPL-3.0"
|
||||
readme = "README.md"
|
||||
|
@ -32,13 +32,13 @@ actix-http = { version = "3.0.2", default-features = false }
|
|||
actix-rt = "2.6.0"
|
||||
actix-web = { version = "4.0.0", default-features = false, optional = true }
|
||||
awc = { version = "3.0.0", default-features = false, optional = true }
|
||||
base64 = { version = "0.13", optional = true }
|
||||
base64 = { version = "0.21", optional = true }
|
||||
futures-core = "0.3.28"
|
||||
http-signature-normalization = { version = "0.7.0", path = ".." }
|
||||
ring = { version = "0.16.20", optional = true }
|
||||
ring = { version = "0.17.5", optional = true }
|
||||
sha2 = { version = "0.10", optional = true }
|
||||
sha3 = { version = "0.10", optional = true }
|
||||
streem = "0.1.1"
|
||||
streem = "0.2.0"
|
||||
thiserror = "1.0"
|
||||
tokio = { version = "1", default-features = false, features = ["sync"] }
|
||||
tracing = "0.1"
|
||||
|
@ -47,7 +47,7 @@ tracing-futures = "0.2"
|
|||
|
||||
[dev-dependencies]
|
||||
actix-rt = "2.6.0"
|
||||
tracing-actix-web = { version = "0.6.0" }
|
||||
tracing-actix-web = { version = "0.7.0" }
|
||||
tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
|
|
|
@ -96,11 +96,12 @@ impl DigestName for Sha512 {
|
|||
mod client {
|
||||
use super::*;
|
||||
use crate::digest::DigestCreate;
|
||||
use base64::prelude::*;
|
||||
|
||||
fn create(mut context: ring::digest::Context, input: &[u8]) -> String {
|
||||
context.update(input);
|
||||
let digest = context.finish();
|
||||
base64::encode(digest.as_ref())
|
||||
BASE64_STANDARD.encode(digest.as_ref())
|
||||
}
|
||||
|
||||
impl DigestCreate for Sha256 {
|
||||
|
@ -126,6 +127,7 @@ mod client {
|
|||
mod server {
|
||||
use super::*;
|
||||
use crate::digest::{DigestPart, DigestVerify};
|
||||
use base64::prelude::*;
|
||||
use tracing::{debug, warn};
|
||||
|
||||
fn verify(context: ring::digest::Context, name: &str, parts: &[DigestPart]) -> bool {
|
||||
|
@ -135,7 +137,7 @@ mod server {
|
|||
{
|
||||
debug!("Verifying digest type, {}", name);
|
||||
let digest = context.finish();
|
||||
let encoded = base64::encode(digest.as_ref());
|
||||
let encoded = BASE64_STANDARD.encode(digest.as_ref());
|
||||
|
||||
return part.digest == encoded;
|
||||
}
|
||||
|
|
|
@ -21,13 +21,14 @@ impl DigestName for Sha512 {
|
|||
mod client {
|
||||
use super::*;
|
||||
use crate::digest::DigestCreate;
|
||||
use base64::prelude::*;
|
||||
|
||||
fn create<D: sha2::Digest + sha2::digest::FixedOutputReset>(
|
||||
digest: &mut D,
|
||||
input: &[u8],
|
||||
) -> String {
|
||||
sha2::Digest::update(digest, input);
|
||||
base64::encode(&digest.finalize_reset())
|
||||
BASE64_STANDARD.encode(&digest.finalize_reset())
|
||||
}
|
||||
|
||||
impl DigestCreate for Sha224 {
|
||||
|
@ -59,6 +60,7 @@ mod client {
|
|||
mod server {
|
||||
use super::*;
|
||||
use crate::digest::{DigestPart, DigestVerify};
|
||||
use base64::prelude::*;
|
||||
use tracing::{debug, warn};
|
||||
|
||||
fn verify<D: sha2::Digest + sha2::digest::FixedOutputReset>(
|
||||
|
@ -71,7 +73,7 @@ mod server {
|
|||
.find(|p| p.algorithm.to_lowercase() == name.to_lowercase())
|
||||
{
|
||||
debug!("Verifying digest type, {}", name);
|
||||
let encoded = base64::encode(&digest.finalize_reset());
|
||||
let encoded = BASE64_STANDARD.encode(&digest.finalize_reset());
|
||||
|
||||
return part.digest == encoded;
|
||||
}
|
||||
|
|
|
@ -40,17 +40,18 @@ impl DigestName for Sha3_512 {
|
|||
const NAME: &'static str = "SHA3-512";
|
||||
}
|
||||
|
||||
#[cfg(features = "client")]
|
||||
#[cfg(feature = "client")]
|
||||
mod client {
|
||||
use super::*;
|
||||
use crate::digest::DigestCreate;
|
||||
use base64::prelude::*;
|
||||
|
||||
fn create<D: sha3::Digest + sha3::digest::FixedOutputReset>(
|
||||
digest: &mut D,
|
||||
input: &[u8],
|
||||
) -> String {
|
||||
digest.update(input);
|
||||
base64::encode(&digest.finalize_reset())
|
||||
sha3::Digest::update(digest, input);
|
||||
BASE64_STANDARD.encode(&digest.finalize_reset())
|
||||
}
|
||||
|
||||
impl DigestCreate for Sha3_224 {
|
||||
|
@ -112,6 +113,7 @@ mod client {
|
|||
mod server {
|
||||
use super::*;
|
||||
use crate::digest::{DigestPart, DigestVerify};
|
||||
use base64::prelude::*;
|
||||
use tracing::{debug, warn};
|
||||
|
||||
fn verify<D: sha3::Digest + sha3::digest::FixedOutputReset>(
|
||||
|
@ -124,7 +126,7 @@ mod server {
|
|||
.find(|p| p.algorithm.to_lowercase() == name.to_lowercase())
|
||||
{
|
||||
debug!("Verifying digest type, {}", name);
|
||||
let encoded = base64::encode(&digest.finalize_reset());
|
||||
let encoded = BASE64_STANDARD.encode(&digest.finalize_reset());
|
||||
|
||||
return part.digest == encoded;
|
||||
}
|
||||
|
|
12
flake.lock
12
flake.lock
|
@ -5,11 +5,11 @@
|
|||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1689068808,
|
||||
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
|
||||
"lastModified": 1694529238,
|
||||
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
|
||||
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -20,11 +20,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1690272529,
|
||||
"narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=",
|
||||
"lastModified": 1700794826,
|
||||
"narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c",
|
||||
"rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
Loading…
Reference in a new issue