forward-proxy 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f624058897845408afede390c49b3048ee7a74f
-  data.tar.gz: d2a90df621baefdecc61bba48a44bfdee2180766
+  metadata.gz: f0e621e13501a70783e49eb16c52fd937974bc7e
+  data.tar.gz: 70488fc1e2147c6c181e1dbb102929fe81eb1ecb
 SHA512:
-  metadata.gz: 76d5bffc4db996cdc9578baa97cef6e13eb519cc065a0856cf83724470b27beaf6819b66aaddaf10bc21b1053b269635623ed5b4e9e0f13dff561bc044c7313d
-  data.tar.gz: e085eba75e664a72575920750045ef62334cc0e3c64c72daddc5db5bf571656fb395790c6cb5d0a32bd3b3320fdeb2e0ce50705d59e3a2da0844628ae9b37148
+  metadata.gz: b5bd0ed7c697ea9ea8e3fb973e31f44947b2c9c5d1b7c23cc025580f82c3cdf16aaf238a9e0b831397c69bf803b5d04f02212553de968dfece8c52c5d1688104
+  data.tar.gz: 9a0b6db5127d71f0351577232d744ff0497c04c35a6a6e70580894d109dd160910b7ec4144134c295bafd35add0c3a9d6e57c6c47f63ca7ec92f16c67fa10c67

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 0.1.4
+
+- `accept` connections via thread pool.
+- catch and throw custom http parse error.
+- `Server:` header added for default error 502 response.
+- rescue and logs socket error `Errno::EBADF`.
+
 ## 0.1.3
 
 - Refine CLI help text.

data/README.md

@@ -2,7 +2,7 @@
 
 ![Gem Version][3] ![Gem][1] ![Build Status][2]
 
-Ruby Forward Proxy implemented with only standard libraries.
+100LOC Ruby forward proxy using just standard libraries.
 
 ```
 $ forward-proxy --binding 0.0.0.0 --port 3182 --threads 2

data/lib/forward_proxy/server.rb

@@ -5,6 +5,7 @@ require 'net/http'
 
 module ForwardProxy
   class HTTPMethodNotImplemented < StandardError; end
+  class HTTPParseError < StandardError; end
 
   class Server
     attr_reader :bind_address, :bind_port
@@ -16,16 +17,21 @@ module ForwardProxy
     end
 
     def start
-      @server = TCPServer.new(bind_address, bind_port)
-
       thread_pool.start
 
+      @server = TCPServer.new(bind_address, bind_port)
+
       log("Listening #{bind_address}:#{bind_port}")
 
       loop do
-        client = server.accept
-
-        thread_pool.schedule(client) do |client_conn|
+        # The following comments are from "man 2 accept"
+        #
+        # The argument socket is a socket that has been created with socket(2), bound to an address with bind(2), and is listening for connections after a listen(2).  accept() extracts the
+        # first connection request on the queue of pending connections, creates a new socket with the same properties of socket, and allocates a new file descriptor for the socket.  If no
+        # pending connections are present on the queue, and the socket is not marked as non-blocking, accept() blocks the caller until a connection is present.  If the socket is marked
+        # non-blocking and no pending connections are present on the queue, accept() returns an error as described below.  The accepted socket may not be used to accept more connections.
+        # The original socket socket, remains open.
+        thread_pool.schedule(server.accept) do |client_conn|
           begin
             req = parse_req(client_conn)
 
@@ -40,6 +46,7 @@ module ForwardProxy
           rescue => e
             client_conn.puts <<~eos.chomp
               HTTP/1.1 502
+              Server: ForwardProxy
             eos
 
             puts e.message
@@ -50,6 +57,9 @@ module ForwardProxy
         end
       end
     rescue Interrupt
+      log("Exiting...")
+    rescue Errno::EBADF => e
+      log(e.message, "ERROR")
     end
 
     def shutdown
@@ -145,6 +155,8 @@ module ForwardProxy
       WEBrick::HTTPRequest.new(WEBrick::Config::HTTP).tap do |req|
         req.parse(client_conn)
       end
+    rescue => e
+      throw HTTPParseError.new(e.message)
     end
 
     def log(str, level = 'INFO')

data/lib/forward_proxy/version.rb

@@ -1,3 +1,3 @@
 module ForwardProxy
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

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