decode fix

Author: alexandraBara

nodescraper/connection/inband/inbandlocal.py

@@ -54,7 +54,7 @@ def run_command(
 
         res = subprocess.run(
             command,
-            encoding=None,
+            encoding="utf-8",
             shell=True,
             timeout=timeout,
             capture_output=True,

nodescraper/plugins/inband/journal/journal_collector.py

@@ -23,8 +23,7 @@
 # SOFTWARE.
 #
 ###############################################################################
-import io
-import json
+import base64
 
 from nodescraper.base import InBandDataCollector
 from nodescraper.enums import EventCategory, EventPriority, ExecutionStatus, OSFamily
@@ -45,10 +44,9 @@ def _read_with_journalctl(self):
         Returns:
             str|None: system journal read
         """
-        cmd = "journalctl --no-pager --system --all --output=short-iso"
+        cmd = "journalctl --no-pager --system --all --output=short-iso  2>&1 | base64 -w0"
         res = self._run_sut_cmd(cmd, sudo=True, log_artifact=False, strip=False)
 
-
         if res.exit_code != 0:
             self._log_event(
                 category=EventCategory.OS,
@@ -61,20 +59,17 @@ def _read_with_journalctl(self):
             self.result.status = ExecutionStatus.ERROR
             return None
 
-        out = res.stdout
-
-        if isinstance(out, (bytes, bytearray)):
-            try:
-                text = out.decode("utf-8")
-            except UnicodeDecodeError:
-                text = out.decode("utf-8", errors="replace")
+        if isinstance(res.stdout, (bytes, bytearray)):
+            b64 = (
+                res.stdout if isinstance(res.stdout, str) else res.stdout.decode("ascii", "ignore")
+            )
+            raw = base64.b64decode("".join(b64.split()))
+            text = raw.decode("utf-8", errors="replace")
         else:
-            text = out
+            text = res.stdout
 
-        text = text.replace("\r\n", "\n").replace("\r", "\n").replace("\x00", "")
         return text
 
-
     def collect_data(self, args=None) -> tuple[TaskResult, JournalData | None]:
         """Collect journal logs
 

nodescraper/plugins/inband/journal/journaldata.py

@@ -23,7 +23,6 @@
 # SOFTWARE.
 #
 ###############################################################################
-import json
 import os
 
 from nodescraper.models import DataModel
@@ -32,7 +31,7 @@
 class JournalData(DataModel):
     """Data model for journal logs"""
 
-    journal_log: str 
+    journal_log: str
 
     def log_model(self, log_path: str):
         """Log data model to a file
@@ -42,6 +41,4 @@ def log_model(self, log_path: str):
         """
         log_name = os.path.join(log_path, "journal.log")
         with open(log_name, "w", encoding="utf-8") as log_filename:
-            for e in self.journal_log:
-                log_filename.write(json.dumps(e, ensure_ascii=False, separators=(",", ":")))
-                log_filename.write("\n")
+            log_filename.write(self.journal_log)

test/unit/plugin/test_journal_collector.py

@@ -68,4 +68,4 @@ def run_map(cmd, **kwargs):
     result, data = c.collect_data()
     assert isinstance(data, JournalData)
 
-    assert data.journal_log == [{"MESSAGE": "hello"}]
+    assert data.journal_log == '{"MESSAGE":"hello"}\n'