From 78b45cbe78ddfa96abb06ad4dee260d39efa5d77 Mon Sep 17 00:00:00 2001
From: Pavel Valach <pavel.valach@cesnet.cz>
Date: Mon, 25 Mar 2024 16:30:58 +0100
Subject: [PATCH] dionaea/log_wardenfiler.py: add _bytes_to_str helper
---
dionaea/log_wardenfiler.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/dionaea/log_wardenfiler.py b/dionaea/log_wardenfiler.py
index bd60dd3..1237486 100644
--- a/dionaea/log_wardenfiler.py
+++ b/dionaea/log_wardenfiler.py
@@ -106,10 +106,15 @@ class LogWardenfilerHandler(ihandler):
ihandler.__init__(self, path)
self.path = path
self._config = config
-
+
+ def _bytes_to_str(self, s):
+ if isinstance(s, str):
+ return s
+ return str(s, "utf-8", "backslashreplace")
+
def _fixup_event(self, event):
if 'database' in event and isinstance(event['database'], bytes):
- event['database'] = str(event['database'], "utf-8", "backslashreplace")
+ event['database'] = self._bytes_to_str(event['database'])
return event
def _save_event(self, event):
--
GitLab