A significant clean-up of the server authentication phase, with a basic test.

The prior implementation involved some (moderately awkward) layered
`match` expressions; this version skips those in favor of `?`. The cost
is a little less detail about (for example) when serialization errors
happen. On the bright side, it gains us some huge improvements in code
clarity. We might be able to get back the tracing later, with other
library support.

In addition, we know have a couple tests: one to make sure we choose the
authentication method appropriately, and a very basic handshake test for
when we're not actually negotiation a username and password.
This commit is contained in:
2021-10-09 18:32:23 -07:00
parent 3364031c18
commit fbd98a5f9b
7 changed files with 331 additions and 106 deletions

View File

@@ -4,3 +4,38 @@ pub mod messages;
pub mod network;
mod serialize;
pub mod server;
#[cfg(test)]
mod test {
use crate::client::{LoginInfo, SOCKSv5Client};
use crate::network::generic::Networklike;
use crate::network::testing::TestingStack;
use crate::server::{SOCKSv5Server, SecurityParameters};
use async_std::task;
#[test]
fn unrestricted_login() {
task::block_on(async {
let mut network_stack = TestingStack::default();
// generate the server
let security_parameters = SecurityParameters::unrestricted();
let default_port = network_stack.listen("localhost", 9999).await.unwrap();
let server =
SOCKSv5Server::new(network_stack.clone(), security_parameters, default_port);
let _server_task = task::spawn(async move { server.run().await });
let stream = network_stack.connect("localhost", 9999).await.unwrap();
let login_info = LoginInfo {
username_password: None,
};
let client = SOCKSv5Client::new(network_stack, stream, &login_info).await;
if let Err(e) = &client {
println!("client result: {:?}", e);
}
assert!(client.is_ok());
})
}
}