lint

warp-tech · Mar 23, 2024 · 47c943d · 47c943d
1 parent 916d51a
commit 47c943d
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 21 deletions.
diff --git a/warpgate-admin/src/api/tickets_list.rs b/warpgate-admin/src/api/tickets_list.rs
@@ -25,7 +25,7 @@ struct CreateTicketRequest {
     username: String,
     target_name: String,
     expiry: Option<DateTime<Utc>>,
-    number_of_uses: Option<i32>
+    number_of_uses: Option<i32>,
 }
 
 #[derive(Object)]
@@ -89,7 +89,6 @@ impl Api {
             created: Set(chrono::Utc::now()),
             expiry: Set(body.expiry),
             uses_left: Set(body.number_of_uses),
-            ..Default::default()
         };
 
         let ticket = values.insert(&*db).await.context("Error saving ticket")?;

diff --git a/warpgate-core/src/auth_state_store.rs b/warpgate-core/src/auth_state_store.rs
@@ -62,7 +62,7 @@ impl AuthStateStore {
             .get_credential_policy(username, supported_credential_types)
             .await?;
         let Some(policy) = policy else {
-            return Err(WarpgateError::UserNotFound(username.into()))
+            return Err(WarpgateError::UserNotFound(username.into()));
         };
 
         let state = AuthState::new(

diff --git a/warpgate-protocol-http/src/api/auth.rs b/warpgate-protocol-http/src/api/auth.rs
@@ -333,17 +333,11 @@ async fn get_auth_state(
 ) -> Option<Arc<Mutex<AuthState>>> {
     let store = services.auth_state_store.lock().await;
 
-    let Some(auth) = auth else {
+    let SessionAuthorization::User(username) = auth? else {
         return None;
     };
 
-    let SessionAuthorization::User(username) = auth else {
-        return None;
-    };
-
-    let Some(state_arc) = store.get(id) else {
-        return None;
-    };
+    let state_arc = store.get(id)?;
 
     {
         let state = state_arc.lock().await;

diff --git a/warpgate-protocol-http/src/logging.rs b/warpgate-protocol-http/src/logging.rs
@@ -15,7 +15,7 @@ pub async fn span_for_request(req: &Request) -> poem::Result<Span> {
         Ok(ref handle) => {
             let handle = handle.lock().await;
             let ss = handle.session_state().lock().await;
-            match { ss.username.clone() } {
+            match ss.username.clone() {
                 Some(ref username) => {
                     info_span!("HTTP", session=%handle.id(), session_username=%username, %client_ip)
                 }

diff --git a/warpgate-protocol-ssh/src/server/session.rs b/warpgate-protocol-ssh/src/server/session.rs
@@ -994,7 +994,7 @@ impl ServerSession {
     }
 
     async fn start_terminal_recording(&mut self, channel_id: Uuid, name: String) {
-        match async {
+        let recorder = async {
             let mut recorder = self
                 .services
                 .recordings
@@ -1009,8 +1009,8 @@ impl ServerSession {
             }
             Ok::<_, recordings::Error>(recorder)
         }
-        .await
-        {
+        .await;
+        match recorder {
             Ok(recorder) => {
                 self.channel_recorders.insert(channel_id, recorder);
             }

diff --git a/warpgate-sso/src/sso.rs b/warpgate-sso/src/sso.rs
@@ -70,9 +70,9 @@ impl SsoClient {
         } else {
             None
         };
-        
+
         let (auth_url, csrf_token, nonce) = auth_req.url();
-        
+
         Ok(SsoLoginRequest {
             auth_url,
             csrf_token,

diff --git a/warpgate-web/src/admin/CreateTarget.svelte b/warpgate-web/src/admin/CreateTarget.svelte
@@ -6,7 +6,7 @@ import { Alert, FormGroup } from 'sveltestrap'
 
 let error: Error|null = null
 let name = ''
-let type: 'Ssh'|'MySql'|'Http' = 'Ssh'
+let type: 'Http' | 'MySql' | 'Ssh' = 'Ssh'
 
 async function create () {
     if (!name || !type) {

diff --git a/warpgate-web/src/admin/CreateTicket.svelte b/warpgate-web/src/admin/CreateTicket.svelte
@@ -40,7 +40,7 @@ async function create () {
                 username: selectedUser.username,
                 targetName: selectedTarget.name,
                 expiry: selectedExpiry ? new Date(selectedExpiry) : undefined,
-                numberOfUses: selectedNumberOfUses
+                numberOfUses: selectedNumberOfUses,
             },
         })
     } catch (err) {

diff --git a/warpgate-web/src/admin/player/TerminalRecordingPlayer.svelte b/warpgate-web/src/admin/player/TerminalRecordingPlayer.svelte
@@ -17,7 +17,7 @@
     let seekInputValue = 0
     let duration = 0
     let resizeObserver: ResizeObserver|undefined
-    let events: (SizeEvent | DataEvent | SnapshotEvent)[] = []
+    let events: (DataEvent | SizeEvent | SnapshotEvent)[] = []
     let playing = false
     let loading = true
     let sessionIsLive: boolean|null = null
@@ -67,7 +67,7 @@
     }
     // eslint-disable-next-line @typescript-eslint/no-type-alias
     type AsciiCastData = [number, 'o', string]
-    type AsciiCastItem = AsciiCastHeader | AsciiCastData
+    type AsciiCastItem = AsciiCastData | AsciiCastHeader
 
     function isAsciiCastHeader (data: AsciiCastItem): data is AsciiCastHeader {
         return 'version' in data