Merge d75f87768e into 6c56f16633

dzgui/util/redact.py

@@ -3,8 +3,7 @@ import re
 from typing import Literal
 
 api_filter = r"(.*&key=)([^&]*)(.*)"
-# FIXME: handle whitespace after directory name ($HOME root)
-home_filter = r"(/home/)([^\s'\/]*)(.*)"
+home_filter = r"(/home/)([^/]*)(.*)"
 REDACTED = r"\1REDACTED\3"
 REDACTION_PATTERNS = [api_filter, home_filter]
 

pyproject.toml

@@ -110,7 +110,6 @@ markers = [
     "mods: tests mod metadata/link creation",
     "pefile: validate PE files",
     "post_install: requires a completed installation",
-    "redact: log redaction mechanisms",
     "slow: long-running tests",
     "webtest: checks remote endpoints"
 ]

tests/test_log_redaction.py

@@ -1,54 +0,0 @@
-import logging
-import pytest
-
-from dzgui.util.redact import RedactionFilter, REDACTION_PATTERNS
-
-
-class RecordsListHandler(logging.Handler):
-    def __init__(self) -> None:
-        super().__init__()
-        self.records_list = []
-
-    def emit(self, record: logging.LogRecord) -> None:
-        self.records_list.append(record)
-
-    def pop(self) -> None:
-        return self.records_list[-1].msg
-
-
-@pytest.mark.redact
-@pytest.mark.parametrize(
-    "log_error, expect",
-    [
-        ("/home/SENSITIVE_USERNAME/subdir", "/home/REDACTED/subdir"),
-        (
-            "https://url.com/?api&key=SENSITIVE_KEY&results=10",
-            "https://url.com/?api&key=REDACTED&results=10",
-        ),
-        (
-            "https://url.com/?api&key=SENSITIVE_KEY",
-            "https://url.com/?api&key=REDACTED",
-        ),
-        (
-            "Error in directory: '/home/SENSITIVE_USERNAME/'",
-            "Error in directory: '/home/REDACTED/'",
-        ),
-        (
-            "Error in directory: '/home/SENSITIVE_USERNAME'",
-            "Error in directory: '/home/REDACTED'",
-        ),
-    ],
-)
-def test_log_redaction(log_error: str, expect: str) -> None:
-    logger = logging.getLogger("TEST")
-
-    handler = RecordsListHandler()
-    logger.addHandler(handler)
-    logger.setLevel(logging.DEBUG)
-
-    _filter = RedactionFilter(patterns=REDACTION_PATTERNS)
-    logger.addFilter(_filter)
-
-    logger.critical(log_error)
-    redacted = handler.pop()
-    assert expect == redacted