http proxy updates

Author: mikalv

apps/http_proxy/config/config.exs

@@ -2,4 +2,6 @@
 # and its dependencies with the aid of the Mix.Config module.
 use Mix.Config
 
-config :out_proxy, :redirect_to_tor, false
+config :http_proxy, :redirect_to_tor, false
+
+config :http_proxy, :http_listen_port, System.get_env("HTTP_PROXY_PORT") || 4480

apps/http_proxy/lib/http_proxy/cache_lookup.ex

@@ -72,7 +72,7 @@ defmodule HttpProxy.CacheLookup do
  end
 
  conn
- |> HttpProxy.HttpHandler.forward_response(conn)
+ |> HttpProxy.HttpHandler.forward_response
  |> halt
  end
 end

apps/http_proxy/lib/http_proxy/endpoint.ex

@@ -22,8 +22,11 @@ defmodule HttpProxy.Endpoint do
  def init(opts), do: opts
 
  def start_link do
- # port = Application.get_env :out_proxy, :port
- port = 4480
+ port = Application.get_env(:http_proxy, :http_listen_port)
+ :ok = :hackney_pool.start_pool(:httpc_pool, [
+ timeout: 15_000,
+ max_connections: 1_000
+ ])
  Logger.info("Running #{__MODULE__} on port #{port}")
  {:ok, _} = Plug.Adapters.Cowboy.http(__MODULE__, [], port: port)
  end

apps/http_proxy/lib/http_proxy/http_handler.ex

@@ -19,8 +19,16 @@ defmodule HttpProxy.HttpHandler do
  # if not - the forwarding crashes and burns, might eat your childs as well.
  headers = Keyword.drop(conn.assigns.headers, ["host","proxy-connection"])
 
- req_options = [follow_redirect: true, hackney: [force_redirect: true]]
- if Application.get_env(:out_proxy, :redirect_to_tor, false) do
+ req_options = [
+ follow_redirect: true,
+ hackney: [
+ pool: :httpc_pool
+ ],
+ max_redirect: 7,
+ recv_timeout: 10_000,
+ timeout: 12_000,
+ ]
+ if Application.get_env(:http_proxy, :redirect_to_tor, false) do
  do_request(conn, method, url, body, headers, req_options ++ [proxy: {:socks5, "127.0.0.1", 9050}])
  else
  do_request(conn, method, url, body, headers, req_options)

apps/http_proxy/lib/http_proxy/https_handler.ex

@@ -26,7 +26,7 @@ defmodule HttpProxy.HttpsHandler do
 
  defp open_remote_connection(conn) do
  [bin_host, port] = String.split(conn.request_path, ":")
- host = String.to_char_list(bin_host)
+ host = String.to_charlist(bin_host)
  port = String.to_integer(port)
 
  {status, sock} = case :gen_tcp.connect(host, port, [:binary, active: false]) do

apps/http_proxy/mix.exs

@@ -25,7 +25,8 @@ defmodule HttpProxy.Mixfile do
  :logger,
  :cowboy,
  :plug,
- :httpoison
+ :httpoison,
+ :dns
  ],
  mod: {HttpProxy, []}
  ]
@@ -50,6 +51,7 @@ defmodule HttpProxy.Mixfile do
  {:plug_cowboy, "~> 1.0"},
  {:plug, "~> 1.8"},
  {:httpoison, "~> 1.5.1"},
+ {:dns, "~> 2.1.2"},
  ]
  end
 end