xevion/dynamic-preauth
1
0
Fork 0
mirror of https://github.com/Xevion/dynamic-preauth.git synced 2025-12-05 23:14:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

simplify thread_rng calls

Browse Source
This commit is contained in:
Xevion
2024-12-23 18:57:03 -06:00
parent f98c9ccc71
commit fc643e5223
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.rs
View File

@@ -10,7 +10,7 @@ use salvo::prelude::{
handler, CatchPanic, Listener, Request, Response, Router, Server, Service, StaticDir, handler, CatchPanic, Listener, Request, Response, Router, Server, Service, StaticDir,
TcpListener, WebSocketUpgrade, TcpListener, WebSocketUpgrade,
}; };
use salvo::websocket::{Message, WebSocket}; use salvo::websocket::WebSocket;
use salvo::writing::Json; use salvo::writing::Json;
use salvo::Depot; use salvo::Depot;
use tokio::sync::{mpsc, Mutex}; use tokio::sync::{mpsc, Mutex};
@@ -40,6 +40,8 @@ async fn session_middleware(req: &mut Request, res: &mut Response, depot: &mut D
new_session_id = new_session_id, new_session_id = new_session_id,
"Session provided in cookie, but does not exist" "Session provided in cookie, but does not exist"
); );
} else {
store.sessions.get_mut(&session_id).unwrap().seen(false);
} }
} }
Err(parse_error) => { Err(parse_error) => {

7
src/models.rs
View File

@@ -1,4 +1,3 @@
use rand::Rng;
use salvo::{http::cookie::Cookie, websocket::Message, Response}; use salvo::{http::cookie::Cookie, websocket::Message, Response};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::{collections::HashMap, path}; use std::{collections::HashMap, path};
@@ -12,7 +11,7 @@ pub struct Session {
pub downloads: Vec<SessionDownload>, pub downloads: Vec<SessionDownload>,
pub first_seen: chrono::DateTime<chrono::Utc>, pub first_seen: chrono::DateTime<chrono::Utc>,
// The last time a request OR websocket message with this session was made // The last time a request OR websocket message from/to this session was made
pub last_seen: chrono::DateTime<chrono::Utc>, pub last_seen: chrono::DateTime<chrono::Utc>,
// The last time a request was made with this session // The last time a request was made with this session
pub last_request: chrono::DateTime<chrono::Utc>, pub last_request: chrono::DateTime<chrono::Utc>,
@@ -33,7 +32,6 @@ impl Session {
// Add a download to the session // Add a download to the session
pub fn add_download(&mut self, exe: &Executable) -> &SessionDownload { pub fn add_download(&mut self, exe: &Executable) -> &SessionDownload {
let mut rng = rand::thread_rng();
let token: u32 = rand::random(); let token: u32 = rand::random();
let download = SessionDownload { let download = SessionDownload {
@@ -127,8 +125,7 @@ impl<'a> State<'a> {
} }
pub async fn new_session(&mut self, res: &mut Response) -> u32 { pub async fn new_session(&mut self, res: &mut Response) -> u32 {
let mut rng = rand::thread_rng(); let id: u32 = rand::random();
let id: u32 = rng.gen();
let now = chrono::Utc::now(); let now = chrono::Utc::now();
self.sessions.insert( self.sessions.insert(