Merge pull request #162 from PerimeterX/dev

Version 5.3.1

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.1] - 2018-11-07
+### Fixed
+- Wrong value in Json response's vid property
+
 ## [5.3.0] - 2018-11-04
 ### Added
 - Support for first party route prefix

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-0)
+> Latest stable version: [v5.3.0](https://luarocks.org/modules/bendpx/perimeterx-nginx-plugin/5.3-1)
 
 
 ## [Introduction](#introduction)

lib/px/block/pxblock.lua

@@ -122,7 +122,7 @@ function M.load(px_config)
                 appId = props.appId,
                 jsClientSrc = props.jsClientSrc,
                 firstPartyEnabled = props.firstPartyEnabled,
-                vid = props.firstPartyEnabled,
+                vid = props.vid,
                 uuid = props.uuid,
                 hostUrl = props.hostUrl,
                 blockScript = props.blockScript

lib/px/utils/pxconstants.lua

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

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

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

t/003-block.t

@@ -207,3 +207,100 @@ User-Agent:  Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_4) AppleWebKit/537.36
 
 --- error_log
 [PerimeterX - DEBUG] [ PX_APP_ID ] - Visitor score is higher than allowed threshold
+
+=== TEST 4: Json response w/first party
+verify the json response
+
+--- http_config
+    lua_package_path "/usr/local/lib/lua/?.lua;/usr/local/openresty/lualib/?.lua;;";
+    lua_ssl_trusted_certificate "/etc/ssl/certs/ca-certificates.crt";
+    lua_ssl_verify_depth 3;
+    lua_socket_pool_size 500;
+    resolver 8.8.8.8;
+    init_worker_by_lua_block {
+        require ("px.utils.pxtimer").application()
+    }
+    set_real_ip_from   0.0.0.0/0;
+    real_ip_header     X-Forwarded-For;
+
+--- config
+    location = /t {
+        resolver 8.8.8.8;
+        set_by_lua_block $config {
+            pxconfig = require "px.pxconfig"
+            pxconfig.cookie_secret = "perimeterx"
+            pxconfig.px_debug = true
+            pxconfig.block_enabled = true
+            pxconfig.enable_server_calls = false
+            pxconfig.send_page_requested_activity = false
+          return true
+        }
+
+        access_by_lua_block {
+            require("px.pxnginx").application(require "px.pxconfig")
+        }
+    }
+
+--- request
+GET /t
+
+--- req_headers
+X-Forwarded-For: 1.2.3.4
+User-Agent:  Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.84 Safari/537.36
+Accept: application/json
+
+--- response_body
+{"uuid":"57ecdc10-0e97-11e6-80b6-095df820282c","appId":"PX_APP_ID","firstPartyEnabled":true,"hostUrl":"\/_APP_ID\/xhr","vid":"vid","jsClientSrc":"\/_APP_ID\/init.js","blockScript":"\/_APP_ID\/captcha\/PX_APP_ID\/captcha.js?a=captcha&m=0&u=57ecdc10-0e97-11e6-80b6-095df820282c&v=vid"}
+--- error_code: 403
+
+--- error_log
+[PerimeterX - DEBUG] [ PX_APP_ID ] - Visitor score is higher than allowed threshold
+
+=== TEST 5: Json response wo/ first party
+verify the json response
+
+--- http_config
+    lua_package_path "/usr/local/lib/lua/?.lua;/usr/local/openresty/lualib/?.lua;;";
+    lua_ssl_trusted_certificate "/etc/ssl/certs/ca-certificates.crt";
+    lua_ssl_verify_depth 3;
+    lua_socket_pool_size 500;
+    resolver 8.8.8.8;
+    init_worker_by_lua_block {
+        require ("px.utils.pxtimer").application()
+    }
+    set_real_ip_from   0.0.0.0/0;
+    real_ip_header     X-Forwarded-For;
+
+--- config
+    location = /t {
+        resolver 8.8.8.8;
+        set_by_lua_block $config {
+            pxconfig = require "px.pxconfig"
+            pxconfig.cookie_secret = "perimeterx"
+            pxconfig.px_debug = true
+            pxconfig.block_enabled = true
+            pxconfig.enable_server_calls = false
+            pxconfig.send_page_requested_activity = false
+            pxconfig.first_party_enabled = false
+          return true
+        }
+
+        access_by_lua_block {
+            require("px.pxnginx").application(require "px.pxconfig")
+        }
+    }
+
+--- request
+GET /t
+
+--- req_headers
+X-Forwarded-For: 1.2.3.4
+User-Agent:  Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.84 Safari/537.36
+Accept: application/json
+
+--- response_body
+{"uuid":"57ecdc10-0e97-11e6-80b6-095df820282c","appId":"PX_APP_ID","firstPartyEnabled":false,"hostUrl":"\/\/collector-PX_APP_ID.perimeterx.net","vid":"vid","jsClientSrc":"\/\/client.perimeterx.net\/PX_APP_ID\/main.min.js","blockScript":"\/\/captcha.px-cdn.net\/PX_APP_ID\/captcha.js?a=captcha&m=0&u=57ecdc10-0e97-11e6-80b6-095df820282c&v=vid"}
+--- error_code: 403
+
+--- error_log
+[PerimeterX - DEBUG] [ PX_APP_ID ] - Visitor score is higher than allowed threshold