forward-proxy 0.6.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7994877d0fdfd4f8c482823781a855c9af1199d9b45df5c65912eabcc2786180
-  data.tar.gz: '093d490188f128068f1ea444063ed61732fbb583245865aad8a90d50ee0b8532'
+  metadata.gz: e40f32962fa3503f6269cee6997a1288ad7921b7d24462ff4258947778850f21
+  data.tar.gz: c1330120ddf74e8e644b051c9b7c30986f0b6a1428d2420c92d8d02649acb846
 SHA512:
-  metadata.gz: 572ca92444d60284f302b38f020a3718a82fee8048b3d6fc10d389af97c479142e3219022ac4c85bc12189025877fc9ce4aab7eac6f853ec6f2ffa4ded392f63
-  data.tar.gz: 113e37c5a6b6da31851464545c5b2774396835cdb23d794253ab81babce52392040adcfdc9d75e473851ea108dfa2f946c7071a2b4b3a13b737ac4ad08b94269
+  metadata.gz: 28ffbea37fa7cfa64e6cd40c56b4f9584d016f5b305567beb939b400e610592a79b7481a9e08171df210e454d37efa18848b7236cc720ffa79a18a001b020f5f
+  data.tar.gz: 054af3f071444d16b77c138e79cf616eef5096081805950cca99d4c0d1ca5352763c50482011b1c11f725dab78293949e3ec5ea678cea0ea782aa8c198a9f34a

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # CHANGELOG
 
+## 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: 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,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:
@@ -165,6 +166,16 @@ module ForwardProxy
           # instead stream the body directly to an IO.
           resp.read_body do |chunk|
             client_conn << 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 << HTTP_EOP if resp['Transfer-Encoding'] == 'chunked'
           end
         end
       end
@@ -173,6 +184,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 +192,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 +208,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.1"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forward-proxy
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.9.0
 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: