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

@@ -15,4 +15,3 @@ scripts/run_mix.sh
 scripts/start_local_tmux_network.sh
 /.floo
 /.flooignore
-/service-providers/simple-socks5/allowed.list

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"

Cargo.toml

@@ -35,7 +35,7 @@ members = [
     "common/topology",
     "gateway",
     "gateway/gateway-requests",
-    "service-providers/simple-socks5",
+    "service-providers/sphinx-socks",
     "mixnode",
     "validator",
 ]

service-providers/sphinx-socks/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "simple-socks5"
+name = "sphinx-socks"
 version = "0.1.0"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 edition = "2018"

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

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