acw/async-socks5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove a duplicated firewall check.

Browse Source
This commit is contained in:
Adam Wick
2021-11-06 20:56:33 -07:00
parent ac11ae64a8
commit abff1a4ec1
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/server.rs
View File

@@ -85,7 +85,7 @@ impl<N: Networklike + Send + 'static> SOCKSv5Server<N> {
let params = self.security_parameters.clone(); let params = self.security_parameters.clone();
let network_mutex_copy = locked_network.clone(); let network_mutex_copy = locked_network.clone();
task::spawn(async move { task::spawn(async move {
match run_authentication(params, stream, their_addr.clone(), their_port).await { match run_authentication(params, stream).await {
Ok(authed_stream) => { Ok(authed_stream) => {
match run_main_loop(network_mutex_copy, authed_stream).await { match run_main_loop(network_mutex_copy, authed_stream).await {
Ok(_) => {} Ok(_) => {}
@@ -246,18 +246,7 @@ fn reasonable_auth_method_choices() {
async fn run_authentication( async fn run_authentication(
params: SecurityParameters, params: SecurityParameters,
mut stream: GenericStream, mut stream: GenericStream,
addr: SOCKSv5Address,
port: u16,
) -> Result<GenericStream, AuthenticationError> { ) -> Result<GenericStream, AuthenticationError> {
// before we do anything at all, we check to see if we just want to blindly reject
// this connection, utterly and completely.
if let Some(firewall_allows) = params.allow_connection {
if !firewall_allows(&addr, port) {
return Err(AuthenticationError::FirewallRejected(addr, port));
}
}
// OK, I guess we'll listen to you
let greeting = ClientGreeting::read(&mut stream).await?; let greeting = ClientGreeting::read(&mut stream).await?;
match choose_authentication_method(&params, &greeting.acceptable_methods) { match choose_authentication_method(&params, &greeting.acceptable_methods) {