Merge pull request #166 from PerimeterX/dev

Version 5.3.2

Author: Johnny Tordgeman

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [5.3.2] - 2018-11-13
+### Fixed
+- Cookie name extractor ability to handle multiple Cookie headers
+
 ## [5.3.1] - 2018-11-07
 ### Fixed
 - Wrong value in Json response's vid property

README.md

@@ -4,7 +4,7 @@
 
 # [PerimeterX](http://www.perimeterx.com) NGINX Lua Plugin
 
-> Latest stable version: [v5.3.0](https://luarocks.org/modules/bendpx/perimeterx-nginx-plugin/5.3-1)
+> Latest stable version: [v5.3.2](https://luarocks.org/modules/bendpx/perimeterx-nginx-plugin/5.3-2)
 
 
 ## [Introduction](#introduction)

lib/px/utils/pxcommonutils.lua

@@ -104,16 +104,30 @@ function _M.decode_uri_component(str)
     return (str:gsub("%%(%x%x)", hex_to_char))
 end
 
-function _M.extract_cookie_names(str)
-    local t
-    if str ~= nil then
-        t = {}
-        local index = 1;
-        for token in string.gmatch(str, ("([^;]+)")) do
-            local key_value = trim(token)
-            for key, value in string.gmatch(key_value, "(%w+)=(%w+)") do
-                t[index] = key
-                index = index + 1
+function _M.extract_cookie_names(cookies)
+    local t = {}
+    local cookies_data = ""
+    if cookies ~= nil then
+        if type(cookies) == 'table' then
+            for k, v in pairs(cookies) do
+                local trimmed = trim(v)
+                if not ends_with(trimmed, ";") then
+                    trimmed = trimmed .. ";"
+                end
+                cookies_data = cookies_data .. trimmed
+            end
+        elseif type(cookies) == 'string' then
+            cookies_data = cookies
+        end
+
+        if (cookies_data ~= "") then
+            local index = 1;
+            for token in string.gmatch(cookies_data, ("([^;]+)")) do
+                local key_value = trim(token)
+                for key, value in string.gmatch(key_value, "(%w+)=(%w+)") do
+                    t[index] = key
+                    index = index + 1
+                end
             end
         end
     end
@@ -124,4 +138,8 @@ function trim(s)
     return (s:gsub("^%s*(.-)%s*$", "%1"))
 end
 
+function ends_with(str, ending)
+   return ending == "" or str:sub(-#ending) == ending
+end
+
 return _M

lib/px/utils/pxconstants.lua

@@ -3,7 +3,7 @@
 ----------------------------------------------
 
 local _M = {
-    MODULE_VERSION = "NGINX Module v5.3.1",
+    MODULE_VERSION = "NGINX Module v5.3.2",
     RISK_PATH = "/api/v3/risk",
     CAPTCHA_PATH = "/api/v2/risk/captcha",
     ACTIVITIES_PATH = "/api/v1/collector/s2s",

perimeterx-nginx-plugin-5.3-1.rockspec perimeterx-nginx-plugin-5.3-2.rockspecperimeterx-nginx-plugin-5.3-1.rockspec renamed to perimeterx-nginx-plugin-5.3-2.rockspec

@@ -1,8 +1,8 @@
  package = "perimeterx-nginx-plugin"
- version = "5.3-1"
+ version = "5.3-2"
  source = {
     url = "git://github.com/PerimeterX/perimeterx-nginx-plugin.git",
-    tag = "v5.3.1",
+    tag = "v5.3.2",
  }
  description = {
     summary = "PerimeterX NGINX Lua Middleware.",