lint, removed lazy_static

Cargo.lock

@@ -4783,7 +4783,6 @@ dependencies = [
  "delegate",
  "futures",
  "humantime-serde",
- "lazy_static",
  "once_cell",
  "password-hash 0.4.1",
  "poem",
@@ -4819,7 +4818,6 @@ dependencies = [
  "data-encoding",
  "futures",
  "humantime-serde",
- "lazy_static",
  "once_cell",
  "packet",
  "password-hash 0.4.1",
@@ -4898,7 +4896,7 @@ dependencies = [
  "delegate",
  "futures",
  "http",
- "lazy_static",
+ "once_cell",
  "percent-encoding",
  "poem",
  "poem-openapi",

warpgate-admin/src/api/users.rs

@@ -159,8 +159,8 @@ impl DetailApi {
         let mut credentials = body.credentials.clone();
         for credential in credentials.iter_mut() {
             if let UserAuthCredential::Password(ref mut c) = credential {
-                if parse_hash(&c.hash.expose_secret()).is_err() {
+                if parse_hash(c.hash.expose_secret()).is_err() {
-                    c.hash = hash_password(&c.hash.expose_secret()).into();
+                    c.hash = hash_password(c.hash.expose_secret()).into();
                 }
             }
         }

warpgate-common/Cargo.toml

@@ -13,7 +13,6 @@ chrono = { version = "0.4", features = ["serde"] }
 data-encoding = "2.3"
 delegate = "0.6"
 humantime-serde = "1.1"
-lazy_static = "1.4"
 futures = "0.3"
 once_cell = "1.14"
 password-hash = "0.4"

warpgate-core/Cargo.toml

@@ -16,7 +16,6 @@ bytes = "1.2"
 chrono = { version = "0.4", features = ["serde"] }
 data-encoding = "2.3"
 humantime-serde = "1.1"
-lazy_static = "1.4"
 futures = "0.3"
 once_cell = "1.14"
 packet = "0.1"

warpgate-protocol-http/Cargo.toml

@@ -13,7 +13,7 @@ data-encoding = "2.3"
 delegate = "0.6"
 futures = "0.3"
 http = "0.2"
-lazy_static = "1.4"
+once_cell = "1.14"
 poem = { version = "^1.3.42", features = [
     "cookie",
     "session",

warpgate-protocol-http/src/proxy.rs

@@ -9,6 +9,7 @@ use futures::{SinkExt, StreamExt};
 use http::header::HeaderName;
 use http::uri::{Authority, Scheme};
 use http::Uri;
+use once_cell::sync::Lazy;
 use poem::web::websocket::{CloseCode, Message, WebSocket};
 use poem::{Body, IntoResponse, Request, Response};
 use tokio_tungstenite::{connect_async_with_config, tungstenite};
@@ -61,24 +62,21 @@ impl SomeRequestBuilder for http::request::Builder {
     }
 }
 
-lazy_static::lazy_static! {
+static DONT_FORWARD_HEADERS: Lazy<HashSet<HeaderName>> = Lazy::new(|| {
     #[allow(clippy::mutable_key_type)]
-    static ref DONT_FORWARD_HEADERS: HashSet<HeaderName> = {
+    let mut s = HashSet::new();
-        #[allow(clippy::mutable_key_type)]
+    s.insert(http::header::ACCEPT_ENCODING);
-        let mut s = HashSet::new();
+    s.insert(http::header::SEC_WEBSOCKET_EXTENSIONS);
-        s.insert(http::header::ACCEPT_ENCODING);
+    s.insert(http::header::SEC_WEBSOCKET_ACCEPT);
-        s.insert(http::header::SEC_WEBSOCKET_EXTENSIONS);
+    s.insert(http::header::SEC_WEBSOCKET_KEY);
-        s.insert(http::header::SEC_WEBSOCKET_ACCEPT);
+    s.insert(http::header::SEC_WEBSOCKET_VERSION);
-        s.insert(http::header::SEC_WEBSOCKET_KEY);
+    s.insert(http::header::UPGRADE);
-        s.insert(http::header::SEC_WEBSOCKET_VERSION);
+    s.insert(http::header::HOST);
-        s.insert(http::header::UPGRADE);
+    s.insert(http::header::CONNECTION);
-        s.insert(http::header::HOST);
+    s.insert(http::header::STRICT_TRANSPORT_SECURITY);
-        s.insert(http::header::CONNECTION);
+    s.insert(http::header::UPGRADE_INSECURE_REQUESTS);
-        s.insert(http::header::STRICT_TRANSPORT_SECURITY);
+    s
-        s.insert(http::header::UPGRADE_INSECURE_REQUESTS);
+});
-        s
-    };
-}
 
 static X_FORWARDED_FOR: HeaderName = HeaderName::from_static("x-forwarded-for");
 static X_FORWARDED_HOST: HeaderName = HeaderName::from_static("x-forwarded-host");
@@ -451,7 +449,7 @@ async fn proxy_ws_inner(
                                     .send(Message::Close(data.map(|data| {
                                         (
                                             CloseCode::from(data.code),
-                                            data.reason.to_owned().to_string(),
+                                            data.reason.into_owned().to_string(),
                                         )
                                     })))
                                     .await?;

warpgate/src/commands/recover_access.rs

@@ -36,7 +36,9 @@ pub(crate) async fn command(cli: &crate::Cli, username: &Option<String>) -> Resu
             .iter_mut()
             .find(|x| &x.username == username)
             .ok_or_else(|| anyhow::anyhow!("User not found"))?,
-        None => {
+        None =>
+        {
+            #[allow(clippy::indexing_slicing)]
             &mut users[dialoguer::Select::with_theme(&theme)
                 .with_prompt("Select a user to recover access for")
                 .items(&usernames)
@@ -61,7 +63,7 @@ pub(crate) async fn command(cli: &crate::Cli, username: &Option<String>) -> Resu
             hash: Secret::new(hash_password(&password)),
         }));
     user.credential_policy
-        .get_or_insert_with(|| Default::default())
+        .get_or_insert_with(Default::default)
         .http = Some(vec![CredentialKind::Password]);
 
     let model = User::ActiveModel {

warpgate/src/commands/setup.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::collapsible_else_if)]
+
 use std::fs::{create_dir_all, File};
 use std::io::Write;
 use std::net::{SocketAddr, ToSocketAddrs};