forward-proxy 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 628359d25536c4190014c9e082fff41b2adef209f04a62d8a6b217c078f3b58b
-  data.tar.gz: 7834932b7242fd66c120d270a922e385a6a58ab63c65e8ce2b7957da43ba5a11
+  metadata.gz: a2f3ade2ec039aaadb19726b347d6cddb7db0f2590b91ab5d6eb69b8fd5c0aee
+  data.tar.gz: 0733602e8b7bab9e95df20cff04bc11981964260db17242460a2c26341a9032b
 SHA512:
-  metadata.gz: 8c47ab1d691807a23ba779f1ae8d4feecd32300f8d840044f66a5cc2f40ccd33c095db60ca9e3f99fb3c8fd60c02ae46d5d8d07b6a4de6298bef24731fb57cb4
-  data.tar.gz: 609a35651496d98e4977f3691c7834efd58fe736615b3b4594e0bc61d11dad0088f11f535f6b287db85f95c1cc8ab55ea2a536447028b690d92ffd0aa3e60669
+  metadata.gz: 9c25af1d60872d711a475028eddc06bc54ee7dd609cd3cbd1858ff667a1facb5e1cfb7ca38889ab7a8603d018a6c69e4b56ee11eaba525818f2cd0bf0a7b59c5
+  data.tar.gz: d105d9a16183951129e62ed1b905a12e12f251541154e90869bb9a74449c10925ec19e3f3fce8d9300f7af38a00dcf6aa26e0a4f2d37ca9882a1bc64a494cba8

data/lib/forward_proxy/errors/http_method_not_implemented.rb

@@ -2,4 +2,4 @@ module ForwardProxy
   module Errors
     class HTTPMethodNotImplemented < StandardError; end
   end
-end
+end

data/lib/forward_proxy/errors/http_parse_error.rb

@@ -2,4 +2,4 @@ module ForwardProxy
   module Errors
     class HTTPParseError < StandardError; end
   end
-end
+end

data/lib/forward_proxy/server.rb

@@ -35,14 +35,8 @@ module ForwardProxy
             else
               raise Errors::HTTPMethodNotImplemented
             end
-          rescue => e
-            client_conn.puts <<~eos.chomp
-              HTTP/1.1 502
-              Via: #{HEADER_VIA}
-            eos
-
-            puts e.message
-            puts e.backtrace.map { |line| "  #{line}" }
+          rescue => err
+            handle_error(err, client_conn)
           ensure
             client_conn.close
           end
@@ -58,7 +52,7 @@ module ForwardProxy
       if socket
         log("Shutting down")
 
-        socket.close 
+        socket.close
       end
     end
 
@@ -119,17 +113,18 @@ module ForwardProxy
     def handle(client_conn, req)
       Net::HTTP.start(req.host, req.port) do |http|
         http.request(map_webrick_to_net_http_req(req)) do |resp|
+          headers= resp.to_hash.merge(Via: [HEADER_VIA, resp['Via']].compact.join(', '))
+
           client_conn.puts <<~eos.chomp
             HTTP/1.1 #{resp.code}
-            Via: #{[HEADER_VIA, resp['Via']].compact.join(', ')}
-            #{resp.each.map { |header, value| "#{header}: #{value}" }.join("\n")}\n\n
+            #{headers.map { |header, value| "#{header}: #{value}" }.join("\n")}\n\n
           eos
 
-          # The following comments are taken from: 
+          # The following comments are taken from:
           # https://docs.ruby-lang.org/en/2.0.0/Net/HTTP.html#class-Net::HTTP-label-Streaming+Response+Bodies
-          
+
           # By default Net::HTTP reads an entire response into memory. If you are
-          # handling large files or wish to implement a progress bar you can 
+          # 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|
             client_conn << chunk
@@ -138,6 +133,16 @@ module ForwardProxy
       end
     end
 
+    def handle_error(err, client_conn)
+      client_conn.puts <<~eos.chomp
+        HTTP/1.1 502
+        Via: #{HEADER_VIA}
+      eos
+
+      log(err.message, "ERROR")
+      puts err.backtrace.map { |line| "  #{line}" }
+    end
+
     def map_webrick_to_net_http_req(req)
       req_headers = Hash[req.header.map { |k, v| [k, v.first] }]
 

data/lib/forward_proxy/version.rb

@@ -1,3 +1,3 @@
 module ForwardProxy
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/forward_proxy.rb

@@ -1,4 +1,4 @@
-$:.unshift File.dirname(__FILE__)
+$LOAD_PATH.unshift File.dirname(__FILE__)
 
 require 'forward_proxy/version'
 require 'forward_proxy/server'

metadata

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