lint

warpgate-admin/src/api/public_key_credentials.rs

@@ -1,5 +1,6 @@
 use std::sync::Arc;
 
+use chrono::{DateTime, Utc};
 use poem::web::Data;
 use poem_openapi::param::Path;
 use poem_openapi::payload::Json;
@@ -12,7 +13,6 @@ use tokio::sync::Mutex;
 use uuid::Uuid;
 use warpgate_common::{UserPublicKeyCredential, WarpgateError};
 use warpgate_db_entities::PublicKeyCredential;
-use chrono::{DateTime, Utc};
 
 use super::AnySecurityScheme;
 

warpgate-core/src/config_providers/db.rs

@@ -2,6 +2,7 @@ use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
 
 use async_trait::async_trait;
+use chrono::Utc;
 use data_encoding::BASE64;
 use sea_orm::{
     ActiveModelTrait, ColumnTrait, DatabaseConnection, EntityTrait, ModelTrait, QueryFilter,
@@ -20,7 +21,6 @@ use warpgate_common::{
     UserSsoCredential, UserTotpCredential, WarpgateError,
 };
 use warpgate_db_entities as entities;
-use chrono::{Utc};
 
 use super::ConfigProvider;
 
@@ -402,33 +402,38 @@ impl ConfigProvider for DatabaseConfigProvider {
         let base64_bytes = data_encoding::BASE64.encode(&public_key_bytes);
         let openssh_public_key = format!("{kind} {base64_bytes}");
 
-        debug!("Attempting to update last_used for public key: {}", openssh_public_key);
+        debug!(
+            "Attempting to update last_used for public key: {}",
+            openssh_public_key
+        );
 
         // Find the public key credential
         let public_key_credential = entities::PublicKeyCredential::Entity::find()
-            .filter(entities::PublicKeyCredential::Column::OpensshPublicKey.eq(openssh_public_key.clone()))
+            .filter(
+                entities::PublicKeyCredential::Column::OpensshPublicKey
+                    .eq(openssh_public_key.clone()),
+            )
             .one(&*db)
             .await?;
 
         let Some(public_key_credential) = public_key_credential else {
-            warn!("Public key not found in the database: {}", openssh_public_key);
+            warn!(
+                "Public key not found in the database: {}",
+                openssh_public_key
+            );
             return Ok(()); // Gracefully return if the key is not found
         };
 
         // Update the `last_used` (last used) timestamp
-        let mut active_model: entities::PublicKeyCredential::ActiveModel = 
+        let mut active_model: entities::PublicKeyCredential::ActiveModel =
             public_key_credential.into();
         active_model.last_used = Set(Some(Utc::now()));
 
-        active_model
-            .update(&*db)
-            .await
-            .map_err(|e| {
-                error!("Failed to update last_used for public key: {:?}", e);
-                WarpgateError::DatabaseError(e.into())
-            })?;
+        active_model.update(&*db).await.map_err(|e| {
+            error!("Failed to update last_used for public key: {:?}", e);
+            WarpgateError::DatabaseError(e.into())
+        })?;
 
-        info!("Successfully updated last_used for public key: {}", openssh_public_key);
         Ok(())
     }
 }

warpgate-db-entities/src/PublicKeyCredential.rs

@@ -1,10 +1,10 @@
+use chrono::{DateTime, Utc};
 use sea_orm::entity::prelude::*;
 use sea_orm::sea_query::ForeignKeyAction;
 use sea_orm::Set;
 use serde::Serialize;
 use uuid::Uuid;
 use warpgate_common::{UserAuthCredential, UserPublicKeyCredential};
-use chrono::{DateTime, Utc};
 
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize)]
 #[sea_orm(table_name = "credentials_public_key")]

warpgate-db-migrations/src/m00012_add_openssh_public_key_label.rs

@@ -21,9 +21,9 @@ impl MigrationTrait for Migration {
                         ColumnDef::new(Alias::new("label"))
                             .string()
                             .not_null()
-                            .default("Public Key")
+                            .default("Public Key"),
                     )
-                    .to_owned()
+                    .to_owned(),
             )
             .await
     }
@@ -38,5 +38,4 @@ impl MigrationTrait for Migration {
             )
             .await
     }
-
 }

warpgate-db-migrations/src/m00013_add_openssh_public_key_dates.rs

