forward-proxy 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d2b9dbd7abcfa81bcdbd29b6dd2045e6d2210e92b303f7cfcdc4ab35ab0b868
-  data.tar.gz: 729d4b7d964c8a5a3bec860f6bceb669a12225900a01b4737de8fdf6ba02a049
+  metadata.gz: ccf19df114eeec55eaef8765999561904d8f5b6cd91b7ed2016053ec9e717408
+  data.tar.gz: ce712f520c0ed32b93ea211ff658d330bef7eeb26c2ddfcea1246d955ce78175
 SHA512:
-  metadata.gz: 70c0b51f0313e4ffedd1146ae93035db45bc8fe3a7cee647ea11cb0397d6862e99047befbc39aee6a08b17fd1e3d16394eb59ad9ad092140ea9354da10feadf6
-  data.tar.gz: b0f3587f3c08b255be222f8f59530e19b5fcc6e589f93eafb1eaa21fac832a0f01847dfcf309ed443e51fdafd96a516241143c1a75795b3d09f0ce7088eedac0
+  metadata.gz: b71608455b079161950b09521d8fd99496767463f3e2aa0f0d293f21e3955b03d7b0ba12f06f3b3df1ff6674d598ed2e7eec7492ffb8fd9047ebb19771625251
+  data.tar.gz: '092035474f162e29d2c7d0735b43cd38e41580aadca7ae50e97e02dee8e6f3825f50393497c0a8db8a5e0b3622d3e44e25e69e03ae02b56eba1cad55abdc1388'

data/README.md

@@ -6,8 +6,8 @@ Minimal forward proxy using 150LOC and only standard libraries. Useful for devel
 
 ```
 $ forward-proxy --binding 0.0.0.0 --port 3182 --threads 2
-[2021-01-14 19:37:47 +1100] INFO Listening 0.0.0.0:3182
-[2021-01-14 19:38:24 +1100] INFO CONNECT raw.githubusercontent.com:443 HTTP/1.1
+I, [2021-07-04T10:33:32.947653 #1790]  INFO -- : Listening 0.0.0.0:3182
+I, [2021-07-04T10:33:32.998298 #1790]  INFO -- : CONNECT raw.githubusercontent.com:443 HTTP/1.1
 ```
 
 ## Installation

data/exe/forward-proxy

@@ -15,7 +15,8 @@ OptionParser.new do |parser|
     options[:bind_address] = bind_address
   end
 
-  parser.on("-tTHREADS", "--threads=THREADS", Integer, "Specify the number of client threads. Default: 32") do |threads|
+  parser.on("-tTHREADS", "--threads=THREADS", Integer,
+            "Specify the number of client threads. Default: 128") do |threads|
     options[:threads] = threads
   end
 

data/lib/forward_proxy/server.rb

@@ -10,11 +10,11 @@ module ForwardProxy
   class Server
     attr_reader :bind_address, :bind_port, :logger
 
-    def initialize(bind_address: "127.0.0.1", bind_port: 9292, threads: 32, logger: Logger.new(STDOUT, level: :info))
-      @logger = logger
-      @thread_pool = ThreadPool.new(threads)
+    def initialize(bind_address: "127.0.0.1", bind_port: 9292, threads: 128, logger: default_logger)
       @bind_address = bind_address
       @bind_port = bind_port
+      @logger = logger
+      @thread_pool = ThreadPool.new(threads)
     end
 
     def start
@@ -29,7 +29,7 @@ module ForwardProxy
           begin
             req = parse_req(client_conn)
 
-            logger.info(req.request_line)
+            logger.info(req.request_line.strip)
 
             case req.request_method
             when METHOD_CONNECT then handle_tunnel(client_conn, req)
@@ -37,8 +37,8 @@ module ForwardProxy
             else
               raise Errors::HTTPMethodNotImplemented
             end
-          rescue => err
-            handle_error(err, client_conn)
+          rescue => e
+            handle_error(e, client_conn)
           ensure
             client_conn.close
           end
@@ -130,20 +130,20 @@ module ForwardProxy
           # "Hypertext Transfer Protocol (HTTP/1.1): Semantics and Content"
           # https://tools.ietf.org/html/rfc7231#section-4.3.6
 
-          #  An intermediary MAY combine an ordered subsequence of Via header
-          #  field entries into a single such entry if the entries have identical
-          #  received-protocol values.  For example,
+          # An intermediary MAY combine an ordered subsequence of Via header
+          # field entries into a single such entry if the entries have identical
+          # received-protocol values.  For example,
           #
-          #    Via: 1.0 ricky, 1.1 ethel, 1.1 fred, 1.0 lucy
+          #   Via: 1.0 ricky, 1.1 ethel, 1.1 fred, 1.0 lucy
           #
-          #  could be collapsed to
+          # could be collapsed to
           #
-          #    Via: 1.0 ricky, 1.1 mertz, 1.0 lucy
+          #   Via: 1.0 ricky, 1.1 mertz, 1.0 lucy
           #
-          #  A sender SHOULD NOT combine multiple entries unless they are all
-          #  under the same organizational control and the hosts have already been
-          #  replaced by pseudonyms.  A sender MUST NOT combine entries that have
-          #  different received-protocol values.
+          # A sender SHOULD NOT combine multiple entries unless they are all
+          # under the same organizational control and the hosts have already been
+          # replaced by pseudonyms.  A sender MUST NOT combine entries that have
+          # different received-protocol values.
           headers = resp.to_hash.merge(Via: [HEADER_VIA, resp['Via']].compact.join(', '))
 
           client_conn.puts <<~eos.chomp
@@ -173,10 +173,13 @@ module ForwardProxy
       eos
 
       logger.error(err.message)
-
       logger.debug(err.backtrace.join("\n"))
     end
 
+    def default_logger
+      Logger.new(STDOUT, level: :info)
+    end
+
     def map_webrick_to_net_http_req(req)
       req_headers = Hash[req.header.map { |k, v| [k, v.first] }]
 

data/lib/forward_proxy/thread_pool.rb

@@ -1,21 +1,18 @@
 module ForwardProxy
   class ThreadPool
-    attr_reader :queue, :threads, :size
+    attr_reader :queue, :size
 
     def initialize(size)
-      @size    = size
-      @queue   = Queue.new
-      @threads = []
+      @size  = size
+      @queue = Queue.new
     end
 
     def start
       size.times do
-        threads << Thread.new do
-          catch(:exit) do
-            loop do
-              job, args = queue.pop
-              job.call(*args)
-            end
+        Thread.new do
+          loop do
+            job, args = queue.pop
+            job.call(*args)
           end
         end
       end
@@ -24,13 +21,5 @@ module ForwardProxy
     def schedule(*args, &block)
       queue.push([block, args])
     end
-
-    def shutdown
-      threads.each do
-        schedule { throw :exit }
-      end
-
-      threads.each(&:join)
-    end
   end
 end

data/lib/forward_proxy/version.rb

@@ -1,3 +1,3 @@
 module ForwardProxy
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forward-proxy
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - James Moriarty
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-04 00:00:00.000000000 Z
+date: 2021-07-13 00:00:00.000000000 Z
 dependencies: []
 description: Forward proxy using just Ruby standard libraries.
 email: