chore(patchs):kong.request.enable_buffering PDK function can now be…

… used when downstream uses HTTP/2. (#13614)

AG-108
FTI-5725

Makefile

@@ -1,7 +1,7 @@
 OS := $(shell uname | awk '{print tolower($$0)}')
 MACHINE := $(shell uname -m)
 
-DEV_ROCKS = "busted 2.2.0" "busted-hjtest 0.0.5" "luacheck 1.2.0" "lua-llthreads2 0.1.6" "ldoc 1.5.0" "luacov 0.15.0"
+DEV_ROCKS = "busted 2.2.0" "busted-hjtest 0.0.5" "luacheck 1.2.0" "lua-llthreads2 0.1.6" "ldoc 1.5.0" "luacov 0.15.0" "lua-reqwest 0.1.0"
 WIN_SCRIPTS = "bin/busted" "bin/kong" "bin/kong-health"
 BUSTED_ARGS ?= -v
 TEST_CMD ?= bin/busted $(BUSTED_ARGS)

build/openresty/patches/ngx_lua-0.10.26_07-remove-http2-hardcode-limitation-in-ngx-location.patch

@@ -0,0 +1,17 @@
+diff --git a/bundle/ngx_lua-0.10.26/src/ngx_http_lua_subrequest.c b/bundle/ngx_lua-0.10.26/src/ngx_http_lua_subrequest.c
+index f4db9aa..d887b28 100644
+--- a/bundle/ngx_lua-0.10.26/src/ngx_http_lua_subrequest.c
++++ b/bundle/ngx_lua-0.10.26/src/ngx_http_lua_subrequest.c
+@@ -172,12 +172,6 @@ ngx_http_lua_ngx_location_capture_multi(lua_State *L)
+         return luaL_error(L, "no request object found");
+     }
+
+-#if (NGX_HTTP_V2)
+-    if (r->main->stream) {
+-        return luaL_error(L, "http2 requests not supported yet");
+-    }
+-#endif
+-
+     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+     if (ctx == NULL) {
+         return luaL_error(L, "no ctx found");

changelog/unreleased/kong/revert-http2-limitation-buffered-request.yml

@@ -0,0 +1,4 @@
+message: |
+  Fixed an issue where the `kong.request.enable_buffering` can not be used when downstream uses HTTP/2.
+type: bugfix
+scope: Core

kong/init.lua

@@ -1252,21 +1252,16 @@ function Kong.access()
 
 
   if ctx.buffered_proxying then
-    local version = ngx.req.http_version()
     local upgrade = var.upstream_upgrade or ""
-    if version < 2 and upgrade == "" then
+    if upgrade == "" then
       if has_timing then
         req_dyn_hook_run_hook("timing", "after:access")
       end
 
       return Kong.response()
     end
 
-    if version >= 2 then
-      ngx_log(ngx_NOTICE, "response buffering was turned off: incompatible HTTP version (", version, ")")
-    else
-      ngx_log(ngx_NOTICE, "response buffering was turned off: connection upgrade (", upgrade, ")")
-    end
+    ngx_log(ngx_NOTICE, "response buffering was turned off: connection upgrade (", upgrade, ")")
 
     ctx.buffered_proxying = nil
   end

kong/pdk/service/request.lua

@@ -90,13 +90,6 @@ local function new(self)
   -- kong.service.request.enable_buffering()
   request.enable_buffering = function()
     check_phase(access_rewrite_balancer)
-
-    if ngx.req.http_version() >= 2 then
-      error("buffered proxying cannot currently be enabled with http/" ..
-            ngx.req.http_version() .. ", please use http/1.x instead", 2)
-    end
-
-
     ngx.ctx.buffered_proxying = true
   end
 

spec/02-integration/05-proxy/24-buffered_spec.lua

@@ -6,8 +6,9 @@ local md5 = ngx.md5
 local TCP_PORT = helpers.get_available_port()
 
 
+for _, client_protocol in ipairs({ "http", "https", "http2" }) do
 for _, strategy in helpers.each_strategy() do
-  describe("Buffered Proxying [#" .. strategy .. "]", function()
+  describe("Buffered Proxying [#" .. strategy .. "] [#" .. client_protocol .. "]", function()
 
     -- TODO: http2 / grpc does not currently work with
     -- ngx.location.capture that buffered proxying uses
@@ -155,7 +156,13 @@ for _, strategy in helpers.each_strategy() do
       end)
 
       before_each(function()
-        proxy_client = helpers.proxy_client()
+        if client_protocol == "http" then
+          proxy_client = helpers.proxy_client()
+        elseif client_protocol == "https" then
+          proxy_client = helpers.proxy_ssl_client()
+        elseif client_protocol == "http2" then
+          proxy_client = helpers.proxy_ssl_client(nil, nil, 2)
+        end
         proxy_ssl_client = helpers.proxy_ssl_client()
       end)
 
@@ -272,3 +279,4 @@ for _, strategy in helpers.each_strategy() do
     end)
   end)
 end
