From cbbbaa3e88ba8375635d0db64e6f1c5ba948b98a Mon Sep 17 00:00:00 2001 From: Inbal Tako Date: Mon, 27 Jul 2020 16:01:59 +0300 Subject: [PATCH 1/2] Fix request parsing --- VERSION | 2 +- securenative/event_manager.py | 2 +- securenative/utils/request_utils.py | 5 +++-- securenative/utils/version_utils.py | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 967b33f..08456a4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.2.7 \ No newline at end of file +0.2.8 \ No newline at end of file diff --git a/securenative/event_manager.py b/securenative/event_manager.py index 3d249f5..ae42ecb 100644 --- a/securenative/event_manager.py +++ b/securenative/event_manager.py @@ -145,7 +145,7 @@ def serialize(obj): "remoteIp": obj.request.remote_ip if obj.request else "", "method": obj.request.method if obj.request else "", "url": obj.request.url if obj.request else "", - "headers": obj.request.headers if obj.request else None + "headers": dict(obj.request.headers) if obj.request else None }, "timestamp": obj.timestamp, "properties": obj.properties, diff --git a/securenative/utils/request_utils.py b/securenative/utils/request_utils.py index 763eb81..52e0f0f 100644 --- a/securenative/utils/request_utils.py +++ b/securenative/utils/request_utils.py @@ -4,9 +4,10 @@ class RequestUtils(object): @staticmethod def get_secure_header_from_request(headers): - if headers: + try: return headers[RequestUtils.SECURENATIVE_HEADER] - return [] + except Exception: + return "" @staticmethod def get_client_ip_from_request(request): diff --git a/securenative/utils/version_utils.py b/securenative/utils/version_utils.py index e4413e2..24ef37c 100644 --- a/securenative/utils/version_utils.py +++ b/securenative/utils/version_utils.py @@ -2,4 +2,4 @@ class VersionUtils(object): @staticmethod def get_version(): - return "0.2.7" + return "0.2.8" From c24b75b0c36f1cd86bc081506059c9e532df2626 Mon Sep 17 00:00:00 2001 From: Inbal Tako Date: Mon, 27 Jul 2020 16:09:06 +0300 Subject: [PATCH 2/2] Fix request parsing --- securenative/context/context_builder.py | 2 +- securenative/event_manager.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/securenative/context/context_builder.py b/securenative/context/context_builder.py index 398f7ba..0b87022 100644 --- a/securenative/context/context_builder.py +++ b/securenative/context/context_builder.py @@ -48,7 +48,7 @@ def from_http_request(request): client_token = None try: - headers = request.headers + headers = dict(request.headers) except Exception: headers = None diff --git a/securenative/event_manager.py b/securenative/event_manager.py index ae42ecb..3d249f5 100644 --- a/securenative/event_manager.py +++ b/securenative/event_manager.py @@ -145,7 +145,7 @@ def serialize(obj): "remoteIp": obj.request.remote_ip if obj.request else "", "method": obj.request.method if obj.request else "", "url": obj.request.url if obj.request else "", - "headers": dict(obj.request.headers) if obj.request else None + "headers": obj.request.headers if obj.request else None }, "timestamp": obj.timestamp, "properties": obj.properties,