luckyimnotanigger/tun2proxy
1
0
Fork 0
mirror of https://github.com/tun2proxy/tun2proxy.git synced 2025-06-10 08:29:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Support authentication without credentials if credentials are provided

Browse source
This commit is contained in:
B. Blechschmidt 2023-05-27 10:28:35 +02:00
parent e5d1cfbef1
commit 75bfdcc95a
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/socks.rs
View file

@ -166,13 +166,14 @@ impl SocksConnection {
if credentials.is_some() { if credentials.is_some() {
self.server_outbuf.extend(&[ self.server_outbuf.extend(&[
self.version as u8, self.version as u8,
SocksCommand::Connect as u8, 2u8,
SocksAuthentication::None as u8,
SocksAuthentication::Password as u8, SocksAuthentication::Password as u8,
]); ]);
} else { } else {
self.server_outbuf.extend(&[ self.server_outbuf.extend(&[
self.version as u8, self.version as u8,
SocksCommand::Connect as u8, 1u8,
SocksAuthentication::None as u8, SocksAuthentication::None as u8,
]); ]);
} }
@ -207,15 +208,19 @@ impl SocksConnection {
return Err("SOCKS5 server replied with an unexpected version.".into()); return Err("SOCKS5 server replied with an unexpected version.".into());
} }
if self.server_inbuf[1] != 0 && self.credentials.is_none() let auth_method = self.server_inbuf[1];
|| self.server_inbuf[1] != 2 && self.credentials.is_some()
if auth_method != SocksAuthentication::None as u8 && self.credentials.is_none()
|| (auth_method != SocksAuthentication::None as u8
&& auth_method != SocksAuthentication::Password as u8)
&& self.credentials.is_some()
{ {
return Err("SOCKS5 server requires an unsupported authentication method.".into()); return Err("SOCKS5 server requires an unsupported authentication method.".into());
} }
self.server_inbuf.drain(0..2); self.server_inbuf.drain(0..2);
if self.credentials.is_some() { if auth_method == SocksAuthentication::Password as u8 {
self.state = SocksState::SendAuthData; self.state = SocksState::SendAuthData;
} else { } else {
self.state = SocksState::SendRequest; self.state = SocksState::SendRequest;