Merge pull request #63 from PerimeterX/dev

Version 3.0.1

Author: Johnny Tordgeman

CHANGELOG.md

@@ -1,4 +1,14 @@
 # Change Log
+
+## [v3.0.1](https://github.com/PerimeterX/perimeterx-python-wsgi) (2019-02-04)
+- Monitor mode bug fix
+- Better error handling
+
+## [v3.0.0](https://github.com/PerimeterX/perimeterx-python-wsgi) (2019-01-28)
+- Added GAE support
+- Added PXHD support
+- Updated VID source handling
+
 ## [v2.3.2](https://github.com/PerimeterX/perimeterx-python-wsgi) (2019-01-13)
 - Changed requirements setting
 

README.md

@@ -4,9 +4,9 @@
 
 [PerimeterX](http://www.perimeterx.com) Python Middleware
 =============================================================
-> Latest stable version: [v3.0.0](https://pypi.org/project/perimeterx-python-wsgi/)
+> Latest stable version: [v3.0.1](https://pypi.org/project/perimeterx-python-wsgi/)
 
-> Latest GAE stable version: [v3.0.0](https://pypi.org/project/perimeterx-python-wsgi-gae/)
+> Latest GAE stable version: [v3.0.1](https://pypi.org/project/perimeterx-python-wsgi-gae/)
 
 Table of Contents
 -----------------

perimeterx/middleware.py

@@ -36,9 +36,9 @@ def __init__(self, app, config=None):
 
     def __call__(self, environ, start_response):
         px_activities_client.send_activities_in_thread()
+        context = None
         try:
             start = time.time()
-            context = None
 
             if environ.get('px_disable_request'):
                 return self.app(environ, start_response)
@@ -76,9 +76,8 @@ def verify(self, request):
             if ctx:
                 self.report_pass_traffic(ctx)
             else:
-                self.report_pass_traffic(PxContext({}, config))
-            return True
-
+                self.report_pass_traffic(PxContext(Request({}), config))
+            return ctx, True
 
     def report_pass_traffic(self, ctx):
         px_activities_client.send_page_requested_activity(ctx, self.config)
@@ -90,12 +89,12 @@ def report_block_traffic(self, ctx):
     def config(self):
         return self._config
 
+
 def create_custom_pxhd_callback(context, start_response):
     def custom_start_response(status, headers, exc_info=None):
         if not context.pxhd or (context.response_pxhd and context.pxhd != context.response_pxhd):
             expiry = px_utils.getExpiryDate()
-            headers.append(('Set-Cookie', "_pxhd={}; path=/; expires={}; ".format(context.response_pxhd, expiry )))
+            headers.append(('Set-Cookie', "_pxhd={}; path=/; expires={}; ".format(context.response_pxhd, expiry)))
         return start_response(status, headers, exc_info)
-    return custom_start_response
-
 
+    return custom_start_response

perimeterx/px_config.py

@@ -19,7 +19,8 @@ def __init__(self, config_dict):
         self._collector_host = 'collector.perimeterx.net' if app_id is None else px_constants.COLLECTOR_URL.format(
             app_id.lower())
         self._encryption_enabled = config_dict.get('encryption_enabled', True)
-        self._sensitive_headers = map(lambda header: header.lower(), config_dict.get('sensitive_headers', ['cookie', 'cookies']))
+        self._sensitive_headers = map(lambda header: header.lower(),
+                                      config_dict.get('sensitive_headers', ['cookie', 'cookies']))
         self._send_page_activities = config_dict.get('send_page_activities', True)
         self._api_timeout_ms = config_dict.get('api_timeout', 1000)
         self._custom_logo = custom_logo
@@ -35,8 +36,17 @@ def __init__(self, config_dict):
         self._ip_headers = config_dict.get('ip_headers', [])
         self._proxy_url = config_dict.get('proxy_url', None)
         self._max_buffer_len = config_dict.get('max_buffer_len', 30)
-        self._sensitive_routes = config_dict.get('sensitive_routes', [])
-        self._whitelist_routes = config_dict.get('whitelist_routes', [])
+
+        sensitive_routes = config_dict.get('sensitive_routes', [])
+        if not isinstance(sensitive_routes, list):
+            raise TypeError('sensitive_routes must be a list')
+        self._sensitive_routes = sensitive_routes
+
+        whitelist_routes = config_dict.get('whitelist_routes', [])
+        if not isinstance(whitelist_routes, list):
+            raise TypeError('whitelist_routes must be a list')
+
+        self._whitelist_routes = whitelist_routes
         self._block_html = 'BLOCK'
         self._logo_visibility = 'visible' if custom_logo is not None else 'hidden'
         self._telemetry_config = self.__create_telemetry_config()

perimeterx/px_constants.py

@@ -30,7 +30,7 @@
 EMPTY_GIF_B64 = 'R0lGODlhAQABAPAAAAAAAAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=='
 COLLECTOR_HOST = 'collector.perimeterx.net'
 FIRST_PARTY_FORWARDED_FOR = 'X-FORWARDED-FOR'
-MODULE_VERSION = 'Python WSGI Module v3.0.0'
+MODULE_VERSION = 'Python WSGI Module v3.0.1'
 API_RISK = '/api/v3/risk'
 PAGE_REQUESTED_ACTIVITY = 'page_requested'
 BLOCK_ACTIVITY = 'block'

perimeterx/px_data_enrichment_cookie.py

@@ -13,6 +13,9 @@ def __init__(self, config):
         self._decoded_cookie = ''
 
     def from_raw_cookie(self, raw_cookie):
+        if not raw_cookie:
+            return
+
         spliced_cookie = raw_cookie.split(':')
         if len(spliced_cookie) != 2:
             return

perimeterx/px_request_verifier.py

@@ -53,7 +53,9 @@ def handle_verification(self, ctx, request):
                 config.additional_activity_handler(ctx, config)
             if config.module_mode == px_constants.MODULE_MODE_BLOCKING:
                 data, headers, status = self.px_blocker.handle_blocking(ctx=ctx, config=config)
-            response_function = generate_blocking_response(data, headers, status)
+                response_function = generate_blocking_response(data, headers, status)
+            else:
+                pass_request = True
 
         if config.custom_request_handler:
             data, headers, status = config.custom_request_handler(ctx, self.config, request)
@@ -78,6 +80,8 @@ def px_blocker(self):
 
 def generate_blocking_response(data, headers, status):
     result = Response(data)
-    result.headers = headers
-    result.status = status
+    if headers is not None:
+        result.headers = headers
+    if status is not None:
+        result.status = status
     return result

setup-gae.py

@@ -2,7 +2,7 @@
 
 from setuptools import setup, find_packages
 
-version = 'v3.0.0'
+version = 'v3.0.1'
 setup(name='perimeterx-python-wsgi-gae',
       version=version,
       license='MIT',

setup.py

@@ -2,7 +2,7 @@
 
 from setuptools import setup, find_packages
 
-version = 'v3.0.0'
+version = 'v3.0.1'
 setup(name='perimeterx-python-wsgi',
       version=version,
       license='MIT',