@@ -18,11 +18,7 @@ impl MigrationTrait for Migration {
             .alter_table(
                 Table::alter()
                     .table(public_key_credential::Entity)
-                    .add_column(
-                        ColumnDef::new(Alias::new("date_added"))
-                            .date_time()
-                            .null(),
-                    )
+                    .add_column(ColumnDef::new(Alias::new("date_added")).date_time().null())
                     .to_owned(),
             )
             .await?;
@@ -32,11 +28,7 @@ impl MigrationTrait for Migration {
             .alter_table(
                 Table::alter()
                     .table(public_key_credential::Entity)
-                    .add_column(
-                        ColumnDef::new(Alias::new("last_used"))
-                            .date_time()
-                            .null(),
-                    )
+                    .add_column(ColumnDef::new(Alias::new("last_used")).date_time().null())
                     .to_owned(),
             )
             .await?;

warpgate-protocol-http/src/api/credentials.rs

@@ -1,3 +1,4 @@
+use chrono::{DateTime, Utc};
 use http::StatusCode;
 use poem::web::Data;
 use poem::{Endpoint, EndpointExt, FromRequest, IntoResponse};
@@ -11,7 +12,7 @@ use uuid::Uuid;
 use warpgate_common::{User, UserPasswordCredential, UserRequireCredentialsPolicy, WarpgateError};
 use warpgate_core::Services;
 use warpgate_db_entities::{self as entities, Parameters, PasswordCredential, PublicKeyCredential};
-use chrono::{DateTime, Utc};
+
 use crate::common::{endpoint_auth, RequestAuthorization};
 
 pub struct Api;
@@ -93,8 +94,8 @@ fn abbreviate_public_key(k: &str) -> String {
 
     format!(
         "{}...{}",
-        &k[..l.min(k.len())],                // Take the first `l` characters.
-        &k[k.len().saturating_sub(l)..]      // Take the last `l` characters safely.
+        &k[..l.min(k.len())],            // Take the first `l` characters.
+        &k[k.len().saturating_sub(l)..]  // Take the last `l` characters safely.
     )
 }
 

warpgate-protocol-ssh/src/server/session.rs

@@ -1227,12 +1227,7 @@ impl ServerSession {
             public_key_bytes: Bytes::from(key.public_key_bytes()),
         });
 
-        let result = self
-            .try_auth_lazy(
-                &selector,
-                key.clone(),
-            )
-            .await;
+        let result = self.try_auth_lazy(&selector, key.clone()).await;
 
         match result {
             Ok(AuthResult::Accepted { .. }) => {
@@ -1248,7 +1243,7 @@ impl ServerSession {
                     warn!(?err, "Failed to update last_used for public key");
                 }
                 russh::server::Auth::Accept
-            },
+            }
             Ok(AuthResult::Rejected) => russh::server::Auth::Reject {
                 proceed_with_methods: Some(MethodSet::all()),
             },

warpgate-web/src/admin/CredentialEditor.svelte

@@ -277,7 +277,7 @@
 
         {#if credential.kind === CredentialKind.PublicKey || credential.kind === CredentialKind.Sso}
         <a
-            class="ms-2 hover-reveal"
+            class="ms-2"
             href={''}
             onclick={e => {
                 if (credential.kind === CredentialKind.Sso) {

warpgate-web/src/gateway/CredentialManager.svelte

@@ -7,7 +7,6 @@
     import { faIdBadge, faKey, faKeyboard, faMobilePhone } from '@fortawesome/free-solid-svg-icons'
     import Fa from 'svelte-fa'
     import PublicKeyCredentialModal from 'admin/PublicKeyCredentialModal.svelte'
-    import { Button } from '@sveltestrap/sveltestrap'
     import CreatePasswordModal from 'admin/CreatePasswordModal.svelte'
     import CreateOtpModal from 'admin/CreateOtpModal.svelte'
     import CredentialUsedStateBadge from 'common/CredentialUsedStateBadge.svelte'
@@ -114,9 +113,9 @@
     <div class="d-flex align-items-center mt-4 mb-2">
         <h4 class="m-0">One-time passwords</h4>
         <span class="ms-auto"></span>
-        <Button size="sm" color="link" on:click={() => {
+        <a href={''} color="link" onclick={() => {
             creatingOtpCredential = true
-        }}>Add device</Button>
+        }}>Add device</a>
     </div>
 
     <div class="list-group list-group-flush mb-3">
@@ -126,7 +125,7 @@
             <span class="label">OTP device</span>
             <span class="ms-auto"></span>
             <a
-                class="hover-reveal ms-2"
+                class="ms-2"
                 href={''}
                 onclick={e => {
                     deleteOtp(credential)
@@ -148,9 +147,9 @@
     <div class="d-flex align-items-center mt-4 mb-2">
         <h4 class="m-0">Public keys</h4>
         <span class="ms-auto"></span>
-        <Button size="sm" color="link" on:click={() => {
+        <a href={''} color="link" onclick={() => {
             creatingPublicKeyCredential = true
-        }}>Add key</Button>
+        }}>Add key</a>
     </div>
 
     <div class="list-group list-group-flush mb-3">
@@ -164,7 +163,7 @@
             <span class="ms-auto"></span>
             <CredentialUsedStateBadge credential={credential} />
             <a
-                class="hover-reveal ms-2"
+                class="ms-2"
                 href={''}
                 onclick={e => {
                     deletePublicKey(credential)

warpgate/src/commands/setup.rs

@@ -226,10 +226,7 @@ pub(crate) async fn command(cli: &crate::Cli) -> Result<()> {
         .to_string_lossy()
         .to_string();
 
-    store.http.key = data_path
-        .join("tls.key.pem")
-        .to_string_lossy()
-        .to_string();
+    store.http.key = data_path.join("tls.key.pem").to_string_lossy().to_string();
 
     store.mysql.certificate = store.http.certificate.clone();
     store.mysql.key = store.http.key.clone();
@@ -239,10 +236,7 @@ pub(crate) async fn command(cli: &crate::Cli) -> Result<()> {
 
     // ---
 
-    store.ssh.keys = data_path
-        .join("ssh-keys")
-        .to_string_lossy()
-        .to_string();
+    store.ssh.keys = data_path.join("ssh-keys").to_string_lossy().to_string();
 
     // ---
 
@@ -257,10 +251,7 @@ pub(crate) async fn command(cli: &crate::Cli) -> Result<()> {
             .with_prompt("Do you want to record user sessions?")
             .interact()?;
     }
-    store.recordings.path = data_path
-        .join("recordings")
-        .to_string_lossy()
-        .to_string();
+    store.recordings.path = data_path.join("recordings").to_string_lossy().to_string();
 
     // ---