mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

allow for nested alternations in regex patterns

Browse source 
Currently alternations are limited to a single level, make it so we can
nest alternations.

Note: this is a temporary solution to the problem. Long term this routine
to convert to pcre will go away when native parsing of aare is added to
the backend.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Steve Beattie <steve@nxnw.org>
This commit is contained in:
John Johansen 2013-11-05 14:33:51 -08:00
parent 1c86517e79
commit 055b68289c
1 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
parser/parser_regex.c
View file

@ -92,7 +92,7 @@ static pattern_t convert_aaregex_to_pcre(const char *aare, int anchor,
_dest += _len; \ _dest += _len; \
} }
#define update_re_pos(X) if (!(*first_re_pos)) { *first_re_pos = (X); } #define update_re_pos(X) if (!(*first_re_pos)) { *first_re_pos = (X); }
#define MAX_ALT_DEPTH 50
*first_re_pos = 0; *first_re_pos = 0;
int ret = TRUE; int ret = TRUE;
@ -106,6 +106,7 @@ static pattern_t convert_aaregex_to_pcre(const char *aare, int anchor,
BOOL bEscape = 0; /* flag to indicate escape */ BOOL bEscape = 0; /* flag to indicate escape */
int ingrouping = 0; /* flag to indicate {} context */ int ingrouping = 0; /* flag to indicate {} context */
int incharclass = 0; /* flag to indicate [ ] context */ int incharclass = 0; /* flag to indicate [ ] context */
int grouping_count[MAX_ALT_DEPTH];
error = e_no_error; error = e_no_error;
ptype = ePatternBasic; /* assume no regex */ ptype = ePatternBasic; /* assume no regex */
@ -245,13 +246,14 @@ static pattern_t convert_aaregex_to_pcre(const char *aare, int anchor,
/* { is a PCRE special character */ /* { is a PCRE special character */
STORE("\\{", dptr, 2); STORE("\\{", dptr, 2);
} else { } else {
if (ingrouping) { update_re_pos(sptr - aare);
ingrouping++;
if (ingrouping >= MAX_ALT_DEPTH) {
error = e_parse_error; error = e_parse_error;
PERROR(_("%s: Illegal open {, nesting groupings not allowed\n"), PERROR(_("%s: Regex grouping error: Exceeded maximum nesting of {}\n"), progname);
progname);
} else { } else {
update_re_pos(sptr - aare); grouping_count[ingrouping] = 0;
ingrouping = 1;
ptype = ePatternRegex; ptype = ePatternRegex;
STORE("(", dptr, 1); STORE("(", dptr, 1);
} }
@ -263,24 +265,18 @@ static pattern_t convert_aaregex_to_pcre(const char *aare, int anchor,
/* { is a PCRE special character */ /* { is a PCRE special character */
STORE("\\}", dptr, 2); STORE("\\}", dptr, 2);
} else { } else {
if (ingrouping <= 1) { if (grouping_count[ingrouping] == 0) {
error = e_parse_error; error = e_parse_error;
PERROR(_("%s: Regex grouping error: Invalid number of items between {}\n"), progname);
if (ingrouping == 1) {
PERROR(_("%s: Regex grouping error: Invalid number of items between {}\n"),
progname);
ingrouping = 0; /* prevent further errors */
} else { /* ingrouping == 0 */
PERROR(_("%s: Regex grouping error: Invalid close }, no matching open { detected\n"),
progname);
}
} else { /* ingrouping > 1 */
ingrouping = 0;
STORE(")", dptr, 1);
} }
ingrouping--;
if (ingrouping < 0) {
error = e_parse_error;
PERROR(_("%s: Regex grouping error: Invalid close }, no matching open { detected\n"), progname);
ingrouping = 0;
}
STORE(")", dptr, 1);
} /* bEscape */ } /* bEscape */
break; break;
@ -294,7 +290,7 @@ static pattern_t convert_aaregex_to_pcre(const char *aare, int anchor,
STORE(sptr, dptr, 1); STORE(sptr, dptr, 1);
} else { } else {
if (ingrouping) { if (ingrouping) {
++ingrouping; grouping_count[ingrouping]++;
STORE("|", dptr, 1); STORE("|", dptr, 1);
} else { } else {
STORE(sptr, dptr, 1); STORE(sptr, dptr, 1);