source/shadowsocks-rust
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-rust.git synced 2026-02-09 01:59:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(sslocal): disallow HTTP/SOCKS4 proxying when authentication required (#1765)

Browse Source
This commit is contained in:
Alexander Azarov
2024-11-12 06:07:51 +00:00
committed by GitHub
parent 1e7c99d83a
commit 82681faa86
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
crates/shadowsocks-service/src/local/socks/server/server.rs
View File

@@ -176,8 +176,13 @@ impl SocksTcpHandler {
match version_buffer[0] {
#[cfg(feature = "local-socks4")]
0x04 => {
let handler = Socks4TcpHandler::new(self.context, self.balancer, self.mode);
handler.handle_socks4_client(self.stream, self.peer_addr).await
if self.socks5_auth.auth_required() {
error!("SOCKS4 disabled when authentication is configured");
Err(io::Error::new(ErrorKind::Other, "SOCKS4 unsupported"))
} else {
let handler = Socks4TcpHandler::new(self.context, self.balancer, self.mode);
handler.handle_socks4_client(self.stream, self.peer_addr).await
}
}
0x05 => {
@@ -193,12 +198,17 @@ impl SocksTcpHandler {
#[cfg(feature = "local-http")]
b'G' | b'g' | b'H' | b'h' | b'P' | b'p' | b'D' | b'd' | b'C' | b'c' | b'O' | b'o' | b'T' | b't' => {
// GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE, PATCH
match self.http_handler.serve_connection(self.stream, self.peer_addr).await {
Ok(..) => Ok(()),
Err(err) => {
error!("HTTP connection {} handler failed with error: {}", self.peer_addr, err);
Err(io::Error::new(ErrorKind::Other, err))
if self.socks5_auth.auth_required() {
error!("HTTP disabled when authentication is configured");
Err(io::Error::new(ErrorKind::Other, "HTTP unsupported"))
} else {
// GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE, PATCH
match self.http_handler.serve_connection(self.stream, self.peer_addr).await {
Ok(..) => Ok(()),
Err(err) => {
error!("HTTP connection {} handler failed with error: {}", self.peer_addr, err);
Err(io::Error::new(ErrorKind::Other, err))
}
}
}
}