#include "slap.h"
+static AccessControl * acl_get(
+ AccessControl *ac, int *count,
+ Backend *be, Operation *op,
+ Entry *e, char *attr,
+ int nmatches, regmatch_t *matches );
+
+static slap_control_t acl_mask(
+ AccessControl *ac, slap_access_mask_t *mask,
+ Backend *be, Connection *conn, Operation *op,
+ Entry *e, char *attr, struct berval *val,
+ regmatch_t *matches );
+
#ifdef SLAPD_ACI_ENABLED
-int aci_access_allowed (struct berval *aci, char *attr, Backend *be, Entry *e,
- Operation *op, int access, char *edn, regmatch_t *matches);
+static int aci_access_allowed(
+ Backend *be,
+ Operation *op,
+ Entry *e, char *attr, struct berval *aci,
+ regmatch_t *matches );
#endif
static int regex_matches(char *pat, char *str, char *buf, regmatch_t *matches);
/*
* access_allowed - check whether op->o_ndn is allowed the requested access
* to entry e, attribute attr, value val. if val is null, access to
- * the whole attribute is assumed (all values). this routine finds
- * the applicable acl and calls acl_access_allowed() to make the
- * decision.
+ * the whole attribute is assumed (all values).
*
- * returns 0 access NOT allowed
- * 1 access allowed
+ * This routine loops through all access controls and calls
+ * acl_mask() on each applicable access control.
+ * The loop exits when a definitive answer is reached or
+ * or no more controls remain.
+ *
+ * returns:
+ * 0 access denied
+ * 1 access granted
*/
int
Entry *e,
char *attr,
struct berval *val,
- int access
+ slap_access_t access
)
{
- int rc;
+ int count;
AccessControl *a;
- char *edn;
+ char accessmaskbuf[ACCESSMASK_MAXLEN];
+ slap_access_mask_t mask;
+ slap_control_t control;
regmatch_t matches[MAXREMATCHES];
- int i;
- int n;
- if ( be == NULL ) {
- return( 0 );
- }
+ Debug( LDAP_DEBUG_ACL,
+ "=> access_allowed: %s access to \"%s\" \"%s\" requested\n",
+ access2str( access ),
+ e->e_dn, attr );
- edn = e->e_ndn;
+ assert( be != NULL );
+ assert( e != NULL );
+ assert( attr != NULL );
+ assert( access > ACL_NONE );
- Debug( LDAP_DEBUG_ACL, "\n=> access_allowed: entry (%s) attr (%s)\n",
- e->e_dn, attr, 0 );
+ /* grant database root access */
+ if ( be != NULL && be_isroot( be, op->o_ndn ) ) {
+ Debug( LDAP_DEBUG_ACL,
+ "<= root access granted\n",
+ 0, 0, 0 );
+ return 1;
+ }
- /* the lastmod attributes are ignored by ACL checking */
+ /* no user modify operational attributes are ignored by ACL checking */
if ( oc_check_no_usermod_attr( attr ) ) {
- Debug( LDAP_DEBUG_ACL, "Operational attribute: %s access allowed\n",
+ Debug( LDAP_DEBUG_ACL, "NoUserMod Operational attribute:"
+ " %s access granted\n",
attr, 0, 0 );
- return(1);
+ return 1;
+ }
+
+ /* use backend default access if no backend acls */
+ if( be != NULL && be->be_acl == NULL ) {
+ 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 );
+
+ return be->be_dfltaccess >= access;
+
+#ifdef notdef
+ /* be is always non-NULL */
+ /* use global default access if no global acls */
+ } else if ( be == NULL && global_acl == NULL ) {
+ Debug( LDAP_DEBUG_ACL,
+ "=> access_allowed: global default %s access %s to \"%s\"\n",
+ access2str( access ),
+ global_default_access >= access ? "granted" : "denied", op->o_dn );
+
+ return global_default_access >= access;
+#endif
}
+ ACL_INIT(mask);
memset(matches, 0, sizeof(matches));
+
+ control = ACL_BREAK;
+ a = NULL;
+ count = 0;
- a = acl_get_applicable( be, op, e, attr, MAXREMATCHES, matches );
+ while( a = acl_get( a, &count, be, op, e, attr, MAXREMATCHES, matches ) )
+ {
+ int i;
- if (a) {
for (i = 0; i < MAXREMATCHES && matches[i].rm_so > 0; i++) {
- Debug( LDAP_DEBUG_ARGS, "=> match[%d]: %d %d ", i,
+ Debug( LDAP_DEBUG_ACL, "=> match[%d]: %d %d ", i,
(int)matches[i].rm_so, (int)matches[i].rm_eo );
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_ARGS, "%c", edn[n], 0, 0 );
+ Debug( LDAP_DEBUG_ACL, "%c", e->e_ndn[n], 0, 0 );
}
}
Debug( LDAP_DEBUG_ARGS, "\n", 0, 0, 0 );
}
+
+ control = acl_mask( a, &mask, be, conn, op,
+ e, attr, val, matches );
+
+ if ( control != ACL_BREAK ) {
+ break;
+ }
+
+ memset(matches, 0, sizeof(matches));
}
- rc = acl_access_allowed( a, attr, be, conn, e, val, op, access, edn, matches );
+ if ( ACL_IS_INVALID( mask ) ) {
+ Debug( LDAP_DEBUG_ACL,
+ "=> access_allowed: \"%s\" (%s) invalid!\n",
+ e->e_dn, attr, 0 );
+ ACL_INIT( mask );
+
+ } else if ( control == ACL_BREAK ) {
+ Debug( LDAP_DEBUG_ACL,
+ "=> access_allowed: no more rules\n", 0, 0, 0);
+ ACL_INIT( mask );
+ }
- Debug( LDAP_DEBUG_ACL, "\n=> access_allowed: exit (%s) attr (%s)\n",
- e->e_dn, attr, 0);
+ Debug( LDAP_DEBUG_ACL,
+ "=> access_allowed: %s access %s by %s\n",
+ access2str( access ),
+ ACL_GRANT(mask, access) ? "granted" : "denied",
+ accessmask2str( mask, accessmaskbuf ) );
- return( rc );
+ return ACL_GRANT(mask, access);
}
/*
- * acl_get_applicable - return the acl applicable to entry e, attribute
+ * acl_get - return the acl applicable to entry e, attribute
* attr. the acl returned is suitable for use in subsequent calls to
* acl_access_allowed().
*/
-AccessControl *
-acl_get_applicable(
+static AccessControl *
+acl_get(
+ AccessControl *a,
+ int *count,
Backend *be,
- Operation *op,
+ Operation *op,
Entry *e,
char *attr,
int nmatch,
regmatch_t *matches
)
{
- int i;
- AccessControl *a;
- char *edn;
-
- Debug( LDAP_DEBUG_ACL, "\n=> acl_get: entry (%s) attr (%s)\n",
- e->e_dn, attr, 0 );
-
- if ( be_isroot( be, op->o_ndn ) ) {
- Debug( LDAP_DEBUG_ACL,
- "<= acl_get: no acl applicable to database root\n", 0, 0,
- 0 );
- return( NULL );
- }
-
- edn = e->e_ndn;
-
- Debug( LDAP_DEBUG_ARGS, "=> acl_get: edn %s\n", edn, 0, 0 );
-
- /* check for a backend-specific acl that matches the entry */
- for ( i = 1, a = be->be_acl; a != NULL; a = a->acl_next, i++ ) {
- if (a->acl_dn_pat != NULL) {
- Debug( LDAP_DEBUG_TRACE, "=> dnpat: [%d] %s nsub: %d\n",
- i, a->acl_dn_pat, (int) a->acl_dn_re.re_nsub);
+ assert( e != NULL );
+ assert( count != NULL );
- if (regexec(&a->acl_dn_re, edn, nmatch, matches, 0)) {
- continue;
-
- } else {
- Debug( LDAP_DEBUG_TRACE, "=> acl_get:[%d] backend ACL match\n",
- i, 0, 0);
- }
- }
-
- if ( a->acl_filter != NULL ) {
- if ( test_filter( NULL, NULL, NULL, e, a->acl_filter ) != 0 ) {
- continue;
- }
+ if( a == NULL ) {
+ if( be == NULL ) {
+ a = global_acl;
+ } else {
+ a = be->be_acl;
}
- Debug( LDAP_DEBUG_ARGS, "=> acl_get: [%d] check attr %s\n", i, attr, 0);
+ assert( a != NULL );
- if ( attr == NULL || a->acl_attrs == NULL ||
- charray_inlist( a->acl_attrs, attr ) )
- {
- Debug( LDAP_DEBUG_ACL, "<= acl_get: [%d] backend acl %s attr: %s\n",
- i, e->e_dn, attr );
- return( a );
- }
- matches[0].rm_so = matches[0].rm_eo = -1;
+ } else {
+ a = a->acl_next;
}
- /* check for a global acl that matches the entry */
- for ( i = 1, a = global_acl; a != NULL; a = a->acl_next, i++ ) {
+ for ( ; a != NULL; a = a->acl_next ) {
+ (*count) ++;
+
if (a->acl_dn_pat != NULL) {
- Debug( LDAP_DEBUG_TRACE, "=> dn pat: [%d] %s nsub: %d\n",
- i, a->acl_dn_pat, (int) a->acl_dn_re.re_nsub);
+ Debug( LDAP_DEBUG_ACL, "=> dnpat: [%d] %s nsub: %d\n",
+ *count, a->acl_dn_pat, (int) a->acl_dn_re.re_nsub );
- if (regexec(&a->acl_dn_re, edn, nmatch, matches, 0)) {
+ if (regexec(&a->acl_dn_re, e->e_ndn, nmatch, matches, 0)) {
continue;
} else {
- Debug( LDAP_DEBUG_TRACE, "=> acl_get: [%d] global ACL match\n",
- i, 0, 0);
+ Debug( LDAP_DEBUG_ACL, "=> acl_get: [%d] matched\n",
+ *count, 0, 0);
}
}
}
}
- Debug( LDAP_DEBUG_ARGS, "=> acl_get: [%d] check attr\n", i, 0, 0);
+ Debug( LDAP_DEBUG_ACL, "=> acl_get: [%d] check attr %s\n",
+ *count, attr, 0);
if ( attr == NULL || a->acl_attrs == NULL ||
charray_inlist( a->acl_attrs, attr ) )
{
- Debug( LDAP_DEBUG_ACL, "<= acl_get: [%d] global acl %s attr: %s\n",
- i, e->e_dn, attr );
- return( a );
+ Debug( LDAP_DEBUG_ACL,
+ "<= acl_get: [%d] acl %s attr: %s\n",
+ *count, e->e_dn, attr );
+ return a;
}
-
matches[0].rm_so = matches[0].rm_eo = -1;
}
- Debug( LDAP_DEBUG_ACL, "<= acl_get: no match\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_ACL, "<= acl_get: done.\n", 0, 0, 0 );
return( NULL );
}
+
/*
- * acl_access_allowed - check whether the given acl allows dn the
+ * acl_mask - modifies mask based upon the given acl and the
* requested access to entry e, attribute attr, value val. if val
* is null, access to the whole attribute is assumed (all values).
*
* 1 access allowed
*/
-int
-acl_access_allowed(
+static slap_control_t
+acl_mask(
AccessControl *a,
- char *attr,
+ slap_access_mask_t *mask,
Backend *be,
- Connection *conn,
+ Connection *conn,
+ Operation *op,
Entry *e,
+ char *attr,
struct berval *val,
- Operation *op,
- int access,
- char *edn,
regmatch_t *matches
)
{
int i;
Access *b;
- int default_access;
+ char accessmaskbuf[ACCESSMASK_MAXLEN];
- Debug( LDAP_DEBUG_ACL,
- "\n=> acl_access_allowed: %s access to entry \"%s\"\n",
- access2str( access ), e->e_dn, 0 );
+ assert( a != NULL );
+ assert( mask != NULL );
Debug( LDAP_DEBUG_ACL,
- "\n=> acl_access_allowed: %s access to value \"%s\" by \"%s\"\n",
- access2str( access ),
- val ? val->bv_val : "any",
- op->o_ndn ? op->o_ndn : "" );
+ "=> acl_mask: access to entry \"%s\", attr \"%s\" requested\n",
+ e->e_dn, attr, 0 );
- if ( be_isroot( be, op->o_ndn ) ) {
- Debug( LDAP_DEBUG_ACL,
- "<= acl_access_allowed: granted to database root\n",
- 0, 0, 0 );
- return( 1 );
- }
+ Debug( LDAP_DEBUG_ACL,
+ "=> acl_mask: to value \"%s\" by \"%s\", (%s) \n",
+ val ? val->bv_val : "*",
+ op->o_ndn ? op->o_ndn : "",
+ accessmask2str( *mask, accessmaskbuf ) );
- default_access = be->be_dfltaccess ? be->be_dfltaccess : global_default_access;
+ for ( i = 1, b = a->acl_access; b != NULL; b = b->a_next, i++ ) {
+ slap_access_mask_t oldmask, modmask;
- if ( a == NULL ) {
- Debug( LDAP_DEBUG_ACL,
- "<= acl_access_allowed: %s by default (no matching to)\n",
- default_access >= access ? "granted" : "denied", 0, 0 );
- return( default_access >= access );
- }
+ ACL_INVALIDATE( modmask );
- for ( i = 1, b = a->acl_access; b != NULL; b = b->a_next, i++ ) {
/* AND <who> clauses */
if ( b->a_dn_pat != NULL ) {
- Debug( LDAP_DEBUG_TRACE, "<= check a_dn_pat: %s\n",
+ Debug( LDAP_DEBUG_ACL, "<= check a_dn_pat: %s\n",
b->a_dn_pat, 0, 0);
/*
* 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 ( strcasecmp( b->a_dn_pat, "anonymous" ) == 0 ) {
+ if ( strcmp( b->a_dn_pat, "anonymous" ) == 0 ) {
if (op->o_ndn != NULL && op->o_ndn[0] != '\0' ) {
continue;
}
- } else if ( strcasecmp( b->a_dn_pat, "self" ) == 0 ) {
+ } else if ( strcmp( b->a_dn_pat, "users" ) == 0 ) {
+ if (op->o_ndn == NULL || op->o_ndn[0] == '\0' ) {
+ continue;
+ }
+
+ } else if ( strcmp( b->a_dn_pat, "self" ) == 0 ) {
if( op->o_ndn == NULL || op->o_ndn[0] == '\0' ) {
continue;
}
- if ( e->e_dn == NULL || strcmp( edn, op->o_ndn ) != 0 ) {
+ if ( e->e_dn == NULL || strcmp( e->e_ndn, op->o_ndn ) != 0 ) {
continue;
}
- } else if ( strcmp( b->a_dn_pat, ".*" ) != 0 &&
- !regex_matches( b->a_dn_pat, op->o_ndn, edn, matches ) )
- {
- continue;
+ } else if ( strcmp( b->a_dn_pat, "*" ) != 0 ) {
+ int ret = regex_matches( b->a_dn_pat,
+ op->o_ndn, e->e_ndn, matches );
+
+ if( ret == 0 ) {
+ continue;
+ }
}
}
if ( b->a_sockurl_pat != NULL ) {
- Debug( LDAP_DEBUG_ARGS, "<= check a_sockurl_pat: %s\n",
+ Debug( LDAP_DEBUG_ACL, "<= check a_sockurl_pat: %s\n",
b->a_sockurl_pat, 0, 0 );
- if ( strcmp( b->a_sockurl_pat, ".*" ) != 0 &&
+ if ( strcmp( b->a_sockurl_pat, "*" ) != 0 &&
!regex_matches( b->a_sockurl_pat, conn->c_listener_url,
- edn, matches ) )
+ e->e_ndn, matches ) )
{
continue;
}
}
if ( b->a_domain_pat != NULL ) {
- Debug( LDAP_DEBUG_ARGS, "<= check a_domain_pat: %s\n",
+ Debug( LDAP_DEBUG_ACL, "<= check a_domain_pat: %s\n",
b->a_domain_pat, 0, 0 );
- if ( strcmp( b->a_domain_pat, ".*" ) != 0 &&
+ if ( strcmp( b->a_domain_pat, "*" ) != 0 &&
!regex_matches( b->a_domain_pat, conn->c_peer_domain,
- edn, matches ) )
+ e->e_ndn, matches ) )
{
continue;
}
}
if ( b->a_peername_pat != NULL ) {
- Debug( LDAP_DEBUG_ARGS, "<= check a_peername_path: %s\n",
+ Debug( LDAP_DEBUG_ACL, "<= check a_peername_path: %s\n",
b->a_peername_pat, 0, 0 );
- if ( strcmp( b->a_peername_pat, ".*" ) != 0 &&
+ if ( strcmp( b->a_peername_pat, "*" ) != 0 &&
!regex_matches( b->a_peername_pat, conn->c_peer_name,
- edn, matches ) )
+ e->e_ndn, matches ) )
{
continue;
}
}
if ( b->a_sockname_pat != NULL ) {
- Debug( LDAP_DEBUG_ARGS, "<= check a_sockname_path: %s\n",
+ Debug( LDAP_DEBUG_ACL, "<= check a_sockname_path: %s\n",
b->a_sockname_pat, 0, 0 );
- if ( strcmp( b->a_sockname_pat, ".*" ) != 0 &&
+ if ( strcmp( b->a_sockname_pat, "*" ) != 0 &&
!regex_matches( b->a_sockname_pat, conn->c_sock_name,
- edn, matches ) )
+ e->e_ndn, matches ) )
{
continue;
}
Attribute *at;
struct berval bv;
- Debug( LDAP_DEBUG_ARGS, "<= check a_dn_at: %s\n",
+ Debug( LDAP_DEBUG_ACL, "<= check a_dn_at: %s\n",
b->a_dn_at, 0, 0);
bv.bv_val = op->o_ndn;
if ( (at = attr_find( e->e_attrs, b->a_dn_at )) != NULL &&
value_find( at->a_vals, &bv, at->a_syntax, 3 ) == 0 )
{
- if ( ACL_IS_SELF(b->a_access) &&
+ if ( b->a_dn_self &&
(val == NULL || value_cmp( &bv, val, at->a_syntax, 2 )) )
{
continue;
}
/* asker not listed in dnattr - check for self access */
- } else if ( ! ACL_IS_SELF(b->a_access) || val == NULL ||
+ } else if ( ! b->a_dn_self || val == NULL ||
value_cmp( &bv, val, at->a_syntax, 2 ) != 0 )
{
continue;
* the values in the attribute group
*/
/* see if asker is listed in dnattr */
- string_expand(buf, sizeof(buf), b->a_group_pat, edn, matches);
+ string_expand(buf, sizeof(buf), b->a_group_pat, e->e_ndn, matches);
if ( dn_normalize(buf) == NULL ) {
/* did not expand to a valid dn */
continue;
}
#ifdef SLAPD_ACI_ENABLED
- if ( b->a_aci_at != NULL ) {
+ if ( b->a_aci_at != NULL ) {
Attribute *at;
/* this case works different from the others above.
* since aci's themselves give permissions, we need
- * to first check b->a_access, the ACL's access level.
+ * to first check b->a_mask, the ACL's access level.
*/
if( op->o_ndn == NULL || op->o_ndn[0] == '\0' ) {
/* first check if the right being requested is
* higher than allowed by the ACL clause.
*/
- if ( ! ACL_GRANT( b->a_access, access ) ) {
+ if ( ! ACL_GRANT( b->a_mask, access ) ) {
continue;
}
* rights given by the acis.
*/
for ( i = 0; at->a_vals[i] != NULL; i++ ) {
- if ( aci_access_allowed( at->a_vals[i], attr, be, e, op, access, edn, matches ) ) {
+ if ( aci_access_allowed( be, op,
+ e, attr, at->a_vals[i],
+ matches ) )
+ {
Debug( LDAP_DEBUG_ACL,
- "<= acl_access_allowed: matched by clause #%d access granted\n",
+ "<= acl_mask: matched by clause #%d access granted\n",
i, 0, 0 );
- return(1);
+ break;
}
}
- continue;
- }
+
+ if( ACL_IS_INVALID( modmask ) ) {
+ continue;
+ }
+
+ } else
#endif
+ {
+ modmask = b->a_mask;
+ }
+
Debug( LDAP_DEBUG_ACL,
- "<= acl_access_allowed: matched by clause #%d access %s\n",
- i,
- ACL_GRANT(b->a_access, access) ? "granted" : "denied",
- 0 );
+ "<= acl_mask: [%d] applying %s (%s)\n",
+ i, accessmask2str( modmask, accessmaskbuf ),
+ b->a_type == ACL_CONTINUE
+ ? "continue"
+ : b->a_type == ACL_BREAK
+ ? "break"
+ : "stop" );
+
+ /* save old mask */
+ oldmask = *mask;
+
+ if( ACL_IS_ADDITIVE(modmask) ) {
+ /* add privs */
+ ACL_PRIV_SET( *mask, modmask );
+
+ /* cleanup */
+ ACL_PRIV_CLR( *mask, ~ACL_PRIV_MASK );
+
+ } else if( ACL_IS_SUBTRACTIVE(modmask) ) {
+ /* substract privs */
+ ACL_PRIV_CLR( *mask, modmask );
+
+ /* cleanup */
+ ACL_PRIV_CLR( *mask, ~ACL_PRIV_MASK );
- return ACL_GRANT(b->a_access, access );
+ } else {
+ /* assign privs */
+ *mask = modmask;
+ }
+
+ Debug( LDAP_DEBUG_ACL,
+ "<= acl_mask: [%d] mask: %s\n",
+ i, accessmask2str(*mask, accessmaskbuf), 0 );
+
+ if( b->a_type == ACL_CONTINUE ) {
+ continue;
+
+ } else if ( b->a_type == ACL_BREAK ) {
+ return ACL_BREAK;
+
+ } else {
+ return ACL_STOP;
+ }
}
Debug( LDAP_DEBUG_ACL,
- "<= acl_access_allowed: %s by default (no matching by)\n",
- default_access >= access ? "granted" : "denied", 0, 0 );
-
- return( default_access >= access );
+ "<= acl_mask: no more <who> clauses, returning %s (stop)\n",
+ accessmask2str(*mask, accessmaskbuf), 0, 0 );
+ return ACL_STOP;
}
/*
* acl_check_modlist - check access control on the given entry to see if
* it allows the given modifications by the user associated with op.
- * returns LDAP_SUCCESS mods allowed ok
- * anything else mods not allowed - return is an error
- * code indicating the problem
+ * returns 1 if mods allowed ok
+ * 0 mods not allowed
*/
int
)
{
int i;
- AccessControl *a;
- char *edn = e->e_ndn;
- for ( ; mlist != NULL; mlist = mlist->ml_next ) {
- regmatch_t matches[MAXREMATCHES];
+ assert( be != NULL );
+ /* short circuit root database access */
+ if ( be_isroot( be, op->o_ndn ) ) {
+ Debug( LDAP_DEBUG_ACL,
+ "<= acl_access_allowed: granted to database root\n",
+ 0, 0, 0 );
+ return 1;
+ }
+
+ /* use backend default access if no backend acls */
+ if( be != NULL && be->be_acl == NULL ) {
+ Debug( LDAP_DEBUG_ACL,
+ "=> access_allowed: backend default %s access %s to \"%s\"\n",
+ access2str( ACL_WRITE ),
+ be->be_dfltaccess >= ACL_WRITE ? "granted" : "denied", op->o_dn );
+
+ return be->be_dfltaccess >= ACL_WRITE;
+
+#ifdef notdef
+ /* be is always non-NULL */
+ /* use global default access if no global acls */
+ } else if ( be == NULL && global_acl == NULL ) {
+ Debug( LDAP_DEBUG_ACL,
+ "=> access_allowed: global default %s access %s to \"%s\"\n",
+ access2str( ACL_WRITE ),
+ global_default_access >= ACL_WRITE ? "granted" : "denied", op->o_dn );
+
+ return global_default_access >= ACL_WRITE;
+#endif
+ }
+
+ for ( ; mlist != NULL; mlist = mlist->ml_next ) {
/* the lastmod attributes are ignored by ACL checking */
if ( oc_check_no_usermod_attr( mlist->ml_type ) ) {
Debug( LDAP_DEBUG_ACL, "Operational attribute: %s access allowed\n",
continue;
}
- a = acl_get_applicable( be, op, e, mlist->ml_type,
- MAXREMATCHES, matches );
-
switch ( mlist->ml_op & ~LDAP_MOD_BVALUES ) {
case LDAP_MOD_REPLACE:
case LDAP_MOD_ADD:
break;
}
for ( i = 0; mlist->ml_bvalues[i] != NULL; i++ ) {
- if ( ! acl_access_allowed( a, mlist->ml_type, be, conn, e, mlist->ml_bvalues[i],
- op, ACL_WRITE, edn, matches) )
+ if ( ! access_allowed( be, conn, op, e,
+ mlist->ml_type, mlist->ml_bvalues[i],
+ ACL_WRITE ) )
{
- return( LDAP_INSUFFICIENT_ACCESS );
+ return( 0 );
}
}
break;
case LDAP_MOD_DELETE:
if ( mlist->ml_bvalues == NULL ) {
- if ( ! acl_access_allowed( a, mlist->ml_type, be, conn, e,
- NULL, op, ACL_WRITE, edn, matches) )
+ if ( ! access_allowed( be, conn, op, e,
+ mlist->ml_type, NULL,
+ ACL_WRITE ) )
{
- return( LDAP_INSUFFICIENT_ACCESS );
+ return( 0 );
}
break;
}
for ( i = 0; mlist->ml_bvalues[i] != NULL; i++ ) {
- if ( ! acl_access_allowed( a, mlist->ml_type, be, conn, e, mlist->ml_bvalues[i],
- op, ACL_WRITE, edn, matches) )
+ if ( ! access_allowed( be, conn, op, e,
+ mlist->ml_type, mlist->ml_bvalues[i],
+ ACL_WRITE ) )
{
- return( LDAP_INSUFFICIENT_ACCESS );
+ return( 0 );
}
}
break;
}
}
- return( LDAP_SUCCESS );
+ return( 1 );
}
#ifdef SLAPD_ACI_ENABLED
}
static int
-aci_list_has_right (struct berval *list, int access, int action)
+aci_list_has_right(
+ struct berval *list,
+ slap_access_t access,
+ int action)
{
struct berval bv;
- int i, right;
+ int i;
+ slap_access_t right;
for (i = 0; aci_get_part(list, i, ',', &bv) >= 0; i++) {
if (bv.bv_len <= 0)
}
static int
-aci_list_has_permission (struct berval *list, char *attr, int access)
+aci_list_has_permission(
+ struct berval *list,
+ char *attr,
+ slap_access_t access)
{
struct berval perm, actn;
int i, action, specific, general;
Backend *be,
Entry *e,
Operation *op,
- char *edn,
regmatch_t *matches
)
{
grpdn = (char *)ch_malloc(1024);
if (grpoc != NULL && grpat != NULL && grpdn != NULL) {
- string_expand(grpdn, 1024, subjdn, edn, matches);
+ string_expand(grpdn, 1024, subjdn, e->e_ndn, matches);
if ( dn_normalize(grpdn) != NULL ) {
rc = (backend_group(be, e, grpdn, op->o_ndn, grpoc, grpat) == 0);
}
return(rc);
}
-int
+static int
aci_access_allowed (
struct berval *aci,
char *attr,
Backend *be,
Entry *e,
Operation *op,
- int access,
- char *edn,
+ slap_access_t access,
regmatch_t *matches
)
{
int rc;
Debug( LDAP_DEBUG_ACL,
- "\n=> aci_access_allowed: %s access to entry \"%s\"\n",
+ "=> aci_access_allowed: %s access to entry \"%s\"\n",
access2str( access ), e->e_dn, 0 );
Debug( LDAP_DEBUG_ACL,
- "\n=> aci_access_allowed: %s access to attribute \"%s\" by \"%s\"\n",
+ "=> aci_access_allowed: %s access to attribute \"%s\" by \"%s\"\n",
access2str( access ),
attr,
op->o_ndn ? op->o_ndn : "" );
}
if (aci_strbvcmp( "self", &bv ) == 0) {
- return(strcasecmp(op->o_ndn, edn) == 0);
+ return(strcasecmp(op->o_ndn, e->e_ndn) == 0);
}
if (aci_strbvcmp( "group", &bv ) == 0) {
- return(aci_group_member(&sdn, "groupOfNames", "member", be, e, op, edn, matches));
+ return(aci_group_member(&sdn, "groupOfNames", "member", be, e, op, matches));
}
if (aci_strbvcmp( "role", &bv ) == 0) {
- return(aci_group_member(&sdn, "organizationalRole", "roleOccupant", be, e, op, edn, matches));
+ return(aci_group_member(&sdn, "organizationalRole", "roleOccupant", be, e, op, matches));
}
return(0);
size = 0;
newbuf[0] = '\0';
+ bufsiz--; /* leave space for lone $ */
flag = 0;
for ( dp = newbuf, sp = pat; size < bufsiz && *sp ; sp++) {
}
}
}
+
+ if (flag) {
+ /* must have ended with a single $ */
+ *dp++ = '$';
+ size++;
+ }
+
*dp = '\0';
Debug( LDAP_DEBUG_TRACE, "=> string_expand: pattern: %s\n", pat, 0, 0 );
projects / openldap / blobdiff