fixes integration tests 1-10

fixed integration tests from 10 to 20

Signed-off-by: Samuele Illuminati <[email protected]>

fixes integration tests & adds upstream http proxy patch

fixes integration & unit tests

Author: kevprice83

gateway/src/apicast/http_proxy.lua

@@ -159,16 +159,9 @@ end
 function _M.request(upstream, proxy_uri)
     local uri = upstream.uri
 
-    if uri.scheme == 'http' then -- rewrite the request to use http_proxy
-        local err
-        local host = upstream:set_host_header()
-        upstream:use_host_header(host)
-        upstream.servers, err = resolve_servers(proxy_uri)
-        if err then
-          ngx.log(ngx.WARN, "HTTP proxy is set, but no servers have been resolved, err: ", err)
-        end
-        upstream.uri.path = absolute_url(uri)
+    if uri.scheme == 'http' then
         upstream:rewrite_request()
+        forward_https_request(proxy_uri, uri, upstream.skip_https_connect)
         return
     elseif uri.scheme == 'https' then
         upstream:rewrite_request()

gateway/src/resty/http/proxy.lua

@@ -72,8 +72,6 @@ local function _connect_proxy_https(httpc, request, host, port)
 end
 
 local function connect_proxy(httpc, request, skip_https_connect)
-    -- target server requires hostname not IP and DNS resolution is left to the proxy itself as specified in the RFC #7231
-    -- https://httpwg.org/specs/rfc7231.html#CONNECT for the CONNECT method
     local uri = request.uri
     local proxy_uri = request.proxy
 
@@ -95,11 +93,9 @@ local function connect_proxy(httpc, request, skip_https_connect)
     ngx.log(ngx.DEBUG, 'connection to ', proxy_uri.host, ':', proxy_uri.port, ' established',
         ', pool: ', options.pool, ' reused times: ', httpc:get_reused_times())
 
-    ngx.log(ngx.DEBUG, 'targeting server ', uri.host, ':', uri.port)
-
     if uri.scheme == 'http' then
         -- http proxy needs absolute URL as the request path
-        request.path = format('%s://%s:%s%s', uri.scheme, uri.host, uri.port, uri.path or '/')
+        request.path = format('%s://%s:%s%s', uri.scheme, uri.host, uri.port, uri.path or request.path or '/')
         return httpc
     elseif uri.scheme == 'https' and skip_https_connect then
         request.path = format('%s://%s:%s%s', uri.scheme, uri.host, uri.port, request.path or '/')
@@ -179,4 +175,4 @@ end
 
 _M.new = connect
 
-return _M:reset()
+return _M:reset()

spec/resty/http/proxy_spec.lua

@@ -50,55 +50,13 @@ describe('resty.http.proxy', function()
         it('connects to the #http_proxy', function()
             _M:reset({ http_proxy = 'http://127.0.0.1:1984' })
 
-            local request = { url = 'http://127.0.0.1:1984/request', method = 'GET' }
+            local request = { url = 'http://upstream:8091/request', method = 'GET' }
             local proxy = assert(_M.new(request))
 
             local res = assert(proxy:request(request))
 
             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)
+            assert.match('GET http://upstream:8091/request HTTP/1.1', res:read_body())
         end)
     end)
 end)