tom/dockermcmgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nix disable check phase, fix incomplete/failed write in proxy mode, add FML support, rename executable to dmm, image tag specific to servers, config folder from env,

Browse Source
This commit is contained in:
tomoron
2026-06-11 15:22:29 +02:00
parent 3f840ea284
commit 887a228cf2
11 changed files with 114 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/minecraft/client/buffer.rs
View File

@ -1,18 +1,24 @@
use tokio::net::TcpStream;
use crate::minecraft::client::client::Client;
use crate::minecraft::varint::varint_read;
use std::collections::VecDeque;
use std::io;
use tokio::io::AsyncWriteExt;
impl Client {
pub async fn in_read(&mut self) -> Result<u8, String> {
loop
{
match self.in_stream.try_read(&mut self.read_buf) {
Ok(n) => {
if let Some(out_stream) = &self.out_stream {
let _ = out_stream.writable().await;
let _ = out_stream.try_write(&self.read_buf[..n]);
if let Some(out_stream) = &mut self.out_stream {
out_stream.write_all(&self.read_buf[..n]).await.map_err(|e| format!("Failed to write to server stream :{}", e))?;
} else {
self.buffer_append((&self.read_buf[..n]).to_vec()).await?;
}
@ -23,8 +29,8 @@ impl Client {
Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
return Ok(1);
}
Err(_e) => {
return Err("read failed".to_string())
Err(e) => {
return Err(format!("in read failed: {}", e))
}
}
}
@ -46,8 +52,7 @@ impl Client {
match self.out_stream.as_mut().unwrap().try_read(&mut self.read_buf) {
Ok(n) => {
let _ = self.in_stream.writable().await;
let _ = self.in_stream.try_write(&self.read_buf[..n]);
self.in_stream.write_all(&self.read_buf[..n]).await.map_err(|e| format!("Failed to write to client stream :{}", e))?;
if n == 0 { Ok(0) } else { Ok(1) }
}
Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
@ -60,10 +65,13 @@ impl Client {
}
}
pub async fn buffer_append(&mut self, data: Vec<u8>) -> Result<(),String> {
if data.len() == 0 {
return Ok(());
}
println!("[{}] adding {} bytes to the buffer",self, data.len());
if self.buffer.len() + data.len() > 65536 {
@ -71,21 +79,35 @@ impl Client {
}
let _ = self.buffer.extend(data);
let mut varint_buffer: VecDeque<u8> = self.buffer[..5].to_vec().into();
println!("varint_buffer : {:?}", varint_buffer);
while self.buffer.len() != 0 && self.buffer.len() - 1 >= self.buffer[0] as usize {
let expected_len = varint_read(&mut varint_buffer)?;
let varint_len = 5 - varint_buffer.len();
println!("expected len : {}, current len : {}", expected_len as usize, self.buffer.len());
println!("buffer : {:?}", self.buffer);
while self.buffer.len() != 0 && self.buffer.len() - 1 >= expected_len as usize {
if self.buffer[0] == 0 {
return Err("invalid packet".to_string());
}
println!("valid packet found, handling");
println!("varint len : {}", varint_len);
println!("len : {}", expected_len);
let len = varint_read(&mut self.buffer.clone().into())? as usize;
self.handle_packet(self.buffer[1..=len].to_vec().into()).await?;
self.buffer.drain(..len + 1);
self.handle_packet(self.buffer[varint_len..=(expected_len as usize)].to_vec().into()).await?;
self.buffer.drain(..(expected_len as usize + varint_len));
println!("buffer after handle : {:?}", self.buffer);
if let Some(out_stream) = &self.out_stream {
println!("out stream present , sending the {} remaining bytes", self.buffer.len());
if self.buffer.len() != 0 {
let _ = out_stream.writable().await;
let _ = out_stream.try_write(self.buffer.as_slice());
let _ = out_stream.writable().await.map_err(|e| format!("out stream writable call failed : {}", e))?;
let _ = out_stream.try_write(self.buffer.as_slice()).map_err(|e| format!("Failed to send remaining buffer to out stream : {}", e))?;
self.buffer.drain(..);
}
}

6
src/minecraft/client/client.rs
View File

@ -6,7 +6,7 @@
/* By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2026/05/07 17:23:09 by tomoron #+# #+# */
/* Updated: 2026/06/10 12:29:08 by tomoron ### ########.fr */
/* Updated: 2026/06/11 12:21:51 by tomoron ### ########.fr */
/* */
/* ************************************************************************** */
@ -72,10 +72,12 @@ impl Client {
let conn = &mut self.db_pool.get().unwrap();
let reg = Regex::new(r"^(?:([a-zA-Z-_]*)\.)?mc\.tmoron\.fr$").unwrap();
let reg = Regex::new(r"^(?:([a-zA-Z-_]*)\.)?mc\.tmoron\.fr").unwrap();
let mut found: Option<String> = None;
if let Some(capture) = reg.captures(&self.handshake.as_ref().unwrap().server_address) {
println!("capture : {:?}", capture);
if let Some(captured_str) = capture.get(1) {
println!("found valid capture : {}", captured_str.as_str());
found = Some(captured_str.as_str().to_string());
}
}

15
src/minecraft/client/packet.rs
View File

@ -9,6 +9,7 @@ use tokio::net::TcpStream;
impl Client {
pub async fn handle_packet(&mut self, mut packet: VecDeque<u8>) -> Result<(), String> {
println!("packet len : {}", packet.len());
let packet_id = varint_read(&mut packet)?;
@ -56,7 +57,8 @@ impl Client {
async fn proxy_start(&mut self) -> Result<(),String> {
println!("[{}] starting proxy mode", self);
let redirect_ip = &self.server.as_ref().unwrap().as_ref().unwrap().redirect_ip.as_ref().unwrap();
let server = &self.server.as_ref().unwrap().as_ref().unwrap();
let redirect_ip = server.redirect_ip.as_ref().unwrap();
let split_ip = redirect_ip.split_once(":");
let domain : String = split_ip.unwrap_or_else(|| (redirect_ip, "")).0.to_string();
let port : u16 = split_ip.unwrap_or_else(|| ("", "25565")).1.parse().map_err(|e| format!("Failed to parse redirect_ip : {}", e))?;
@ -64,7 +66,12 @@ impl Client {
.map_err(|_| "failed to connect to remote host".to_string())?;
let mut new_handshake = self.handshake.as_ref().unwrap().clone();
new_handshake.server_address = domain;
if server.simple_redirect {
new_handshake.server_address = domain;
} else {
new_handshake.server_address = self.handshake.as_ref().unwrap().server_address.clone();
}
new_handshake.server_port = port;
let handshake_packet = new_handshake.to_packet();
@ -76,8 +83,10 @@ impl Client {
let _ = self.out_stream.as_ref().unwrap().writable().await;
let _ = self.out_stream.as_ref().unwrap().try_write(packet.as_slice());
println!("[{}] sent handshake to server", self);
println!("proxy mode started, buffer len : {}", self.buffer.len());
Ok(())
}
}