methanium/mtp
Watch
3
0
Fork
You've already forked mtp
 0
Code Issues Pull requests 3 Projects Releases 22 Packages Wiki Activity Actions

[WIP] Security work While on holiday

Browse source
This commit is contained in:
Alex 2026-08-12 22:45:28 +02:00
commit 7f0231e3f1
Signed by: alex
SSH key fingerprint: SHA256:D1+Ub8o0v4K5y1JNivW8IxEOelqLSvPmUzBbDIoZkRQ
109 changed files with 19694 additions and 5210 deletions
Download patch file Download diff file Expand all files Collapse all files

51
mtp-webserver/src/h3.rs
View file

@ -67,7 +67,10 @@ pub(crate) async fn run_driver(
let host_config = host_config.clone();
let auth_semaphore = auth_semaphore.clone();
connection_tasks.spawn(async move {
let _permit = permit;
// The permit normally lives for this HTTP/3 connection.
// For an MTP session it is moved into the resulting
// connection so the limit covers the session lifetime.
let mut connection_permit = Some(permit);
let connect_start = std::time::Instant::now();
let connection = match incoming.await {
Ok(connection) => connection,
@ -149,27 +152,41 @@ pub(crate) async fn run_driver(
remote_addr,
));
let mtp_tx = mtp_tx.clone();
let mtp_queue_permit = match mtp_tx.clone().try_reserve_owned() {
Ok(permit) => permit,
Err(_) => {
tracing::debug!(
"rejecting MTP session because the application queue is full"
);
connection.close(
quinn::VarInt::from_u32(0),
b"mtp application queue is full",
);
return;
}
};
let auth_semaphore = auth_semaphore.clone();
let host_config = host_config.clone();
let connection_guard = connection_permit.take();
let connection = connection.clone();
let close_connection = connection.clone();
tokio::spawn(async move {
let result =
accept_web_connection(session, mtp_path, connection, send_pongs, policy, host_config, auth_semaphore)
.await;
match mtp_tx.try_send(result) {
Ok(()) => {}
Err(tokio::sync::mpsc::error::TrySendError::Full(result)) => {
tracing::warn!("MTP connection backlog is full; dropping connection");
if let Ok(connection) = result {
connection.sender.close();
}
}
Err(tokio::sync::mpsc::error::TrySendError::Closed(result)) => {
if let Ok(connection) = result {
connection.sender.close();
}
}
let result = accept_web_connection(
session,
mtp_path,
connection,
send_pongs,
policy,
host_config,
auth_semaphore,
connection_guard,
)
.await;
if result.is_err() {
close_connection
.close(quinn::VarInt::from_u32(0), b"mtp handshake failed");
}
mtp_queue_permit.send(result);
});
return;
}