rack-reverse-proxy 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5006b032a51816d16876f3a92b9a1e0435483832
-  data.tar.gz: 8c5b31b2cff31606543f2d216bc2937178926b1f
+  metadata.gz: 585ae7eb632c419d011c716865928e286d795fcc
+  data.tar.gz: 90b7af6bfcabf097166b5e5e24f4fb3346baa4cc
 SHA512:
-  metadata.gz: 20c79748659c8c1e0e52294322b7470a7f31cd4ac6c32e83f9d035044badb02f2c9ea5db1b97839c12e629643e26b6ecabced99f7ad6afdc80eccee015e87b38
-  data.tar.gz: 5990b64a3e455ecfc80f67d5c6059fc48fc1fb0eb94c266653d511459628f118e3158c40612dd7dfe0e2da887916cff8ab4a1ce07e8159d907de7fd35e03c033
+  metadata.gz: af3323dcc567ef1c2f1bb177e926d3f65efe8ed3dd0218d3765a5495f30d45aa3527bd744beca11a103e8612b6d71976e8712414dea80abac85e7875d6f6d476
+  data.tar.gz: d9978acd0a9122f0a43b313a41ea25333e2ec387c46ca7cdb1835bdeb1ebb9fa0db124a28103127bc91eac8f3fa1e6a2884be9cd08ee354cf5bcb923f48edc86

data/.travis.yml

@@ -1,12 +1,9 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-  - 2.1
-  - 2.2
-  - jruby-18mode
-  - jruby-19mode
+  - 2.2.5
+  - 2.3.1
+  - 2.4.1
+  - jruby-9.0.5.0
   - rbx
 
 before_install:
@@ -16,4 +13,7 @@ bundler_args: --without development
 
 script:
   - bundle exec rspec
-  - script/rubocop
+
+matrix:
+  allow_failures:
+    - rvm: rbx

data/Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 gemspec
 
 ruby_version = RUBY_VERSION.to_f
-rubocop_platform = [:ruby_20, :ruby_21, :ruby_22]
+rubocop_platform = [:ruby_20, :ruby_21, :ruby_22, :ruby_23, :ruby_24]
 rubocop_platform = [:ruby_20, :ruby_21] if ruby_version < 2.0
 
 group :test do

data/README.md

@@ -39,7 +39,7 @@ use Rack::ReverseProxy do
 end
 
 app = proc do |env|
