From ccd7484979171109679521908eae76e88b55d9e9 Mon Sep 17 00:00:00 2001 From: shimun Date: Sat, 24 Dec 2022 20:57:16 +0100 Subject: [PATCH] fix: warnings --- server/src/api.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/server/src/api.rs b/server/src/api.rs index 6ab1269..ef27fda 100644 --- a/server/src/api.rs +++ b/server/src/api.rs @@ -4,7 +4,7 @@ use std::collections::HashMap; use std::net::SocketAddr; use std::path::{self, PathBuf}; use std::sync::Arc; -use std::time::{Duration, SystemTime}; +use std::time::SystemTime; use anyhow::Context; use axum::body; @@ -18,8 +18,7 @@ use jwt_compact::alg::{Hs256, Hs256Key}; use jwt_compact::{AlgorithmExt, Token, UntrustedToken}; use rand::{thread_rng, Rng}; use serde::{Deserialize, Serialize}; -use ssh_key::private::Ed25519Keypair; -use ssh_key::{certificate, Certificate, PrivateKey, PublicKey}; +use ssh_key::{Certificate, PublicKey}; use tokio::sync::Mutex; use tower::ServiceBuilder; use tower_http::{trace::TraceLayer, ServiceBuilderExt}; @@ -198,6 +197,7 @@ async fn fallback_404() -> ApiResult<()> { Err(ApiError::CertificateNotFound) } +#[cfg(feature = "index")] async fn list_certs( _: CertList, State(ApiState { certs, .. }): State, @@ -233,7 +233,7 @@ async fn get_certs_identifier( .. }): State, ) -> ApiResult { - use jwt_compact::{AlgorithmExt, Claims, Header, TimeOptions}; + use jwt_compact::{Claims, Header, TimeOptions}; if client_auth { let claims = Claims::new(AuthClaims { identifier }) @@ -375,12 +375,14 @@ async fn put_cert_update( let identity = cert.key_id(); info!(%identity, ?principals, "updating certificate"); certs.lock().await.insert(cert.key_id().to_string(), cert); - Ok(format!("{} -> {}", prev_serial, serial)) + Ok(format!("{prev_serial} -> {serial}")) } #[cfg(test)] mod tests { + use ssh_key::{certificate, private::Ed25519Keypair, PrivateKey}; use std::env::temp_dir; + use std::time::Duration; use super::*; @@ -433,7 +435,7 @@ mod tests { cert_dir: dbg!(temp_dir()), validation_args: Default::default(), client_auth: false, - jwt_key: Hs256Key::new(&[0u8; 16]), + jwt_key: Hs256Key::new([0u8; 16]), } }