forward-proxy 0.6.2 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1fe517be17887550c0afe7d8ad757227d79667083ad5530aa714a8e0b2398be
-  data.tar.gz: 574b65e5fd8bf6e324f0657f8bfc87342481c5f177c87f1e9f2cffe49953db17
+  metadata.gz: ebb420c1a9dd1e13e77b0884f0349e3bb9f78150a9e00004bb6db86a95c3766d
+  data.tar.gz: 3186ebd3f6f1beadc466aeb81f1f427f43f62960dab3680ce9be8ed1efd5e0d4
 SHA512:
-  metadata.gz: 34d36e4bfc21abaf59a75ecec4fa86b5d9157beb5e7f7437201f15689f584fb92076f6db5095929d52062b6c543a53d65bc81393bc5013204206d8f2c041c4d2
-  data.tar.gz: 4e7c99b2485929fe9fb93da86256bd642ff56f8f93207b3cdd0eccc6606d4c6f53d64514adbf550831062185390ae5b1327619bfa26dcd2631ca817acab6c36d
+  metadata.gz: 5fc1d9053270cda730bd7ca85a5e08fa4a42105fe8a2a7d17cbfa0ac8b29d437a6dde6c5d884b336a5295c1ebaa842bc5c0e15cded11f309148e5253f1a7fd12
+  data.tar.gz: ee39eb4f082d8ba7e4bd7f7d0bf5233b763e0ce6ff787b531a549e8b3ab4caf1fd03831c71244a73e0ab570988e13762373d437bd42632effafcb4f783eebacc

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # CHANGELOG
 
+## 0.9.1
+
+- bugfix chunked length.
+
+## 0.9.0
+
+- bugfix chunked response behavior.
+
+## 0.8.0
+
+- add http `head` support.
+- add http `501` not implemented status response.
+
+## 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/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: 300, 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,17 +67,18 @@ 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"
+    HTTP_EOP = "\r\n"
 
     # The following comments are from the IETF document
     # "Hypertext Transfer Protocol (HTTP/1.1): Semantics and Content"
@@ -113,7 +114,7 @@ module ForwardProxy
       # the request-target.
       client_conn.write <<~eos.chomp
         HTTP/1.1 200 OK
-        #{HEADER_EOP}
+        #{HTTP_EOP}
       eos
 
       # The CONNECT method requests that the recipient establish a tunnel to
@@ -154,7 +155,7 @@ module ForwardProxy
           client_conn.puts <<~eos.chomp
             HTTP/1.1 #{resp.code}
             #{headers.map { |header, value| "#{header}: #{value}" }.join("\n")}
-            #{HEADER_EOP}
+            #{HTTP_EOP}
           eos
 
           # The following comments are taken from:
@@ -164,6 +165,17 @@ module ForwardProxy
           # handling large files or wish to implement a progress bar you can
           # instead stream the body directly to an IO.
           resp.read_body do |chunk|
+            # The following comments are taken from:
+            # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Transfer-Encoding#directives
+
+            # Data is sent in a series of chunks. The Content-Length header is omitted in this case and
+            # at the beginning of each chunk you need to add the length of the current chunk in
+            # hexadecimal format, followed by '\r\n' and then the chunk itself, followed by another
+            # '\r\n'. The terminating chunk is a regular chunk, with the exception that its length
+            # is zero. It is followed by the trailer, which consists of a (possibly empty) sequence of
+            # header fields.
+            client_conn << chunk.bytesize.to_s(16) + HTTP_EOP if resp['Transfer-Encoding'] == 'chunked'
+
             client_conn << chunk
           end
         end
@@ -173,6 +185,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
@@ -180,7 +193,7 @@ module ForwardProxy
       client_conn.puts <<~eos.chomp
         HTTP/1.1 #{status_code}
         Via: #{HEADER_VIA}
-        #{HEADER_EOP}
+        #{HTTP_EOP}
       eos
 
       logger.error(err.message)
@@ -196,6 +209,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.2"
+  VERSION = "0.9.1"
 end

metadata

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