rack-reverse-proxy 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d51045cd47dd0cee3f5afb010a2915f9dd6367ba
-  data.tar.gz: c675c804802eb806d6fca45b471630ed0d980268
+  metadata.gz: c4e87644e758f5a1fa0a3d4fcefaad9876b7b798
+  data.tar.gz: aee6c2fd853ba1c1ce552058a63c9130ea1f6e74
 SHA512:
-  metadata.gz: dada6c70259a95d63705ffad9ad59f54d492b721b98d2496322ba33cec38d1005a778830091dfe44c2f5a2b23a9d4b91ff002d761f90a93a37dc32f4de38c7ad
-  data.tar.gz: 7aa447d71a827b37b3a53818723b426c8c0135b90b7c7dcdc2b850dcd1717531e5dddd99afc82ffdcee57f6ebc4a761bb4fba320529f793ad239e21b08a99c3b
+  metadata.gz: a372f0bd493d50b7d411d1c1abc59382cd22ad7db6fa6a3192a93e37acd52e6f037bc6aae76d359fb6d095557f58adeecbfe87d27b94f6c2602c76417fd0a354
+  data.tar.gz: ec4efcc102cdd5fc88cd7e77e47df6450486e9be23729b0a3605ad540eb9ced832e4c864fd3dc2f7dc79b3bc46c13ef43a9215b0cde46793e3265472528abc9a

data/README.md

@@ -1,5 +1,5 @@
 # A Reverse Proxy for Rack
