From 256c04bbfa9349877ef6ee3a239d492819af38ad Mon Sep 17 00:00:00 2001 From: Dave Hrycyszyn Date: Tue, 8 Sep 2020 16:20:27 +0100 Subject: [PATCH] Feature/sphinx socks (#326) * Renamed simple-socks5 to sphinx-socks * Changing default storefile path to rename * Adding a sample list of allowed network requests * Fixing test --- .gitignore | 1 - Cargo.lock | 40 +++++++++---------- Cargo.toml | 2 +- .../Cargo.toml | 2 +- .../sphinx-socks/allowed.list.sample | 11 +++++ .../src/allowed_hosts.rs | 4 +- .../src/connection.rs | 0 .../src/core.rs | 0 .../src/main.rs | 0 .../src/websocket.rs | 0 10 files changed, 35 insertions(+), 25 deletions(-) rename service-providers/{simple-socks5 => sphinx-socks}/Cargo.toml (97%) create mode 100644 service-providers/sphinx-socks/allowed.list.sample rename service-providers/{simple-socks5 => sphinx-socks}/src/allowed_hosts.rs (99%) rename service-providers/{simple-socks5 => sphinx-socks}/src/connection.rs (100%) rename service-providers/{simple-socks5 => sphinx-socks}/src/core.rs (100%) rename service-providers/{simple-socks5 => sphinx-socks}/src/main.rs (100%) rename service-providers/{simple-socks5 => sphinx-socks}/src/websocket.rs (100%) diff --git a/.gitignore b/.gitignore index 6b5b8997ef..4675987263 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,3 @@ scripts/run_mix.sh scripts/start_local_tmux_network.sh /.floo /.flooignore -/service-providers/simple-socks5/allowed.list diff --git a/Cargo.lock b/Cargo.lock index 5829bc10a4..5015ce0747 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2780,26 +2780,6 @@ dependencies = [ "libc", ] -[[package]] -name = "simple-socks5" -version = "0.1.0" -dependencies = [ - "clap", - "dirs 2.0.2", - "futures 0.3.4", - "log 0.4.8", - "nymsphinx", - "ordered-buffer", - "pretty_env_logger", - "proxy-helpers", - "publicsuffix", - "rand 0.7.3", - "socks5-requests", - "tokio 0.2.22", - "tokio-tungstenite", - "websocket-requests", -] - [[package]] name = "siphasher" version = "0.2.3" @@ -2954,6 +2934,26 @@ dependencies = [ "sha2", ] +[[package]] +name = "sphinx-socks" +version = "0.1.0" +dependencies = [ + "clap", + "dirs 2.0.2", + "futures 0.3.4", + "log 0.4.8", + "nymsphinx", + "ordered-buffer", + "pretty_env_logger", + "proxy-helpers", + "publicsuffix", + "rand 0.7.3", + "socks5-requests", + "tokio 0.2.22", + "tokio-tungstenite", + "websocket-requests", +] + [[package]] name = "stream-cipher" version = "0.3.2" diff --git a/Cargo.toml b/Cargo.toml index 7d421625ab..7402f97d30 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,7 @@ members = [ "common/topology", "gateway", "gateway/gateway-requests", - "service-providers/simple-socks5", + "service-providers/sphinx-socks", "mixnode", "validator", ] diff --git a/service-providers/simple-socks5/Cargo.toml b/service-providers/sphinx-socks/Cargo.toml similarity index 97% rename from service-providers/simple-socks5/Cargo.toml rename to service-providers/sphinx-socks/Cargo.toml index 5a6e5a73b3..4d590cbacf 100644 --- a/service-providers/simple-socks5/Cargo.toml +++ b/service-providers/sphinx-socks/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "simple-socks5" +name = "sphinx-socks" version = "0.1.0" authors = ["Dave Hrycyszyn ", "Jędrzej Stuczyński "] edition = "2018" diff --git a/service-providers/sphinx-socks/allowed.list.sample b/service-providers/sphinx-socks/allowed.list.sample new file mode 100644 index 0000000000..c8bf2fcf6d --- /dev/null +++ b/service-providers/sphinx-socks/allowed.list.sample @@ -0,0 +1,11 @@ +blockstream.info +qtornado.com +aranguren.org +hsmithsxurybd7uh.onion +hsmiths.com +not.fyi +cluelessperson.com +wgzwu3vg3i54wayx.onion +bauerj.eu +electrum.org +greenaddress.it diff --git a/service-providers/simple-socks5/src/allowed_hosts.rs b/service-providers/sphinx-socks/src/allowed_hosts.rs similarity index 99% rename from service-providers/simple-socks5/src/allowed_hosts.rs rename to service-providers/sphinx-socks/src/allowed_hosts.rs index 44fddbba5f..51e7908358 100644 --- a/service-providers/simple-socks5/src/allowed_hosts.rs +++ b/service-providers/sphinx-socks/src/allowed_hosts.rs @@ -153,7 +153,7 @@ impl HostsStore { } fn setup_storefile(base_dir: PathBuf, filename: PathBuf) -> PathBuf { - let dirpath = base_dir.join("service-providers").join("socks5"); + let dirpath = base_dir.join("service-providers").join("sphinx-socks"); fs::create_dir_all(&dirpath).expect(&format!( "could not create storage directory at {:?}", dirpath @@ -348,7 +348,7 @@ mod tests { fn create_test_storefile() -> (PathBuf, PathBuf, PathBuf) { let base_dir = test_base_dir(); let filename = PathBuf::from(format!("hosts-store-{}.list", random_string())); - let dirpath = base_dir.join("service-providers").join("socks5"); + let dirpath = base_dir.join("service-providers").join("sphinx-socks"); fs::create_dir_all(&dirpath).expect(&format!( "could not create storage directory at {:?}", dirpath diff --git a/service-providers/simple-socks5/src/connection.rs b/service-providers/sphinx-socks/src/connection.rs similarity index 100% rename from service-providers/simple-socks5/src/connection.rs rename to service-providers/sphinx-socks/src/connection.rs diff --git a/service-providers/simple-socks5/src/core.rs b/service-providers/sphinx-socks/src/core.rs similarity index 100% rename from service-providers/simple-socks5/src/core.rs rename to service-providers/sphinx-socks/src/core.rs diff --git a/service-providers/simple-socks5/src/main.rs b/service-providers/sphinx-socks/src/main.rs similarity index 100% rename from service-providers/simple-socks5/src/main.rs rename to service-providers/sphinx-socks/src/main.rs diff --git a/service-providers/simple-socks5/src/websocket.rs b/service-providers/sphinx-socks/src/websocket.rs similarity index 100% rename from service-providers/simple-socks5/src/websocket.rs rename to service-providers/sphinx-socks/src/websocket.rs