#include "lber_pvt.h"
#include "lutil.h"
-static char *style_strings[] = {
+static const char style_base[] = "base";
+char *style_strings[] = {
"regex",
"expand",
- "base",
+ "exact",
"one",
"subtree",
"children",
}
} else if ( strncasecmp( left, "val", 3 ) == 0 ) {
+ char *mr;
+
if ( !BER_BVISEMPTY( &a->acl_attrval ) ) {
fprintf( stderr,
"%s: line %d: attr val already specified in to clause.\n",
fname, lineno );
acl_usage();
}
+
ber_str2bv( right, 0, 1, &a->acl_attrval );
a->acl_attrval_style = ACL_STYLE_BASE;
+
+ mr = strchr( left, '/' );
+ if ( mr != NULL ) {
+ mr[ 0 ] = '\0';
+ mr++;
+
+ a->acl_attrval_mr = mr_find( mr );
+ if ( a->acl_attrval_mr == NULL ) {
+ fprintf( stderr, "%s: line %d: "
+ "invalid matching rule \"%s\".\n",
+ fname, lineno, mr );
+ acl_usage();
+ }
+
+ if( !mr_usable_with_at( a->acl_attrval_mr, a->acl_attrs[ 0 ].an_desc->ad_type ) )
+ {
+ fprintf( stderr, "%s: line %d: "
+ "matching rule \"%s\" use "
+ "with attr \"%s\" not appropriate.\n",
+ fname, lineno, mr,
+ a->acl_attrs[ 0 ].an_name.bv_val );
+ acl_usage();
+ }
+ }
+
if ( style != NULL ) {
if ( strcasecmp( style, "regex" ) == 0 ) {
int e = regcomp( &a->acl_attrval_re, a->acl_attrval.bv_val,
} else if ( a->acl_attrs[0].an_desc->ad_type->
sat_syntax == slap_schema.si_syn_distinguishedName )
{
+ struct berval bv;
+
if ( !strcasecmp( style, "baseObject" ) ||
!strcasecmp( style, "base" ) )
{
a->acl_attrval_style = ACL_STYLE_BASE;
}
+ bv = a->acl_attrval;
+ rc = dnNormalize( 0, NULL, NULL, &bv, &a->acl_attrval, NULL );
+ if ( rc != LDAP_SUCCESS ) {
+ fprintf( stderr,
+ "%s: line %d: unable to normalize DN \"%s\" "
+ "for attributeType \"%s\" (%d).\n",
+ fname, lineno, bv.bv_val,
+ a->acl_attrs[0].an_desc->ad_cname.bv_val, rc );
+ acl_usage();
+ }
+ ber_memfree( bv.bv_val );
+
} else {
fprintf( stderr,
"%s: line %d: unknown val.<style> \"%s\" "
}
}
}
-
+
+ /* Check for appropriate matching rule */
+ if ( a->acl_attrval_style != ACL_STYLE_REGEX ) {
+ if ( a->acl_attrval_mr == NULL ) {
+ a->acl_attrval_mr = a->acl_attrs[ 0 ].an_desc->ad_type->sat_equality;
+ }
+
+ if ( a->acl_attrval_mr == NULL ) {
+ fprintf( stderr, "%s: line %d: "
+ "attr \"%s\" must have an EQUALITY matching rule.\n",
+ fname, lineno, a->acl_attrs[ 0 ].an_name.bv_val );
+ acl_usage();
+ }
+ }
+
} else {
fprintf( stderr,
"%s: line %d: expecting <what> got \"%s\"\n",
{
free( a->acl_dn_pat.bv_val );
BER_BVZERO( &a->acl_dn_pat );
+ a->acl_dn_style = ACL_STYLE_REGEX;
}
if ( !BER_BVISEMPTY( &a->acl_dn_pat ) ||
case ACL_STYLE_REGEX:
fprintf( stderr, "%s: line %d: "
"\"regex\" style implies "
- "\"expand\" modifier (ignored)\n",
+ "\"expand\" modifier"
+ SLAPD_CONF_UNKNOWN_IGNORED ".\n",
fname, lineno );
+#ifdef SLAPD_CONF_UNKNOWN_BAILOUT
+ acl_usage();
+#endif /* SLAPD_CONF_UNKNOWN_BAILOUT */
break;
case ACL_STYLE_EXPAND:
fprintf( stderr, "%s: line %d: "
"\"expand\" style used "
"in conjunction with "
- "\"expand\" modifier (ignored)\n",
+ "\"expand\" modifier"
+ SLAPD_CONF_UNKNOWN_IGNORED ".\n",
fname, lineno );
+#ifdef SLAPD_CONF_UNKNOWN_BAILOUT
+ acl_usage();
+#endif /* SLAPD_CONF_UNKNOWN_BAILOUT */
#endif
break;
bdn->a_pat = bv;
}
bdn->a_style = sty;
- bdn->a_expand = expand;
+ if ( expand ) {
+ char *exp;
+ int gotit = 0;
+
+ for ( exp = strchr( bdn->a_pat.bv_val, '$' );
+ exp && exp - bdn->a_pat.bv_val < bdn->a_pat.bv_len;
+ exp = strchr( exp, '$' ) )
+ {
+ if ( isdigit( exp[ 1 ] ) ) {
+ gotit = 1;
+ break;
+ }
+ }
+
+ if ( gotit == 1 ) {
+ bdn->a_expand = expand;
+
+ } else {
+ fprintf( stderr,
+ "%s: line %d: \"expand\" used "
+ "with no expansions in \"pattern\""
+ SLAPD_CONF_UNKNOWN_IGNORED ".\n",
+ fname, lineno );
+#ifdef SLAPD_CONF_UNKNOWN_BAILOUT
+ acl_usage();
+#endif /* SLAPD_CONF_UNKNOWN_BAILOUT */
+ }
+ }
if ( sty == ACL_STYLE_SELF ) {
bdn->a_self_level = level;
"<access clause> ::= access to <what> "
"[ by <who> <access> [ <control> ] ]+ \n"
"<what> ::= * | [dn[.<dnstyle>]=<DN>] [filter=<filter>] [attrs=<attrlist>]\n"
- "<attrlist> ::= <attr> [val[.<attrstyle>]=<value>] | <attr> , <attrlist>\n"
+ "<attrlist> ::= <attr> [val[/matchingRule][.<attrstyle>]=<value>] | <attr> , <attrlist>\n"
"<attr> ::= <attrname> | entry | children\n",
"<who> ::= [ * | anonymous | users | self | dn[.<dnstyle>]=<DN> ]\n"
"\t[ realanonymous | realusers | realself | realdn[.<dnstyle>]=<DN> ]\n"
} else {
ptr = lutil_strcopy( ptr, "dn." );
- ptr = lutil_strcopy( ptr, style_strings[bdn->a_style] );
+ if ( bdn->a_style == ACL_STYLE_BASE )
+ ptr = lutil_strcopy( ptr, style_base );
+ else
+ ptr = lutil_strcopy( ptr, style_strings[bdn->a_style] );
if ( bdn->a_style == ACL_STYLE_LEVEL ) {
int n = sprintf( ptr, "{%d}", bdn->a_level );
if ( n > 0 ) {
}
if ( !BER_BVISEMPTY( &b->a_peername_pat ) ) {
- ptr = lutil_strcopy( ptr, " peername=\"" );
+ ptr = lutil_strcopy( ptr, " peername" );
+ *ptr++ = '.';
+ ptr = lutil_strcopy( ptr, style_strings[b->a_peername_style] );
+ *ptr++ = '=';
+ *ptr++ = '"';
ptr = lutil_strcopy( ptr, b->a_peername_pat.bv_val );
*ptr++ = '"';
}
if ( !BER_BVISEMPTY( &b->a_sockname_pat ) ) {
- ptr = lutil_strcopy( ptr, " sockname=\"" );
+ ptr = lutil_strcopy( ptr, " sockname" );
+ *ptr++ = '.';
+ ptr = lutil_strcopy( ptr, style_strings[b->a_sockname_style] );
+ *ptr++ = '=';
+ *ptr++ = '"';
ptr = lutil_strcopy( ptr, b->a_sockname_pat.bv_val );
*ptr++ = '"';
}
if ( !BER_BVISEMPTY( &b->a_domain_pat ) ) {
- ptr = lutil_strcopy( ptr, " domain=" );
+ ptr = lutil_strcopy( ptr, " domain" );
+ *ptr++ = '.';
+ ptr = lutil_strcopy( ptr, style_strings[b->a_domain_style] );
+ if ( b->a_domain_expand ) {
+ ptr = lutil_strcopy( ptr, ",expand" );
+ }
+ *ptr++ = '=';
ptr = lutil_strcopy( ptr, b->a_domain_pat.bv_val );
}
if ( !BER_BVISEMPTY( &b->a_sockurl_pat ) ) {
- ptr = lutil_strcopy( ptr, " sockurl=\"" );
+ ptr = lutil_strcopy( ptr, " sockurl" );
+ *ptr++ = '.';
+ ptr = lutil_strcopy( ptr, style_strings[b->a_sockurl_style] );
+ *ptr++ = '=';
+ *ptr++ = '"';
ptr = lutil_strcopy( ptr, b->a_sockurl_pat.bv_val );
*ptr++ = '"';
}
if ( !BER_BVISEMPTY( &b->a_set_pat ) ) {
- ptr = lutil_strcopy( ptr, " set=\"" );
+ ptr = lutil_strcopy( ptr, " set" );
+ *ptr++ = '.';
+ ptr = lutil_strcopy( ptr, style_strings[b->a_set_style] );
+ *ptr++ = '=';
+ *ptr++ = '"';
ptr = lutil_strcopy( ptr, b->a_set_pat.bv_val );
*ptr++ = '"';
}
if ( !BER_BVISNULL( &a->acl_dn_pat ) ) {
to++;
ptr = lutil_strcopy( ptr, " dn." );
- ptr = lutil_strcopy( ptr, style_strings[a->acl_dn_style] );
+ if ( a->acl_dn_style == ACL_STYLE_BASE )
+ ptr = lutil_strcopy( ptr, style_base );
+ else
+ ptr = lutil_strcopy( ptr, style_strings[a->acl_dn_style] );
*ptr++ = '=';
*ptr++ = '"';
ptr = lutil_strcopy( ptr, a->acl_dn_pat.bv_val );
if ( !BER_BVISEMPTY( &a->acl_attrval ) ) {
to++;
ptr = lutil_strcopy( ptr, " val." );
- ptr = lutil_strcopy( ptr, style_strings[a->acl_attrval_style] );
+ if ( a->acl_attrval_style == ACL_STYLE_BASE &&
+ a->acl_attrs[0].an_desc->ad_type->sat_syntax ==
+ slap_schema.si_syn_distinguishedName )
+ ptr = lutil_strcopy( ptr, style_base );
+ else
+ ptr = lutil_strcopy( ptr, style_strings[a->acl_attrval_style] );
*ptr++ = '=';
*ptr++ = '"';
ptr = lutil_strcopy( ptr, a->acl_attrval.bv_val );