-[![TravisCI](https://secure.travis-ci.org/pex/rack-reverse-proxy.png "Build Status")](http://travis-ci.org/pex/rack-reverse-proxy "Build Status")
+[![TravisCI](https://secure.travis-ci.org/waterlink/rack-reverse-proxy.svg "Build Status")](http://travis-ci.org/waterlink/rack-reverse-proxy "Build Status")
 
 This is a simple reverse proxy for Rack that pretty heavily rips off Rack Forwarder. It is not meant for production systems (although it may work), as the webserver fronting your app is generally much better at this sort of thing.
 
@@ -59,6 +59,7 @@ reverse_proxy_options sets global options for all reverse proxies. Available opt
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
-## Copyright
+## Contributors
 
-Copyright (c) 2010 Jon Swope. See LICENSE for details.
+- Jon Swope, creator
+- Oleksii Fedorov, maintainer

data/lib/rack/reverse_proxy.rb

@@ -3,6 +3,7 @@ require 'net/https'
 require "rack-proxy"
 require "rack/reverse_proxy_matcher"
 require "rack/exception"
+require "rack/reverse_proxy/http_streaming_response"
 
 module Rack
   class ReverseProxy
@@ -12,12 +13,12 @@ module Rack
       @app = app || lambda {|env| [404, [], []] }
       @matchers = []
       @global_options = {:preserve_host => true, :x_forwarded_host => true, :matching => :all, :replace_response_host => false}
-      instance_eval &b if block_given?
+      instance_eval(&b) if block_given?
     end
 
     def call(env)
       rackreq = Rack::Request.new(env)
-      matcher = get_matcher(rackreq.fullpath, extract_http_request_headers(rackreq.env), rackreq)
+      matcher = get_matcher(rackreq.fullpath, Proxy.extract_http_request_headers(rackreq.env), rackreq)
       return @app.call(env) if matcher.nil?
 
       if @global_options[:newrelic_instrumentation]
@@ -43,10 +44,14 @@ module Rack
       target_request = Net::HTTP.const_get(source_request.request_method.capitalize).new(uri.request_uri)
 
       # Setup headers
-      target_request_headers = extract_http_request_headers(source_request.env)
+      target_request_headers = Proxy.extract_http_request_headers(source_request.env)
 
       if options[:preserve_host]
-        target_request_headers['HOST'] = "#{uri.host}:#{uri.port}"
+        if uri.port == uri.default_port
+          target_request_headers['HOST'] = uri.host
+        else
+          target_request_headers['HOST'] = "#{uri.host}:#{uri.port}"
+        end
       end
 
       if options[:x_forwarded_host]
@@ -71,42 +76,26 @@ module Rack
       # Create a streaming response (the actual network communication is deferred, a.k.a. streamed)
       target_response = HttpStreamingResponse.new(target_request, uri.host, uri.port)
 
+      # pass the timeout configuration through
+      target_response.set_read_timeout(options[:timeout]) if options[:timeout].to_i > 0
+
       target_response.use_ssl = "https" == uri.scheme
 
       # Let rack set the transfer-encoding header
-      response_headers = target_response.headers
-      response_headers.delete('transfer-encoding')
+      response_headers = Rack::Utils::HeaderHash.new Proxy.normalize_headers(format_headers(target_response.headers))
+      response_headers.delete('Transfer-Encoding')
 
       # Replace the location header with the proxy domain
-      if response_headers['location'] && options[:replace_response_host]
-        response_location = URI(response_headers['location'][0])
+      if response_headers['Location'] && options[:replace_response_host]
+        response_location = URI(response_headers['location'])
         response_location.host = source_request.host
-        response_headers['location'] = response_location.to_s
+        response_location.port = source_request.port
+        response_headers['Location'] = response_location.to_s
       end
 
       [target_response.status, response_headers, target_response.body]
     end
 
-    def extract_http_request_headers(env)
-      headers = env.reject do |k, v|
-        !(/^HTTP_[A-Z_]+$/ === k) || v.nil?
-      end.map do |k, v|
-        [reconstruct_header_name(k), v]
-      end.inject(Utils::HeaderHash.new) do |hash, k_v|
-        k, v = k_v
-        hash[k] = v
-        hash
-      end
-
-      x_forwarded_for = (headers["X-Forwarded-For"].to_s.split(/, +/) << env["REMOTE_ADDR"]).join(", ")
-
-      headers.merge!("X-Forwarded-For" =>  x_forwarded_for)
-    end
-
-    def reconstruct_header_name(name)
-      name.sub(/^HTTP_/, "").gsub("_", "-")
-    end
-
     def get_matcher(path, headers, rackreq)
       matches = @matchers.select do |matcher|
         matcher.match?(path, headers, rackreq)
@@ -129,5 +118,13 @@ module Rack
       raise GenericProxyURI.new(url) if matcher.is_a?(String) && url.is_a?(String) && URI(url).class == URI::Generic
       @matchers << ReverseProxyMatcher.new(matcher,url,opts)
     end
+
+    def format_headers(headers)
+      headers.reduce({}) do |acc, (key, val)|
+        formated_key = key.split('-').map(&:capitalize).join('-')
+        acc[formated_key] = Array(val)
+	acc
+      end
+    end
   end
 end

data/lib/rack/reverse_proxy/http_streaming_response.rb

@@ -0,0 +1,7 @@
+module Rack
+  class HttpStreamingResponse
+    def set_read_timeout(value)
+      self.read_timeout = value
+    end
+  end
+end

data/lib/rack/reverse_proxy_matcher.rb

@@ -1,6 +1,6 @@
 module Rack
   class ReverseProxyMatcher
-    def initialize(matcher,url=nil,options)
+    def initialize(matcher, url=nil, options={})
       @default_url=url
       @url=url
       @options=options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-reverse-proxy
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Jon Swope
@@ -11,22 +11,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-24 00:00:00.000000000 Z
+date: 2015-07-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -41,34 +27,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.18'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +98,7 @@ files:
 - README.md
 - lib/rack/exception.rb
 - lib/rack/reverse_proxy.rb
+- lib/rack/reverse_proxy/http_streaming_response.rb
 - lib/rack/reverse_proxy_matcher.rb
 homepage: http://github.com/waterlink/rack-reverse-proxy
 licenses: []
@@ -160,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A Simple Reverse Proxy for Rack