From 47c943d201082e196605630689de47ec72f49549 Mon Sep 17 00:00:00 2001 From: Eugene Date: Sat, 23 Mar 2024 12:24:52 +0100 Subject: [PATCH] lint --- warpgate-admin/src/api/tickets_list.rs | 3 +-- warpgate-core/src/auth_state_store.rs | 2 +- warpgate-protocol-http/src/api/auth.rs | 10 ++-------- warpgate-protocol-http/src/logging.rs | 2 +- warpgate-protocol-ssh/src/server/session.rs | 6 +++--- warpgate-sso/src/sso.rs | 4 ++-- warpgate-web/src/admin/CreateTarget.svelte | 2 +- warpgate-web/src/admin/CreateTicket.svelte | 2 +- .../src/admin/player/TerminalRecordingPlayer.svelte | 4 ++-- 9 files changed, 14 insertions(+), 21 deletions(-) diff --git a/warpgate-admin/src/api/tickets_list.rs b/warpgate-admin/src/api/tickets_list.rs index 05563b4..5e3ee8b 100644 --- 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>, - number_of_uses: Option + number_of_uses: Option, } #[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 index 048536e..c6432d1 100644 --- 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 index efc1b43..e210d54 100644 --- 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>> { 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 index 12cc1bf..bda800b 100644 --- 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 { 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 index c7c9a53..818e3b6 100644 --- 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 index f523e66..67bed66 100644 --- 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 index 3d43b21..9155288 100644 --- 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 index 47e9415..16227a2 100644 --- 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 index 43e4c18..13633ed 100644 --- 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