-  [ 200, {'Content-Type' => 'text/plain'}, "b" ]
+  [ 200, {'Content-Type' => 'text/plain'}, ["b"] ]
 end
 run app
 ```

data/lib/rack_reverse_proxy/errors.rb

@@ -1,7 +1,7 @@
 module RackReverseProxy
   module Errors
     # GenericURI indicates that url is too generic
-    class GenericURI < Exception
+    class GenericURI < RuntimeError
       attr_reader :url
 
       def intialize(url)
@@ -14,7 +14,7 @@ module RackReverseProxy
     end
 
     # AmbiguousMatch indicates that path matched more than one endpoint
-    class AmbiguousMatch < Exception
+    class AmbiguousMatch < RuntimeError
       attr_reader :path, :matches
 
       def initialize(path, matches)

data/lib/rack_reverse_proxy/roundtrip.rb

@@ -98,6 +98,7 @@ module RackReverseProxy
       return unless options[:x_forwarded_headers]
       target_request_headers["X-Forwarded-Host"] = source_request.host
       target_request_headers["X-Forwarded-Port"] = source_request.port.to_s
+      target_request_headers["X-Forwarded-Proto"] = source_request.scheme
     end
 
     def initialize_http_header
@@ -207,7 +208,11 @@ module RackReverseProxy
       setup_request
       setup_response_headers
 
-      rack_response
+      transform_response(rack_response)
+    end
+
+    def transform_response(response)
+      rule.transform(path, env, response, uri, headers, source_request)
     end
 
     def format_headers(headers)
@@ -238,7 +243,7 @@ module RackReverseProxy
     end
 
     def find_rule
-      return if matches.length < 1
+      return if matches.empty?
       non_ambiguous_match
       matches.first
     end

data/lib/rack_reverse_proxy/rule.rb

@@ -25,6 +25,16 @@ module RackReverseProxy
       ).build_uri
     end
 
+    def transform(path, env, response, request_uri, *args)
+      Candidate.new(
+        self,
+        has_custom_url,
+        path,
+        env,
+        matches(path, *args)
+      ).transform(response, request_uri)
+    end
+
     def to_s
       %("#{spec}" => "#{url}")
     end
@@ -68,6 +78,10 @@ module RackReverseProxy
         raw_uri
       end
 
+      def transform(response, request_uri)
+        matches.transform(response, request_uri)
+      end
+
       private
 
       attr_reader :rule, :url, :has_custom_url, :path, :env, :matches
@@ -138,6 +152,16 @@ module RackReverseProxy
         end
       end
 
+      def transform(response, request_uri)
+        found.inject(response) do |accumulator, match|
+          if match.respond_to?(:transform)
+            match.transform(accumulator, request_uri)
+          else
+            accumulator
+          end
+        end
+      end
+
       private
 
       attr_reader :spec, :url, :path, :headers, :rackreq, :spec_arity, :has_custom_url

data/lib/rack_reverse_proxy/version.rb

@@ -1,4 +1,4 @@
 #:nodoc:
 module RackReverseProxy
-  VERSION = "0.11.0".freeze
+  VERSION = "0.12.0".freeze
 end

data/rack-reverse-proxy.gemspec

@@ -2,6 +2,7 @@ lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "rack_reverse_proxy/version"
 
+# rubocop:disable
 Gem::Specification.new do |spec|
   spec.name          = "rack-reverse-proxy"
   spec.version       = RackReverseProxy::VERSION
@@ -35,8 +36,9 @@ eos
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rack", ">= 1.0.0"
-  spec.add_dependency "rack-proxy", "~> 0.5", ">= 0.5.14"
+  spec.add_dependency "rack-proxy", "~> 0.6", ">= 0.6.1"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.3"
 end
+# rubocop:enable

data/spec/rack/reverse_proxy_spec.rb

@@ -1,4 +1,6 @@
 require "spec_helper"
+require "cgi"
+require "base64"
 
 RSpec.describe Rack::ReverseProxy do
   include Rack::Test::Methods
@@ -102,6 +104,16 @@ RSpec.describe Rack::ReverseProxy do
       ).to have_been_made
     end
 
+    it "sets the X-Forwarded-Proto header to the proxying scheme by default" do
+      stub_request(:any, "example.com/test/stuff")
+      get "https://example.com/test/stuff"
+      expect(
+        a_request(:get, "example.com/test/stuff").with(
+          :headers => { "X-Forwarded-Proto" => "https" }
+        )
+      ).to have_been_made
+    end
+
     it "does not produce headers with a Status key" do
       stub_request(:get, "http://example.com/2test").to_return(
         :status => 301, :headers => { :status => "301 Moved Permanently" }
@@ -249,6 +261,17 @@ RSpec.describe Rack::ReverseProxy do
         ).not_to have_been_made
         expect(a_request(:get, "http://example.com/test/stuff")).to have_been_made
       end
+
+      it "does not set the X-Forwarded-Proto header to the proxying scheme" do
+        stub_request(:any, "example.com/test/stuff")
+        get "https://example.com/test/stuff"
+        expect(
+          a_request(:get, "example.com/test/stuff").with(
+            :headers => { "X-Forwarded-Proto" => "https" }
+          )
+        ).not_to have_been_made
+        expect(a_request(:get, "example.com/test/stuff")).to have_been_made
+      end
     end
 
     describe "with timeout configuration" do
@@ -289,7 +312,9 @@ RSpec.describe Rack::ReverseProxy do
       end
 
       it "makes request with basic auth" do
-        stub_request(:get, "http://joe:shmoe@example.com/test/stuff").to_return(
+        stub_request(:get, "http://example.com/test/stuff").with(
+          :basic_auth => %w(joe shmoe)
+        ).to_return(
           :body => "secured content"
         )
         get "/test/stuff"
@@ -558,6 +583,46 @@ RSpec.describe Rack::ReverseProxy do
       end
     end
 
+    describe "with a matching and transforming class" do
+      #:nodoc:
+      class MatcherAndTransformer
+        def self.match(_path)
+          MatcherAndTransformer.new
+        end
+
+        def url(_path)
+          "http://example.org/redirecting"
+        end
+
+        def transform(response, request_uri)
+          status, headers, body = response
+          location = headers["Location"]
+          headers["Location"] = "?url=" + CGI.escape(location) +
+                                "&request_uri=" + CGI.escape(request_uri.to_s)
+          [status, headers, body]
+        end
+      end
+
+      def app
+        Rack::ReverseProxy.new(dummy_app) do
+          reverse_proxy MatcherAndTransformer
+        end
+      end
+
+      it "transforms the proxied response" do
+        stub_request(:get, "http://example.org/redirecting").to_return(
+          :headers => {
+            "Location" => "http://example.org/target"
+          }
+        )
+
+        get "/"
+        expect(last_response.headers["Location"])
+          .to eq("?url=http%3A%2F%2Fexample.org%2Ftarget" \
+            "&request_uri=http%3A%2F%2Fexample.org%2Fredirecting")
+      end
+    end
+
     describe "with a matching class" do
       #:nodoc:
       class RequestMatcher
@@ -607,9 +672,9 @@ RSpec.describe Rack::ReverseProxy do
       #:nodoc:
       class MatcherHeaders
         def self.match(path, headers)
-          if path.match(%r{^/test}) && headers["ACCEPT"] && headers["ACCEPT"] == "foo.bar"
-            MatcherHeaders.new
-          end
+          MatcherHeaders.new if path.match(%r{^/test}) &&
+                                headers["ACCEPT"] &&
+                                headers["ACCEPT"] == "foo.bar"
         end
 
         def url(path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-reverse-proxy
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Jon Swope
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -33,20 +33,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.14
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.14
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A Simple Reverse Proxy for Rack