X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Facl.c;h=6babdba3390e2b99a823f28f490c83677cf7fec6;hb=4a8d8eb78a610baefde7f5b3e0a371961dafff84;hp=475826cc87a77bf75f6947f03ab5f22aa9c9d0bd;hpb=bfb646553327ea973306aa7b2885a56ade18f1d5;p=openldap
diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 475826cc87..6babdba339 100644
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -2,7 +2,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,6 +48,8 @@
static struct berval
aci_bv_entry = BER_BVC("entry"),
aci_bv_children = BER_BVC("children"),
+ aci_bv_onelevel = BER_BVC("onelevel"),
+ aci_bv_subtree = BER_BVC("subtree"),
aci_bv_br_entry = BER_BVC("[entry]"),
aci_bv_br_all = BER_BVC("[all]"),
aci_bv_access_id = BER_BVC("access-id"),
@@ -75,13 +77,18 @@ static struct berval
aci_bv_role_attr = BER_BVC(SLAPD_ROLE_ATTR),
aci_bv_set_attr = BER_BVC(SLAPD_ACI_SET_ATTR);
+typedef enum slap_aci_scope_t {
+ SLAP_ACI_SCOPE_ENTRY = 0x1,
+ SLAP_ACI_SCOPE_CHILDREN = 0x2,
+ SLAP_ACI_SCOPE_SUBTREE = ( SLAP_ACI_SCOPE_ENTRY | SLAP_ACI_SCOPE_CHILDREN )
+} slap_aci_scope_t;
static AccessControl * acl_get(
AccessControl *ac, int *count,
Operation *op, Entry *e,
AttributeDescription *desc,
struct berval *val,
- int nmatches, regmatch_t *matches,
+ int nmatch, regmatch_t *matches,
AccessControlState *state );
static slap_control_t acl_mask(
@@ -89,6 +96,7 @@ static slap_control_t acl_mask(
Operation *op, Entry *e,
AttributeDescription *desc,
struct berval *val,
+ int nmatch,
regmatch_t *matches,
int count,
AccessControlState *state );
@@ -99,17 +107,19 @@ static int aci_mask(
AttributeDescription *desc,
struct berval *val,
struct berval *aci,
+ int nmatch,
regmatch_t *matches,
slap_access_t *grant,
slap_access_t *deny,
- struct berval *scope);
+ slap_aci_scope_t scope);
#endif
static int regex_matches(
- struct berval *pat, char *str, char *buf, regmatch_t *matches);
-static void string_expand(
+ struct berval *pat, char *str, char *buf,
+ int nmatch, regmatch_t *matches);
+static int string_expand(
struct berval *newbuf, struct berval *pattern,
- char *match, regmatch_t *matches);
+ char *match, int nmatch, regmatch_t *matches);
typedef struct AciSetCookie {
Operation *op;
@@ -117,6 +127,7 @@ typedef struct AciSetCookie {
} AciSetCookie;
SLAP_SET_GATHER aci_set_gather;
+SLAP_SET_GATHER aci_set_gather2;
static int aci_match_set ( struct berval *subj, Operation *op,
Entry *e, int setref );
@@ -142,12 +153,12 @@ static int aci_match_set ( struct berval *subj, Operation *op,
int
access_allowed_mask(
Operation *op,
- Entry *e,
+ Entry *e,
AttributeDescription *desc,
- struct berval *val,
- slap_access_t access,
- AccessControlState *state,
- slap_mask_t *maskp )
+ struct berval *val,
+ slap_access_t access,
+ AccessControlState *state,
+ slap_mask_t *maskp )
{
int ret = 1;
int count;
@@ -201,15 +212,9 @@ access_allowed_mask(
state->as_vd_ad=desc;
}
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, ENTRY,
- "access_allowed: %s access to \"%s\" \"%s\" requested\n",
- access2str( access ), e->e_dn, attr );
-#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: %s access to \"%s\" \"%s\" requested\n",
access2str( access ), e->e_dn, attr );
-#endif
if ( op == NULL ) {
/* no-op call */
@@ -244,17 +249,11 @@ access_allowed_mask(
/* grant database root access */
if ( be != NULL && be_isroot( op ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, INFO,
- "access_allowed: conn %lu root access granted\n",
- op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_ACL,
"<= root access granted\n",
0, 0, 0 );
-#endif
if ( maskp ) {
- mask = ACL_LVL_WRITE;
+ mask = ACL_LVL_MANAGE;
}
goto done;
@@ -269,33 +268,19 @@ access_allowed_mask(
&& desc != slap_schema.si_ad_entry
&& desc != slap_schema.si_ad_children )
{
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "access_allowed: conn %lu NoUserMod Operational attribute: %s "
- "access granted\n", op->o_connid, attr , 0 );
-#else
Debug( LDAP_DEBUG_ACL, "NoUserMod Operational attribute:"
" %s access granted\n",
attr, 0, 0 );
-#endif
goto done;
}
/* use backend default access if no backend acls */
if( be != NULL && be->be_acl == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "access_allowed: backend default %s access %s to \"%s\"\n",
- access2str( access ),
- be->be_dfltaccess >= access ? "granted" : "denied",
- op->o_dn.bv_val ? op->o_dn.bv_val : "(anonymous)" );
-#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: backend default %s access %s to \"%s\"\n",
access2str( access ),
be->be_dfltaccess >= access ? "granted" : "denied",
op->o_dn.bv_val ? op->o_dn.bv_val : "(anonymous)" );
-#endif
ret = be->be_dfltaccess >= access;
if ( maskp ) {
@@ -313,18 +298,10 @@ access_allowed_mask(
/* be is always non-NULL */
/* use global default access if no global acls */
} else if ( be == NULL && frontendDB->be_acl == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "access_allowed: global default %s access %s to \"%s\"\n",
- access2str( access ),
- frontendDB->be_dfltaccess >= access ? "granted" : "denied",
- op->o_dn.bv_val );
-#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: global default %s access %s to \"%s\"\n",
access2str( access ),
frontendDB->be_dfltaccess >= access ? "granted" : "denied", op->o_dn.bv_val );
-#endif
ret = frontendDB->be_dfltaccess >= access;
if ( maskp ) {
@@ -368,25 +345,15 @@ access_allowed_mask(
int i;
for (i = 0; i < MAXREMATCHES && matches[i].rm_so > 0; i++) {
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "access_allowed: match[%d]: %d %d ",
- i, (int)matches[i].rm_so, (int)matches[i].rm_eo );
-#else
Debug( LDAP_DEBUG_ACL, "=> match[%d]: %d %d ", i,
(int)matches[i].rm_so, (int)matches[i].rm_eo );
-#endif
if( matches[i].rm_so <= matches[0].rm_eo ) {
int n;
for ( n = matches[i].rm_so; n < matches[i].rm_eo; n++) {
Debug( LDAP_DEBUG_ACL, "%c", e->e_ndn[n], 0, 0 );
}
}
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, ARGS, "\n" , 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ARGS, "\n", 0, 0, 0 );
-#endif
}
if (state) {
@@ -401,7 +368,7 @@ access_allowed_mask(
vd_access:
control = acl_mask( a, &mask, op,
- e, desc, val, matches, count, state );
+ e, desc, val, MAXREMATCHES, matches, count, state );
if ( control != ACL_BREAK ) {
break;
@@ -411,41 +378,23 @@ vd_access:
}
if ( ACL_IS_INVALID( mask ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "access_allowed: conn %lu \"%s\" (%s) invalid!\n",
- op->o_connid, e->e_dn, attr );
-#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: \"%s\" (%s) invalid!\n",
e->e_dn, attr, 0 );
-#endif
ACL_INIT(mask);
} else if ( control == ACL_BREAK ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "access_allowed: conn %lu no more rules\n", op->o_connid, 0,0 );
-#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: no more rules\n", 0, 0, 0);
-#endif
goto done;
}
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, ENTRY,
- "access_allowed: %s access %s by %s\n",
- access2str( access ), ACL_GRANT( mask, access ) ? "granted" : "denied",
- accessmask2str( mask, accessmaskbuf ) );
-#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: %s access %s by %s\n",
access2str( access ),
ACL_GRANT(mask, access) ? "granted" : "denied",
- accessmask2str( mask, accessmaskbuf ) );
-#endif
+ accessmask2str( mask, accessmaskbuf, 1 ) );
ret = ACL_GRANT(mask, access);
@@ -516,26 +465,14 @@ acl_get(
if ( a->acl_dn_pat.bv_len || ( a->acl_dn_style != ACL_STYLE_REGEX )) {
if ( a->acl_dn_style == ACL_STYLE_REGEX ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "acl_get: dnpat [%d] %s nsub: %d\n",
- *count, a->acl_dn_pat.bv_val,
- (int) a->acl_dn_re.re_nsub );
-#else
Debug( LDAP_DEBUG_ACL, "=> dnpat: [%d] %s nsub: %d\n",
*count, a->acl_dn_pat.bv_val, (int) a->acl_dn_re.re_nsub );
-#endif
if (regexec(&a->acl_dn_re, e->e_ndn, nmatch, matches, 0))
continue;
} else {
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1, "acl_get: dn [%d] %s\n",
- *count, a->acl_dn_pat.bv_val, 0 );
-#else
Debug( LDAP_DEBUG_ACL, "=> dn: [%d] %s\n",
*count, a->acl_dn_pat.bv_val, 0 );
-#endif
patlen = a->acl_dn_pat.bv_len;
if ( dnlen < patlen )
continue;
@@ -576,13 +513,8 @@ acl_get(
continue;
}
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "acl_get: [%d] matched\n", *count, 0, 0 );
-#else
Debug( LDAP_DEBUG_ACL, "=> acl_get: [%d] matched\n",
*count, 0, 0 );
-#endif
}
if ( a->acl_attrs && !ad_inlist( desc, a->acl_attrs ) ) {
@@ -606,29 +538,20 @@ acl_get(
}
if ( a->acl_attrval_style == ACL_STYLE_REGEX ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "acl_get: valpat %s\n",
- a->acl_attrval.bv_val, 0, 0 );
-#else
Debug( LDAP_DEBUG_ACL,
"acl_get: valpat %s\n",
a->acl_attrval.bv_val, 0, 0 );
-#endif
- if (regexec(&a->acl_attrval_re, val->bv_val, 0, NULL, 0))
+ if ( regexec( &a->acl_attrval_re, val->bv_val, 0, NULL, 0 ) )
+ {
continue;
+ }
+
} else {
int match = 0;
const char *text;
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "acl_get: val %s\n",
- a->acl_attrval.bv_val, 0, 0 );
-#else
Debug( LDAP_DEBUG_ACL,
"acl_get: val %s\n",
a->acl_attrval.bv_val, 0, 0 );
-#endif
if ( a->acl_attrs[0].an_desc->ad_type->sat_syntax != slap_schema.si_syn_distinguishedName ) {
if (value_match( &match, desc,
@@ -685,21 +608,12 @@ acl_get(
}
}
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "acl_get: [%d] attr %s\n", *count, attr ,0 );
-#else
Debug( LDAP_DEBUG_ACL, "=> acl_get: [%d] attr %s\n",
*count, attr, 0);
-#endif
return a;
}
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, RESULTS, "acl_get: done.\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ACL, "<= acl_get: done.\n", 0, 0, 0 );
-#endif
return( NULL );
}
@@ -729,15 +643,16 @@ acl_get(
static slap_control_t
acl_mask(
- AccessControl *a,
- slap_mask_t *mask,
- Operation *op,
- Entry *e,
- AttributeDescription *desc,
- struct berval *val,
- regmatch_t *matches,
- int count,
- AccessControlState *state )
+ AccessControl *a,
+ slap_mask_t *mask,
+ Operation *op,
+ Entry *e,
+ AttributeDescription *desc,
+ struct berval *val,
+ int nmatch,
+ regmatch_t *matches,
+ int count,
+ AccessControlState *state )
{
int i, odnlen, patlen;
Access *b;
@@ -755,16 +670,6 @@ acl_mask(
assert( attr != NULL );
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, ENTRY,
- "acl_mask: conn %lu access to entry \"%s\", attr \"%s\" requested\n",
- op->o_connid, e->e_dn, attr );
-
- LDAP_LOG( ACL, ARGS,
- " to %s by \"%s\", (%s) \n", val ? "value" : "all values",
- op->o_ndn.bv_val ? op->o_ndn.bv_val : "",
- accessmask2str( *mask, accessmaskbuf ) );
-#else
Debug( LDAP_DEBUG_ACL,
"=> acl_mask: access to entry \"%s\", attr \"%s\" requested\n",
e->e_dn, attr, 0 );
@@ -773,8 +678,7 @@ acl_mask(
"=> acl_mask: to %s by \"%s\", (%s) \n",
val ? "value" : "all values",
op->o_ndn.bv_val ? op->o_ndn.bv_val : "",
- accessmask2str( *mask, accessmaskbuf ) );
-#endif
+ accessmask2str( *mask, accessmaskbuf, 1) );
if( state && ( state->as_recorded & ACL_STATE_RECORDED_VD )
@@ -794,31 +698,31 @@ acl_mask(
ACL_INVALIDATE( modmask );
/* AND clauses */
- if ( b->a_dn_pat.bv_len != 0 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "acl_mask: conn %lu check a_dn_pat: %s\n",
- op->o_connid, b->a_dn_pat.bv_val ,0 );
-#else
+ if ( !BER_BVISEMPTY( &b->a_dn_pat ) ) {
Debug( LDAP_DEBUG_ACL, "<= check a_dn_pat: %s\n",
b->a_dn_pat.bv_val, 0, 0);
-#endif
/*
* if access applies to the entry itself, and the
* user is bound as somebody in the same namespace as
* the entry, OR the given dn matches the dn pattern
*/
- if ( bvmatch( &b->a_dn_pat, &aci_bv_anonymous ) ) {
+ /*
+ * NOTE: styles "anonymous", "users" and "self"
+ * have been moved to enum slap_style_t, whose
+ * value is set in a_dn_style; however, the string
+ * is maintaned in a_dn_pat.
+ */
+ if ( b->a_dn_style == ACL_STYLE_ANONYMOUS ) {
if ( op->o_ndn.bv_len != 0 ) {
continue;
}
- } else if ( bvmatch( &b->a_dn_pat, &aci_bv_users ) ) {
+ } else if ( b->a_dn_style == ACL_STYLE_USERS ) {
if ( op->o_ndn.bv_len == 0 ) {
continue;
}
- } else if ( bvmatch( &b->a_dn_pat, &aci_bv_self ) ) {
+ } else if ( b->a_dn_style == ACL_STYLE_SELF ) {
if ( op->o_ndn.bv_len == 0 ) {
continue;
}
@@ -829,10 +733,51 @@ acl_mask(
} else if ( b->a_dn_style == ACL_STYLE_REGEX ) {
if ( !ber_bvccmp( &b->a_dn_pat, '*' ) ) {
- int ret = regex_matches( &b->a_dn_pat,
- op->o_ndn.bv_val, e->e_ndn, matches );
+ int tmp_nmatch;
+ regmatch_t tmp_matches[2],
+ *tmp_matchesp = tmp_matches;
+
+ int rc = 0;
- if( ret == 0 ) {
+ switch ( a->acl_dn_style ) {
+ case ACL_STYLE_REGEX:
+ if ( !BER_BVISNULL( &a->acl_dn_pat ) ) {
+ tmp_matchesp = matches;
+ tmp_nmatch = nmatch;
+ break;
+ }
+ /* FALLTHRU: applies also to ACL_STYLE_REGEX when pattern is "*" */
+
+ case ACL_STYLE_BASE:
+ tmp_matches[0].rm_so = 0;
+ tmp_matches[0].rm_eo = e->e_nname.bv_len;
+ tmp_nmatch = 1;
+ break;
+
+ case ACL_STYLE_ONE:
+ case ACL_STYLE_SUBTREE:
+ case ACL_STYLE_CHILDREN:
+ tmp_matches[0].rm_so = 0;
+ tmp_matches[0].rm_eo = e->e_nname.bv_len;
+ tmp_matches[1].rm_so = e->e_nname.bv_len - a->acl_dn_pat.bv_len;
+ tmp_matches[1].rm_eo = e->e_nname.bv_len;
+ tmp_nmatch = 2;
+ break;
+
+ default:
+ /* error */
+ rc = 1;
+ break;
+ }
+
+ if ( rc ) {
+ continue;
+ }
+
+ if ( !regex_matches( &b->a_dn_pat,
+ op->o_ndn.bv_val, e->e_ndn,
+ tmp_nmatch, tmp_matchesp ) )
+ {
continue;
}
}
@@ -845,18 +790,68 @@ acl_mask(
continue;
if ( b->a_dn_expand ) {
- struct berval bv;
- char buf[ACL_BUF_SIZE];
+ struct berval bv;
+ char buf[ACL_BUF_SIZE];
+
+ int tmp_nmatch;
+ regmatch_t tmp_matches[2],
+ *tmp_matchesp = tmp_matches;
+
+ int rc = 0;
bv.bv_len = sizeof( buf ) - 1;
bv.bv_val = buf;
- string_expand(&bv, &b->a_dn_pat,
- e->e_ndn, matches);
- if ( dnNormalize(0, NULL, NULL, &bv, &pat, op->o_tmpmemctx ) != LDAP_SUCCESS ) {
+ switch ( a->acl_dn_style ) {
+ case ACL_STYLE_REGEX:
+ if ( !BER_BVISNULL( &a->acl_dn_pat ) ) {
+ tmp_matchesp = matches;
+ tmp_nmatch = nmatch;
+ break;
+ }
+ /* FALLTHRU: applies also to ACL_STYLE_REGEX when pattern is "*" */
+
+ case ACL_STYLE_BASE:
+ tmp_matches[0].rm_so = 0;
+ tmp_matches[0].rm_eo = e->e_nname.bv_len;
+ tmp_nmatch = 1;
+ break;
+
+ case ACL_STYLE_ONE:
+ case ACL_STYLE_SUBTREE:
+ case ACL_STYLE_CHILDREN:
+ tmp_matches[0].rm_so = 0;
+ tmp_matches[0].rm_eo = e->e_nname.bv_len;
+ tmp_matches[1].rm_so = e->e_nname.bv_len - a->acl_dn_pat.bv_len;
+ tmp_matches[1].rm_eo = e->e_nname.bv_len;
+ tmp_nmatch = 2;
+ break;
+
+ default:
+ /* error */
+ rc = 1;
+ break;
+ }
+
+ if ( rc ) {
+ continue;
+ }
+
+ if ( string_expand( &bv, &b->a_dn_pat,
+ e->e_nname.bv_val,
+ tmp_nmatch, tmp_matchesp ) )
+ {
+ continue;
+ }
+
+ if ( dnNormalize(0, NULL, NULL, &bv,
+ &pat, op->o_tmpmemctx )
+ != LDAP_SUCCESS )
+ {
/* did not expand to a valid dn */
continue;
}
+
} else {
pat = b->a_dn_pat;
}
@@ -909,7 +904,7 @@ acl_mask(
dn_match_cleanup:;
if ( pat.bv_val != b->a_dn_pat.bv_val ) {
- free( pat.bv_val );
+ slap_sl_free( pat.bv_val, op->o_tmpmemctx );
}
if ( !got_match ) {
@@ -918,23 +913,17 @@ dn_match_cleanup:;
}
}
- if ( b->a_sockurl_pat.bv_len ) {
+ if ( !BER_BVISEMPTY( &b->a_sockurl_pat ) ) {
if ( ! op->o_conn->c_listener ) {
continue;
}
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "acl_mask: conn %lu check a_sockurl_pat: %s\n",
- op->o_connid, b->a_sockurl_pat.bv_val , 0 );
-#else
Debug( LDAP_DEBUG_ACL, "<= check a_sockurl_pat: %s\n",
b->a_sockurl_pat.bv_val, 0, 0 );
-#endif
if ( !ber_bvccmp( &b->a_sockurl_pat, '*' ) ) {
if ( b->a_sockurl_style == ACL_STYLE_REGEX) {
if (!regex_matches( &b->a_sockurl_pat, op->o_conn->c_listener_url.bv_val,
- e->e_ndn, matches ) )
+ e->e_ndn, nmatch, matches ) )
{
continue;
}
@@ -945,35 +934,36 @@ dn_match_cleanup:;
bv.bv_len = sizeof( buf ) - 1;
bv.bv_val = buf;
- string_expand( &bv, &b->a_sockurl_pat, e->e_ndn, matches );
+ if ( string_expand( &bv, &b->a_sockurl_pat,
+ e->e_ndn, nmatch, matches ) )
+ {
+ continue;
+ }
- if ( ber_bvstrcasecmp( &bv, &op->o_conn->c_listener_url ) != 0 ) {
+ if ( ber_bvstrcasecmp( &bv, &op->o_conn->c_listener_url ) != 0 )
+ {
continue;
}
} else {
if ( ber_bvstrcasecmp( &b->a_sockurl_pat, &op->o_conn->c_listener_url ) != 0 )
+ {
continue;
+ }
}
}
}
- if ( b->a_domain_pat.bv_len ) {
+ if ( !BER_BVISEMPTY( &b->a_domain_pat ) ) {
if ( !op->o_conn->c_peer_domain.bv_val ) {
continue;
}
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "acl_mask: conn %lu check a_domain_pat: %s\n",
- op->o_connid, b->a_domain_pat.bv_val , 0 );
-#else
Debug( LDAP_DEBUG_ACL, "<= check a_domain_pat: %s\n",
b->a_domain_pat.bv_val, 0, 0 );
-#endif
if ( !ber_bvccmp( &b->a_domain_pat, '*' ) ) {
if ( b->a_domain_style == ACL_STYLE_REGEX) {
if (!regex_matches( &b->a_domain_pat, op->o_conn->c_peer_domain.bv_val,
- e->e_ndn, matches ) )
+ e->e_ndn, nmatch, matches ) )
{
continue;
}
@@ -989,7 +979,11 @@ dn_match_cleanup:;
bv.bv_len = sizeof(buf) - 1;
bv.bv_val = buf;
- string_expand(&bv, &b->a_domain_pat, e->e_ndn, matches);
+ if ( string_expand(&bv, &b->a_domain_pat,
+ e->e_ndn, nmatch, matches) )
+ {
+ continue;
+ }
pat = bv;
}
@@ -1015,22 +1009,16 @@ dn_match_cleanup:;
}
}
- if ( b->a_peername_pat.bv_len ) {
+ if ( !BER_BVISEMPTY( &b->a_peername_pat ) ) {
if ( !op->o_conn->c_peer_name.bv_val ) {
continue;
}
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "acl_mask: conn %lu check a_peername_path: %s\n",
- op->o_connid, b->a_peername_pat.bv_val , 0 );
-#else
Debug( LDAP_DEBUG_ACL, "<= check a_peername_path: %s\n",
b->a_peername_pat.bv_val, 0, 0 );
-#endif
if ( !ber_bvccmp( &b->a_peername_pat, '*' ) ) {
if ( b->a_peername_style == ACL_STYLE_REGEX ) {
if (!regex_matches( &b->a_peername_pat, op->o_conn->c_peer_name.bv_val,
- e->e_ndn, matches ) )
+ e->e_ndn, nmatch, matches ) )
{
continue;
}
@@ -1048,7 +1036,11 @@ dn_match_cleanup:;
bv.bv_len = sizeof( buf ) - 1;
bv.bv_val = buf;
- string_expand( &bv, &b->a_peername_pat, e->e_ndn, matches );
+ if ( string_expand( &bv, &b->a_peername_pat,
+ e->e_ndn, nmatch, matches ) )
+ {
+ continue;
+ }
if ( ber_bvstrcasecmp( &bv, &op->o_conn->c_peer_name ) != 0 ) {
continue;
@@ -1125,22 +1117,16 @@ dn_match_cleanup:;
}
}
- if ( b->a_sockname_pat.bv_len ) {
- if ( !op->o_conn->c_sock_name.bv_val ) {
+ if ( !BER_BVISEMPTY( &b->a_sockname_pat ) ) {
+ if ( BER_BVISNULL( &op->o_conn->c_sock_name ) ) {
continue;
}
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "acl_mask: conn %lu check a_sockname_path: %s\n",
- op->o_connid, b->a_sockname_pat.bv_val , 0 );
-#else
Debug( LDAP_DEBUG_ACL, "<= check a_sockname_path: %s\n",
b->a_sockname_pat.bv_val, 0, 0 );
-#endif
if ( !ber_bvccmp( &b->a_sockname_pat, '*' ) ) {
if ( b->a_sockname_style == ACL_STYLE_REGEX) {
if (!regex_matches( &b->a_sockname_pat, op->o_conn->c_sock_name.bv_val,
- e->e_ndn, matches ) )
+ e->e_ndn, nmatch, matches ) )
{
continue;
}
@@ -1151,15 +1137,20 @@ dn_match_cleanup:;
bv.bv_len = sizeof( buf ) - 1;
bv.bv_val = buf;
- string_expand( &bv, &b->a_sockname_pat, e->e_ndn, matches );
+ if ( string_expand( &bv, &b->a_sockname_pat,
+ e->e_ndn, nmatch, matches ) )
+ {
+ continue;
+ }
if ( ber_bvstrcasecmp( &bv, &op->o_conn->c_sock_name ) != 0 ) {
continue;
}
} else {
- if ( ber_bvstrcasecmp( &b->a_sockname_pat, &op->o_conn->c_sock_name ) != 0 )
+ if ( ber_bvstrcasecmp( &b->a_sockname_pat, &op->o_conn->c_sock_name ) != 0 ) {
continue;
+ }
}
}
}
@@ -1177,14 +1168,8 @@ dn_match_cleanup:;
continue;
}
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "acl_mask: conn %lu check a_dn_pat: %s\n",
- op->o_connid, attr , 0 );
-#else
Debug( LDAP_DEBUG_ACL, "<= check a_dn_at: %s\n",
attr, 0, 0);
-#endif
bv = op->o_ndn;
/* see if asker is listed in dnattr */
@@ -1248,7 +1233,7 @@ dn_match_cleanup:;
}
}
- if ( b->a_group_pat.bv_len ) {
+ if ( !BER_BVISEMPTY( &b->a_group_pat ) ) {
struct berval bv;
struct berval ndn = BER_BVNULL;
int rc;
@@ -1263,12 +1248,61 @@ dn_match_cleanup:;
*/
/* see if asker is listed in dnattr */
if ( b->a_group_style == ACL_STYLE_EXPAND ) {
- char buf[ACL_BUF_SIZE];
+ char buf[ACL_BUF_SIZE];
+ int tmp_nmatch;
+ regmatch_t tmp_matches[2],
+ *tmp_matchesp = tmp_matches;
+
bv.bv_len = sizeof(buf) - 1;
- bv.bv_val = buf;
+ bv.bv_val = buf;
+
+ rc = 0;
+
+ switch ( a->acl_dn_style ) {
+ case ACL_STYLE_REGEX:
+ if ( !BER_BVISNULL( &a->acl_dn_pat ) ) {
+ tmp_matchesp = matches;
+ tmp_nmatch = nmatch;
+ break;
+ }
- string_expand( &bv, &b->a_group_pat, e->e_ndn, matches );
- if ( dnNormalize( 0, NULL, NULL, &bv, &ndn, op->o_tmpmemctx ) != LDAP_SUCCESS ) {
+ /* FALLTHRU: applies also to ACL_STYLE_REGEX when pattern is "*" */
+ case ACL_STYLE_BASE:
+ tmp_matches[0].rm_so = 0;
+ tmp_matches[0].rm_eo = e->e_nname.bv_len;
+ tmp_nmatch = 1;
+ break;
+
+ case ACL_STYLE_ONE:
+ case ACL_STYLE_SUBTREE:
+ case ACL_STYLE_CHILDREN:
+ tmp_matches[0].rm_so = 0;
+ tmp_matches[0].rm_eo = e->e_nname.bv_len;
+ tmp_matches[1].rm_so = e->e_nname.bv_len - a->acl_dn_pat.bv_len;
+ tmp_matches[1].rm_eo = e->e_nname.bv_len;
+ tmp_nmatch = 2;
+ break;
+
+ default:
+ /* error */
+ rc = 1;
+ break;
+ }
+
+ if ( rc ) {
+ continue;
+ }
+
+ if ( string_expand( &bv, &b->a_group_pat,
+ e->e_nname.bv_val,
+ tmp_nmatch, tmp_matchesp ) )
+ {
+ continue;
+ }
+
+ if ( dnNormalize( 0, NULL, NULL, &bv, &ndn,
+ op->o_tmpmemctx ) != LDAP_SUCCESS )
+ {
/* did not expand to a valid dn */
continue;
}
@@ -1282,105 +1316,195 @@ dn_match_cleanup:;
rc = backend_group( op, e, &bv, &op->o_ndn,
b->a_group_oc, b->a_group_at );
- if ( ndn.bv_val ) free( ndn.bv_val );
+ if ( ndn.bv_val ) {
+ slap_sl_free( ndn.bv_val, op->o_tmpmemctx );
+ }
if ( rc != 0 ) {
continue;
}
}
- if ( b->a_set_pat.bv_len != 0 ) {
- struct berval bv;
- char buf[ACL_BUF_SIZE];
- if( b->a_set_style == ACL_STYLE_REGEX ){
- bv.bv_len = sizeof(buf) - 1;
+ if ( !BER_BVISEMPTY( &b->a_set_pat ) ) {
+ struct berval bv;
+ char buf[ACL_BUF_SIZE];
+
+ if ( b->a_set_style == ACL_STYLE_EXPAND ) {
+ int tmp_nmatch;
+ regmatch_t tmp_matches[2],
+ *tmp_matchesp = tmp_matches;
+ int rc = 0;
+
+ bv.bv_len = sizeof( buf ) - 1;
bv.bv_val = buf;
- string_expand( &bv, &b->a_set_pat, e->e_ndn, matches );
- }else{
+
+ rc = 0;
+
+ switch ( a->acl_dn_style ) {
+ case ACL_STYLE_REGEX:
+ if ( !BER_BVISNULL( &a->acl_dn_pat ) ) {
+ tmp_matchesp = matches;
+ tmp_nmatch = nmatch;
+ break;
+ }
+
+ /* FALLTHRU: applies also to ACL_STYLE_REGEX when pattern is "*" */
+ case ACL_STYLE_BASE:
+ tmp_matches[0].rm_so = 0;
+ tmp_matches[0].rm_eo = e->e_nname.bv_len;
+ tmp_nmatch = 1;
+ break;
+
+ case ACL_STYLE_ONE:
+ case ACL_STYLE_SUBTREE:
+ case ACL_STYLE_CHILDREN:
+ tmp_matches[0].rm_so = 0;
+ tmp_matches[0].rm_eo = e->e_nname.bv_len;
+ tmp_matches[1].rm_so = e->e_nname.bv_len - a->acl_dn_pat.bv_len;
+ tmp_matches[1].rm_eo = e->e_nname.bv_len;
+ tmp_nmatch = 2;
+ break;
+
+ default:
+ /* error */
+ rc = 1;
+ break;
+ }
+
+ if ( rc ) {
+ continue;
+ }
+
+ if ( string_expand( &bv, &b->a_set_pat,
+ e->e_nname.bv_val,
+ tmp_nmatch, tmp_matchesp ) )
+ {
+ continue;
+ }
+
+ } else {
bv = b->a_set_pat;
}
- if (aci_match_set( &bv, op, e, 0 ) == 0) {
+
+ if ( aci_match_set( &bv, op, e, 0 ) == 0 ) {
continue;
}
}
if ( b->a_authz.sai_ssf ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "acl_mask: conn %lu check a_authz.sai_ssf: ACL %u > OP %u\n",
- op->o_connid, b->a_authz.sai_ssf, op->o_ssf );
-#else
Debug( LDAP_DEBUG_ACL, "<= check a_authz.sai_ssf: ACL %u > OP %u\n",
b->a_authz.sai_ssf, op->o_ssf, 0 );
-#endif
if ( b->a_authz.sai_ssf > op->o_ssf ) {
continue;
}
}
if ( b->a_authz.sai_transport_ssf ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "acl_mask: conn %lu check a_authz.sai_transport_ssf: "
- "ACL %u > OP %u\n",
- op->o_connid, b->a_authz.sai_transport_ssf,
- op->o_transport_ssf );
-#else
Debug( LDAP_DEBUG_ACL,
"<= check a_authz.sai_transport_ssf: ACL %u > OP %u\n",
b->a_authz.sai_transport_ssf, op->o_transport_ssf, 0 );
-#endif
if ( b->a_authz.sai_transport_ssf > op->o_transport_ssf ) {
continue;
}
}
if ( b->a_authz.sai_tls_ssf ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "acl_mask: conn %lu check a_authz.sai_tls_ssf: ACL %u > "
- "OP %u\n",
- op->o_connid, b->a_authz.sai_tls_ssf, op->o_tls_ssf );
-#else
Debug( LDAP_DEBUG_ACL,
"<= check a_authz.sai_tls_ssf: ACL %u > OP %u\n",
b->a_authz.sai_tls_ssf, op->o_tls_ssf, 0 );
-#endif
if ( b->a_authz.sai_tls_ssf > op->o_tls_ssf ) {
continue;
}
}
if ( b->a_authz.sai_sasl_ssf ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "acl_mask: conn %lu check a_authz.sai_sasl_ssf: "
- "ACL %u > OP %u\n",
- op->o_connid, b->a_authz.sai_sasl_ssf, op->o_sasl_ssf );
-#else
Debug( LDAP_DEBUG_ACL,
"<= check a_authz.sai_sasl_ssf: ACL %u > OP %u\n",
b->a_authz.sai_sasl_ssf, op->o_sasl_ssf, 0 );
-#endif
if ( b->a_authz.sai_sasl_ssf > op->o_sasl_ssf ) {
continue;
}
}
+#ifdef SLAP_DYNACL
+ if ( b->a_dynacl ) {
+ slap_dynacl_t *da;
+ slap_access_t tgrant, tdeny;
+
+ /* this case works different from the others above.
+ * since aci's themselves give permissions, we need
+ * to first check b->a_access_mask, the ACL's access level.
+ */
+ if ( BER_BVISEMPTY( &e->e_nname ) ) {
+ /* no ACIs in the root DSE */
+ continue;
+ }
+
+ /* first check if the right being requested
+ * is allowed by the ACL clause.
+ */
+ if ( ! ACL_GRANT( b->a_access_mask, *mask ) ) {
+ continue;
+ }
+
+ /* start out with nothing granted, nothing denied */
+ ACL_INIT(tgrant);
+ ACL_INIT(tdeny);
+
+ for ( da = b->a_dynacl; da; da = da->da_next ) {
+ slap_access_t grant, deny;
+
+ (void)( *da->da_mask )( da->da_private, op, e, desc, val, nmatch, matches, &grant, &deny );
+
+ tgrant |= grant;
+ tdeny |= deny;
+ }
+
+ /* remove anything that the ACL clause does not allow */
+ tgrant &= b->a_access_mask & ACL_PRIV_MASK;
+ tdeny &= ACL_PRIV_MASK;
+
+ /* see if we have anything to contribute */
+ if( ACL_IS_INVALID(tgrant) && ACL_IS_INVALID(tdeny) ) {
+ continue;
+ }
+
+ /* this could be improved by changing acl_mask so that it can deal with
+ * by clauses that return grant/deny pairs. Right now, it does either
+ * additive or subtractive rights, but not both at the same time. So,
+ * we need to combine the grant/deny pair into a single rights mask in
+ * a smart way: if either grant or deny is "empty", then we use the
+ * opposite as is, otherwise we remove any denied rights from the grant
+ * rights mask and construct an additive mask.
+ */
+ if (ACL_IS_INVALID(tdeny)) {
+ modmask = tgrant | ACL_PRIV_ADDITIVE;
+
+ } else if (ACL_IS_INVALID(tgrant)) {
+ modmask = tdeny | ACL_PRIV_SUBSTRACTIVE;
+
+ } else {
+ modmask = (tgrant & ~tdeny) | ACL_PRIV_ADDITIVE;
+ }
+
+ } else
+#else /* !SLAP_DYNACL */
+
#ifdef SLAPD_ACI_ENABLED
if ( b->a_aci_at != NULL ) {
Attribute *at;
- slap_access_t grant, deny, tgrant, tdeny;
- struct berval parent_ndn, old_parent_ndn;
- BerVarray bvals = NULL;
- int ret,stop;
+ slap_access_t grant, deny, tgrant, tdeny;
+ struct berval parent_ndn,
+ old_parent_ndn = BER_BVNULL;
+ BerVarray bvals = NULL;
+ int ret, stop;
/* this case works different from the others above.
* since aci's themselves give permissions, we need
* to first check b->a_access_mask, the ACL's access level.
*/
- if ( e->e_nname.bv_len == 0 ) {
+ if ( BER_BVISEMPTY( &e->e_nname ) ) {
/* no ACIs in the root DSE */
continue;
}
@@ -1411,27 +1535,28 @@ dn_match_cleanup:;
if (aci_mask( op,
e, desc, val,
&at->a_nvals[i],
- matches, &grant, &deny, &aci_bv_entry ) != 0)
+ nmatch, matches,
+ &grant, &deny, SLAP_ACI_SCOPE_ENTRY ) != 0)
{
tgrant |= grant;
tdeny |= deny;
}
}
Debug(LDAP_DEBUG_ACL, "<= aci_mask grant %s deny %s\n",
- accessmask2str(tgrant,accessmaskbuf),
- accessmask2str(tdeny, accessmaskbuf1), 0);
+ accessmask2str(tgrant,accessmaskbuf, 1),
+ accessmask2str(tdeny, accessmaskbuf1, 1), 0);
}
/* If the entry level aci didn't contain anything valid for the
* current operation, climb up the tree and evaluate the
* acis with scope set to subtree
*/
- if( (tgrant == ACL_PRIV_NONE) && (tdeny == ACL_PRIV_NONE) ){
+ if ( (tgrant == ACL_PRIV_NONE) && (tdeny == ACL_PRIV_NONE) ) {
dnParent(&(e->e_nname), &parent_ndn);
- while ( parent_ndn.bv_val != old_parent_ndn.bv_val ){
+ while ( parent_ndn.bv_val != old_parent_ndn.bv_val ) {
old_parent_ndn = parent_ndn;
Debug(LDAP_DEBUG_ACL, "checking ACI of %s\n", parent_ndn.bv_val, 0, 0);
- ret = backend_attribute(op, NULL, &parent_ndn, b->a_aci_at, &bvals);
+ ret = backend_attribute(op, NULL, &parent_ndn, b->a_aci_at, &bvals, ACL_AUTH);
switch(ret){
case LDAP_SUCCESS :
stop = 0;
@@ -1445,8 +1570,10 @@ dn_match_cleanup:;
* see also ACL_RECORD_VALUE_STATE above */
ACL_RECORD_VALUE_STATE;
#endif
- if (aci_mask(op, e, desc, val, &bvals[i], matches,
- &grant, &deny, &aci_bv_children) != 0) {
+ if (aci_mask(op, e, desc, val, &bvals[i],
+ nmatch, matches,
+ &grant, &deny, SLAP_ACI_SCOPE_CHILDREN ) != 0 )
+ {
tgrant |= grant;
tdeny |= deny;
/* evaluation stops as soon as either a "deny" or a
@@ -1457,8 +1584,8 @@ dn_match_cleanup:;
}
}
Debug(LDAP_DEBUG_ACL, "<= aci_mask grant %s deny %s\n",
- accessmask2str(tgrant,accessmaskbuf),
- accessmask2str(tdeny, accessmaskbuf1), 0);
+ accessmask2str(tgrant,accessmaskbuf, 1),
+ accessmask2str(tdeny, accessmaskbuf1, 1), 0);
}
break;
@@ -1516,27 +1643,20 @@ dn_match_cleanup:;
}
} else
-#endif
+#endif /* SLAPD_ACI_ENABLED */
+#endif /* !SLAP_DYNACL */
{
modmask = b->a_access_mask;
}
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, RESULTS,
- "acl_mask: [%d] applying %s (%s)\n",
- i, accessmask2str( modmask, accessmaskbuf),
- b->a_type == ACL_CONTINUE ? "continue" : b->a_type == ACL_BREAK
- ? "break" : "stop" );
-#else
Debug( LDAP_DEBUG_ACL,
"<= acl_mask: [%d] applying %s (%s)\n",
- i, accessmask2str( modmask, accessmaskbuf ),
+ i, accessmask2str( modmask, accessmaskbuf, 1 ),
b->a_type == ACL_CONTINUE
? "continue"
: b->a_type == ACL_BREAK
? "break"
: "stop" );
-#endif
/* save old mask */
oldmask = *mask;
@@ -1559,15 +1679,9 @@ dn_match_cleanup:;
*mask = modmask;
}
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "acl_mask: conn %lu [%d] mask: %s\n",
- op->o_connid, i, accessmask2str( *mask, accessmaskbuf) );
-#else
Debug( LDAP_DEBUG_ACL,
"<= acl_mask: [%d] mask: %s\n",
- i, accessmask2str(*mask, accessmaskbuf), 0 );
-#endif
+ i, accessmask2str(*mask, accessmaskbuf, 1), 0 );
if( b->a_type == ACL_CONTINUE ) {
continue;
@@ -1583,15 +1697,9 @@ dn_match_cleanup:;
/* implicit "by * none" clause */
ACL_INIT(*mask);
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, RESULTS,
- "acl_mask: conn %lu no more clauses, returning %d (stop)\n",
- op->o_connid, accessmask2str( *mask, accessmaskbuf) , 0 );
-#else
Debug( LDAP_DEBUG_ACL,
"<= acl_mask: no more clauses, returning %s (stop)\n",
- accessmask2str(*mask, accessmaskbuf), 0, 0 );
-#endif
+ accessmask2str(*mask, accessmaskbuf, 1), 0, 0 );
return ACL_STOP;
}
@@ -1625,32 +1733,20 @@ acl_check_modlist(
/* short circuit root database access */
if ( be_isroot( op ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "acl_check_modlist: conn %lu access granted to root user\n",
- op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_ACL,
"<= acl_access_allowed: granted to database root\n",
0, 0, 0 );
-#endif
goto done;
}
/* use backend default access if no backend acls */
if( op->o_bd != NULL && op->o_bd->be_acl == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "acl_check_modlist: backend default %s access %s to \"%s\"\n",
- access2str( ACL_WRITE ),
- op->o_bd->be_dfltaccess >= ACL_WRITE ? "granted" : "denied",
- op->o_dn.bv_val );
-#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: backend default %s access %s to \"%s\"\n",
access2str( ACL_WRITE ),
- op->o_bd->be_dfltaccess >= ACL_WRITE ? "granted" : "denied", op->o_dn.bv_val );
-#endif
+ op->o_bd->be_dfltaccess >= ACL_WRITE
+ ? "granted" : "denied",
+ op->o_dn.bv_val );
ret = (op->o_bd->be_dfltaccess >= ACL_WRITE);
goto done;
}
@@ -1662,15 +1758,9 @@ acl_check_modlist(
* by the user
*/
if ( is_at_no_user_mod( mlist->sml_desc->ad_type ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "acl_check_modlist: conn %lu no-user-mod %s: modify access granted\n",
- op->o_connid, mlist->sml_desc->ad_cname.bv_val , 0 );
-#else
Debug( LDAP_DEBUG_ACL, "acl: no-user-mod %s:"
" modify access granted\n",
mlist->sml_desc->ad_cname.bv_val, 0, 0 );
-#endif
continue;
}
@@ -1750,64 +1840,268 @@ done:
static int
aci_get_part(
- struct berval *list,
- int ix,
- char sep,
- struct berval *bv )
+ struct berval *list,
+ int ix,
+ char sep,
+ struct berval *bv )
{
- int len;
- char *p;
+ int len;
+ char *p;
- if (bv) {
+ if ( bv ) {
BER_BVZERO( bv );
}
len = list->bv_len;
p = list->bv_val;
- while (len >= 0 && --ix >= 0) {
- while (--len >= 0 && *p++ != sep) ;
+ while ( len >= 0 && --ix >= 0 ) {
+ while ( --len >= 0 && *p++ != sep )
+ ;
}
- while (len >= 0 && *p == ' ') {
+ while ( len >= 0 && *p == ' ' ) {
len--;
p++;
}
- if (len < 0)
- return(-1);
+ if ( len < 0 ) {
+ return -1;
+ }
- if (!bv)
- return(0);
+ if ( !bv ) {
+ return 0;
+ }
bv->bv_val = p;
- while (--len >= 0 && *p != sep) {
+ while ( --len >= 0 && *p != sep ) {
bv->bv_len++;
p++;
}
- while (bv->bv_len > 0 && *--p == ' ')
+ while ( bv->bv_len > 0 && *--p == ' ' ) {
bv->bv_len--;
- return(bv->bv_len);
+ }
+
+ return bv->bv_len;
+}
+
+typedef struct aci_set_gather_t {
+ SetCookie *cookie;
+ BerVarray bvals;
+} aci_set_gather_t;
+
+static int
+aci_set_cb_gather( Operation *op, SlapReply *rs )
+{
+ aci_set_gather_t *p = (aci_set_gather_t *)op->o_callback->sc_private;
+
+ if ( rs->sr_type == REP_SEARCH ) {
+ BerValue bvals[ 2 ];
+ BerVarray bvalsp = NULL;
+ int j;
+
+ for ( j = 0; !BER_BVISNULL( &rs->sr_attrs[ j ].an_name ); j++ ) {
+ AttributeDescription *desc = rs->sr_attrs[ j ].an_desc;
+
+ if ( desc == slap_schema.si_ad_entryDN ) {
+ bvalsp = bvals;
+ bvals[ 0 ] = rs->sr_entry->e_nname;
+ BER_BVZERO( &bvals[ 1 ] );
+
+ } else {
+ Attribute *a;
+
+ a = attr_find( rs->sr_entry->e_attrs, desc );
+ if ( a != NULL ) {
+ int i;
+
+ for ( i = 0; !BER_BVISNULL( &a->a_nvals[ i ] ); i++ )
+ ;
+
+ bvalsp = a->a_nvals;
+ }
+ }
+ }
+
+ if ( bvals ) {
+ p->bvals = slap_set_join( p->cookie, p->bvals,
+ ( '|' | SLAP_SET_RREF ), bvalsp );
+ }
+
+ } else {
+ assert( rs->sr_type == REP_RESULT );
+ }
+
+ return 0;
}
BerVarray
-aci_set_gather (SetCookie *cookie, struct berval *name, struct berval *attr)
+aci_set_gather( SetCookie *cookie, struct berval *name, AttributeDescription *desc )
{
- AciSetCookie *cp = (AciSetCookie *)cookie;
- BerVarray bvals = NULL;
- struct berval ndn;
+ AciSetCookie *cp = (AciSetCookie *)cookie;
+ int rc = 0;
+ LDAPURLDesc *ludp = NULL;
+ Operation op2 = { 0 };
+ SlapReply rs = {REP_RESULT};
+ AttributeName anlist[ 2 ], *anlistp = NULL;
+ int nattrs = 0;
+ slap_callback cb = { NULL, aci_set_cb_gather, NULL, NULL };
+ aci_set_gather_t p = { 0 };
+ const char *text = NULL;
+ static struct berval defaultFilter_bv = BER_BVC( "(objectClass=*)" );
/* this routine needs to return the bervals instead of
* plain strings, since syntax is not known. It should
* also return the syntax or some "comparison cookie".
*/
+ if ( strncasecmp( name->bv_val, "ldap:///", STRLENOF( "ldap:///" ) ) != 0 ) {
+ return aci_set_gather2( cookie, name, desc );
+ }
+
+ rc = ldap_url_parse( name->bv_val, &ludp );
+ if ( rc != LDAP_URL_SUCCESS ) {
+ rc = LDAP_PROTOCOL_ERROR;
+ goto url_done;
+ }
+
+ if ( ( ludp->lud_host && ludp->lud_host[0] ) || ludp->lud_exts )
+ {
+ /* host part must be empty */
+ /* extensions parts must be empty */
+ rc = LDAP_PROTOCOL_ERROR;
+ goto url_done;
+ }
- if (dnNormalize(0, NULL, NULL, name, &ndn, cp->op->o_tmpmemctx) == LDAP_SUCCESS) {
- const char *text;
- AttributeDescription *desc = NULL;
- if (slap_bv2ad(attr, &desc, &text) == LDAP_SUCCESS) {
- backend_attribute(cp->op,
- cp->e, &ndn, desc, &bvals);
+ /* Grab the searchbase and see if an appropriate database can be found */
+ ber_str2bv( ludp->lud_dn, 0, 0, &op2.o_req_dn );
+ rc = dnNormalize( 0, NULL, NULL, &op2.o_req_dn,
+ &op2.o_req_ndn, cp->op->o_tmpmemctx );
+ BER_BVZERO( &op2.o_req_dn );
+ if ( rc != LDAP_SUCCESS ) {
+ goto url_done;
+ }
+
+ op2.o_bd = select_backend( &op2.o_req_ndn, 0, 1 );
+ if ( ( op2.o_bd == NULL ) || ( op2.o_bd->be_search == NULL ) ) {
+ rc = LDAP_NO_SUCH_OBJECT;
+ goto url_done;
+ }
+
+ /* Grab the filter */
+ if ( ludp->lud_filter ) {
+ ber_str2bv_x( ludp->lud_filter, 0, 0, &op2.ors_filterstr,
+ cp->op->o_tmpmemctx );
+
+ } else {
+ op2.ors_filterstr = defaultFilter_bv;
+ }
+
+ op2.ors_filter = str2filter_x( cp->op, op2.ors_filterstr.bv_val );
+ if ( op2.ors_filter == NULL ) {
+ rc = LDAP_PROTOCOL_ERROR;
+ goto url_done;
+ }
+
+ /* Grab the scope */
+ op2.ors_scope = ludp->lud_scope;
+
+ /* Grap the attributes */
+ if ( ludp->lud_attrs ) {
+ for ( ; ludp->lud_attrs[ nattrs ]; nattrs++ )
+ ;
+
+ anlistp = slap_sl_malloc( sizeof( AttributeName ) * ( nattrs + 2 ),
+ cp->op->o_tmpmemctx );
+
+ for ( ; ludp->lud_attrs[ nattrs ]; nattrs++ ) {
+ ber_str2bv( ludp->lud_attrs[ nattrs ], 0, 0, &anlistp[ nattrs ].an_name );
+ anlistp[ nattrs ].an_desc = NULL;
+ rc = slap_bv2ad( &anlistp[ nattrs ].an_name,
+ &anlistp[ nattrs ].an_desc, &text );
+ if ( rc != LDAP_SUCCESS ) {
+ goto url_done;
+ }
}
- slap_sl_free(ndn.bv_val, cp->op->o_tmpmemctx);
+
+ } else {
+ anlistp = anlist;
}
- return(bvals);
+
+ anlistp[ nattrs ].an_name = desc->ad_cname;
+ anlistp[ nattrs ].an_desc = desc;
+
+ BER_BVZERO( &anlistp[ nattrs + 1 ].an_name );
+
+ p.cookie = cookie;
+
+ op2.o_hdr = cp->op->o_hdr;
+ op2.o_tag = LDAP_REQ_SEARCH;
+ op2.o_ndn = op2.o_bd->be_rootndn;
+ op2.o_callback = &cb;
+ op2.o_time = slap_get_time();
+ op2.o_do_not_cache = 1;
+ op2.o_is_auth_check = 0;
+ ber_dupbv_x( &op2.o_req_dn, &op2.o_req_ndn, cp->op->o_tmpmemctx );
+ op2.ors_slimit = SLAP_NO_LIMIT;
+ op2.ors_tlimit = SLAP_NO_LIMIT;
+ op2.ors_attrs = anlistp;
+ op2.ors_attrsonly = 0;
+
+ cb.sc_private = &p;
+
+ rc = op2.o_bd->be_search( &op2, &rs );
+ if ( rc != 0 ) {
+ goto url_done;
+ }
+
+url_done:;
+ if ( op2.ors_filter ) {
+ filter_free_x( cp->op, op2.ors_filter );
+ }
+ if ( !BER_BVISNULL( &op2.o_req_ndn ) ) {
+ slap_sl_free( op2.o_req_ndn.bv_val, cp->op->o_tmpmemctx );
+ }
+ if ( !BER_BVISNULL( &op2.o_req_dn ) ) {
+ slap_sl_free( op2.o_req_dn.bv_val, cp->op->o_tmpmemctx );
+ }
+ if ( ludp ) {
+ ldap_free_urldesc( ludp );
+ }
+ if ( anlistp && anlistp != anlist ) {
+ slap_sl_free( anlistp, cp->op->o_tmpmemctx );
+ }
+
+ return p.bvals;
+}
+
+BerVarray
+aci_set_gather2( SetCookie *cookie, struct berval *name, AttributeDescription *desc )
+{
+ AciSetCookie *cp = (AciSetCookie *)cookie;
+ BerVarray bvals = NULL;
+ struct berval ndn;
+ int rc = 0;
+
+ /* this routine needs to return the bervals instead of
+ * plain strings, since syntax is not known. It should
+ * also return the syntax or some "comparison cookie".
+ */
+ rc = dnNormalize( 0, NULL, NULL, name, &ndn, cp->op->o_tmpmemctx );
+ if ( rc == LDAP_SUCCESS ) {
+ if ( desc == slap_schema.si_ad_entryDN ) {
+ bvals = (BerVarray)slap_sl_malloc( sizeof( BerValue ) * 2,
+ cp->op->o_tmpmemctx );
+ bvals[ 0 ] = ndn;
+ BER_BVZERO( &bvals[ 1 ] );
+ BER_BVZERO( &ndn );
+
+ } else {
+ backend_attribute( cp->op,
+ cp->e, &ndn, desc, &bvals, ACL_NONE );
+ }
+
+ if ( !BER_BVISNULL( &ndn ) ) {
+ slap_sl_free( ndn.bv_val, cp->op->o_tmpmemctx );
+ }
+ }
+
+ return bvals;
}
static int
@@ -1821,12 +2115,10 @@ aci_match_set (
struct berval set = BER_BVNULL;
int rc = 0;
AciSetCookie cookie;
- Operation op2 = *op;
- op2.o_conn = NULL;
+ if ( setref == 0 ) {
+ ber_dupbv_x( &set, subj, op->o_tmpmemctx );
- if (setref == 0) {
- ber_dupbv_x( &set, subj, op2.o_tmpmemctx );
} else {
struct berval subjdn, ndn = BER_BVNULL;
struct berval setat;
@@ -1836,7 +2128,7 @@ aci_match_set (
/* format of string is "entry/setAttrName" */
if ( aci_get_part( subj, 0, '/', &subjdn ) < 0 ) {
- return(0);
+ return 0;
}
if ( aci_get_part( subj, 1, '/', &setat ) < 0 ) {
@@ -1848,9 +2140,9 @@ aci_match_set (
* as the length of the dn to be normalized
*/
if ( slap_bv2ad( &setat, &desc, &text ) == LDAP_SUCCESS ) {
- if ( dnNormalize( 0, NULL, NULL, &subjdn, &ndn, op2.o_tmpmemctx ) == LDAP_SUCCESS )
+ if ( dnNormalize( 0, NULL, NULL, &subjdn, &ndn, op->o_tmpmemctx ) == LDAP_SUCCESS )
{
- backend_attribute( &op2, e, &ndn, desc, &bvals );
+ backend_attribute( op, e, &ndn, desc, &bvals, ACL_NONE );
if ( bvals != NULL && !BER_BVISNULL( &bvals[0] ) ) {
int i;
@@ -1861,18 +2153,18 @@ aci_match_set (
bvals[0].bv_val = bvals[i-1].bv_val;
BER_BVZERO( &bvals[i-1] );
}
- ber_bvarray_free_x( bvals, op2.o_tmpmemctx );
- slap_sl_free( ndn.bv_val, op2.o_tmpmemctx );
+ ber_bvarray_free_x( bvals, op->o_tmpmemctx );
+ slap_sl_free( ndn.bv_val, op->o_tmpmemctx );
}
}
}
if ( !BER_BVISNULL( &set ) ) {
- cookie.op = &op2;
+ cookie.op = op;
cookie.e = e;
rc = ( slap_set_filter( aci_set_gather, (SetCookie *)&cookie, &set,
- &op2.o_ndn, &e->e_nname, NULL ) > 0 );
- slap_sl_free( set.bv_val, op2.o_tmpmemctx );
+ &op->o_ndn, &e->e_nname, NULL ) > 0 );
+ slap_sl_free( set.bv_val, op->o_tmpmemctx );
}
return(rc);
@@ -2036,11 +2328,12 @@ aci_list_get_rights(
static int
aci_group_member (
- struct berval *subj,
- struct berval *defgrpoc,
- struct berval *defgrpat,
- Operation *op,
+ struct berval *subj,
+ struct berval *defgrpoc,
+ struct berval *defgrpat,
+ Operation *op,
Entry *e,
+ int nmatch,
regmatch_t *matches
)
{
@@ -2079,11 +2372,16 @@ aci_group_member (
struct berval bv, ndn;
bv.bv_len = sizeof( buf ) - 1;
bv.bv_val = (char *)&buf;
- string_expand(&bv, &subjdn, e->e_ndn, matches);
- if ( dnNormalize(0, NULL, NULL, &bv, &ndn, op->o_tmpmemctx) == LDAP_SUCCESS ) {
- rc = (backend_group(op, e, &ndn, &op->o_ndn,
- grp_oc, grp_ad) == 0);
- free( ndn.bv_val );
+ if ( string_expand(&bv, &subjdn,
+ e->e_ndn, nmatch, matches) )
+ {
+ rc = LDAP_OTHER;
+ goto done;
+ }
+ if ( dnNormalize( 0, NULL, NULL, &bv, &ndn, op->o_tmpmemctx ) == LDAP_SUCCESS ) {
+ rc = ( backend_group( op, e, &ndn, &op->o_ndn,
+ grp_oc, grp_ad ) == 0 );
+ slap_sl_free( ndn.bv_val, op->o_tmpmemctx );
}
}
@@ -2093,84 +2391,201 @@ done:
static int
aci_mask(
- Operation *op,
- Entry *e,
- AttributeDescription *desc,
- struct berval *val,
- struct berval *aci,
+ Operation *op,
+ Entry *e,
+ AttributeDescription *desc,
+ struct berval *val,
+ struct berval *aci,
+ int nmatch,
regmatch_t *matches,
- slap_access_t *grant,
- slap_access_t *deny,
- struct berval *scope
+ slap_access_t *grant,
+ slap_access_t *deny,
+ slap_aci_scope_t asserted_scope
)
{
- struct berval bv, perms, sdn;
- int rc;
+ struct berval bv, scope, perms, type, sdn;
+ int rc;
- assert( desc->ad_cname.bv_val != NULL );
+ assert( !BER_BVISNULL( &desc->ad_cname ) );
/* parse an aci of the form:
- oid#scope#action;rights;attr;rights;attr$action;rights;attr;rights;attr#dnType#subjectDN
+ oid # scope # action;rights;attr;rights;attr
+ $ action;rights;attr;rights;attr # type # subject
+
+ [NOTE: the following comment is very outdated,
+ as the draft version it refers to (Ando, 2004-11-20)].
See draft-ietf-ldapext-aci-model-04.txt section 9.1 for
a full description of the format for this attribute.
Differences: "this" in the draft is "self" here, and
- "self" and "public" is in the position of dnType.
+ "self" and "public" is in the position of type.
- For now, this routine only supports scope=entry.
+ = {entry|children|subtree}
+ = {public|users|access-id|subtree|onelevel|children|
+ self|dnattr|group|role|set|set-ref}
+
+ This routine now supports scope={ENTRY,CHILDREN}
+ with the semantics:
+ - ENTRY applies to "entry" and "subtree";
+ - CHILDREN aplies to "children" and "subtree"
*/
+
/* check that the aci has all 5 components */
- if (aci_get_part(aci, 4, '#', NULL) < 0)
- return(0);
+ if ( aci_get_part( aci, 4, '#', NULL ) < 0 ) {
+ return 0;
+ }
/* check that the aci family is supported */
- if (aci_get_part(aci, 0, '#', &bv) < 0)
- return(0);
+ if ( aci_get_part( aci, 0, '#', &bv ) < 0 ) {
+ return 0;
+ }
/* check that the scope matches */
- if (aci_get_part(aci, 1, '#', &bv) < 0
- || ber_bvstrcasecmp( scope, &bv ) != 0)
- {
- return(0);
+ if ( aci_get_part( aci, 1, '#', &scope ) < 0 ) {
+ return 0;
+ }
+
+ /* note: scope can be either ENTRY or CHILDREN;
+ * they respectively match "entry" and "children" in bv
+ * both match "subtree" */
+ switch ( asserted_scope ) {
+ case SLAP_ACI_SCOPE_ENTRY:
+ if ( ber_bvstrcasecmp( &scope, &aci_bv_entry ) != 0
+ && ber_bvstrcasecmp( &scope, &aci_bv_subtree ) != 0 )
+ {
+ return 0;
+ }
+ break;
+
+ case SLAP_ACI_SCOPE_CHILDREN:
+ if ( ber_bvstrcasecmp( &scope, &aci_bv_children ) != 0
+ && ber_bvstrcasecmp( &scope, &aci_bv_subtree ) != 0 )
+ {
+ return 0;
+ }
+ break;
+
+ default:
+ return 0;
}
/* get the list of permissions clauses, bail if empty */
- if (aci_get_part(aci, 2, '#', &perms) <= 0)
- return(0);
+ if ( aci_get_part( aci, 2, '#', &perms ) <= 0 ) {
+ return 0;
+ }
/* check if any permissions allow desired access */
- if (aci_list_get_rights(&perms, &desc->ad_cname, val, grant, deny) == 0)
- return(0);
+ if ( aci_list_get_rights( &perms, &desc->ad_cname, val, grant, deny ) == 0 ) {
+ return 0;
+ }
/* see if we have a DN match */
- if (aci_get_part(aci, 3, '#', &bv) < 0)
- return(0);
+ if ( aci_get_part( aci, 3, '#', &type ) < 0 ) {
+ return 0;
+ }
- if (aci_get_part(aci, 4, '#', &sdn) < 0)
- return(0);
+ /* see if we have a public (i.e. anonymous) access */
+ if ( ber_bvstrcasecmp( &aci_bv_public, &type ) == 0 ) {
+ return 1;
+ }
+
+ /* otherwise require an identity */
+ if ( BER_BVISNULL( &op->o_ndn ) || BER_BVISEMPTY( &op->o_ndn ) ) {
+ return 0;
+ }
- if (ber_bvstrcasecmp( &aci_bv_access_id, &bv ) == 0) {
+ /* see if we have a users access */
+ if ( ber_bvstrcasecmp( &aci_bv_users, &type ) == 0 ) {
+ return 1;
+ }
+
+ /* NOTE: this may fail if a DN contains a valid '#' (unescaped);
+ * just grab all the berval up to its end (ITS#3303).
+ * NOTE: the problem could be solved by providing the DN with
+ * the embedded '#' encoded as hexpairs: "cn=Foo#Bar" would
+ * become "cn=Foo\23Bar" and be safely used by aci_mask(). */
+#if 0
+ if ( aci_get_part( aci, 4, '#', &sdn ) < 0 ) {
+ return 0;
+ }
+#endif
+ sdn.bv_val = type.bv_val + type.bv_len + STRLENOF( "#" );
+ sdn.bv_len = aci->bv_len - ( sdn.bv_val - aci->bv_val );
+
+ if ( ber_bvstrcasecmp( &aci_bv_access_id, &type ) == 0 ) {
struct berval ndn;
- rc = 0;
- if ( dnNormalize(0, NULL, NULL, &sdn, &ndn, op->o_tmpmemctx) == LDAP_SUCCESS ) {
- if (dn_match( &op->o_ndn, &ndn))
- rc = 1;
- free(ndn.bv_val);
+
+ rc = dnNormalize( 0, NULL, NULL, &sdn, &ndn, op->o_tmpmemctx );
+ if ( rc != LDAP_SUCCESS ) {
+ return 0;
+ }
+
+ if ( dn_match( &op->o_ndn, &ndn ) ) {
+ rc = 1;
+ }
+ slap_sl_free( ndn.bv_val, op->o_tmpmemctx );
+
+ return rc;
+
+ } else if ( ber_bvstrcasecmp( &aci_bv_subtree, &type ) == 0 ) {
+ struct berval ndn;
+
+ rc = dnNormalize( 0, NULL, NULL, &sdn, &ndn, op->o_tmpmemctx );
+ if ( rc != LDAP_SUCCESS ) {
+ return 0;
}
- return (rc);
- } else if (ber_bvstrcasecmp( &aci_bv_public, &bv ) == 0) {
- return(1);
+ if ( dnIsSuffix( &op->o_ndn, &ndn ) ) {
+ rc = 1;
+ }
+ slap_sl_free( ndn.bv_val, op->o_tmpmemctx );
- } else if (ber_bvstrcasecmp( &aci_bv_self, &bv ) == 0) {
- if (dn_match(&op->o_ndn, &e->e_nname))
- return(1);
+ return rc;
- } else if (ber_bvstrcasecmp( &aci_bv_dnattr, &bv ) == 0) {
- Attribute *at;
- AttributeDescription *ad = NULL;
- const char *text;
+ } else if ( ber_bvstrcasecmp( &aci_bv_onelevel, &type ) == 0 ) {
+ struct berval ndn, pndn;
+
+ rc = dnNormalize( 0, NULL, NULL, &sdn, &ndn, op->o_tmpmemctx );
+ if ( rc != LDAP_SUCCESS ) {
+ return 0;
+ }
+
+ dnParent( &ndn, &pndn );
+
+ if ( dn_match( &op->o_ndn, &pndn ) ) {
+ rc = 1;
+ }
+ slap_sl_free( ndn.bv_val, op->o_tmpmemctx );
+
+ return rc;
+
+ } else if ( ber_bvstrcasecmp( &aci_bv_children, &type ) == 0 ) {
+ struct berval ndn;
+
+ rc = dnNormalize( 0, NULL, NULL, &sdn, &ndn, op->o_tmpmemctx );
+ if ( rc != LDAP_SUCCESS ) {
+ return 0;
+ }
+
+ if ( !dn_match( &op->o_ndn, &ndn )
+ && dnIsSuffix( &op->o_ndn, &ndn ) )
+ {
+ rc = 1;
+ }
+ slap_sl_free( ndn.bv_val, op->o_tmpmemctx );
+
+ return rc;
+
+ } else if ( ber_bvstrcasecmp( &aci_bv_self, &type ) == 0 ) {
+ if ( dn_match( &op->o_ndn, &e->e_nname ) ) {
+ return 1;
+ }
+
+ } else if ( ber_bvstrcasecmp( &aci_bv_dnattr, &type ) == 0 ) {
+ Attribute *at;
+ AttributeDescription *ad = NULL;
+ const char *text;
rc = slap_bv2ad( &sdn, &ad, &text );
@@ -2180,17 +2595,15 @@ aci_mask(
rc = 0;
- bv = op->o_ndn;
-
- for(at = attrs_find( e->e_attrs, ad );
- at != NULL;
- at = attrs_find( at->a_next, ad ) )
+ for ( at = attrs_find( e->e_attrs, ad );
+ at != NULL;
+ at = attrs_find( at->a_next, ad ) )
{
- if (value_find_ex( ad,
+ if ( value_find_ex( ad,
SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH |
SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
at->a_nvals,
- &bv, op->o_tmpmemctx) == 0 )
+ &op->o_ndn, op->o_tmpmemctx ) == 0 )
{
rc = 1;
break;
@@ -2199,36 +2612,340 @@ aci_mask(
return rc;
+ } else if ( ber_bvstrcasecmp( &aci_bv_group, &type ) == 0 ) {
+ if ( aci_group_member( &sdn, &aci_bv_group_class,
+ &aci_bv_group_attr, op, e, nmatch, matches ) )
+ {
+ return 1;
+ }
- } else if (ber_bvstrcasecmp( &aci_bv_group, &bv ) == 0) {
- if (aci_group_member(&sdn, &aci_bv_group_class, &aci_bv_group_attr, op, e, matches))
- return(1);
+ } else if ( ber_bvstrcasecmp( &aci_bv_role, &type ) == 0 ) {
+ if ( aci_group_member( &sdn, &aci_bv_role_class,
+ &aci_bv_role_attr, op, e, nmatch, matches ) )
+ {
+ return 1;
+ }
- } else if (ber_bvstrcasecmp( &aci_bv_role, &bv ) == 0) {
- if (aci_group_member(&sdn, &aci_bv_role_class, &aci_bv_role_attr, op, e, matches))
- return(1);
+ } else if ( ber_bvstrcasecmp( &aci_bv_set, &type ) == 0 ) {
+ if ( aci_match_set( &sdn, op, e, 0 ) ) {
+ return 1;
+ }
- } else if (ber_bvstrcasecmp( &aci_bv_set, &bv ) == 0) {
- if (aci_match_set(&sdn, op, e, 0))
- return(1);
+ } else if ( ber_bvstrcasecmp( &aci_bv_set_ref, &type ) == 0 ) {
+ if ( aci_match_set( &sdn, op, e, 1 ) ) {
+ return 1;
+ }
+ }
- } else if (ber_bvstrcasecmp( &aci_bv_set_ref, &bv ) == 0) {
- if (aci_match_set(&sdn, op, e, 1))
- return(1);
+ return 0;
+}
+#ifdef SLAP_DYNACL
+static int
+dynacl_aci_parse( const char *fname, int lineno, slap_style_t sty, const char *right, void **privp )
+{
+ AttributeDescription *ad = NULL;
+ const char *text = NULL;
+
+ if ( sty != ACL_STYLE_REGEX && sty != ACL_STYLE_BASE ) {
+ fprintf( stderr, "%s: line %d: "
+ "inappropriate style \"%s\" in \"aci\" by clause\n",
+ fname, lineno, sty );
+ return -1;
}
- return(0);
+ if ( right != NULL && *right != '\0' ) {
+ if ( slap_str2ad( right, &ad, &text ) != LDAP_SUCCESS ) {
+ fprintf( stderr,
+ "%s: line %d: aci \"%s\": %s\n",
+ fname, lineno, right, text );
+ return -1;
+ }
+
+ } else {
+ ad = slap_schema.si_ad_aci;
+ }
+
+ if ( !is_at_syntax( ad->ad_type, SLAPD_ACI_SYNTAX) ) {
+ fprintf( stderr, "%s: line %d: "
+ "aci \"%s\": inappropriate syntax: %s\n",
+ fname, lineno, right,
+ ad->ad_type->sat_syntax_oid );
+ return -1;
+ }
+
+ *privp = (void *)ad;
+
+ return 0;
+}
+
+static int
+dynacl_aci_unparse( void *priv, struct berval *bv )
+{
+ AttributeDescription *ad = ( AttributeDescription * )priv;
+ char *ptr;
+
+ assert( ad );
+
+ bv->bv_val = ch_malloc( STRLENOF(" aci=") + ad->ad_cname.bv_len + 1 );
+ ptr = lutil_strcopy( bv->bv_val, " aci=" );
+ ptr = lutil_strcopy( ptr, ad->ad_cname.bv_val );
+ bv->bv_len = ptr - bv->bv_val;
+
+ return 0;
+}
+
+
+static int
+dynacl_aci_mask(
+ void *priv,
+ Operation *op,
+ Entry *e,
+ AttributeDescription *desc,
+ struct berval *val,
+ int nmatch,
+ regmatch_t *matches,
+ slap_access_t *grantp,
+ slap_access_t *denyp )
+{
+ AttributeDescription *ad = ( AttributeDescription * )priv;
+ Attribute *at;
+ slap_access_t tgrant, tdeny, grant, deny;
+#ifdef LDAP_DEBUG
+ char accessmaskbuf[ACCESSMASK_MAXLEN];
+ char accessmaskbuf1[ACCESSMASK_MAXLEN];
+#endif /* LDAP_DEBUG */
+
+ /* start out with nothing granted, nothing denied */
+ ACL_INIT(tgrant);
+ ACL_INIT(tdeny);
+
+ /* get the aci attribute */
+ at = attr_find( e->e_attrs, ad );
+ if ( at != NULL ) {
+ int i;
+
+ /* the aci is an multi-valued attribute. The
+ * rights are determined by OR'ing the individual
+ * rights given by the acis.
+ */
+ for ( i = 0; !BER_BVISNULL( &at->a_nvals[i] ); i++ ) {
+ if ( aci_mask( op, e, desc, val, &at->a_nvals[i],
+ nmatch, matches, &grant, &deny,
+ SLAP_ACI_SCOPE_ENTRY ) != 0 )
+ {
+ tgrant |= grant;
+ tdeny |= deny;
+ }
+ }
+
+ Debug( LDAP_DEBUG_ACL, "<= aci_mask grant %s deny %s\n",
+ accessmask2str( tgrant, accessmaskbuf, 1 ),
+ accessmask2str( tdeny, accessmaskbuf1, 1 ), 0 );
+ }
+
+ /* If the entry level aci didn't contain anything valid for the
+ * current operation, climb up the tree and evaluate the
+ * acis with scope set to subtree
+ */
+ if ( tgrant == ACL_PRIV_NONE && tdeny == ACL_PRIV_NONE ) {
+ struct berval parent_ndn;
+ struct berval old_parent_ndn = BER_BVNULL;
+
+#if 1
+ /* to solve the chicken'n'egg problem of accessing
+ * the OpenLDAPaci attribute, the direct access
+ * to the entry's attribute is unchecked; however,
+ * further accesses to OpenLDAPaci values in the
+ * ancestors occur through backend_attribute(), i.e.
+ * with the identity of the operation, requiring
+ * further access checking. For uniformity, this
+ * makes further requests occur as the rootdn, if
+ * any, i.e. searching for the OpenLDAPaci attribute
+ * is considered an internal search. If this is not
+ * acceptable, then the same check needs be performed
+ * when accessing the entry's attribute. */
+ Operation op2 = *op;
+
+ if ( !BER_BVISNULL( &op->o_bd->be_rootndn ) ) {
+ op2.o_dn = op->o_bd->be_rootdn;
+ op2.o_ndn = op->o_bd->be_rootndn;
+ }
+#endif
+
+ dnParent( &e->e_nname, &parent_ndn );
+ while ( parent_ndn.bv_val != old_parent_ndn.bv_val ){
+ int i;
+ BerVarray bvals = NULL;
+ int ret, stop;
+
+ old_parent_ndn = parent_ndn;
+ Debug( LDAP_DEBUG_ACL, "checking ACI of \"%s\"\n", parent_ndn.bv_val, 0, 0 );
+ ret = backend_attribute( &op2, NULL, &parent_ndn, ad, &bvals, ACL_AUTH );
+
+ switch ( ret ) {
+ case LDAP_SUCCESS :
+ stop = 0;
+ if ( !bvals ) {
+ break;
+ }
+
+ for ( i = 0; !BER_BVISNULL( &bvals[i] ); i++) {
+ if ( aci_mask( op, e, desc, val,
+ &bvals[i],
+ nmatch, matches,
+ &grant, &deny,
+ SLAP_ACI_SCOPE_CHILDREN ) != 0 )
+ {
+ tgrant |= grant;
+ tdeny |= deny;
+ /* evaluation stops as soon as either a "deny" or a
+ * "grant" directive matches.
+ */
+ if ( tgrant != ACL_PRIV_NONE || tdeny != ACL_PRIV_NONE ) {
+ stop = 1;
+ }
+ }
+ Debug( LDAP_DEBUG_ACL, "<= aci_mask grant %s deny %s\n",
+ accessmask2str( tgrant, accessmaskbuf, 1 ),
+ accessmask2str( tdeny, accessmaskbuf1, 1 ), 0 );
+ }
+ break;
+
+ case LDAP_NO_SUCH_ATTRIBUTE:
+ /* just go on if the aci-Attribute is not present in
+ * the current entry
+ */
+ Debug( LDAP_DEBUG_ACL, "no such attribute\n", 0, 0, 0 );
+ stop = 0;
+ break;
+
+ case LDAP_NO_SUCH_OBJECT:
+ /* We have reached the base object */
+ Debug( LDAP_DEBUG_ACL, "no such object\n", 0, 0, 0 );
+ stop = 1;
+ break;
+
+ default:
+ stop = 1;
+ break;
+ }
+
+ if ( stop ) {
+ break;
+ }
+ dnParent( &old_parent_ndn, &parent_ndn );
+ }
+ }
+
+ *grantp = tgrant;
+ *denyp = tdeny;
+
+ return 0;
}
+/* need to register this at some point */
+static slap_dynacl_t dynacl_aci = {
+ "aci",
+ dynacl_aci_parse,
+ dynacl_aci_unparse,
+ dynacl_aci_mask,
+ NULL,
+ NULL,
+ NULL
+};
+
+#endif /* SLAP_DYNACL */
+
#endif /* SLAPD_ACI_ENABLED */
-static void
+#ifdef SLAP_DYNACL
+
+/*
+ * dynamic ACL infrastructure
+ */
+static slap_dynacl_t *da_list = NULL;
+
+int
+slap_dynacl_register( slap_dynacl_t *da )
+{
+ slap_dynacl_t *tmp;
+
+ for ( tmp = da_list; tmp; tmp = tmp->da_next ) {
+ if ( strcasecmp( da->da_name, tmp->da_name ) == 0 ) {
+ break;
+ }
+ }
+
+ if ( tmp != NULL ) {
+ return -1;
+ }
+
+ if ( da->da_mask == NULL ) {
+ return -1;
+ }
+
+ da->da_private = NULL;
+ da->da_next = da_list;
+ da_list = da;
+
+ return 0;
+}
+
+static slap_dynacl_t *
+slap_dynacl_next( slap_dynacl_t *da )
+{
+ if ( da ) {
+ return da->da_next;
+ }
+ return da_list;
+}
+
+slap_dynacl_t *
+slap_dynacl_get( const char *name )
+{
+ slap_dynacl_t *da;
+
+ for ( da = slap_dynacl_next( NULL ); da; da = slap_dynacl_next( da ) ) {
+ if ( strcasecmp( da->da_name, name ) == 0 ) {
+ break;
+ }
+ }
+
+ return da;
+}
+#endif /* SLAP_DYNACL */
+
+int
+acl_init( void )
+{
+ int i, rc;
+#ifdef SLAP_DYNACL
+ slap_dynacl_t *known_dynacl[] = {
+#ifdef SLAPD_ACI_ENABLED
+ &dynacl_aci,
+#endif /* SLAPD_ACI_ENABLED */
+ NULL
+ };
+
+ for ( i = 0; known_dynacl[ i ]; i++ ) {
+ rc = slap_dynacl_register( known_dynacl[ i ] );
+ if ( rc ) {
+ return rc;
+ }
+ }
+#endif /* SLAP_DYNACL */
+
+ return 0;
+}
+
+static int
string_expand(
- struct berval *bv,
- struct berval *pat,
- char *match,
- regmatch_t *matches)
+ struct berval *bv,
+ struct berval *pat,
+ char *match,
+ int nmatch,
+ regmatch_t *matches)
{
ber_len_t size;
char *sp;
@@ -2268,12 +2985,14 @@ string_expand(
}
if ( *sp != /*'{'*/ '}' ) {
- /* error */
+ /* FIXME: error */
+ return 1;
}
}
- if ( n >= MAXREMATCHES ) {
-
+ if ( n >= nmatch ) {
+ /* FIXME: error */
+ return 1;
}
*dp = '\0';
@@ -2305,22 +3024,19 @@ string_expand(
*dp = '\0';
bv->bv_len = size;
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL1,
- "string_expand: pattern = %.*s\n", (int)pat->bv_len, pat->bv_val, 0 );
- LDAP_LOG( ACL, DETAIL1, "string_expand: expanded = %s\n", bv->bv_val, 0, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "=> string_expand: pattern: %.*s\n", (int)pat->bv_len, pat->bv_val, 0 );
Debug( LDAP_DEBUG_TRACE, "=> string_expand: expanded: %s\n", bv->bv_val, 0, 0 );
-#endif
+
+ return 0;
}
static int
regex_matches(
- struct berval *pat, /* pattern to expand and match against */
- char *str, /* string to match against pattern */
- char *buf, /* buffer with $N expansion variables */
- regmatch_t *matches /* offsets in buffer for $N expansion variables */
+ struct berval *pat, /* pattern to expand and match against */
+ char *str, /* string to match against pattern */
+ char *buf, /* buffer with $N expansion variables */
+ int nmatch, /* size of the matches array */
+ regmatch_t *matches /* offsets in buffer for $N expansion variables */
)
{
regex_t re;
@@ -2328,42 +3044,33 @@ regex_matches(
struct berval bv;
int rc;
- bv.bv_len = sizeof(newbuf) - 1;
+ bv.bv_len = sizeof( newbuf ) - 1;
bv.bv_val = newbuf;
- if(str == NULL) str = "";
+ if (str == NULL) {
+ str = "";
+ };
- string_expand(&bv, pat, buf, matches);
- if (( rc = regcomp(&re, newbuf, REG_EXTENDED|REG_ICASE))) {
+ string_expand( &bv, pat, buf, nmatch, matches );
+ rc = regcomp( &re, newbuf, REG_EXTENDED|REG_ICASE );
+ if ( rc ) {
char error[ACL_BUF_SIZE];
- regerror(rc, &re, error, sizeof(error));
+ regerror( rc, &re, error, sizeof( error ) );
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, ERR,
- "regex_matches: compile( \"%s\", \"%s\") failed %s\n",
- pat->bv_val, str, error );
-#else
Debug( LDAP_DEBUG_TRACE,
"compile( \"%s\", \"%s\") failed %s\n",
pat->bv_val, str, error );
-#endif
return( 0 );
}
- rc = regexec(&re, str, 0, NULL, 0);
+ rc = regexec( &re, str, 0, NULL, 0 );
regfree( &re );
-#ifdef NEW_LOGGING
- LDAP_LOG( ACL, DETAIL2, "regex_matches: string: %s\n", str, 0, 0 );
- LDAP_LOG( ACL, DETAIL2, "regex_matches: rc: %d %s\n",
- rc, rc ? "matches" : "no matches", 0 );
-#else
Debug( LDAP_DEBUG_TRACE,
"=> regex_matches: string: %s\n", str, 0, 0 );
Debug( LDAP_DEBUG_TRACE,
"=> regex_matches: rc: %d %s\n",
rc, !rc ? "matches" : "no matches", 0 );
-#endif
return( !rc );
}