hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2802 from 21pages/fix

Browse Source 
opt is_recent_session
This commit is contained in:
RustDesk 2023-01-11 11:16:57 +08:00 committed by GitHub
commit 8e3e8ab5bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/server/connection.rs
View File

@ -1041,18 +1041,21 @@ impl Connection {
false false
} }
fn is_of_recent_session(&mut self) -> bool { fn is_recent_session(&mut self) -> bool {
let session = SESSIONS let session = SESSIONS
.lock() .lock()
.unwrap() .unwrap()
.get(&self.lr.my_id) .get(&self.lr.my_id)
.map(|s| s.to_owned()); .map(|s| s.to_owned());
SESSIONS
.lock()
.unwrap()
.retain(|_, s| s.last_recv_time.lock().unwrap().elapsed() < SESSION_TIMEOUT);
if let Some(session) = session { if let Some(session) = session {
if session.name == self.lr.my_name if session.name == self.lr.my_name
&& session.session_id == self.lr.session_id && session.session_id == self.lr.session_id
&& !self.lr.password.is_empty() && !self.lr.password.is_empty()
&& self.validate_one_password(session.random_password.clone()) && self.validate_one_password(session.random_password.clone())
&& session.last_recv_time.lock().unwrap().elapsed() < SESSION_TIMEOUT
{ {
SESSIONS.lock().unwrap().insert( SESSIONS.lock().unwrap().insert(
self.lr.my_id.clone(), self.lr.my_id.clone(),
@ -1178,7 +1181,7 @@ impl Connection {
{ {
self.send_login_error("Connection not allowed").await; self.send_login_error("Connection not allowed").await;
return false; return false;
} else if self.is_of_recent_session() { } else if self.is_recent_session() {
self.try_start_cm(lr.my_id, lr.my_name, true); self.try_start_cm(lr.my_id, lr.my_name, true);
self.send_logon_response().await; self.send_logon_response().await;
if self.port_forward_socket.is_some() { if self.port_forward_socket.is_some() {