+end -- for _, client_protocol

spec/03-plugins/38-ai-proxy/02-openai_integration_spec.lua

@@ -63,8 +63,9 @@ local _EXPECTED_CHAT_STATS = {
   },
 }
 
+for _, client_protocol in ipairs({ "http", "https", "http2" }) do
 for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
-  describe(PLUGIN_NAME .. ": (access) [#" .. strategy .. "]", function()
+  describe(PLUGIN_NAME .. ": (access) [#" .. strategy .. "] [#" .. client_protocol .. "]", function()
     local client
 
     lazy_setup(function()
@@ -825,7 +826,13 @@ for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
     end)
 
     before_each(function()
-      client = helpers.proxy_client()
+      if client_protocol == "http" then
+        client = helpers.proxy_client()
+      elseif client_protocol == "https" then
+        client = helpers.proxy_ssl_client()
+      elseif client_protocol == "http2" then
+        client = helpers.proxy_ssl_client(nil, nil, 2)
+      end
       -- Note: if file is removed instead of trunacted, file-log ends writing to a unlinked file handle
       truncate_file(FILE_LOG_PATH_STATS_ONLY)
       truncate_file(FILE_LOG_PATH_NO_LOGS)
@@ -1695,3 +1702,4 @@ for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
   end)
 
 end end
+end -- for _, client_protocol

spec/03-plugins/38-ai-proxy/03-anthropic_integration_spec.lua

@@ -6,8 +6,9 @@ local deepcompare  = require("pl.tablex").deepcompare
 local PLUGIN_NAME = "ai-proxy"
 local MOCK_PORT = helpers.get_available_port()
 
+for _, client_protocol in ipairs({ "http", "https", "http2" }) do
 for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
-  describe(PLUGIN_NAME .. ": (access) [#" .. strategy .. "]", function()
+  describe(PLUGIN_NAME .. ": (access) [#" .. strategy .. "] [#" .. client_protocol .. "]", function()
     local client
 
     lazy_setup(function()
@@ -515,7 +516,13 @@ for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
     end)
 
     before_each(function()
-      client = helpers.proxy_client()
+      if client_protocol == "http" then
+        client = helpers.proxy_client()
+      elseif client_protocol == "https" then
+        client = helpers.proxy_ssl_client()
+      elseif client_protocol == "http2" then
+        client = helpers.proxy_ssl_client(nil, nil, true)
+      end
     end)
 
     after_each(function()
@@ -781,3 +788,4 @@ for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
   end)
 
 end end
+end -- for _, client_protocol

spec/03-plugins/38-ai-proxy/04-cohere_integration_spec.lua

@@ -5,9 +5,9 @@ local pl_file = require "pl.file"
 local PLUGIN_NAME = "ai-proxy"
 local MOCK_PORT = helpers.get_available_port()
 
+for _, client_protocol in ipairs({ "http", "https", "http2" }) do
 for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
-  describe(PLUGIN_NAME .. ": (access) [#" .. strategy .. "]", function()
-    local client
+  describe(PLUGIN_NAME .. ": (access) [#" .. strategy .. "] [#" .. client_protocol .. "]", function()    local client
 
     lazy_setup(function()
       local bp = helpers.get_db_utils(strategy == "off" and "postgres" or strategy, nil, { PLUGIN_NAME })
@@ -390,7 +390,13 @@ for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
     end)
 
     before_each(function()
-      client = helpers.proxy_client()
+      if client_protocol == "http" then
+        client = helpers.proxy_client()
+      elseif client_protocol == "https" then
+        client = helpers.proxy_ssl_client()
+      elseif client_protocol == "http2" then
+        client = helpers.proxy_ssl_client(nil, nil, 2)
+      end
     end)
 
     after_each(function()
@@ -624,3 +630,4 @@ for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
   end)
 
 end end
+end -- for _, client_protocol

spec/03-plugins/38-ai-proxy/05-azure_integration_spec.lua

@@ -5,8 +5,9 @@ local pl_file = require "pl.file"
 local PLUGIN_NAME = "ai-proxy"
 local MOCK_PORT = helpers.get_available_port()
 
+for _, client_protocol in ipairs({ "http", "https", "http2" }) do
 for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
-  describe(PLUGIN_NAME .. ": (access) [#" .. strategy .. "]", function()
+  describe(PLUGIN_NAME .. ": (access) [#" .. strategy .. "] [#" .. client_protocol .. "]", function()
     local client
 
     lazy_setup(function()
@@ -407,7 +408,13 @@ for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
     end)
 
     before_each(function()
-      client = helpers.proxy_client()
+      if client_protocol == "http" then
+        client = helpers.proxy_client()
+      elseif client_protocol == "https" then
+        client = helpers.proxy_ssl_client()
+      elseif client_protocol == "http2" then
+        client = helpers.proxy_ssl_client(nil, nil, 2)
+      end
     end)
 
     after_each(function()
@@ -650,3 +657,4 @@ for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
   end)
 
 end end
+end -- for _, client_protocol

spec/03-plugins/38-ai-proxy/06-mistral_integration_spec.lua

@@ -5,8 +5,9 @@ local pl_file = require "pl.file"
 local PLUGIN_NAME = "ai-proxy"
 local MOCK_PORT = helpers.get_available_port()
 
+for _, client_protocol in ipairs({ "http", "https", "http2" }) do
 for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
-  describe(PLUGIN_NAME .. ": (access) [#" .. strategy .. "]", function()
+  describe(PLUGIN_NAME .. ": (access) [#" .. strategy .. "] [#" .. client_protocol .. "]", function()
     local client
 
     lazy_setup(function()
@@ -343,7 +344,13 @@ for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
     end)
 
     before_each(function()
-      client = helpers.proxy_client()
+      if client_protocol == "http" then
+        client = helpers.proxy_client()
+      elseif client_protocol == "https" then
+        client = helpers.proxy_ssl_client()
+      elseif client_protocol == "http2" then
+        client = helpers.proxy_ssl_client(nil, nil, 2)
+      end
     end)
 
     after_each(function()
@@ -512,3 +519,4 @@ for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
   end)
 
 end end
+end -- for _, client_protocol

spec/03-plugins/38-ai-proxy/07-llama2_integration_spec.lua

@@ -5,8 +5,10 @@ local pl_file = require "pl.file"
 local PLUGIN_NAME = "ai-proxy"
 local MOCK_PORT = helpers.get_available_port()
 
+for _, client_protocol in ipairs({ "http", "https", "http2" }) do
+
 for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
-  describe(PLUGIN_NAME .. ": (access) [#" .. strategy .. "]", function()
+  describe(PLUGIN_NAME .. ": (access) [#" .. strategy .. "] [#" .. client_protocol .. "]", function()
     local client
 
     lazy_setup(function()
@@ -191,7 +193,13 @@ for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
     end)
 
     before_each(function()
-      client = helpers.proxy_client()
+      if client_protocol == "http" then
+        client = helpers.proxy_client()
+      elseif client_protocol == "https" then
+        client = helpers.proxy_ssl_client()
+      elseif client_protocol == "http2" then
+        client = helpers.proxy_ssl_client(nil, nil, 2)
+      end
     end)
 
     after_each(function()
@@ -443,3 +451,4 @@ for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
   end)
 
 end end
+end -- for _, client_protocol

spec/03-plugins/38-ai-proxy/08-encoding_integration_spec.lua

@@ -110,8 +110,9 @@ local plugin_conf = {
   },
 }
 
+for _, client_protocol in ipairs({ "http", "https", "http2" }) do
 for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
-  describe(PLUGIN_NAME .. ": (access) [#" .. strategy .. "]", function()
+  describe(PLUGIN_NAME .. ": (access) [#" .. strategy .. "] [#" .. client_protocol .. "]", function()
     local client
 
     lazy_setup(function()
@@ -241,7 +242,13 @@ for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
     end)
 
     before_each(function()
-      client = helpers.proxy_client()
+      if client_protocol == "http" then
+        client = helpers.proxy_client()
+      elseif client_protocol == "https" then
+        client = helpers.proxy_ssl_client()
+      elseif client_protocol == "http2" then
+        client = helpers.proxy_ssl_client(nil, nil, 2)
+      end
     end)
 
     after_each(function()
@@ -369,3 +376,4 @@ for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
   ----
 
 end end
+end -- for _, client_protocol

spec/03-plugins/38-ai-proxy/09-streaming_integration_spec.lua

@@ -7,8 +7,9 @@ local http = require("resty.http")
 local PLUGIN_NAME = "ai-proxy"
 local MOCK_PORT = helpers.get_available_port()
 
+for _, client_protocol in ipairs({ "http", "https", "http2" }) do
 for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
-  describe(PLUGIN_NAME .. ": (access) [#" .. strategy .. "]", function()
+  describe(PLUGIN_NAME .. ": (access) [#" .. strategy .. "] [#" .. client_protocol .. "]", function()
     local client
 
     lazy_setup(function()
@@ -500,7 +501,13 @@ for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
     end)
 
     before_each(function()
-      client = helpers.proxy_client()
+      if client_protocol == "http" then
+        client = helpers.proxy_client()
+      elseif client_protocol == "https" then
+        client = helpers.proxy_ssl_client()
+      elseif client_protocol == "http2" then
+        client = helpers.proxy_ssl_client(nil, nil, 2)
+      end
     end)
 
     after_each(function()
@@ -812,3 +819,4 @@ for _, strategy in helpers.all_strategies() do if strategy ~= "cassandra" then
   end)
 
 end end
+end -- for _, client_protocol