astelm/telemt
1
0
Fork 0
mirror of https://github.com/telemt/telemt.git synced 2026-04-25 14:34:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Unlimited mask_relay_max_bytes

Browse Source
This commit is contained in:
Alexey
2026-04-21 11:30:58 +03:00
parent 1e5b84c0ed
commit 09310ff284
3 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/config/load.rs
View File

@@ -640,12 +640,6 @@ impl ProxyConfig {
)); ));
} }
if config.censorship.mask_relay_max_bytes == 0 {
return Err(ProxyError::Config(
"censorship.mask_relay_max_bytes must be > 0".to_string(),
));
}
if config.censorship.mask_relay_max_bytes > 67_108_864 { if config.censorship.mask_relay_max_bytes > 67_108_864 {
return Err(ProxyError::Config( return Err(ProxyError::Config(
"censorship.mask_relay_max_bytes must be <= 67108864".to_string(), "censorship.mask_relay_max_bytes must be <= 67108864".to_string(),

1
src/config/types.rs
View File

@@ -1768,6 +1768,7 @@ pub struct AntiCensorshipConfig {
pub mask_shape_above_cap_blur_max_bytes: usize, pub mask_shape_above_cap_blur_max_bytes: usize,
/// Maximum bytes relayed per direction on unauthenticated masking fallback paths. /// Maximum bytes relayed per direction on unauthenticated masking fallback paths.
/// Set to 0 to disable byte cap (unlimited within relay/idle timeouts).
#[serde(default = "default_mask_relay_max_bytes")] #[serde(default = "default_mask_relay_max_bytes")]
pub mask_relay_max_bytes: usize, pub mask_relay_max_bytes: usize,

29
src/proxy/masking.rs
View File

@@ -60,21 +60,18 @@ where
let mut buf = Box::new([0u8; MASK_BUFFER_SIZE]); let mut buf = Box::new([0u8; MASK_BUFFER_SIZE]);
let mut total = 0usize; let mut total = 0usize;
let mut ended_by_eof = false; let mut ended_by_eof = false;
let unlimited = byte_cap == 0;
if byte_cap == 0 {
return CopyOutcome {
total,
ended_by_eof,
};
}
loop { loop {
let read_len = if unlimited {
MASK_BUFFER_SIZE
} else {
let remaining_budget = byte_cap.saturating_sub(total); let remaining_budget = byte_cap.saturating_sub(total);
if remaining_budget == 0 { if remaining_budget == 0 {
break; break;
} }
remaining_budget.min(MASK_BUFFER_SIZE)
let read_len = remaining_budget.min(MASK_BUFFER_SIZE); };
let read_res = timeout(idle_timeout, reader.read(&mut buf[..read_len])).await; let read_res = timeout(idle_timeout, reader.read(&mut buf[..read_len])).await;
let n = match read_res { let n = match read_res {
Ok(Ok(n)) => n, Ok(Ok(n)) => n,
@@ -930,21 +927,21 @@ async fn consume_client_data<R: AsyncRead + Unpin>(
byte_cap: usize, byte_cap: usize,
idle_timeout: Duration, idle_timeout: Duration,
) { ) {
if byte_cap == 0 {
return;
}
// Keep drain path fail-closed under slow-loris stalls. // Keep drain path fail-closed under slow-loris stalls.
let mut buf = Box::new([0u8; MASK_BUFFER_SIZE]); let mut buf = Box::new([0u8; MASK_BUFFER_SIZE]);
let mut total = 0usize; let mut total = 0usize;
let unlimited = byte_cap == 0;
loop { loop {
let read_len = if unlimited {
MASK_BUFFER_SIZE
} else {
let remaining_budget = byte_cap.saturating_sub(total); let remaining_budget = byte_cap.saturating_sub(total);
if remaining_budget == 0 { if remaining_budget == 0 {
break; break;
} }
remaining_budget.min(MASK_BUFFER_SIZE)
let read_len = remaining_budget.min(MASK_BUFFER_SIZE); };
let n = match timeout(idle_timeout, reader.read(&mut buf[..read_len])).await { let n = match timeout(idle_timeout, reader.read(&mut buf[..read_len])).await {
Ok(Ok(n)) => n, Ok(Ok(n)) => n,
Ok(Err(_)) | Err(_) => break, Ok(Err(_)) | Err(_) => break,
@@ -955,7 +952,7 @@ async fn consume_client_data<R: AsyncRead + Unpin>(
} }
total = total.saturating_add(n); total = total.saturating_add(n);
if total >= byte_cap { if !unlimited && total >= byte_cap {
break; break;
} }
} }