Fix response transformer hang. See issues #1260 and #1207

Kong · May 27, 2016 · a34f6ce · a34f6ce
1 parent 8e6c84e
commit a34f6ce
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/kong/plugins/response-transformer/handler.lua b/kong/plugins/response-transformer/handler.lua
@@ -2,8 +2,12 @@ local BasePlugin = require "kong.plugins.base_plugin"
 local body_filter = require "kong.plugins.response-transformer.body_transformer"
 local header_filter = require "kong.plugins.response-transformer.header_transformer"
 
+local is_body_transform_set = header_filter.is_body_transform_set
+local is_json_body = header_filter.is_json_body
+
 local ResponseTransformerHandler = BasePlugin:extend()
 
+
 function ResponseTransformerHandler:new()
   ResponseTransformerHandler.super.new(self, "response-transformer")
 end
@@ -20,7 +24,8 @@ end
 
 function ResponseTransformerHandler:body_filter(conf)
   ResponseTransformerHandler.super.body_filter(self)
-  if body_filter.is_json_body(ngx.header["content-type"]) then
+
+  if is_body_transform_set(conf) and is_json_body(ngx.header["content-type"]) then
     local chunk, eof = ngx.arg[1], ngx.arg[2]
     if eof then
       local body = body_filter.transform_json_body(conf, ngx.ctx.buffer)

diff --git a/kong/plugins/response-transformer/header_transformer.lua b/kong/plugins/response-transformer/header_transformer.lua
@@ -40,6 +40,10 @@ local function is_body_transform_set(conf)
   return #conf.add.json > 0  or #conf.remove.json > 0 or #conf.replace.json > 0 or #conf.append.json > 0
 end
 
+-- export utility functions
+_M.is_json_body = is_json_body
+_M.is_body_transform_set = is_body_transform_set
+
 ---
 --   # Example:
 --   ngx.headers = header_filter.transform_headers(conf, ngx.headers)