Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bug-1764633: remove non-printable/non-ascii characters from signature #6782

Merged
merged 1 commit into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions socorro/signature/generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
SignatureIPCMessageName,
SignatureRunWatchDog,
SignatureShutdownTimeout,
SigPrintableCharsOnly,
SigTruncate,
StackOverflowSignature,
StackwalkerErrorSignatureRule,
Expand All @@ -37,6 +38,7 @@
StackOverflowSignature,
HungProcess,
# NOTE(willkg): These should always come last and in this order
SigPrintableCharsOnly,
SigFixWhitespace,
SigTruncate,
]
Expand Down
14 changes: 14 additions & 0 deletions socorro/signature/rules.py
Original file line number Diff line number Diff line change
Expand Up @@ -918,6 +918,20 @@ def action(self, crash_data, result):
return True


class SigPrintableCharsOnly(Rule):
"""Remove non-printable characters from signature."""

def action(self, crash_data, result):
original_sig = result.signature
sig = "".join(
[c for c in original_sig.strip() if c.isascii() and c.isprintable()]
)
if sig != original_sig:
result.set_signature(self.name, sig)
result.info(self.name, "unprintable characters removed")
return True


class SigFixWhitespace(Rule):
"""Fix whitespace in signatures.

Expand Down
24 changes: 24 additions & 0 deletions socorro/signature/tests/test_rules.py
Original file line number Diff line number Diff line change
Expand Up @@ -1718,6 +1718,30 @@ def test_action_non_ascii_abort_message(self):
assert result.signature == "Abort | unknown | hello"


class TestSigPrintableCharsOnly:
@pytest.mark.parametrize(
"signature, expected",
[
("everything | fine", "everything | fine"),
# Non-printable null character
("libxul.so\x00 | frame2", "libxul.so | frame2"),
# Non-ascii emoji
("libxul.so\U0001f600 | frame2", "libxul.so | frame2"),
],
)
def test_whitespace_fixing(self, signature, expected):
rule = rules.SigPrintableCharsOnly()
result = generator.Result()
result.signature = signature
action_result = rule.action({}, result)
assert action_result is True
assert result.signature == expected
if signature != expected:
assert result.notes == [
"SigPrintableCharsOnly: unprintable characters removed"
]


class TestSigFixWhitespace:
@pytest.mark.parametrize(
"signature, expected",
Expand Down