2020-12-12 17:11:22 +00:00
|
|
|
use std::{
|
|
|
|
convert::TryInto,
|
2020-12-12 17:50:40 +00:00
|
|
|
fmt::{self, Debug, Formatter},
|
2020-12-12 17:11:22 +00:00
|
|
|
ops::Deref,
|
|
|
|
};
|
|
|
|
|
|
|
|
use chrono::{DateTime, Duration, Utc};
|
|
|
|
use serde::{
|
|
|
|
de::{
|
|
|
|
self,
|
|
|
|
Visitor,
|
|
|
|
},
|
|
|
|
Deserialize,
|
|
|
|
Deserializer,
|
|
|
|
};
|
|
|
|
|
2020-12-12 17:50:40 +00:00
|
|
|
#[derive (Copy, Clone, PartialEq, Eq)]
|
2020-12-12 17:11:22 +00:00
|
|
|
pub struct BlakeHashWrapper (blake3::Hash);
|
|
|
|
|
2020-12-12 17:50:40 +00:00
|
|
|
impl Debug for BlakeHashWrapper {
|
|
|
|
fn fmt (&self, f: &mut Formatter <'_>) -> Result <(), fmt::Error> {
|
|
|
|
write! (f, "{}", self.encode_base64 ())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-12-12 17:11:22 +00:00
|
|
|
impl BlakeHashWrapper {
|
|
|
|
pub fn from_key (bytes: &[u8]) -> Self {
|
|
|
|
Self (blake3::hash (bytes))
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn encode_base64 (&self) -> String {
|
|
|
|
base64::encode (self.as_bytes ())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Deref for BlakeHashWrapper {
|
|
|
|
type Target = blake3::Hash;
|
|
|
|
|
|
|
|
fn deref (&self) -> &<Self as Deref>::Target {
|
|
|
|
&self.0
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
struct BlakeHashVisitor;
|
|
|
|
|
|
|
|
impl <'de> Visitor <'de> for BlakeHashVisitor {
|
|
|
|
type Value = blake3::Hash;
|
|
|
|
|
|
|
|
fn expecting (&self, formatter: &mut fmt::Formatter) -> fmt::Result {
|
|
|
|
formatter.write_str ("a 32-byte blake3 hash, encoded as base64")
|
|
|
|
}
|
|
|
|
|
|
|
|
fn visit_str <E: de::Error> (self, value: &str)
|
|
|
|
-> Result <Self::Value, E>
|
|
|
|
{
|
|
|
|
let bytes: Vec <u8> = base64::decode (value).map_err (|_| E::custom (format! ("str is not base64: {}", value)))?;
|
|
|
|
let bytes: [u8; 32] = (&bytes [..]).try_into ().map_err (|_| E::custom (format! ("decode base64 is not 32 bytes long: {}", value)))?;
|
|
|
|
|
|
|
|
let tripcode = blake3::Hash::from (bytes);
|
|
|
|
|
|
|
|
Ok (tripcode)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl <'de> Deserialize <'de> for BlakeHashWrapper {
|
|
|
|
fn deserialize <D: Deserializer <'de>> (deserializer: D) -> Result <Self, D::Error> {
|
|
|
|
Ok (BlakeHashWrapper (deserializer.deserialize_str (BlakeHashVisitor)?))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub struct Valid7Days;
|
2020-12-16 14:46:03 +00:00
|
|
|
pub struct Valid30Days;
|
2020-12-12 17:11:22 +00:00
|
|
|
//pub struct Valid90Days;
|
|
|
|
|
|
|
|
pub trait MaxValidDuration {
|
|
|
|
fn dur () -> Duration;
|
|
|
|
}
|
|
|
|
|
|
|
|
impl MaxValidDuration for Valid7Days {
|
|
|
|
fn dur () -> Duration {
|
|
|
|
Duration::days (7)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-12-16 14:46:03 +00:00
|
|
|
impl MaxValidDuration for Valid30Days {
|
|
|
|
fn dur () -> Duration {
|
|
|
|
Duration::days (30)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-12-12 17:11:22 +00:00
|
|
|
#[derive (Deserialize)]
|
|
|
|
pub struct ScraperKey <V: MaxValidDuration> {
|
2020-12-16 14:46:03 +00:00
|
|
|
name: String,
|
|
|
|
|
2020-12-13 01:54:54 +00:00
|
|
|
not_before: DateTime <Utc>,
|
|
|
|
not_after: DateTime <Utc>,
|
2020-12-16 14:46:03 +00:00
|
|
|
pub hash: BlakeHashWrapper,
|
2020-12-12 17:12:38 +00:00
|
|
|
|
|
|
|
#[serde (default)]
|
2020-12-12 17:11:22 +00:00
|
|
|
_phantom: std::marker::PhantomData <V>,
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive (Copy, Clone, Debug, PartialEq)]
|
|
|
|
pub enum KeyValidity {
|
|
|
|
Valid,
|
|
|
|
|
2020-12-12 17:50:40 +00:00
|
|
|
WrongKey (BlakeHashWrapper),
|
2020-12-12 17:11:22 +00:00
|
|
|
ClockIsBehind,
|
|
|
|
Expired,
|
|
|
|
DurationTooLong (Duration),
|
|
|
|
DurationNegative,
|
|
|
|
}
|
|
|
|
|
2020-12-21 14:26:51 +00:00
|
|
|
impl <V: MaxValidDuration> ScraperKey <V> {
|
2020-12-16 14:46:03 +00:00
|
|
|
pub fn new_30_day <S: Into <String>> (name: S, input: &[u8]) -> Self {
|
2020-12-13 01:54:54 +00:00
|
|
|
let now = Utc::now ();
|
|
|
|
|
|
|
|
Self {
|
2020-12-16 14:46:03 +00:00
|
|
|
name: name.into (),
|
2020-12-13 01:54:54 +00:00
|
|
|
not_before: now,
|
2020-12-21 14:26:51 +00:00
|
|
|
not_after: now + V::dur (),
|
2020-12-13 01:54:54 +00:00
|
|
|
hash: BlakeHashWrapper::from_key (input),
|
|
|
|
_phantom: Default::default (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-12-12 17:11:22 +00:00
|
|
|
impl <V: MaxValidDuration> ScraperKey <V> {
|
|
|
|
pub fn is_valid (&self, now: DateTime <Utc>, input: &[u8]) -> KeyValidity {
|
|
|
|
use KeyValidity::*;
|
|
|
|
|
|
|
|
// I put this first because I think the constant-time check should run
|
|
|
|
// before anything else. But I'm not a crypto expert, so it's just
|
|
|
|
// guesswork.
|
2020-12-12 17:50:40 +00:00
|
|
|
let input_hash = BlakeHashWrapper::from_key (input);
|
|
|
|
if input_hash != self.hash {
|
|
|
|
return WrongKey (input_hash);
|
2020-12-12 17:11:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if self.not_after < self.not_before {
|
|
|
|
return DurationNegative;
|
|
|
|
}
|
|
|
|
|
|
|
|
let max_dur = V::dur ();
|
|
|
|
let actual_dur = self.not_after - self.not_before;
|
|
|
|
|
|
|
|
if actual_dur > max_dur {
|
|
|
|
return DurationTooLong (max_dur);
|
|
|
|
}
|
|
|
|
|
|
|
|
if now >= self.not_after {
|
|
|
|
return Expired;
|
|
|
|
}
|
|
|
|
|
|
|
|
if now < self.not_before {
|
|
|
|
return ClockIsBehind;
|
|
|
|
}
|
|
|
|
|
|
|
|
return Valid;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg (test)]
|
|
|
|
mod tests {
|
|
|
|
use chrono::{Utc};
|
|
|
|
use super::*;
|
|
|
|
use KeyValidity::*;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn duration_negative () {
|
|
|
|
let zero_time = Utc::now ();
|
|
|
|
|
2020-12-16 14:46:03 +00:00
|
|
|
let key = ScraperKey::<Valid30Days> {
|
|
|
|
name: "automated testing".to_string (),
|
2020-12-12 17:11:22 +00:00
|
|
|
not_before: zero_time + Duration::days (1 + 2),
|
|
|
|
not_after: zero_time + Duration::days (1),
|
|
|
|
hash: BlakeHashWrapper::from_key ("bad_password".as_bytes ()),
|
|
|
|
_phantom: Default::default (),
|
|
|
|
};
|
|
|
|
|
|
|
|
let err = DurationNegative;
|
|
|
|
|
|
|
|
for (input, expected) in &[
|
|
|
|
(zero_time + Duration::days (0), err),
|
|
|
|
(zero_time + Duration::days (2), err),
|
|
|
|
(zero_time + Duration::days (100), err),
|
|
|
|
] {
|
|
|
|
assert_eq! (key.is_valid (*input, "bad_password".as_bytes ()), *expected);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn key_valid_too_long () {
|
|
|
|
let zero_time = Utc::now ();
|
|
|
|
|
2020-12-16 14:46:03 +00:00
|
|
|
let key = ScraperKey::<Valid30Days> {
|
|
|
|
name: "automated testing".to_string (),
|
2020-12-12 17:11:22 +00:00
|
|
|
not_before: zero_time + Duration::days (1),
|
2020-12-16 14:46:03 +00:00
|
|
|
not_after: zero_time + Duration::days (1 + 31),
|
2020-12-12 17:11:22 +00:00
|
|
|
hash: BlakeHashWrapper::from_key ("bad_password".as_bytes ()),
|
|
|
|
_phantom: Default::default (),
|
|
|
|
};
|
|
|
|
|
2020-12-16 14:46:03 +00:00
|
|
|
let err = DurationTooLong (Duration::days (30));
|
2020-12-12 17:11:22 +00:00
|
|
|
|
|
|
|
for (input, expected) in &[
|
|
|
|
(zero_time + Duration::days (0), err),
|
|
|
|
(zero_time + Duration::days (2), err),
|
|
|
|
(zero_time + Duration::days (100), err),
|
|
|
|
] {
|
|
|
|
assert_eq! (key.is_valid (*input, "bad_password".as_bytes ()), *expected);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn normal_key () {
|
|
|
|
let zero_time = Utc::now ();
|
|
|
|
|
2020-12-16 14:46:03 +00:00
|
|
|
let key = ScraperKey::<Valid30Days> {
|
|
|
|
name: "automated testing".to_string (),
|
2020-12-12 17:11:22 +00:00
|
|
|
not_before: zero_time + Duration::days (1),
|
2020-12-16 14:46:03 +00:00
|
|
|
not_after: zero_time + Duration::days (1 + 30),
|
2020-12-12 17:11:22 +00:00
|
|
|
hash: BlakeHashWrapper::from_key ("bad_password".as_bytes ()),
|
|
|
|
_phantom: Default::default (),
|
|
|
|
};
|
|
|
|
|
|
|
|
for (input, expected) in &[
|
|
|
|
(zero_time + Duration::days (0), ClockIsBehind),
|
|
|
|
(zero_time + Duration::days (2), Valid),
|
2020-12-21 14:26:51 +00:00
|
|
|
(zero_time + Duration::days (29), Valid),
|
2020-12-16 14:46:03 +00:00
|
|
|
(zero_time + Duration::days (1 + 30), Expired),
|
2020-12-12 17:11:22 +00:00
|
|
|
(zero_time + Duration::days (100), Expired),
|
|
|
|
] {
|
|
|
|
assert_eq! (key.is_valid (*input, "bad_password".as_bytes ()), *expected);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn wrong_key () {
|
|
|
|
let zero_time = Utc::now ();
|
|
|
|
|
2020-12-16 14:46:03 +00:00
|
|
|
let key = ScraperKey::<Valid30Days> {
|
|
|
|
name: "automated testing".to_string (),
|
2020-12-12 17:11:22 +00:00
|
|
|
not_before: zero_time + Duration::days (1),
|
2020-12-16 14:46:03 +00:00
|
|
|
not_after: zero_time + Duration::days (1 + 30),
|
2020-12-12 17:11:22 +00:00
|
|
|
hash: BlakeHashWrapper::from_key ("bad_password".as_bytes ()),
|
|
|
|
_phantom: Default::default (),
|
|
|
|
};
|
|
|
|
|
2020-12-12 17:50:40 +00:00
|
|
|
for input in &[
|
|
|
|
zero_time + Duration::days (0),
|
|
|
|
zero_time + Duration::days (2),
|
2020-12-16 14:46:03 +00:00
|
|
|
zero_time + Duration::days (1 + 30),
|
2020-12-12 17:50:40 +00:00
|
|
|
zero_time + Duration::days (100),
|
2020-12-12 17:11:22 +00:00
|
|
|
] {
|
2020-12-12 17:50:40 +00:00
|
|
|
let validity = key.is_valid (*input, "badder_password".as_bytes ());
|
|
|
|
|
|
|
|
match validity {
|
|
|
|
WrongKey (_) => (),
|
|
|
|
_ => panic! ("Expected WrongKey here"),
|
|
|
|
}
|
2020-12-12 17:11:22 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|