upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-25 09:09:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow caller to determine if the process should exit or not when the regex is found to be problematic.

Browse source
This commit is contained in:
Greg Burd 2023-08-08 11:08:22 -04:00
parent 2738a32de3
commit 7a4812d2fa
No known key found for this signature in database
GPG key ID: 1FC1E7793410DE46
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
servers/slapd/aclparse.c
View file

@ -119,7 +119,7 @@ slap_dynacl_config(
}
#endif /* SLAP_DYNACL */
static void
static int
regtest(const char *fname, int lineno, char *pat) {
int e;
regex_t re;
@ -160,7 +160,7 @@ regtest(const char *fname, int lineno, char *pat) {
"%s: line %d: regular expression \"%s\" too large\n",
fname, lineno, pat );
(void)acl_usage();
exit( EXIT_FAILURE );
return -1;
}
if ((e = regcomp(&re, buf, REG_EXTENDED|REG_ICASE))) {
@ -172,9 +172,11 @@ regtest(const char *fname, int lineno, char *pat) {
"%s: line %d: regular expression \"%s\" bad because of %s\n",
fname, lineno, pat, error );
acl_usage();
exit( EXIT_FAILURE );
regfree(&re);
return -1;
}
regfree(&re);
return 0;
}
/*
@ -903,7 +905,8 @@ parse_acl(
} else {
acl_regex_normalized_dn( right, &bv );
if ( !ber_bvccmp( &bv, '*' ) ) {
regtest( fname, lineno, bv.bv_val );
if ( regtest( fname, lineno, bv.bv_val ) != 0)
goto fail;
}
}
@ -1123,7 +1126,8 @@ parse_acl(
if ( sty == ACL_STYLE_EXPAND ) {
acl_regex_normalized_dn( right, &bv );
if ( !ber_bvccmp( &bv, '*' ) ) {
regtest( fname, lineno, bv.bv_val );
if ( regtest( fname, lineno, bv.bv_val ) != 0)
goto fail;
}
b->a_group_pat = bv;
@ -1275,7 +1279,8 @@ parse_acl(
if ( sty == ACL_STYLE_REGEX ) {
acl_regex_normalized_dn( right, &bv );
if ( !ber_bvccmp( &bv, '*' ) ) {
regtest( fname, lineno, bv.bv_val );
if ( regtest( fname, lineno, bv.bv_val ) != 0)
goto fail;
}
b->a_peername_pat = bv;
@ -1415,7 +1420,8 @@ parse_acl(
if ( sty == ACL_STYLE_REGEX ) {
acl_regex_normalized_dn( right, &bv );
if ( !ber_bvccmp( &bv, '*' ) ) {
regtest( fname, lineno, bv.bv_val );
if ( regtest( fname, lineno, bv.bv_val ) != 0)
goto fail;
}
b->a_sockname_pat = bv;
@ -1474,7 +1480,8 @@ parse_acl(
if ( sty == ACL_STYLE_REGEX ) {
acl_regex_normalized_dn( right, &bv );
if ( !ber_bvccmp( &bv, '*' ) ) {
regtest( fname, lineno, bv.bv_val );
if ( regtest( fname, lineno, bv.bv_val ) != 0)
goto fail;
}
b->a_domain_pat = bv;
@ -1520,7 +1527,8 @@ parse_acl(
if ( sty == ACL_STYLE_REGEX ) {
acl_regex_normalized_dn( right, &bv );
if ( !ber_bvccmp( &bv, '*' ) ) {
regtest( fname, lineno, bv.bv_val );
if ( regtest( fname, lineno, bv.bv_val ) != 0)
goto fail;
}
b->a_sockurl_pat = bv;
@ -2227,7 +2235,7 @@ acl_usage( void )
/*
* Set pattern to a "normalized" DN from src.
* At present it simply eats the (optional) space after
* At present, it simply eats the (optional) space after
* a RDN separator (,)
* Eventually will evolve in a more complete normalization
*/