From 3f3ae19d63ae92eb1c9dbf1941510733e2b37f5f Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 12 Aug 2020 14:30:03 +0200 Subject: [PATCH] formatting fixups Signed-off-by: Wolfgang Bumiller --- src/tools/ticket.rs | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/src/tools/ticket.rs b/src/tools/ticket.rs index 625c2051..07a263b9 100644 --- a/src/tools/ticket.rs +++ b/src/tools/ticket.rs @@ -6,16 +6,15 @@ use std::marker::PhantomData; use anyhow::{bail, format_err, Error}; use base64; - -use openssl::pkey::{PKey, Private, HasPublic}; -use openssl::sign::{Signer, Verifier}; use openssl::hash::MessageDigest; -use percent_encoding::{AsciiSet, percent_decode_str, percent_encode}; +use openssl::pkey::{HasPublic, PKey, Private}; +use openssl::sign::{Signer, Verifier}; +use percent_encoding::{percent_decode_str, percent_encode, AsciiSet}; use crate::api2::types::Userid; use crate::tools::epoch_now_u64; -pub const TICKET_LIFETIME: i64 = 3600*2; // 2 hours +pub const TICKET_LIFETIME: i64 = 3600 * 2; // 2 hours pub const TERM_PREFIX: &str = "PBSTERM"; @@ -220,13 +219,17 @@ where let mut parts = ticket.splitn(4, ':'); let prefix = percent_decode_str( - parts.next().ok_or_else(|| format_err!("ticket without prefix"))?, + parts + .next() + .ok_or_else(|| format_err!("ticket without prefix"))?, ) .decode_utf8() .map_err(|err| format_err!("invalid ticket, error decoding prefix: {}", err))?; let data = percent_decode_str( - parts.next().ok_or_else(|| format_err!("ticket without data"))?, + parts + .next() + .ok_or_else(|| format_err!("ticket without data"))?, ) .decode_utf8() .map_err(|err| format_err!("invalid ticket, error decoding data: {}", err))?; @@ -239,7 +242,9 @@ where ) .map_err(|err| format_err!("ticket with bad timestamp: {}", err))?; - let remainder = parts.next().ok_or_else(|| format_err!("ticket without signature"))?; + let remainder = parts + .next() + .ok_or_else(|| format_err!("ticket without signature"))?; // ::