<div dir="ltr"> <div class="gmail_extra"> <div class="gmail_quote">On Tue, Feb 23, 2016 at 1:45 AM, Christian Boltz <<a href="mailto:apparmor@cboltz.de" target="_blank">apparmor@cboltz.de</a>> wrote: <blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hello, Am Montag, 22. Februar 2016, 01:55:35 CET schrieb Kshitij Gupta: > On Mon, Feb 22, 2016 at 1:07 AM, Kshitij Gupta wrote: <div><div class="h5">> > On Sun, Dec 27, 2015 at 8:34 PM, Christian Boltz wrote: > >> some dbus rule conditionals come with optional parenthesis. Instead > >> of making the regex even more complicated, use a small function to > >> strip those parenthesis. > >> > >> Also add some tests for strip_parenthesis() to test-regex.py. > >> > >> > >> [ 53-add-strip_parenthesis.diff ] > >> > >> === modified file ./utils/apparmor/regex.py > >> --- utils/apparmor/regex.py 2015-12-21 00:13:57.207799592 +0100 > >> +++ utils/apparmor/regex.py 2015-12-24 01:19:47.916978461 +0100 > >> @@ -128,6 +128,15 @@ > >> > >> return matches.group('magicpath') > >> > >> +def strip_parenthesis(data): > >> + '''strips parenthesis from the given string and returns the > >> strip()ped result. > >> + The parenthesis must be the first and last char, otherwise > >> they won't be removed. > >> + Even if no parenthesis get removed, the result will be > >> strip()ped. + ''' > >> + if data[0] + data[-1] == '()': > >> + return data[1:-1].strip() > >> + else: > >> + return data.strip() > > > > Might be useful to do the data.strip() before the "data[0] + > > data[-1] == '()'" check, that way you don't miss on something like > > '(hey) '. This is because there doesn't seem to be a strong > > assumption that the data will already be stripped coz we return > > data.strip() </div></div>I'm following the strip_quotes() behaviour in not stripping space before removing parenthesis, and I'm quite sure the regexes that "feed" strip_parenthesis() make sure there's no whitespace around. See for example RE_ACCESS_KEYWORDS and RE_FLAG in apparmor/rule/dbus.py (from the dbus patch series, not in bzr yet) OTOH, whitespace inside parenthesis is allowed, so it makes sense to strip() it after removing the parenthesis. > > Also, I don't see any harm in having the .strip before the check. In theory it could "hide" whitespace included by (IMHO) broken regexes, with all sort of follow-up problems. I hope not-removed parenthesis (if the string starts or ends with whitespace) are more visible and easier to find, so I prefer not to strip() whe whole string. </blockquote><div>umm ok. Acked-by: Kshitij Gupta <<a href="mailto:kgupta8592@gmail.com" target="_blank">kgupta8592@gmail.com</a>> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> > >> def strip_quotes(data): > >> if data[0] + data[-1] == '""': > >> === modified file ./utils/test/test-regex_matches.py ... Regards, Christian Boltz -- > Ich hätte auch nie geglaubt, das es 10 Minuten dauern kann, bis jemand > ohne Fehler einmal ein lspci -v fehlerfrei eingegeben hat. Hast Du auch erwähnt, daß man anschließend die RETURN-Taste drücken muß? [> Torsten Hallmann und Bernd Brodesser in suse-linux] -- AppArmor mailing list <a href="mailto:AppArmor@lists.ubuntu.com">AppArmor@lists.ubuntu.com</a> Modify settings or unsubscribe at: <a href="https://lists.ubuntu.com/mailman/listinfo/apparmor" rel="noreferrer" target="_blank">https://lists.ubuntu.com/mailman/listinfo/apparmor</a> </blockquote></div> -- <div class="gmail_signature"><div dir="ltr"><div>Regards, </div>Kshitij Gupta </div></div> </div></div>