Merge pull request #1021 from 3scale/fix-incorrect-connection-reuse

[THREESCALE-2205] Fix incorrect connection reuse

Author: davidor

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## Fixed
 
 - Segfault when normalizing some client certificates [PR #1006](https://github.com/3scale/APIcast/pull/1006)
+- Fixed incorrect connection reuse for requests on different domains [PR #1021](https://github.com/3scale/APIcast/pull/1021), [THREESCALE-2205](https://issues.jboss.org/browse/THREESCALE-2205)
 
 ## [3.5.0] - 2019-05-07
 

gateway/src/resty/http/proxy.lua

@@ -17,7 +17,9 @@ local function connect_direct(httpc, request)
     local uri = request.uri
     local host = uri.host
     local ip, port = httpc:resolve(host, nil, uri)
-    local ok, err = httpc:connect(ip, port or default_port(uri))
+
+    local options = { pool = format('%s:%s', host, port) }
+    local ok, err = httpc:connect(ip, port or default_port(uri), options)
 
     if not ok then return nil, err end
 

spec/resty/http/proxy_spec.lua

@@ -58,5 +58,47 @@ describe('resty.http.proxy', function()
             assert.same(200, res.status)
             assert.match('GET http://127.0.0.1:1984/request HTTP/1.1', res:read_body())
         end)
+
+        -- Regression test. Ref: https://issues.jboss.org/browse/THREESCALE-2205
+        context('when different subdomains resolve to the same IP', function()
+            local request_domain_1 = { url = 'http://test.example.com/', method = 'GET' }
+            local request_domain_2 = { url = 'http://prod.example.com/', method = 'GET' }
+
+            before_each(function()
+                -- Make everything resolve to the same IP
+                local resty_resolver = require 'resty.resolver.http'
+                stub(resty_resolver, 'resolve', function() return "1.1.1.1", 80 end)
+            end)
+
+            context('and it uses a http proxy', function()
+                before_each(function()
+                    _M:reset({ http_proxy = 'http://127.0.0.1:1984' })
+                end)
+
+                it('does not reuse the connection', function()
+                    local proxy = _M.new(request_domain_1)
+                    proxy:request(request_domain_1):read_body()
+                    proxy:set_keepalive()
+
+                    proxy = _M.new(request_domain_2)
+                    assert.same(0, proxy:get_reused_times())
+                end)
+            end)
+
+            context('and it does not use an http proxy', function()
+                before_each(function()
+                    _M:reset({})
+                end)
+
+                it('does not reuse the connection', function()
+                    local proxy = _M.new(request_domain_1)
+                    proxy:request(request_domain_1):read_body()
+                    proxy:set_keepalive()
+
+                    proxy = _M.new(request_domain_2)
+                    assert.same(0, proxy:get_reused_times())
+                end)
+            end)
+        end)
     end)
 end)