diff --git a/Cargo.lock b/Cargo.lock index faf10de6..e53937ef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1999,7 +1999,7 @@ dependencies = [ [[package]] name = "shadowsocks" -version = "1.14.1" +version = "1.14.2" dependencies = [ "arc-swap 1.5.0", "async-trait", @@ -2054,7 +2054,7 @@ dependencies = [ [[package]] name = "shadowsocks-rust" -version = "1.14.2" +version = "1.14.3" dependencies = [ "build-time", "byte_string", @@ -2087,7 +2087,7 @@ dependencies = [ [[package]] name = "shadowsocks-service" -version = "1.14.2" +version = "1.14.3" dependencies = [ "arc-swap 1.5.0", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 9efde257..3c2c5056 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shadowsocks-rust" -version = "1.14.2" +version = "1.14.3" authors = ["Shadowsocks Contributors"] description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls." repository = "https://github.com/shadowsocks/shadowsocks-rust" diff --git a/crates/shadowsocks-service/Cargo.toml b/crates/shadowsocks-service/Cargo.toml index d0402b54..20339728 100644 --- a/crates/shadowsocks-service/Cargo.toml +++ b/crates/shadowsocks-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shadowsocks-service" -version = "1.14.2" +version = "1.14.3" authors = ["Shadowsocks Contributors"] description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls." repository = "https://github.com/shadowsocks/shadowsocks-rust" diff --git a/crates/shadowsocks-service/src/local/socks/server/socks5/tcprelay.rs b/crates/shadowsocks-service/src/local/socks/server/socks5/tcprelay.rs index 25762e55..3552c228 100644 --- a/crates/shadowsocks-service/src/local/socks/server/socks5/tcprelay.rs +++ b/crates/shadowsocks-service/src/local/socks/server/socks5/tcprelay.rs @@ -99,10 +99,10 @@ impl Socks5TcpHandler { trace!("reply handshake {:?}", resp); - return Err(Error::new( + Err(Error::new( ErrorKind::Other, "currently shadowsocks-rust does not support authentication", - )); + )) } async fn check_auth_password(&self, stream: &mut TcpStream) -> io::Result<()> { @@ -171,13 +171,13 @@ impl Socks5TcpHandler { user_name, password ); - return Err(Error::new( + Err(Error::new( ErrorKind::Other, format!( "Username/Password Authentication failed, user: {}, password: {}", user_name, password ), - )); + )) } } diff --git a/crates/shadowsocks/Cargo.toml b/crates/shadowsocks/Cargo.toml index f07375a6..fe4d09f1 100644 --- a/crates/shadowsocks/Cargo.toml +++ b/crates/shadowsocks/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shadowsocks" -version = "1.14.1" +version = "1.14.2" authors = ["Shadowsocks Contributors"] description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls." repository = "https://github.com/shadowsocks/shadowsocks-rust" diff --git a/crates/shadowsocks/src/relay/socks5.rs b/crates/shadowsocks/src/relay/socks5.rs index a7ddf01c..83340aa9 100644 --- a/crates/shadowsocks/src/relay/socks5.rs +++ b/crates/shadowsocks/src/relay/socks5.rs @@ -826,7 +826,10 @@ impl PasswdAuthRequest { let uname = uname.into(); let passwd = passwd.into(); assert!( - uname.len() > 0 && uname.len() <= u8::MAX as usize && passwd.len() > 0 && passwd.len() <= u8::MAX as usize + !uname.is_empty() + && uname.len() <= u8::MAX as usize + && !passwd.is_empty() + && passwd.len() <= u8::MAX as usize ); PasswdAuthRequest { uname, passwd }