shiroyashik/sculptor
1
0
Fork 0
mirror of https://github.com/shiroyashik/sculptor.git synced 2025-12-06 13:01:12 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Leaks ;3 fixed

Browse source
This commit is contained in:
Shiroyasha 2024-05-26 03:21:25 +03:00
parent c0c7245f03
commit b435d9e420
Signed by: shiroyashik
GPG key ID: E4953D3940D7860A
2 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main.rs
View file

@ -68,6 +68,10 @@ impl Authenticated {
pub fn contains_token(&self, token: &String) -> bool { pub fn contains_token(&self, token: &String) -> bool {
self.user_data.contains_key(token) self.user_data.contains_key(token)
} }
pub fn remove(&self, uuid: &Uuid) {
let token = self.uuid.remove(uuid).unwrap().1;
self.user_data.remove(&token);
}
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]

22
src/ws/handler.rs
View file

@ -50,18 +50,20 @@ async fn handle_socket(mut socket: WebSocket, state: AppState) {
info!("[WebSocket{}] Connection successfully closed!", owner.name()); info!("[WebSocket{}] Connection successfully closed!", owner.name());
if let Some(u) = owner.0 { if let Some(u) = owner.0 {
state.broadcasts.remove(&u.uuid); state.broadcasts.remove(&u.uuid);
state.authenticated.remove(&u.uuid);
} }
return; return;
} }
msg msg
} else { } else {
warn!("[WebSocket{}] Receive error! Connection terminated!", owner.name()); debug!("[WebSocket{}] Receive error! Connection terminated!", owner.name());
if let Some(u) = owner.0 { if let Some(u) = owner.0 {
state.broadcasts.remove(&u.uuid); state.broadcasts.remove(&u.uuid);
state.authenticated.remove(&u.uuid);
} }
return; return;
}; };
// Далее код для обработки msg // Next is the code for processing msg
let msg_vec = msg.clone().into_data(); let msg_vec = msg.clone().into_data();
let msg_array = msg_vec.as_slice(); let msg_array = msg_vec.as_slice();
@ -71,6 +73,7 @@ async fn handle_socket(mut socket: WebSocket, state: AppState) {
error!("[WebSocket{}] This message is not from Figura! {e:?}", owner.name()); error!("[WebSocket{}] This message is not from Figura! {e:?}", owner.name());
if let Some(u) = owner.0 { if let Some(u) = owner.0 {
state.broadcasts.remove(&u.uuid); state.broadcasts.remove(&u.uuid);
state.authenticated.remove(&u.uuid);
} }
return; return;
}, },
@ -79,10 +82,10 @@ async fn handle_socket(mut socket: WebSocket, state: AppState) {
debug!("[WebSocket{}] Raw: {newmsg:?}", owner.name()); debug!("[WebSocket{}] Raw: {newmsg:?}", owner.name());
match newmsg { match newmsg {
C2SMessage::Token(token) => { // FIXME: Написать переменную спомощью которой бужет проверяться авторизовался ли пользователь или нет C2SMessage::Token(token) => {
debug!("[WebSocket{}] C2S : Token", owner.name()); debug!("[WebSocket{}] C2S : Token", owner.name());
let token = String::from_utf8(token.to_vec()).unwrap(); let token = String::from_utf8(token.to_vec()).unwrap();
match state.authenticated.get(&token) { // Принцип прост: если токена в authenticated нет, значит это trash match state.authenticated.get(&token) { // The principle is simple: if there is no token in authenticated, then it's "dirty hacker" :D
Some(t) => { Some(t) => {
//username = t.username.clone(); //username = t.username.clone();
owner.0 = Some(WSUser { username: t.username.clone(), token, uuid: t.uuid }); owner.0 = Some(WSUser { username: t.username.clone(), token, uuid: t.uuid });
@ -103,8 +106,9 @@ async fn handle_socket(mut socket: WebSocket, state: AppState) {
debug!("[WebSocket] Tried to log in with {token}"); // Tried to log in with token: {token} debug!("[WebSocket] Tried to log in with {token}"); // Tried to log in with token: {token}
if let Some(u) = owner.0 { if let Some(u) = owner.0 {
state.broadcasts.remove(&u.uuid); state.broadcasts.remove(&u.uuid);
state.authenticated.remove(&u.uuid);
} }
return; // TODO: Прописать код отключения return; // TODO: Define the trip code
}, },
}; };
}, },
@ -117,9 +121,9 @@ async fn handle_socket(mut socket: WebSocket, state: AppState) {
}; };
continue; continue;
}, },
C2SMessage::Sub(uuid) => { // FIXME: Исключить возможность использования SUB без авторизации C2SMessage::Sub(uuid) => { // TODO: Eliminate the possibility of using SUB without authentication
debug!("[WebSocket{}] C2S : Sub", owner.name()); debug!("[WebSocket{}] C2S : Sub", owner.name());
// Отбрасываю Sub на самого себя // Rejecting Sub to itself
if uuid == owner.0.clone().unwrap().uuid { if uuid == owner.0.clone().unwrap().uuid {
continue; continue;
}; };
@ -141,7 +145,7 @@ async fn handle_socket(mut socket: WebSocket, state: AppState) {
}, },
C2SMessage::Unsub(uuid) => { C2SMessage::Unsub(uuid) => {
debug!("[WebSocket{}] C2S : Unsub", owner.name()); debug!("[WebSocket{}] C2S : Unsub", owner.name());
// Отбрасываю Unsub на самого себя // Rejecting UnSub to itself
if uuid == owner.0.clone().unwrap().uuid { if uuid == owner.0.clone().unwrap().uuid {
continue; continue;
}; };
@ -157,6 +161,7 @@ async fn handle_socket(mut socket: WebSocket, state: AppState) {
warn!("[WebSocket{}] Send error! Connection terminated!", owner.name()); warn!("[WebSocket{}] Send error! Connection terminated!", owner.name());
if let Some(u) = owner.0 { if let Some(u) = owner.0 {
state.broadcasts.remove(&u.uuid); state.broadcasts.remove(&u.uuid);
state.authenticated.remove(&u.uuid);
} }
return; return;
} }
@ -170,6 +175,7 @@ async fn handle_socket(mut socket: WebSocket, state: AppState) {
warn!("[WebSocketSubscriber{}] Send error! Connection terminated!", owner.name()); warn!("[WebSocketSubscriber{}] Send error! Connection terminated!", owner.name());
if let Some(u) = owner.0 { if let Some(u) = owner.0 {
state.broadcasts.remove(&u.uuid); state.broadcasts.remove(&u.uuid);
state.authenticated.remove(&u.uuid);
} }
return; return;
} }