snappy-hub

Merge lp://staging/~kyrofa/snappy-hub/snappy-debug_escape_regex_strings into lp://staging/~snappy-debug-developers/snappy-hub/snappy-debug

snappy-debug_escape_regex_strings
Merge into snappy-debug

Proposed by Kyle Fazzari on 2015-11-13

Status:	Merged
Merged at revision:	17
Proposed branch:	lp://staging/~kyrofa/snappy-hub/snappy-debug_escape_regex_strings
Merge into:	lp://staging/~snappy-debug-developers/snappy-hub/snappy-debug
Diff against target:	74 lines (+12/-10) 1 file modified bin/snappy-security-scanlog (+12/-10)
To merge this branch:	bzr merge lp://staging/~kyrofa/snappy-hub/snappy-debug_escape_regex_strings
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Jamie Strandboge		2015-11-13	Approve on 2015-11-13
Review via email: mp+277463@code.staging.launchpad.net

Commit message

Escape externally-controlled strings in regex.

Description of the change

snappy-security-scanlog currently dies with a "sre_constants.error: multiple repeat" exception when an apparmor event contains things like "++" (e.g. libstdc++). This is because it builds regex based on externally-controlled strings (like event names) without escaping them.

This change simply escapes all externally-controlled strings provided to re.compile().

Revision history for this message