forward-proxy 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ef1fa7e497462fc27f6b33ace589450994664c35c0e2744fae3a46c6caa0372
-  data.tar.gz: a396b7121e8a512a518a033aaa14261d7b86fd0377cf6e29d183a34ba02ff010
+  metadata.gz: f4251c1e0cac2b15b884b54ee293a1822ee955347f3c488b558c0f82cf50ddfe
+  data.tar.gz: 51a472149c1c0f04ad12edc90b0084760417e03b8d17889b27ee11ceb66ebc0d
 SHA512:
-  metadata.gz: af543772c2f4159b0697f3ad02d4a330f776b73f1ccbaab6e8eb0dff9a8b5a6855b515fea99165c884132e743fd65aff7ac5973916256bcd6f476102d9dad743
-  data.tar.gz: e625cc351e9ce99744ff6ad00dac9c4e2e22c75cc0f8e4899c17736dcd06067398e1228bbebc6fb5ba07b44322f9806e62259c712f7d9bfddc89db5620045ded
+  metadata.gz: f930317afad701fd29d5db2a720ce8d1ed7d9039116baa81c667f873ba709d252fe2c2286920258d522597279f9997c8fd284100640f966e14599f3d7b2df563
+  data.tar.gz: c5ca8e7c0c5238c5a0d09d9fc17a8eb920b014598e42a5aace0780663e19d52a8c850eab28be1cf8fa2a2449521a425d0b3b33e5546e7d6db1a14ea9610721ac

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 0.8.0
+
+- add http head support.
+- improve timeout testing.
+
+## 0.7.0
+
+- bugfix default threads from `4` to `128`.
+
 ## 0.6.0
 
 - add connection timeout to stop tracking connection from saturating client threads.

data/README.md

@@ -38,7 +38,8 @@ forward-proxy
 Usage: forward-proxy [options]
     -p, --port=PORT                  Bind to specified port. Default: 9292
     -b, --binding=BINDING            Bind to the specified ip. Default: 127.0.0.1
-    -t, --threads=THREADS            Specify the number of client threads. Default: 32
+    -t, --timeout=TIMEOUT            Specify the connection timeout in seconds. Default: 300
+    -c, --threads=THREADS            Specify the number of client threads. Default: 128
     -h, --help                       Prints this help.
 ```
 

data/exe/forward-proxy

@@ -16,7 +16,7 @@ OptionParser.new do |parser|
   end
 
   parser.on("-tTIMEOUT", "--timeout=TIMEOUT", Integer,
-            "Specify the connection timout in seconds. Default: 300") do |threads|
+            "Specify the connection timeout in seconds. Default: 300") do |threads|
     options[:timeout] = threads
   end
 

data/lib/forward_proxy/server.rb

@@ -12,7 +12,7 @@ module ForwardProxy
   class Server
     attr_reader :bind_address, :bind_port, :logger, :timeout
 
-    def initialize(bind_address: "127.0.0.1", bind_port: 9292, threads: 4, timeout: 1, logger: default_logger)
+    def initialize(bind_address: "127.0.0.1", bind_port: 9292, threads: 128, timeout: 300, logger: default_logger)
       @bind_address = bind_address
       @bind_port = bind_port
       @logger = logger
@@ -37,7 +37,7 @@ module ForwardProxy
 
               case req.request_method
               when METHOD_CONNECT then handle_tunnel(client_conn, req)
-              when METHOD_GET, METHOD_POST then handle(client_conn, req)
+              when METHOD_GET, METHOD_HEAD, METHOD_POST then handle(client_conn, req)
               else
                 raise Errors::HTTPMethodNotImplemented
               end
@@ -67,14 +67,15 @@ module ForwardProxy
 
     attr_reader :socket, :thread_pool
 
-    # The following comments are from the IETF document
-    # "Hypertext Transfer Protocol -- HTTP/1.1: Basic Rules"
-    # https://datatracker.ietf.org/doc/html/rfc2616#section-2.2
-
     METHOD_CONNECT = "CONNECT"
     METHOD_GET = "GET"
+    METHOD_HEAD = "HEAD"
     METHOD_POST = "POST"
 
+    # The following comments are from the IETF document
+    # "Hypertext Transfer Protocol -- HTTP/1.1: Basic Rules"
+    # https://datatracker.ietf.org/doc/html/rfc2616#section-2.2
+
     # HTTP/1.1 defines the sequence CR LF as the end-of-line marker for all
     # protocol elements except the entity-body.
     HEADER_EOP = "\r\n"
@@ -173,6 +174,7 @@ module ForwardProxy
     def handle_error(client_conn, err)
       status_code = case err
                     when Errors::ConnectionTimeoutError then 504
+                    when Errors::HTTPMethodNotImplemented then 501
                     else
                       502
                     end
@@ -196,6 +198,7 @@ module ForwardProxy
 
       klass = case req.request_method
               when METHOD_GET then Net::HTTP::Get
+              when METHOD_HEAD then Net::HTTP::Head
               when METHOD_POST then Net::HTTP::Post
               else
                 raise Errors::HTTPMethodNotImplemented

data/lib/forward_proxy/thread_pool.rb

@@ -1,24 +1,29 @@
 module ForwardProxy
   class ThreadPool
-    attr_reader :queue, :size
+    attr_reader :queue, :size, :threads
 
     def initialize(size)
-      @size  = size
-      @queue = Queue.new
+      @queue   = Queue.new
+      @size    = size
+      @threads = []
     end
 
     def start
       size.times do
-        Thread.new do
+        thread = Thread.new do
           loop do
             job, args = queue.pop
             job.call(*args)
           end
         end
+
+        threads.push(thread)
       end
     end
 
     def schedule(*args, &block)
+      raise Exception, "no threads" unless threads.any?(&:alive?)
+
       queue.push([block, args])
     end
   end

data/lib/forward_proxy/version.rb

@@ -1,3 +1,3 @@
 module ForwardProxy
-  VERSION = "0.6.0"
+  VERSION = "0.8.0"
 end

metadata

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