#[derive(Error,Debug)]
pub enum ReadLimitedError {
#[error("maximum size {limit} exceeded")]
- Truncated { limit: usize },
+ Truncated { sofar: Box<[u8]>, limit: usize },
#[error("HTTP error {0}")]
Hyper(#[from] hyper::Error),
}
+impl ReadLimitedError {
+ pub fn discard_data(&mut self) { match self {
+ ReadLimitedError::Truncated { sofar,.. } => { mem::take(sofar); },
+ _ => { },
+ } }
+}
+#[ext(pub)]
+impl<T> Result<T,ReadLimitedError> {
+ fn discard_data(self) -> Self {
+ self.map_err(|mut e| { e.discard_data(); e })
+ }
+}
+
#[throws(ReadLimitedError)]
pub async fn read_limited_bytes<S>(limit: usize, stream: &mut S) -> Box<[u8]>
where S: futures::Stream<Item=Result<hyper::body::Bytes,hyper::Error>>
let b = item?;
accum.extend(b);
if accum.len() > limit {
- throw!(ReadLimitedError::Truncated { limit })
+ throw!(ReadLimitedError::Truncated { limit, sofar: accum.into() })
}
}
accum.into()
}
+pub fn time_t_now() -> u64 {
+ SystemTime::now()
+ .duration_since(UNIX_EPOCH)
+ .unwrap_or_else(|_| Duration::default()) // clock is being weird
+ .as_secs()
+}
+
use sha2::Digest as _;
-type HmacH = sha2::Sha256;
-const HMAC_B: usize = 64;
-const HMAC_L: usize = 32;
+pub type HmacH = sha2::Sha256;
+pub const HMAC_B: usize = 64;
+pub const HMAC_L: usize = 32;
pub fn token_hmac(key: &[u8], message: &[u8]) -> [u8; HMAC_L] {
let key = {