From 2f570823941e47a69d3932c78560c2566b419a08 Mon Sep 17 00:00:00 2001 From: Zachary Boyd Date: Tue, 11 Sep 2018 19:37:13 -0400 Subject: [PATCH] "proxyByName" is now disabled by default because most browsers do not support SOCKS authentication --- CHANGELOG.md | 2 +- README.md | 2 +- src/default_config.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 419159d..0a2ab77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Added - Instances can now added to one or more groups by setting the `Group` field in the instance definition to a single string or array -- You can now proxy through a specific instance using the username field when connecting to a proxy. Setting `--proxyByName` or `-n` to false will disable this feature. For example: to connect to an instance named `instance-1` via http use `http://instance-1:@localhost:9080` +- You can now proxy through a specific instance using the username field when connecting to a proxy by setting `--proxyByName` or `-n` to "individual" or true. For example: to connect to an instance named `instance-1` via http use `http://instance-1:@localhost:9080` - You can also connect to a specific group of instances by setting `--proxyByName` or `-n` to "group". If enabled, requests made to `://foo:@localhost:9080` would be routed to instances in the `foo` group in round-robin fashion - The control server will accept WebSocket connections if the `--websocketControlHost` or `-w` argument is set. If the argument is used without a hostname it will default to 9078 on all interfaces - All servers (DNS, HTTP, SOCKS and Control) all have a `listen` method which takes a port and optionally a host. It will return a Promise that will resolve when the server is listening diff --git a/README.md b/README.md index 0c0a8cd..28d41a3 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ Instances can optionally be assigned name and a weight. If the `loadBalanceMetho } ``` -If the `proxyByName` (argument `-n`) configuration property is set to 'individual', which it is by default, you can use the instance name to send requests to a specific instance. The username field in the proxy URL will identify the instance. For example, using `http://instance-1:@localhost:9080` when connecting to the HTTP Proxy would route requests to "instance-1". +If the `proxyByName` (argument `-n`) configuration property is set to "individual" or true you can use the instance name to send requests to a specific instance. The username field in the proxy URL will identify the instance. For example, using `http://instance-1:@localhost:9080` when connecting to the HTTP Proxy would route requests to "instance-1". This feature works on the HTTP Proxy as well as the SOCKS Proxy, but not the DNS proxy since DNS lacks authentication. diff --git a/src/default_config.js b/src/default_config.js index 7c769f3..3903757 100644 --- a/src/default_config.js +++ b/src/default_config.js @@ -9,7 +9,7 @@ module.exports = { "socksHost": null, "dnsHost": null, "httpHost": null, - "proxyByName": 'individual', + "proxyByName": false, "denyUnidentifedUsers": false, "logLevel": "info", "loadBalanceMethod": "round_robin",