WIP Add SOCKS5 (remote) access method test

Author: MarkusPettersson98

talpid-types/src/net/proxy.rs

@@ -65,6 +65,24 @@ impl CustomProxy {
     }
 }
 
+impl From<Socks5Remote> for CustomProxy {
+    fn from(value: Socks5Remote) -> Self {
+        CustomProxy::Socks5Remote(value)
+    }
+}
+
+impl From<Socks5Local> for CustomProxy {
+    fn from(value: Socks5Local) -> Self {
+        CustomProxy::Socks5Local(value)
+    }
+}
+
+impl From<Shadowsocks> for CustomProxy {
+    fn from(value: Shadowsocks) -> Self {
+        CustomProxy::Shadowsocks(value)
+    }
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, Hash)]
 pub struct Shadowsocks {
     pub endpoint: SocketAddr,

test/test-manager/src/tests/access_methods.rs

@@ -1,6 +1,7 @@
 //! Integration tests for API access methods.
 use super::{Error, TestContext};
 use mullvad_management_interface::MullvadProxyClient;
+use talpid_types::net::proxy::CustomProxy;
 use test_macro::test_function;
 use test_rpc::ServiceClient;
 
@@ -26,13 +27,12 @@ pub async fn test_custom_access_methods(
     log::info!("Testing Shadowsocks access method");
     test_shadowsocks(mullvad_client.clone()).await?;
     log::info!("Testing SOCKS5 (Remote) access method");
-    test_socks_remote().await?;
+    test_socks_remote(mullvad_client.clone()).await?;
     Ok(())
 }
 
 async fn test_shadowsocks(mut mullvad_client: MullvadProxyClient) -> Result<(), Error> {
     use mullvad_types::relay_list::RelayEndpointData;
-    use talpid_types::net::proxy::CustomProxy;
     // Set up all the parameters needed to create a custom Shadowsocks access method.
     //
     // Since Mullvad host's Shadowsocks relays on their bridge servers, we can
@@ -54,6 +54,32 @@ async fn test_shadowsocks(mut mullvad_client: MullvadProxyClient) -> Result<(),
         })
         .expect("`test_shadowsocks` needs at least one shadowsocks relay to execute. Found non in relay list.");
 
+    assert_access_method_works(mullvad_client, access_method.clone()).await?;
+
+    Ok(())
+}
+
+async fn test_socks_remote(mut mullvad_client: MullvadProxyClient) -> Result<(), Error> {
+    use talpid_types::net::proxy::Socks5Remote;
+    // Set up all the parameters needed to create a custom SOCKS5 access method.
+    //
+    // The remote SOCKS5 proxy is assumed to be running on the test manager.
+    // On which port it listens to is defined in the test config.
+    let endpoint = todo!();
+    let access_method = Socks5Remote {
+        endpoint: todo!(),
+        auth: None,
+    };
+
+    assert_access_method_works(mullvad_client, access_method.into()).await?;
+
+    Ok(())
+}
+
+async fn assert_access_method_works(
+    mut mullvad_client: MullvadProxyClient,
+    access_method: CustomProxy,
+) -> Result<(), Error> {
     let successful = mullvad_client
         .test_custom_api_access_method(access_method.clone().into())
         .await?;
@@ -65,8 +91,3 @@ async fn test_shadowsocks(mut mullvad_client: MullvadProxyClient) -> Result<(),
 
     Ok(())
 }
-
-#[allow(clippy::unused_async)]
-async fn test_socks_remote() -> Result<(), Error> {
-    unimplemented!("Testing SOCKS5 (Remote) access method is not implemented")
-}