readme tlc

README.md

@@ -9,17 +9,18 @@ In VPN mode, it takes a pool of OpenVPN files and creates a Docker container for
 each one. After a successful VPN connection, each container spawns a SOCKS5
 proxy server and binds it to a port on the Docker host. 
 
-In Tor mode, multiple containers connecioning to the Tor network are stated and
-can be rotated through, giving you a new egree IP with each request.
+In Tor mode, containers initiate a connection to the Tor network. 
+
+Both VPN and Tor nodes can be rotated through, giving you a new egress IP with each request.
 
 Combined with tools like Burp suite or proxychains, this creates your very own (small) private 
 botnet on the cheap.
 
 [Password Spraying Blog Post Using DoxyCannon](https://sec.alexflor.es/post/password_spraying_with_doxycannon/)
 
 ## Prerequisites
-- VPN Mode
-  * A VPN subscription to a provider that distributes \*.ovpn files
+
+If using VPN mode, you'll need a VPN subscription to a provider that distributes `*.ovpn` files
 
 - Install the required pip modules:
   ```sh
@@ -33,7 +34,7 @@ botnet on the cheap.
 - `proxychains4` is required for interactive mode
 
 ## Setup
-- Create an `NAME.txt` file with your ovpn credentials in `VPN`. The format is:
+- Create a `NAME.txt` file with your ovpn credentials in `VPN`. The format is:
   ```txt
   username
   password
@@ -58,7 +59,6 @@ botnet on the cheap.
 
 - If `--dir` is equal to `VPN`, a container will be launched for each `ovpn` file inside the folder. Use `--single` to have HAproxy load-balance between all VPNs.
     ```sh
-     doxycannon vpn --dir VPN --up
      doxycannon vpn --dir VPN --single # Launch HAproxy to load balance
      ```
 
@@ -67,34 +67,31 @@ botnet on the cheap.
 - Alternatively, use the `tor` subcommand to just spin up tor nodes
 
     ```sh
-    doxycannon tor --nodes 7 --up
-    doxycannon tor --single
+    doxycannon tor --nodes 7 --single
     ```
 
 ## Usage
 
-_note: the way proxychains seeds its PRNG to choose a random proxy is not fast
-enough to ensure each subsequent request goes out through a different IP. You
-may get between 1-10 requests being made from the same IP. If this is
-unacceptable, I [merged a patch](https://github.com/haad/proxychains/pull/73)
-to the original proxychains repo. Download and build from master to get the
-fix. https://github.com/haad/proxychains_
+_note_: proxychains' prng uses an epoch time-based seed which means you may get multiple requests
+being made from the same IP if less than a second passes between requests. If this is unacceptable,
+I have a patch for [rofl0r/proxychains-ng](https://github.com/rofl0r/proxychains-ng) on my fork,
+`prng` branch located
+[here](https://github.com/audibleblink/proxychains-ng/commit/c55920fca1fa1b9218eb9e321072331bfbd5403b.patch)
 
 ### One-off, random commands
-While your containers are up, you can use proxychains to issue commands through
+While your containers are up, you can use proxychains-ng to issue commands through
 random proxies
 
 ```sh
 proxychains4 -q curl -s ipconfig.io/json
-proxychains4 -q hydra -L users.txt -p Winter2018 manager.example.com -t 8 ssh
+proxychains4 -q hydra -L users.txt -p Winter2020 manager.example.com -t 8 ssh
 ```
 
 ### GUI Tools
 
-Use the `--single` flag to create a proxy rotator after bringing up your proxies.
+Use the `--single` flag to create a proxy rotator.
 
 ```sh
-❯❯ ./doxycannon.py [vpn|tor] --up
 ❯❯ ./doxycannon.py [vpn|tor] --single
 [+] Writing HAProxy configuration
 [*] Image doxyproxy built.
@@ -103,20 +100,17 @@ Use the `--single` flag to create a proxy rotator after bringing up your proxies
 ^C
 [*] doxyproxy was issued a stop command
 [*] Your proxies are still running.
-
 ```
 
-To see what's happening, checkout out the [haproxy](haproxy) folder.
-Essentially, one is building a layer 4 load-balancer between all the VPNs. This
-will allow you rotate through your proxies from a single port which means you
-can point your browsers or BURPSuite instances at it and have every request use
-a different VPN.
+To see what's happening, checkout out the [haproxy](haproxy) folder.  Essentially, the tool builds
+a layer 4 load-balancer between all the VPNs. This allows rotatation of proxies through a single
+port. One can then point browsers or BURPSuite at it and have every request use a
+different VPN.
 
 ### Specific SOCKS proxies
-If you want to use a specific proxy, give your utility the proper SOCKS port.
 
 Example: To make a request through Japan, use `docker ps` and find the local
-port to which the Japanese proxy is bound.
+port to which the Japanese VPN is bound.
 
 Configure your tool to use that port:
 
@@ -125,7 +119,7 @@ curl --socks5 localhost:50xx ipconfig.io/json
 ```
 
 ### Interactive
-Once you've built your image and started your containers, run the utility with
+Once you've started your containers, run the utility with
 the `--interactive` flag to get a bash session where all network traffic is
 redirected through proxychains4
 
@@ -139,13 +133,3 @@ redirected through proxychains4
 
 This was originally a fork of pry0cc's ProxyDock. It's been modified to an
 extent where less than 1% of the original code remains.
-
-## Help Wanted
-
-- [ ] Allow for management of remote doxycannon installs through the Docker API
-- [ ] Connect to VPN endpoints through TOR when `--up --tor` is passed
-- [X] Interactive mode
-- [X] Python management script
-- [X] Faster Up/Down Container management
-- [X] Dispatch server - (will allow GUI applications to use doxycannon)
-- [X] Creates a single local proxy server that dispatches through VPNs

doxycannon.py

@@ -337,7 +337,7 @@ def interactive(image, conf):
             port_range = range(START_PORT, START_PORT + ovpn_file_count)
             write_proxychains_conf(port_range)
 
-        os.system("proxychains4 zsh")
+        os.system("proxychains4 bash")
     except Exception as err:
         print(err)
         raise