TudbuT/revpfw3
1
0
Fork 0
Code Issues Pull requests Projects Releases 8 Packages Wiki Activity Actions

fix some off-by-one errors

Browse source
This commit is contained in:
Daniella / Tove 2023-02-01 20:42:46 +01:00
parent 404de4676b
commit bfd1c1bc90
4 changed files with 54 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -72,7 +72,7 @@ dependencies = [
[[package]] [[package]]
name = "revpfw3" name = "revpfw3"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"enum-ordinalize", "enum-ordinalize",
] ]

2
Cargo.toml
View file

@ -3,7 +3,7 @@ name = "revpfw3"
repository = "https://github.com/tudbut/revpfw3" repository = "https://github.com/tudbut/revpfw3"
description = "A tool to bypass portforwarding restrictions using some cheap VServer" description = "A tool to bypass portforwarding restrictions using some cheap VServer"
license = "MIT" license = "MIT"
version = "0.2.0" version = "0.2.1"
edition = "2021" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

46
src/client.rs
View file

@ -4,7 +4,7 @@ use std::{
net::{Shutdown, TcpStream}, net::{Shutdown, TcpStream},
thread, thread,
time::{Duration, SystemTime}, time::{Duration, SystemTime},
vec, vec, collections::HashMap,
}; };
use crate::{io_sync, PacketType, SocketAdapter}; use crate::{io_sync, PacketType, SocketAdapter};
@ -12,6 +12,7 @@ use crate::{io_sync, PacketType, SocketAdapter};
pub fn client(ip: &str, port: u16, dest_ip: &str, dest_port: u16, key: &str, sleep_delay_ms: u64) { pub fn client(ip: &str, port: u16, dest_ip: &str, dest_port: u16, key: &str, sleep_delay_ms: u64) {
let mut buf1 = [0u8; 1]; let mut buf1 = [0u8; 1];
let mut buf4 = [0u8; 4]; let mut buf4 = [0u8; 4];
let mut buf8 = [0u8; 8];
let mut buf16 = [0u8; 16]; let mut buf16 = [0u8; 16];
let mut buf = [0; 1024]; let mut buf = [0; 1024];
let mut tcp = TcpStream::connect((ip, port)).unwrap(); let mut tcp = TcpStream::connect((ip, port)).unwrap();
@ -34,7 +35,8 @@ pub fn client(ip: &str, port: u16, dest_ip: &str, dest_port: u16, key: &str, sle
let mut tcp = SocketAdapter::new(tcp); let mut tcp = SocketAdapter::new(tcp);
tcp.set_nonblocking(true); tcp.set_nonblocking(true);
let mut sockets: Vec<SocketAdapter> = Vec::new(); let mut sockets: HashMap<u64, SocketAdapter> = HashMap::new();
let mut id = 0;
let mut last_keep_alive = SystemTime::now(); let mut last_keep_alive = SystemTime::now();
loop { loop {
let mut did_anything = false; let mut did_anything = false;
@ -44,7 +46,7 @@ pub fn client(ip: &str, port: u16, dest_ip: &str, dest_port: u16, key: &str, sle
} }
let mut to_remove = vec![]; let mut to_remove = vec![];
for (i, socket) in sockets.iter_mut().enumerate() { for (&i, socket) in sockets.iter_mut() {
if let Ok(x) = socket.poll(&mut buf) { if let Ok(x) = socket.poll(&mut buf) {
if let Some(len) = x { if let Some(len) = x {
if len == 0 { if len == 0 {
@ -52,7 +54,7 @@ pub fn client(ip: &str, port: u16, dest_ip: &str, dest_port: u16, key: &str, sle
} else { } else {
tcp.write(&[PacketType::ServerData.ordinal() as u8]) tcp.write(&[PacketType::ServerData.ordinal() as u8])
.unwrap(); .unwrap();
tcp.write(&(i as u32).to_be_bytes()).unwrap(); tcp.write(&i.to_be_bytes()).unwrap();
tcp.write(&(len as u32).to_be_bytes()).unwrap(); tcp.write(&(len as u32).to_be_bytes()).unwrap();
tcp.write(&buf[..len]).unwrap(); tcp.write(&buf[..len]).unwrap();
} }
@ -65,15 +67,17 @@ pub fn client(ip: &str, port: u16, dest_ip: &str, dest_port: u16, key: &str, sle
if let x @ 1.. = socket.clear_delay() { if let x @ 1.. = socket.clear_delay() {
tcp.write(&[PacketType::ClientExceededBuffer.ordinal() as u8]) tcp.write(&[PacketType::ClientExceededBuffer.ordinal() as u8])
.unwrap(); .unwrap();
tcp.write(&(i as u32).to_be_bytes()).unwrap(); tcp.write(&i.to_be_bytes()).unwrap();
tcp.write(&x.to_be_bytes()).unwrap(); tcp.write(&x.to_be_bytes()).unwrap();
} }
} }
for i in to_remove.into_iter().rev() { for i in to_remove.into_iter().rev() {
tcp.write(&[PacketType::CloseClient.ordinal() as u8]) tcp.write(&[PacketType::CloseClient.ordinal() as u8])
.unwrap(); .unwrap();
tcp.write(&(i as u32).to_be_bytes()).unwrap(); tcp.write(&i.to_be_bytes()).unwrap();
let _ = sockets.remove(i).internal.shutdown(Shutdown::Both); if let Some(x) = sockets.remove(&i) {
let _ = x.internal.shutdown(Shutdown::Both);
}
} }
tcp.update().unwrap(); tcp.update().unwrap();
@ -94,15 +98,14 @@ pub fn client(ip: &str, port: u16, dest_ip: &str, dest_port: u16, key: &str, sle
PacketType::NewClient => { PacketType::NewClient => {
let mut tcp = SocketAdapter::new(TcpStream::connect((dest_ip, dest_port)).unwrap()); let mut tcp = SocketAdapter::new(TcpStream::connect((dest_ip, dest_port)).unwrap());
tcp.set_nonblocking(true); tcp.set_nonblocking(true);
sockets.push(tcp); sockets.insert((id, id += 1).0, tcp);
} }
PacketType::CloseClient => { PacketType::CloseClient => {
tcp.internal.read_exact(&mut buf4).unwrap(); tcp.internal.read_exact(&mut buf8).unwrap();
let _ = sockets if let Some(x) = sockets.remove(&u64::from_be_bytes(buf8)) {
.remove(u32::from_be_bytes(buf4) as usize) let _ = x.internal.shutdown(Shutdown::Both);
.internal }
.shutdown(Shutdown::Both);
} }
PacketType::KeepAlive => { PacketType::KeepAlive => {
@ -111,25 +114,28 @@ pub fn client(ip: &str, port: u16, dest_ip: &str, dest_port: u16, key: &str, sle
} }
PacketType::ClientData => { PacketType::ClientData => {
tcp.internal.read_exact(&mut buf4).unwrap(); tcp.internal.read_exact(&mut buf8).unwrap();
let idx = u32::from_be_bytes(buf4) as usize; let idx = u64::from_be_bytes(buf8);
tcp.internal.read_exact(&mut buf4).unwrap(); tcp.internal.read_exact(&mut buf4).unwrap();
let len = u32::from_be_bytes(buf4) as usize; let len = u32::from_be_bytes(buf4) as usize;
tcp.internal.read_exact(&mut buf[..len]).unwrap(); tcp.internal.read_exact(&mut buf[..len]).unwrap();
let _ = sockets[idx].write_later(&buf[..len]); if let Some(socket) = sockets.get_mut(&idx) {
let _ = socket.write_later(&buf[..len]);
}
} }
PacketType::ServerData => unreachable!(), PacketType::ServerData => unreachable!(),
PacketType::ClientExceededBuffer => { PacketType::ClientExceededBuffer => {
tcp.internal.read_exact(&mut buf4).unwrap(); tcp.internal.read_exact(&mut buf8).unwrap();
let idx = u32::from_be_bytes(buf4) as usize; let idx = u64::from_be_bytes(buf8);
tcp.internal.read_exact(&mut buf16).unwrap(); tcp.internal.read_exact(&mut buf16).unwrap();
let amount = u128::from_be_bytes(buf16); let amount = u128::from_be_bytes(buf16);
if sockets.len() != 1 { // a single connection doesn't need overuse-penalties // a single connection doesn't need overuse-penalties
sockets[idx].punish(amount); if let (true, Some(socket)) = (sockets.len() > 1, sockets.get_mut(&idx)) {
socket.punish(amount);
} }
} }
} }

45
src/server.rs
View file

@ -1,4 +1,5 @@
use std::{ use std::{
collections::HashMap,
io::Read, io::Read,
io::Write, io::Write,
net::{Shutdown, TcpListener}, net::{Shutdown, TcpListener},
@ -12,6 +13,7 @@ use crate::{io_sync, PacketType, SocketAdapter};
pub fn server(port: u16, key: &str, sleep_delay_ms: u64) { pub fn server(port: u16, key: &str, sleep_delay_ms: u64) {
let mut buf1 = [0u8; 1]; let mut buf1 = [0u8; 1];
let mut buf4 = [0u8; 4]; let mut buf4 = [0u8; 4];
let mut buf8 = [0u8; 8];
let mut buf16 = [0u8; 16]; let mut buf16 = [0u8; 16];
let mut buf = [0; 1024]; let mut buf = [0; 1024];
let tcpl = TcpListener::bind(("0.0.0.0", port)).unwrap(); let tcpl = TcpListener::bind(("0.0.0.0", port)).unwrap();
@ -43,7 +45,8 @@ pub fn server(port: u16, key: &str, sleep_delay_ms: u64) {
let mut tcp = SocketAdapter::new(tcp); let mut tcp = SocketAdapter::new(tcp);
tcp.set_nonblocking(true); tcp.set_nonblocking(true);
let mut sockets: Vec<SocketAdapter> = Vec::new(); let mut sockets: HashMap<u64, SocketAdapter> = HashMap::new();
let mut id = 0;
let mut last_keep_alive_sent = SystemTime::now(); let mut last_keep_alive_sent = SystemTime::now();
let mut last_keep_alive = SystemTime::now(); let mut last_keep_alive = SystemTime::now();
loop { loop {
@ -60,13 +63,13 @@ pub fn server(port: u16, key: &str, sleep_delay_ms: u64) {
if let Ok(new) = tcpl.accept() { if let Ok(new) = tcpl.accept() {
let mut new = SocketAdapter::new(new.0); let mut new = SocketAdapter::new(new.0);
new.set_nonblocking(true); new.set_nonblocking(true);
sockets.push(new); sockets.insert((id, id += 1).0, new);
tcp.write(&[PacketType::NewClient.ordinal() as u8]).unwrap(); tcp.write(&[PacketType::NewClient.ordinal() as u8]).unwrap();
did_anything = true; did_anything = true;
} }
let mut to_remove = vec![]; let mut to_remove = vec![];
for (i, socket) in sockets.iter_mut().enumerate() { for (&i, socket) in sockets.iter_mut() {
if let Ok(x) = socket.poll(&mut buf) { if let Ok(x) = socket.poll(&mut buf) {
if let Some(len) = x { if let Some(len) = x {
if len == 0 { if len == 0 {
@ -74,7 +77,7 @@ pub fn server(port: u16, key: &str, sleep_delay_ms: u64) {
} else { } else {
tcp.write(&[PacketType::ClientData.ordinal() as u8]) tcp.write(&[PacketType::ClientData.ordinal() as u8])
.unwrap(); .unwrap();
tcp.write(&(i as u32).to_be_bytes()).unwrap(); tcp.write(&i.to_be_bytes()).unwrap();
tcp.write(&(len as u32).to_be_bytes()).unwrap(); tcp.write(&(len as u32).to_be_bytes()).unwrap();
tcp.write(&buf[..len]).unwrap(); tcp.write(&buf[..len]).unwrap();
} }
@ -87,15 +90,17 @@ pub fn server(port: u16, key: &str, sleep_delay_ms: u64) {
if let x @ 1.. = socket.clear_delay() { if let x @ 1.. = socket.clear_delay() {
tcp.write(&[PacketType::ClientExceededBuffer.ordinal() as u8]) tcp.write(&[PacketType::ClientExceededBuffer.ordinal() as u8])
.unwrap(); .unwrap();
tcp.write(&(i as u32).to_be_bytes()).unwrap(); tcp.write(&i.to_be_bytes()).unwrap();
tcp.write(&x.to_be_bytes()).unwrap(); tcp.write(&x.to_be_bytes()).unwrap();
} }
} }
for i in to_remove.into_iter().rev() { for i in to_remove.into_iter().rev() {
tcp.write(&[PacketType::CloseClient.ordinal() as u8]) tcp.write(&[PacketType::CloseClient.ordinal() as u8])
.unwrap(); .unwrap();
tcp.write(&(i as u32).to_be_bytes()).unwrap(); tcp.write(&i.to_be_bytes()).unwrap();
let _ = sockets.remove(i).internal.shutdown(Shutdown::Both); if let Some(x) = sockets.remove(&i) {
let _ = x.internal.shutdown(Shutdown::Both);
}
} }
tcp.update().unwrap(); tcp.update().unwrap();
@ -116,11 +121,10 @@ pub fn server(port: u16, key: &str, sleep_delay_ms: u64) {
PacketType::NewClient => unreachable!(), PacketType::NewClient => unreachable!(),
PacketType::CloseClient => { PacketType::CloseClient => {
tcp.internal.read_exact(&mut buf4).unwrap(); tcp.internal.read_exact(&mut buf8).unwrap();
let _ = sockets if let Some(x) = sockets.remove(&u64::from_be_bytes(buf8)) {
.remove(u32::from_be_bytes(buf4) as usize) let _ = x.internal.shutdown(Shutdown::Both);
.internal }
.shutdown(Shutdown::Both);
} }
PacketType::KeepAlive => { PacketType::KeepAlive => {
@ -130,23 +134,26 @@ pub fn server(port: u16, key: &str, sleep_delay_ms: u64) {
PacketType::ClientData => unreachable!(), PacketType::ClientData => unreachable!(),
PacketType::ServerData => { PacketType::ServerData => {
tcp.internal.read_exact(&mut buf4).unwrap(); tcp.internal.read_exact(&mut buf8).unwrap();
let idx = u32::from_be_bytes(buf4) as usize; let idx = u64::from_be_bytes(buf8);
tcp.internal.read_exact(&mut buf4).unwrap(); tcp.internal.read_exact(&mut buf4).unwrap();
let len = u32::from_be_bytes(buf4) as usize; let len = u32::from_be_bytes(buf4) as usize;
tcp.internal.read_exact(&mut buf[..len]).unwrap(); tcp.internal.read_exact(&mut buf[..len]).unwrap();
let _ = sockets[idx].write_later(&buf[..len]); if let Some(socket) = sockets.get_mut(&idx) {
let _ = socket.write_later(&buf[..len]);
}
} }
PacketType::ClientExceededBuffer => { PacketType::ClientExceededBuffer => {
tcp.internal.read_exact(&mut buf4).unwrap(); tcp.internal.read_exact(&mut buf8).unwrap();
let idx = u32::from_be_bytes(buf4) as usize; let idx = u64::from_be_bytes(buf8);
tcp.internal.read_exact(&mut buf16).unwrap(); tcp.internal.read_exact(&mut buf16).unwrap();
let amount = u128::from_be_bytes(buf16); let amount = u128::from_be_bytes(buf16);
if sockets.len() != 1 { // a single connection doesn't need overuse-penalties // a single connection doesn't need overuse-penalties
sockets[idx].punish(amount); if let (true, Some(socket)) = (sockets.len() > 1, sockets.get_mut(&idx)) {
socket.punish(amount);
} }
} }
} }