hardcoresushi/AIRA
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Decrease max message size to 16MB

Browse Source
This commit is contained in:
Matéo Duparc 2021-06-18 20:02:48 +02:00
parent 40cab75f96
commit 6b81cec83a
Signed by: hardcoresushi
GPG Key ID: 007F84120107191E
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -403,9 +403,9 @@ dependencies = [
[[package]] [[package]]
name = "async-psec" name = "async-psec"
version = "0.3.1" version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6aa693cf79f81392aeffa439d2aae418d8d04816e86c0032a3e80e8b5df0b743" checksum = "589ceb2d0c6d841e27084dac8599b84436b9024dc047f71963c7460c31f1e8f5"
dependencies = [ dependencies = [
"aes-gcm", "aes-gcm",
"async-trait", "async-trait",

3
src/constants.rs
View File

@ -4,4 +4,5 @@ pub const APPLICATION_FOLDER: &str = "AIRA";
pub const DB_NAME: &str = "AIRA.db"; pub const DB_NAME: &str = "AIRA.db";
pub const HTTP_COOKIE_NAME: &str = "aira_auth"; pub const HTTP_COOKIE_NAME: &str = "aira_auth";
pub const MSG_LOADING_COUNT: usize = 20; pub const MSG_LOADING_COUNT: usize = 20;
pub const FILE_CHUNK_SIZE: usize = 1023996; pub const FILE_CHUNK_SIZE: usize = 1_023_996;
pub const MAX_RECV_SIZE: usize = 16_383_996;

6
src/frontend/index.js
View File

@ -174,7 +174,7 @@ document.getElementById("attach_file").onchange = function(event) {
let files = event.target.files; let files = event.target.files;
let useLargeFileTransfer = false; let useLargeFileTransfer = false;
for (let i=0; i<files.length; ++i) { for (let i=0; i<files.length; ++i) {
if (files[i].size > 32760000) { if (files[i].size > 16380000) {
useLargeFileTransfer = true; useLargeFileTransfer = true;
break; break;
} }
@ -215,7 +215,7 @@ document.getElementById("attach_file").onchange = function(event) {
formData.append("", files[i]); formData.append("", files[i]);
fetch("/send_file", {method: "POST", body: formData}).then(response => { fetch("/send_file", {method: "POST", body: formData}).then(response => {
if (response.ok) { if (response.ok) {
response.text().then(uuid => onFileSent(currentSessionId, new Date.now(), uuid, files[i].name)); response.text().then(uuid => onFileSent(currentSessionId, new Date(), uuid, files[i].name));
} else { } else {
console.log(response); console.log(response);
} }
@ -1193,4 +1193,4 @@ function displayHistory(scrollToBottom = true) {
socket.send("load_msgs "+currentSessionId); socket.send("load_msgs "+currentSessionId);
} }
} }
} }

8
src/session_manager.rs
View File

@ -100,7 +100,10 @@ impl SessionManager {
} }
} }
if !msg_saved { if !msg_saved {
self.saved_msgs.write().unwrap().get_mut(&session_id).unwrap().push(message); //can be None if session disconnected
if let Some(saved_msgs) = self.saved_msgs.write().unwrap().get_mut(&session_id) {
saved_msgs.push(message)
}
} }
} }
@ -412,7 +415,7 @@ impl SessionManager {
} }
} }
Err(e) => { Err(e) => {
if e != PsecError::BrokenPipe && e != PsecError::ConnectionReset && e != PsecError::BufferTooLarge { if e != PsecError::BrokenPipe && e != PsecError::ConnectionReset {
print_error!(e); print_error!(e);
} }
break; break;
@ -468,6 +471,7 @@ impl SessionManager {
fn handle_new_session(session_manager: Arc<SessionManager>, mut session: Session, outgoing: bool) { fn handle_new_session(session_manager: Arc<SessionManager>, mut session: Session, outgoing: bool) {
tokio::spawn(async move { tokio::spawn(async move {
let mut peer_public_key = [0; PUBLIC_KEY_LENGTH]; let mut peer_public_key = [0; PUBLIC_KEY_LENGTH];
session.set_max_recv_size(constants::MAX_RECV_SIZE, false);
let session = { let session = {
let identity = { let identity = {
session_manager.identity.read().unwrap().clone() session_manager.identity.read().unwrap().clone()