/* acl.c - routines to parse and check acl's */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include "slap.h"
#include "sets.h"
+#include "lber_pvt.h"
+
+
+/*
+ * speed up compares
+ */
+static struct berval
+ aci_bv_entry = { sizeof("entry") - 1, "entry" },
+ aci_bv_br_entry = { sizeof("[entry]") - 1, "[entry]" },
+ aci_bv_br_all = { sizeof("[all]") - 1, "[all]" },
+ aci_bv_access_id = { sizeof("access-id") - 1, "access-id" },
+ aci_bv_anonymous = { sizeof("anonymous") - 1, "anonymous" },
+ aci_bv_users = { sizeof("users") - 1, "users" },
+ aci_bv_self = { sizeof("self") - 1, "self" },
+ aci_bv_dnattr = { sizeof("dnattr") - 1, "dnattr" },
+ aci_bv_group = { sizeof("group") - 1, "group" },
+ aci_bv_role = { sizeof("role") - 1, "role" },
+ aci_bv_set = { sizeof("set") - 1, "set" },
+ aci_bv_set_ref = { sizeof("set-ref") - 1, "set-ref"},
+ aci_bv_grant = { sizeof("grant") - 1, "grant" },
+ aci_bv_deny = { sizeof("deny") - 1, "deny" };
static AccessControl * acl_get(
AccessControl *ac, int *count,
#endif
static int regex_matches(
- char *pat, char *str, char *buf, regmatch_t *matches);
+ struct berval *pat, char *str, char *buf, regmatch_t *matches);
static void string_expand(
- char *newbuf, int bufsiz, char *pattern,
+ struct berval *newbuf, struct berval *pattern,
char *match, regmatch_t *matches);
-char **aci_set_gather (void *cookie, char *name, char *attr);
+typedef struct AciSetCookie {
+ Backend *be;
+ Entry *e;
+ Connection *conn;
+ Operation *op;
+} AciSetCookie;
+
+SLAP_SET_GATHER aci_set_gather;
static int aci_match_set ( struct berval *subj, Backend *be,
Entry *e, Connection *conn, Operation *op, int setref );
#endif
slap_mask_t mask;
slap_control_t control;
+ const char *attr;
+ regmatch_t matches[MAXREMATCHES];
- const char *attr = desc ? desc->ad_cname->bv_val : NULL;
+ assert( e != NULL );
+ assert( desc != NULL );
+ assert( access > ACL_NONE );
- regmatch_t matches[MAXREMATCHES];
+ attr = desc->ad_cname.bv_val;
+
+ assert( attr != NULL );
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
- "access_allowed: conn %d %s access to \"%s\" \"%s\" requested\n",
- conn->c_connid, access2str( access ), e->e_dn, attr ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
+ "access_allowed: conn %d %s access to \"%s\" \"%s\" requested\n",
+ conn ? conn->c_connid : -1, 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 );
+ access2str( access ), e->e_dn, attr );
#endif
+ if ( op == NULL ) {
+ /* no-op call */
+ return 1;
+ }
+
+ if ( be == NULL ) be = &backends[0];
assert( be != NULL );
- assert( e != NULL );
- assert( attr != NULL );
- assert( access > ACL_NONE );
/* grant database root access */
- if ( be != NULL && be_isroot( be, op->o_ndn ) ) {
+ if ( be != NULL && be_isroot( be, &op->o_ndn ) ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
- "access_allowed: conn %d root access granted\n",
- conn->c_connid));
+ LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
+ "access_allowed: conn %d root access granted\n",
+ conn->c_connid));
#else
Debug( LDAP_DEBUG_ACL,
"<= root access granted\n",
&& desc != slap_schema.si_ad_children )
{
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
- "access_allowed: conn %d NoUserMod Operational attribute: %s access granted\n",
- conn->c_connid, attr ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "access_allowed: conn %d NoUserMod Operational attribute: %s access granted\n",
+ conn->c_connid, attr ));
#else
- Debug( LDAP_DEBUG_ACL, "NoUserMod Operational attribute:"
+ Debug( LDAP_DEBUG_ACL, "NoUserMod Operational attribute:"
" %s access granted\n",
attr, 0, 0 );
#endif
/* use backend default access if no backend acls */
if( be != NULL && be->be_acl == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
- "access_allowed: conn %d backend default %s access %s to \"%s\"\n",
- conn->c_connid, access2str( access ),
- be->be_dfltaccess >= access ? "granted" : "denied", op->o_dn ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "access_allowed: conn %d backend default %s access %s to \"%s\"\n",
+ conn->c_connid, access2str( access ),
+ be->be_dfltaccess >= access ? "granted" : "denied", op->o_dn.bv_val ));
#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 );
+ be->be_dfltaccess >= access ? "granted" : "denied", op->o_dn.bv_val );
#endif
return be->be_dfltaccess >= access;
/* use global default access if no global acls */
} else if ( be == NULL && global_acl == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
- "access_allowed: conn %d global default %s access %s to \"%s\"\n",
- conn->c_connid, access2str( access ),
- global_default_access >= access ? "granted" : "denied", op->o_dn ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "access_allowed: conn %d global default %s access %s to \"%s\"\n",
+ conn->c_connid, access2str( access ),
+ global_default_access >= 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 ),
- global_default_access >= access ? "granted" : "denied", op->o_dn );
+ global_default_access >= access ? "granted" : "denied", op->o_dn.bv_val );
#endif
return global_default_access >= access;
#endif
for (i = 0; i < MAXREMATCHES && matches[i].rm_so > 0; i++) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
- "access_allowed: conn %d match[%d]: %d %d ",
- conn->c_connid, i, (int)matches[i].rm_so, (int)matches[i].rm_eo ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "access_allowed: conn %d match[%d]: %d %d ",
+ conn->c_connid, 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 );
}
}
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_ARGS, "\n" ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_ARGS, "\n" ));
#else
Debug( LDAP_DEBUG_ARGS, "\n", 0, 0, 0 );
#endif
if ( ACL_IS_INVALID( mask ) ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
- "access_allowed: conn %d \"%s\" (%s) invalid!\n",
- conn->c_connid, e->e_dn, attr ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "access_allowed: conn %d \"%s\" (%s) invalid!\n",
+ conn->c_connid, e->e_dn, attr ));
#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: \"%s\" (%s) invalid!\n",
} else if ( control == ACL_BREAK ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
- "access_allowed: conn %d no more rules\n", conn->c_connid ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "access_allowed: conn %d no more rules\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: no more rules\n", 0, 0, 0);
}
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
- "access_allowed: conn %d %s access %s by %s\n",
- access2str( access ),
- ACL_GRANT( mask, access ) ? "granted" : "denied",
- accessmask2str( mask, accessmaskbuf ) ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
+ "access_allowed: conn %d %s access %s by %s\n",
+ conn->c_connid,
+ access2str( access ),
+ ACL_GRANT( mask, access ) ? "granted" : "denied",
+ accessmask2str( mask, accessmaskbuf ) ));
#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: %s access %s by %s\n",
assert( e != NULL );
assert( count != NULL );
+ assert( desc != NULL );
+
+ attr = desc->ad_cname.bv_val;
- attr = desc ? desc->ad_cname->bv_val : NULL;
+ assert( attr != NULL );
if( a == NULL ) {
if( be == NULL ) {
a = a->acl_next;
}
- dnlen = strlen(e->e_ndn);
+ dnlen = e->e_nname.bv_len;
for ( ; a != NULL; a = a->acl_next ) {
(*count) ++;
- if (a->acl_dn_pat != NULL) {
+ if (a->acl_dn_pat.bv_len != 0) {
if ( a->acl_dn_style == ACL_STYLE_REGEX ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
- "acl_get: dnpat [%d] %s nsub: %d\n",
- *count, a->acl_dn_pat, (int) a->acl_dn_re.re_nsub ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_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, (int) a->acl_dn_re.re_nsub );
+ *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", LDAP_LEVEL_DETAIL1,
- "acl_get: dn [%d] %s\n",
- *count, a->acl_dn_pat ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_get: dn [%d] %s\n",
+ *count, a->acl_dn_pat.bv_val ));
#else
Debug( LDAP_DEBUG_ACL, "=> dn: [%d] %s\n",
- *count, a->acl_dn_pat, 0 );
+ *count, a->acl_dn_pat.bv_val, 0 );
#endif
- patlen = strlen( a->acl_dn_pat );
+ patlen = a->acl_dn_pat.bv_len;
if ( dnlen < patlen )
continue;
continue;
} else if ( a->acl_dn_style == ACL_STYLE_ONE ) {
- char *rdn;
int rdnlen = -1;
if ( dnlen <= patlen )
continue;
- if ( e->e_ndn[dnlen - patlen - 1] != ',' )
+ if ( !DN_SEPARATOR( e->e_ndn[dnlen - patlen - 1] ) )
continue;
- rdn = dn_rdn( NULL, e->e_ndn );
- if ( rdn != NULL ) {
- rdnlen = strlen( rdn );
- ch_free( rdn );
- }
+ rdnlen = dn_rdnlen( NULL, &e->e_nname );
if ( rdnlen != dnlen - patlen - 1 )
continue;
} else if ( a->acl_dn_style == ACL_STYLE_SUBTREE ) {
- if ( dnlen > patlen && e->e_ndn[dnlen - patlen - 1] != ',' )
+ if ( dnlen > patlen && !DN_SEPARATOR( e->e_ndn[dnlen - patlen - 1] ) )
continue;
} else if ( a->acl_dn_style == ACL_STYLE_CHILDREN ) {
if ( dnlen <= patlen )
continue;
- if ( e->e_ndn[dnlen - patlen - 1] != ',' )
+ if ( !DN_SEPARATOR( e->e_ndn[dnlen - patlen - 1] ) )
continue;
}
- if ( strcmp( a->acl_dn_pat, e->e_ndn + dnlen - patlen ) != 0 )
+ if ( strcmp( a->acl_dn_pat.bv_val, e->e_ndn + dnlen - patlen ) != 0 )
continue;
}
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
- "acl_get: [%d] matched\n",
- *count ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_get: [%d] matched\n",
+ *count ));
#else
Debug( LDAP_DEBUG_ACL, "=> acl_get: [%d] matched\n",
*count, 0, 0 );
}
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
- "acl_get: [%d] check attr %s\n",
- *count, attr ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_get: [%d] check attr %s\n",
+ *count, attr ));
#else
- Debug( LDAP_DEBUG_ACL, "=> acl_get: [%d] check attr %s\n",
- *count, attr, 0);
+ Debug( LDAP_DEBUG_ACL, "=> acl_get: [%d] check attr %s\n",
+ *count, attr, 0);
#endif
if ( attr == NULL || a->acl_attrs == NULL ||
ad_inlist( desc, a->acl_attrs ) )
{
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
- "acl_get: [%d] acl %s attr: %s\n",
- *count, e->e_dn, attr ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_get: [%d] acl %s attr: %s\n",
+ *count, e->e_dn, attr ));
#else
Debug( LDAP_DEBUG_ACL,
"<= acl_get: [%d] acl %s attr: %s\n",
}
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
- "acl_get: done.\n" ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
+ "acl_get: done.\n" ));
#else
Debug( LDAP_DEBUG_ACL, "<= acl_get: done.\n", 0, 0, 0 );
#endif
#ifdef LDAP_DEBUG
char accessmaskbuf[ACCESSMASK_MAXLEN];
#endif
- const char *attr = desc ? desc->ad_cname->bv_val : NULL;
+ const char *attr;
assert( a != NULL );
assert( mask != NULL );
+ assert( desc != NULL );
+
+ attr = desc->ad_cname.bv_val;
+
+ assert( attr != NULL );
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
- "acl_mask: conn %d access to entry \"%s\", attr \"%s\" requested\n",
- conn->c_connid, e->e_dn, attr ));
-
- LDAP_LOG(( "acl", LDAP_LEVEL_ARGS,
- " to %s by \"%s\", (%s) \n",
- val ? "value" : "all values",
- op->o_ndn ? op->o_ndn : "",
- accessmask2str( *mask, accessmaskbuf ) ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
+ "acl_mask: conn %d access to entry \"%s\", attr \"%s\" requested\n",
+ conn->c_connid, e->e_dn, attr ));
+
+ LDAP_LOG(( "acl", LDAP_LEVEL_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",
Debug( LDAP_DEBUG_ACL,
"=> acl_mask: to %s by \"%s\", (%s) \n",
val ? "value" : "all values",
- op->o_ndn ? op->o_ndn : "",
+ op->o_ndn.bv_val ? op->o_ndn.bv_val : "",
accessmask2str( *mask, accessmaskbuf ) );
#endif
ACL_INVALIDATE( modmask );
/* AND <who> clauses */
- if ( b->a_dn_pat != NULL ) {
+ if ( b->a_dn_pat.bv_len != 0 ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
- "acl_mask: conn %d check a_dn_pat: %s\n",
- conn->c_connid, b->a_dn_pat ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_mask: conn %d check a_dn_pat: %s\n",
+ conn->c_connid, b->a_dn_pat.bv_val ));
#else
Debug( LDAP_DEBUG_ACL, "<= check a_dn_pat: %s\n",
- b->a_dn_pat, 0, 0);
+ 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 ( strcmp( b->a_dn_pat, "anonymous" ) == 0 ) {
- if (op->o_ndn != NULL && op->o_ndn[0] != '\0' ) {
+ if ( ber_bvcmp( &b->a_dn_pat, &aci_bv_anonymous ) == 0 ) {
+ if ( op->o_ndn.bv_len != 0 ) {
continue;
}
- } else if ( strcmp( b->a_dn_pat, "users" ) == 0 ) {
- if (op->o_ndn == NULL || op->o_ndn[0] == '\0' ) {
+ } else if ( ber_bvcmp( &b->a_dn_pat, &aci_bv_users ) == 0 ) {
+ if ( op->o_ndn.bv_len == 0 ) {
continue;
}
- } else if ( strcmp( b->a_dn_pat, "self" ) == 0 ) {
- if( op->o_ndn == NULL || op->o_ndn[0] == '\0' ) {
+ } else if ( ber_bvcmp( &b->a_dn_pat, &aci_bv_self ) == 0 ) {
+ if ( op->o_ndn.bv_len == 0 ) {
continue;
}
- if ( e->e_dn == NULL || strcmp( e->e_ndn, op->o_ndn ) != 0 ) {
+ if ( e->e_dn == NULL || !dn_match( &e->e_nname, &op->o_ndn ) ) {
continue;
}
} else if ( b->a_dn_style == ACL_STYLE_REGEX ) {
- if ( strcmp( b->a_dn_pat, "*" ) != 0 ) {
- int ret = regex_matches( b->a_dn_pat,
- op->o_ndn, e->e_ndn, matches );
+ if ( ber_bvccmp( &b->a_dn_pat, '*' ) == 0 ) {
+ int ret = regex_matches( &b->a_dn_pat,
+ op->o_ndn.bv_val, e->e_ndn, matches );
if( ret == 0 ) {
continue;
if ( e->e_dn == NULL )
continue;
- patlen = strlen( b->a_dn_pat );
- odnlen = strlen( op->o_ndn );
+ patlen = b->a_dn_pat.bv_len;
+ odnlen = op->o_ndn.bv_len;
if ( odnlen < patlen )
continue;
continue;
} else if ( b->a_dn_style == ACL_STYLE_ONE ) {
- char *rdn;
int rdnlen = -1;
if ( odnlen <= patlen )
continue;
- if ( op->o_ndn[odnlen - patlen - 1] != ',' )
+ if ( !DN_SEPARATOR( op->o_ndn.bv_val[odnlen - patlen - 1] ) )
continue;
- rdn = dn_rdn( NULL, op->o_ndn );
- if ( rdn != NULL ) {
- rdnlen = strlen( rdn );
- ch_free( rdn );
- }
+ rdnlen = dn_rdnlen( NULL, &op->o_ndn );
if ( rdnlen != odnlen - patlen - 1 )
continue;
} else if ( b->a_dn_style == ACL_STYLE_SUBTREE ) {
- if ( odnlen > patlen && op->o_ndn[odnlen - patlen - 1] != ',' )
+ if ( odnlen > patlen && !DN_SEPARATOR( op->o_ndn.bv_val[odnlen - patlen - 1] ) )
continue;
} else if ( b->a_dn_style == ACL_STYLE_CHILDREN ) {
if ( odnlen <= patlen )
continue;
- if ( op->o_ndn[odnlen - patlen - 1] != ',' )
+ if ( !DN_SEPARATOR( op->o_ndn.bv_val[odnlen - patlen - 1] ) )
continue;
}
- if ( strcmp( b->a_dn_pat, op->o_ndn + odnlen - patlen ) != 0 )
+ if ( strcmp( b->a_dn_pat.bv_val, op->o_ndn.bv_val + odnlen - patlen ) != 0 )
continue;
-
}
}
- if ( b->a_sockurl_pat != NULL ) {
+ if ( b->a_sockurl_pat.bv_len ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
- "acl_mask: conn %d check a_sockurl_pat: %s\n",
- conn->c_connid, b->a_sockurl_pat ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_mask: conn %d check a_sockurl_pat: %s\n",
+ conn->c_connid, b->a_sockurl_pat.bv_val ));
#else
Debug( LDAP_DEBUG_ACL, "<= check a_sockurl_pat: %s\n",
- b->a_sockurl_pat, 0, 0 );
+ b->a_sockurl_pat.bv_val, 0, 0 );
#endif
- if ( strcmp( b->a_sockurl_pat, "*" ) != 0) {
+ if ( ber_bvccmp( &b->a_sockurl_pat, '*' ) != 0) {
if ( b->a_sockurl_style == ACL_STYLE_REGEX) {
- if (!regex_matches( b->a_sockurl_pat, conn->c_listener_url,
+ if (!regex_matches( &b->a_sockurl_pat, conn->c_listener_url.bv_val,
e->e_ndn, matches ) )
{
continue;
}
} else {
- if ( strcasecmp( b->a_sockurl_pat, conn->c_listener_url ) == 0 )
+ if ( ber_bvstrcasecmp( &b->a_sockurl_pat, &conn->c_listener_url ) != 0 )
continue;
}
}
}
- if ( b->a_domain_pat != NULL ) {
+ if ( b->a_domain_pat.bv_len ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
- "acl_mask: conn %d check a_domain_pat: %s\n",
- conn->c_connid, b->a_domain_pat ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_mask: conn %d check a_domain_pat: %s\n",
+ conn->c_connid, b->a_domain_pat.bv_val ));
#else
Debug( LDAP_DEBUG_ACL, "<= check a_domain_pat: %s\n",
- b->a_domain_pat, 0, 0 );
+ b->a_domain_pat.bv_val, 0, 0 );
#endif
- if ( strcmp( b->a_domain_pat, "*" ) != 0) {
+ if ( ber_bvccmp( &b->a_domain_pat, '*' ) != 0) {
if ( b->a_domain_style == ACL_STYLE_REGEX) {
- if (!regex_matches( b->a_domain_pat, conn->c_peer_domain,
+ if (!regex_matches( &b->a_domain_pat, conn->c_peer_domain.bv_val,
e->e_ndn, matches ) )
{
continue;
}
} else {
- if ( strcasecmp( b->a_domain_pat, conn->c_peer_domain ) == 0 )
+ if ( ber_bvstrcasecmp( &b->a_domain_pat, &conn->c_peer_domain ) != 0 )
continue;
}
}
}
- if ( b->a_peername_pat != NULL ) {
+ if ( b->a_peername_pat.bv_len ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
- "acl_mask: conn %d check a_perrname_path: %s\n",
- conn->c_connid, b->a_peername_pat ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_mask: conn %d check a_perrname_path: %s\n",
+ conn->c_connid, b->a_peername_pat.bv_val ));
#else
Debug( LDAP_DEBUG_ACL, "<= check a_peername_path: %s\n",
- b->a_peername_pat, 0, 0 );
+ b->a_peername_pat.bv_val, 0, 0 );
#endif
- if ( strcmp( b->a_peername_pat, "*" ) != 0) {
+ if ( ber_bvccmp( &b->a_peername_pat, '*' ) != 0) {
if ( b->a_peername_style == ACL_STYLE_REGEX) {
- if (!regex_matches( b->a_peername_pat, conn->c_peer_name,
+ if (!regex_matches( &b->a_peername_pat, conn->c_peer_name.bv_val,
e->e_ndn, matches ) )
{
continue;
}
} else {
- if ( strcasecmp( b->a_peername_pat, conn->c_peer_name ) == 0 )
+ if ( ber_bvstrcasecmp( &b->a_peername_pat, &conn->c_peer_name ) != 0 )
continue;
}
}
}
- if ( b->a_sockname_pat != NULL ) {
+ if ( b->a_sockname_pat.bv_len ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
- "acl_mask: conn %d check a_sockname_path: %s\n",
- conn->c_connid, b->a_sockname_pat ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_mask: conn %d check a_sockname_path: %s\n",
+ conn->c_connid, b->a_sockname_pat.bv_val ));
#else
Debug( LDAP_DEBUG_ACL, "<= check a_sockname_path: %s\n",
- b->a_sockname_pat, 0, 0 );
+ b->a_sockname_pat.bv_val, 0, 0 );
#endif
- if ( strcmp( b->a_sockname_pat, "*" ) != 0) {
+ if ( ber_bvccmp( &b->a_sockname_pat, '*' ) != 0) {
if ( b->a_sockname_style == ACL_STYLE_REGEX) {
- if (!regex_matches( b->a_sockname_pat, conn->c_sock_name,
+ if (!regex_matches( &b->a_sockname_pat, conn->c_sock_name.bv_val,
e->e_ndn, matches ) )
{
continue;
}
} else {
- if ( strcasecmp( b->a_sockname_pat, conn->c_sock_name ) == 0 )
+ if ( ber_bvstrcasecmp( &b->a_sockname_pat, &conn->c_sock_name ) != 0 )
continue;
}
}
}
- if ( b->a_dn_at != NULL && op->o_ndn != NULL ) {
+ if ( b->a_dn_at != NULL && op->o_ndn.bv_len != 0 ) {
Attribute *at;
struct berval bv;
int rc, match = 0;
const char *text;
- const char *desc = b->a_dn_at->ad_cname->bv_val;
+ const char *attr = b->a_dn_at->ad_cname.bv_val;
+
+ assert( attr != NULL );
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
- "acl_mask: conn %d check a_dn_pat: %s\n",
- conn->c_connid, desc ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_mask: conn %d check a_dn_pat: %s\n",
+ conn->c_connid, attr ));
#else
Debug( LDAP_DEBUG_ACL, "<= check a_dn_at: %s\n",
- desc, 0, 0);
+ attr, 0, 0);
#endif
- bv.bv_val = op->o_ndn;
- bv.bv_len = strlen( bv.bv_val );
+ bv = op->o_ndn;
/* see if asker is listed in dnattr */
for( at = attrs_find( e->e_attrs, b->a_dn_at );
}
}
- if ( b->a_group_pat != NULL && op->o_ndn != NULL ) {
+ if ( b->a_group_pat.bv_len && op->o_ndn.bv_len ) {
char buf[1024];
+ struct berval bv = { sizeof(buf) - 1, buf };
+ struct berval ndn = { 0, NULL };
+ int rc;
/* b->a_group is an unexpanded entry name, expanded it should be an
* entry with objectclass group* and we test to see if odn is one of
*/
/* see if asker is listed in dnattr */
if ( b->a_group_style == ACL_STYLE_REGEX ) {
- string_expand(buf, sizeof(buf), b->a_group_pat, e->e_ndn, matches);
- if ( dn_normalize(buf) == NULL ) {
+ string_expand(&bv, &b->a_group_pat, e->e_ndn, matches);
+ if ( dnNormalize2(NULL, &bv, &ndn) != LDAP_SUCCESS ) {
/* did not expand to a valid dn */
continue;
}
+ bv = ndn;
} else {
- strncpy( buf, b->a_group_pat, sizeof(buf) - 1 );
- buf[sizeof(buf) - 1] = 0;
+ bv = b->a_group_pat;
}
- if (backend_group(be, conn, op, e, buf, op->o_ndn,
- b->a_group_oc, b->a_group_at) != 0)
- {
+ rc = backend_group(be, conn, op, e, &bv, &op->o_ndn,
+ b->a_group_oc, b->a_group_at);
+ if ( ndn.bv_val )
+ free( ndn.bv_val );
+ if ( rc != 0 ) {
continue;
}
}
- if ( b->a_set_pat != NULL ) {
- struct berval bv;
-
- bv.bv_val = b->a_set_pat;
- bv.bv_len = strlen(b->a_set_pat);
- if (aci_match_set( &bv, be, e, conn, op, 0 ) == 0) {
+ if ( b->a_set_pat.bv_len != 0 ) {
+ if (aci_match_set( &b->a_set_pat, be, e, conn, op, 0 ) == 0) {
continue;
}
}
if ( b->a_authz.sai_ssf ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
- "acl_mask: conn %d check a_authz.sai_ssf: ACL %u > OP %u\n",
- conn->c_connid, b->a_authz.sai_ssf, op->o_ssf ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_mask: conn %d check a_authz.sai_ssf: ACL %u > OP %u\n",
+ conn->c_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 );
if ( b->a_authz.sai_transport_ssf ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
- "acl_mask: conn %d check a_authz.sai_transport_ssf: ACL %u > OP %u\n",
- conn->c_connid, b->a_authz.sai_transport_ssf, op->o_transport_ssf ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_mask: conn %d check a_authz.sai_transport_ssf: ACL %u > OP %u\n",
+ conn->c_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",
if ( b->a_authz.sai_tls_ssf ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
- "acl_mask: conn %d check a_authz.sai_tls_ssf: ACL %u > OP %u\n",
- conn->c_connid, b->a_authz.sai_tls_ssf, op->o_tls_ssf ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_mask: conn %d check a_authz.sai_tls_ssf: ACL %u > OP %u\n",
+ conn->c_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",
if ( b->a_authz.sai_sasl_ssf ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
- "acl_mask: conn %d check a_authz.sai_sasl_ssf: ACL %u > OP %u\n",
- conn->c_connid, b->a_authz.sai_sasl_ssf, op->o_sasl_ssf ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_mask: conn %d check a_authz.sai_sasl_ssf: ACL %u > OP %u\n",
+ conn->c_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 ) {
+ if ( b->a_authz.sai_sasl_ssf > op->o_sasl_ssf ) {
continue;
}
}
* to first check b->a_access_mask, the ACL's access level.
*/
- if( op->o_ndn == NULL || op->o_ndn[0] == '\0' ) {
- continue;
- }
-
- if ( e->e_dn == NULL ) {
+ if ( e->e_nname.bv_len == 0 ) {
+ /* no ACIs in the root DSE */
continue;
}
* rights are determined by OR'ing the individual
* rights given by the acis.
*/
- for ( i = 0; at->a_vals[i] != NULL; i++ ) {
+ for ( i = 0; at->a_vals[i].bv_val != NULL; i++ ) {
if (aci_mask( be, conn, op,
- e, desc, val, at->a_vals[i],
+ e, desc, val, &at->a_vals[i],
matches, &grant, &deny ) != 0)
{
tgrant |= grant;
* 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
+ * 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.
*/
}
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_RESULTS,
- "acl_mask: conn %d [%d] applying %s (%s)\n",
- conn->c_connid, i, accessmask2str( modmask, accessmaskbuf),
- b->a_type == ACL_CONTINUE ? "continue" : b->a_type == ACL_BREAK
- ? "break" : "stop" ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_RESULTS,
+ "acl_mask: conn %d [%d] applying %s (%s)\n",
+ conn->c_connid, 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",
}
#ifdef NEW_LOGGING
- LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
- "acl_mask: conn %d [%d] mask: %s\n",
- conn->c_connid, i, accessmask2str( *mask, accessmaskbuf) ));
+ LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
+ "acl_mask: conn %d [%d] mask: %s\n",
+ conn->c_connid, i, accessmask2str( *mask, accessmaskbuf) ));
#else
Debug( LDAP_DEBUG_ACL,
"<= acl_mask: [%d] mask: %s\n",
}
}
+ /* implicit "by * none" clause */
+ ACL_INIT(*mask);
+
#ifdef NEW_LOGGING
- LDAP_LOG(( "aci", LDAP_LEVEL_RESULTS,
- "acl_mask: conn %d no more <who> clauses, returning %d (stop)\n",
- conn->c_connid, accessmask2str( *mask, accessmaskbuf) ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_RESULTS,
+ "acl_mask: conn %d no more <who> clauses, returning %d (stop)\n",
+ conn->c_connid, accessmask2str( *mask, accessmaskbuf) ));
#else
Debug( LDAP_DEBUG_ACL,
"<= acl_mask: no more <who> clauses, returning %s (stop)\n",
Modifications *mlist
)
{
- int i;
+ struct berval *bv;
assert( be != NULL );
/* short circuit root database access */
- if ( be_isroot( be, op->o_ndn ) ) {
+ if ( be_isroot( be, &op->o_ndn ) ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
- "acl_check_modlist: conn %d access granted to root user\n",
- conn->c_connid ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_check_modlist: conn %d access granted to root user\n",
+ conn->c_connid ));
#else
Debug( LDAP_DEBUG_ACL,
"<= acl_access_allowed: granted to database root\n",
/* use backend default access if no backend acls */
if( be != NULL && be->be_acl == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
- "acl_check_modlist: conn %d backend default %s access %s to \"%s\"\n",
- conn->c_connid, access2str( ACL_WRITE ),
- be->be_dfltaccess >= ACL_WRITE ? "granted" : "denied", op->o_dn ));
+ LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
+ "acl_check_modlist: conn %d backend default %s access %s to \"%s\"\n",
+ conn->c_connid, access2str( ACL_WRITE ),
+ be->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 ),
- be->be_dfltaccess >= ACL_WRITE ? "granted" : "denied", op->o_dn );
+ be->be_dfltaccess >= ACL_WRITE ? "granted" : "denied", op->o_dn.bv_val );
#endif
return be->be_dfltaccess >= ACL_WRITE;
/* use global default access if no global acls */
} else if ( be == NULL && global_acl == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
- "acl_check_modlist: conn %d global default %s access %s to \"%s\"\n",
- conn->c_connid, access2str( ACL_WRITE ),
- global_default_access >= ACL_WRITE ? "granted" : "denied", op->o_dn ));
+ LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
+ "acl_check_modlist: conn %d global default %s access %s to \"%s\"\n",
+ conn->c_connid, access2str( ACL_WRITE ),
+ global_default_access >= ACL_WRITE ? "granted" : "denied", op->o_dn ));
#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: global default %s access %s to \"%s\"\n",
*/
if ( is_at_no_user_mod( mlist->sml_desc->ad_type ) ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
- "acl_check_modlist: conn %d no-user-mod %s: modify access granted\n",
- conn->c_connid, mlist->sml_desc->ad_cname->bv_val ));
+ LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
+ "acl_check_modlist: conn %d no-user-mod %s: modify access granted\n",
+ conn->c_connid, mlist->sml_desc->ad_cname.bv_val ));
#else
- Debug( LDAP_DEBUG_ACL, "acl: no-user-mod %s:"
+ Debug( LDAP_DEBUG_ACL, "acl: no-user-mod %s:"
" modify access granted\n",
- mlist->sml_desc->ad_cname->bv_val, 0, 0 );
+ mlist->sml_desc->ad_cname.bv_val, 0, 0 );
#endif
continue;
}
switch ( mlist->sml_op ) {
case LDAP_MOD_REPLACE:
- case LDAP_MOD_ADD:
- if ( mlist->sml_bvalues == NULL ) {
- break;
+ /*
+ * We must check both permission to delete the whole
+ * attribute and permission to add the specific attributes.
+ * This prevents abuse from selfwriters.
+ */
+ if ( ! access_allowed( be, conn, op, e,
+ mlist->sml_desc, NULL, ACL_WRITE ) )
+ {
+ return( 0 );
}
- for ( i = 0; mlist->sml_bvalues[i] != NULL; i++ ) {
+
+ if ( mlist->sml_bvalues == NULL ) break;
+
+ /* fall thru to check value to add */
+
+ case LDAP_MOD_ADD:
+ assert( mlist->sml_bvalues != NULL );
+
+ for ( bv = mlist->sml_bvalues; bv->bv_val != NULL; bv++ ) {
if ( ! access_allowed( be, conn, op, e,
- mlist->sml_desc, mlist->sml_bvalues[i], ACL_WRITE ) )
+ mlist->sml_desc, bv, ACL_WRITE ) )
{
return( 0 );
}
}
break;
}
- for ( i = 0; mlist->sml_bvalues[i] != NULL; i++ ) {
+ for ( bv = mlist->sml_bvalues; bv->bv_val != NULL; bv++ ) {
if ( ! access_allowed( be, conn, op, e,
- mlist->sml_desc, mlist->sml_bvalues[i], ACL_WRITE ) )
+ mlist->sml_desc, bv, ACL_WRITE ) )
{
return( 0 );
}
}
break;
+
+ case SLAP_MOD_SOFTADD:
+ /* allow adding attribute via modrdn thru */
+ break;
+
+ default:
+ assert( 0 );
+ return( 0 );
}
}
return(s);
}
-static int
-aci_strbvcmp(
- const char *s,
- struct berval *bv )
-{
- int res, len;
-
- res = strncasecmp( s, bv->bv_val, bv->bv_len );
- if (res)
- return(res);
- len = strlen(s);
- if (len > (int)bv->bv_len)
- return(1);
- if (len < (int)bv->bv_len)
- return(-1);
- return(0);
-}
-
static int
aci_get_part(
struct berval *list,
return(bv->bv_len);
}
-char **
-aci_set_gather (void *cookie, char *name, char *attr)
+BerVarray
+aci_set_gather (void *cookie, struct berval *name, struct berval *attr)
{
- struct {
- Backend *be;
- Entry *e;
- Connection *conn;
- Operation *op;
- } *cp = (void *)cookie;
- struct berval **bvals = NULL;
- char **vals = NULL;
- char *ndn;
- int i;
+ AciSetCookie *cp = cookie;
+ BerVarray bvals = NULL;
+ struct berval ndn;
/* 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 ((ndn = ch_strdup(name)) != NULL) {
- if (dn_normalize(ndn) != NULL) {
- const char *text;
- AttributeDescription *desc = NULL;
- if (slap_str2ad(attr, &desc, &text) == LDAP_SUCCESS) {
- backend_attribute(cp->be, NULL /*cp->conn*/,
- NULL /*cp->op*/, cp->e,
- ndn, desc, &bvals);
- if (bvals != NULL) {
- for (i = 0; bvals[i] != NULL; i++) { }
- vals = ch_calloc(i + 1, sizeof(char *));
- if (vals != NULL) {
- while (--i >= 0) {
- vals[i] = bvals[i]->bv_val;
- bvals[i]->bv_val = NULL;
- }
- }
- ber_bvecfree(bvals);
- }
- ad_free(desc, 1);
- }
+ if (dnNormalize2(NULL, name, &ndn) == LDAP_SUCCESS) {
+ const char *text;
+ AttributeDescription *desc = NULL;
+ if (slap_bv2ad(attr, &desc, &text) == LDAP_SUCCESS) {
+ backend_attribute(cp->be, NULL, NULL,
+ cp->e, &ndn, desc, &bvals);
}
- ch_free(ndn);
+ free(ndn.bv_val);
}
- return(vals);
+ return(bvals);
}
static int
int setref
)
{
- char *set = NULL;
+ struct berval set = { 0, NULL };
int rc = 0;
- struct {
- Backend *be;
- Entry *e;
- Connection *conn;
- Operation *op;
- } cookie;
+ AciSetCookie cookie;
if (setref == 0) {
- set = aci_bvstrdup(subj);
+ ber_dupbv( &set, subj );
} else {
- struct berval bv;
- char *subjdn;
- char *setat;
- struct berval **bvals;
+ struct berval subjdn, ndn = { 0, NULL };
+ struct berval setat;
+ BerVarray bvals;
const char *text;
AttributeDescription *desc = NULL;
/* format of string is "entry/setAttrName" */
- if (aci_get_part(subj, 0, '/', &bv) < 0) {
- return(0);
- }
-
- subjdn = aci_bvstrdup(&bv);
- if ( subjdn == NULL ) {
+ if (aci_get_part(subj, 0, '/', &subjdn) < 0) {
return(0);
+ } else {
+ /* FIXME: If dnNormalize was based on ldap_bv2dn
+ * instead of ldap_str2dn and would honor the bv_len
+ * we could skip this step and not worry about the
+ * unterminated string.
+ */
+ char *s = ch_malloc(subjdn.bv_len + 1);
+ AC_MEMCPY(s, subjdn.bv_val, subjdn.bv_len);
+ subjdn.bv_val = s;
}
- if ( aci_get_part(subj, 1, '/', &bv) < 0 ) {
- setat = ch_strdup( SLAPD_ACI_SET_ATTR );
- } else {
- setat = aci_bvstrdup(&bv);
+ if ( aci_get_part(subj, 1, '/', &setat) < 0 ) {
+ setat.bv_val = SLAPD_ACI_SET_ATTR;
+ setat.bv_len = sizeof(SLAPD_ACI_SET_ATTR)-1;
}
- if ( setat != NULL ) {
- if ( dn_normalize(subjdn) != NULL
- && slap_str2ad(setat, &desc, &text) == LDAP_SUCCESS )
+ if ( setat.bv_val != NULL ) {
+ if ( dnNormalize2(NULL, &subjdn, &ndn) == LDAP_SUCCESS
+ && slap_bv2ad(&setat, &desc, &text) == LDAP_SUCCESS )
{
backend_attribute(be, NULL, NULL, e,
- subjdn, desc, &bvals);
- ad_free(desc, 1);
+ &ndn, desc, &bvals);
if ( bvals != NULL ) {
- if ( bvals[0] != NULL )
- set = ch_strdup(bvals[0]->bv_val);
- ber_bvecfree(bvals);
+ if ( bvals[0].bv_val != NULL ) {
+ int i;
+ set = bvals[0];
+ bvals[0].bv_val = NULL;
+ for (i=1;bvals[i].bv_val;i++);
+ bvals[0].bv_val = bvals[i-1].bv_val;
+ bvals[i-1].bv_val = NULL;
+ }
+ ber_bvarray_free(bvals);
}
}
- ch_free(setat);
+ if (ndn.bv_val)
+ free(ndn.bv_val);
}
- ch_free(subjdn);
+ ch_free(subjdn.bv_val);
}
- if (set != NULL) {
+ if (set.bv_val != NULL) {
cookie.be = be;
cookie.e = e;
cookie.conn = conn;
cookie.op = op;
- rc = (set_filter(aci_set_gather, &cookie, set, op->o_ndn, e->e_ndn, NULL) > 0);
- ch_free(set);
+ rc = (slap_set_filter(aci_set_gather, &cookie, &set,
+ &op->o_ndn, &e->e_nname, NULL) > 0);
+ ch_free(set.bv_val);
}
return(rc);
}
static int
aci_list_has_attr(
struct berval *list,
- const char *attr,
+ const struct berval *attr,
struct berval *val )
{
struct berval bv, left, right;
if (aci_get_part(&bv, 0, '=', &left) < 0
|| aci_get_part(&bv, 1, '=', &right) < 0)
{
- if (aci_strbvcmp(attr, &bv) == 0)
+ if (ber_bvstrcasecmp(attr, &bv) == 0)
return(1);
} else if (val == NULL) {
- if (aci_strbvcmp(attr, &left) == 0)
+ if (ber_bvstrcasecmp(attr, &left) == 0)
return(1);
} else {
- if (aci_strbvcmp(attr, &left) == 0) {
+ if (ber_bvstrcasecmp(attr, &left) == 0) {
/* this is experimental code that implements a
* simple (prefix) match of the attribute value.
* the ACI draft does not provide for aci's that
if (aci_get_part(&right, 0, '*', &left) < 0
|| right.bv_len <= left.bv_len)
{
- if (aci_strbvcmp(val->bv_val, &right) == 0)
+ if (ber_bvstrcasecmp(val, &right) == 0)
return(1);
} else if (val->bv_len >= left.bv_len) {
if (strncasecmp( val->bv_val, left.bv_val, left.bv_len ) == 0)
static slap_access_t
aci_list_get_attr_rights(
struct berval *list,
- const char *attr,
+ const struct berval *attr,
struct berval *val )
{
struct berval bv;
static int
aci_list_get_rights(
struct berval *list,
- const char *attr,
+ const struct berval *attr,
struct berval *val,
slap_access_t *grant,
slap_access_t *deny )
slap_access_t *mask;
int i, found;
- if (attr == NULL || *attr == 0 || strcasecmp(attr, "entry") == 0) {
- attr = "[entry]";
+ if (attr == NULL || attr->bv_len == 0
+ || ber_bvstrcasecmp( attr, &aci_bv_entry ) == 0) {
+ attr = &aci_bv_br_entry;
}
found = 0;
for (i = 0; aci_get_part(list, i, '$', &perm) >= 0; i++) {
if (aci_get_part(&perm, 0, ';', &actn) < 0)
continue;
- if (aci_strbvcmp( "grant", &actn ) == 0) {
+ if (ber_bvstrcasecmp( &aci_bv_grant, &actn ) == 0) {
mask = grant;
- } else if (aci_strbvcmp( "deny", &actn ) == 0) {
+ } else if (ber_bvstrcasecmp( &aci_bv_deny, &actn ) == 0) {
mask = deny;
} else {
continue;
found = 1;
*mask |= aci_list_get_attr_rights(&perm, attr, val);
- *mask |= aci_list_get_attr_rights(&perm, "[all]", NULL);
+ *mask |= aci_list_get_attr_rights(&perm, &aci_bv_br_all, NULL);
}
return(found);
}
static int
aci_group_member (
struct berval *subj,
- const char *defgrpoc,
- const char *defgrpat,
+ struct berval *defgrpoc,
+ struct berval *defgrpat,
Backend *be,
Entry *e,
Connection *conn,
)
{
struct berval bv;
- char *subjdn, *grpdn = NULL;
- char *grpoc;
- char *grpat;
+ struct berval subjdn;
+ struct berval grpoc;
+ struct berval grpat;
ObjectClass *grp_oc = NULL;
AttributeDescription *grp_ad = NULL;
- char *text;
+ const char *text;
int rc;
/* format of string is "group/objectClassValue/groupAttrName" */
- if (aci_get_part(subj, 0, '/', &bv) < 0) {
+ if (aci_get_part(subj, 0, '/', &subjdn) < 0) {
return(0);
}
- subjdn = aci_bvstrdup(&bv);
- if (subjdn == NULL) {
- return(0);
+ if (aci_get_part(subj, 1, '/', &grpoc) < 0) {
+ grpoc = *defgrpoc;
}
- if (aci_get_part(subj, 1, '/', &bv) < 0) {
- grpoc = ch_strdup( defgrpoc );
- } else {
- grpoc = aci_bvstrdup(&bv);
- }
-
- if (aci_get_part(subj, 2, '/', &bv) < 0) {
- grpat = ch_strdup( defgrpat );
- } else {
- grpat = aci_bvstrdup(&bv);
+ if (aci_get_part(subj, 2, '/', &grpat) < 0) {
+ grpat = *defgrpat;
}
- rc = slap_str2ad( grpat, &grp_ad, &text );
+ rc = slap_bv2ad( &grpat, &grp_ad, &text );
if( rc != LDAP_SUCCESS ) {
rc = 0;
goto done;
}
rc = 0;
- grp_oc = oc_find( grpoc );
- grpdn = (char *)ch_malloc(1024);
+ grp_oc = oc_bvfind( &grpoc );
- if (grp_oc != NULL && grp_ad != NULL && grpdn != NULL) {
- string_expand(grpdn, 1024, subjdn, e->e_ndn, matches);
- if ( dn_normalize(grpdn) != NULL ) {
- rc = (backend_group(be, conn, op, e, grpdn, op->o_ndn, grp_oc, grp_ad) == 0);
+ if (grp_oc != NULL && grp_ad != NULL ) {
+ struct berval ndn;
+ bv.bv_val = (char *)ch_malloc(1024);
+ bv.bv_len = 1024;
+ string_expand(&bv, &subjdn, e->e_ndn, matches);
+ if ( dnNormalize2(NULL, &bv, &ndn) == LDAP_SUCCESS ) {
+ rc = (backend_group(be, conn, op, e, &ndn, &op->o_ndn, grp_oc, grp_ad) == 0);
+ free( ndn.bv_val );
}
+ ch_free(bv.bv_val);
}
done:
- if( grp_ad != NULL ) ad_free( grp_ad, 1 );
- ch_free(grpdn);
- ch_free(grpat);
- ch_free(grpoc);
- ch_free(subjdn);
return(rc);
}
+static struct berval GroupClass = {
+ sizeof(SLAPD_GROUP_CLASS)-1, SLAPD_GROUP_CLASS };
+static struct berval GroupAttr = {
+ sizeof(SLAPD_GROUP_ATTR)-1, SLAPD_GROUP_ATTR };
+static struct berval RoleClass = {
+ sizeof(SLAPD_ROLE_CLASS)-1, SLAPD_ROLE_CLASS };
+static struct berval RoleAttr = {
+ sizeof(SLAPD_ROLE_ATTR)-1, SLAPD_ROLE_ATTR };
+
static int
aci_mask(
Backend *be,
)
{
struct berval bv, perms, sdn;
- char *subjdn;
int rc;
- char *attr = desc->ad_cname->bv_val;
+
+
+ assert( desc->ad_cname.bv_val != NULL );
/* parse an aci of the form:
oid#scope#action;rights;attr;rights;attr$action;rights;attr;rights;attr#dnType#subjectDN
/* check that the scope is "entry" */
if (aci_get_part(aci, 1, '#', &bv) < 0
- || aci_strbvcmp( "entry", &bv ) != 0)
+ || ber_bvstrcasecmp( &aci_bv_entry, &bv ) != 0)
{
return(0);
}
return(0);
/* check if any permissions allow desired access */
- if (aci_list_get_rights(&perms, attr, val, grant, deny) == 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, 4, '#', &sdn) < 0)
return(0);
- if (aci_strbvcmp( "access-id", &bv ) == 0) {
- subjdn = aci_bvstrdup(&sdn);
- if (subjdn == NULL)
- return(0);
+ if (ber_bvstrcasecmp( &aci_bv_access_id, &bv ) == 0) {
+ struct berval ndn;
rc = 1;
- if ( dn_normalize(subjdn) != NULL )
- if (strcasecmp(op->o_ndn, subjdn) != 0)
+ if ( dnNormalize2(NULL, &sdn, &ndn) == LDAP_SUCCESS ) {
+ if (!dn_match( &op->o_ndn, &ndn))
rc = 0;
- ch_free(subjdn);
+ free(ndn.bv_val);
+ }
return(rc);
}
- if (aci_strbvcmp( "self", &bv ) == 0) {
- if (strcasecmp(op->o_ndn, e->e_ndn) == 0)
+ if (ber_bvstrcasecmp( &aci_bv_self, &bv ) == 0) {
+ if (dn_match(&op->o_ndn, &e->e_nname))
return(1);
- } else if (aci_strbvcmp( "dnattr", &bv ) == 0) {
- char *dnattr = aci_bvstrdup(&sdn);
+ } else if (ber_bvstrcasecmp( &aci_bv_dnattr, &bv ) == 0) {
Attribute *at;
AttributeDescription *ad = NULL;
const char *text;
- rc = slap_str2ad( dnattr, &ad, &text );
- ch_free( dnattr );
+ rc = slap_bv2ad( &sdn, &ad, &text );
if( rc != LDAP_SUCCESS ) {
return 0;
rc = 0;
- bv.bv_val = op->o_ndn;
- bv.bv_len = strlen( bv.bv_val );
+ bv = op->o_ndn;
for(at = attrs_find( e->e_attrs, ad );
at != NULL;
}
}
- ad_free( ad, 1 );
return rc;
- } else if (aci_strbvcmp( "group", &bv ) == 0) {
- if (aci_group_member(&sdn, SLAPD_GROUP_CLASS, SLAPD_GROUP_ATTR, be, e, conn, op, matches))
+ } else if (ber_bvstrcasecmp( &aci_bv_group, &bv ) == 0) {
+ if (aci_group_member(&sdn, &GroupClass, &GroupAttr, be, e, conn, op, matches))
return(1);
- } else if (aci_strbvcmp( "role", &bv ) == 0) {
- if (aci_group_member(&sdn, SLAPD_ROLE_CLASS, SLAPD_ROLE_ATTR, be, e, conn, op, matches))
+ } else if (ber_bvstrcasecmp( &aci_bv_role, &bv ) == 0) {
+ if (aci_group_member(&sdn, &RoleClass, &RoleAttr, be, e, conn, op, matches))
return(1);
- } else if (aci_strbvcmp( "set", &bv ) == 0) {
+ } else if (ber_bvstrcasecmp( &aci_bv_set, &bv ) == 0) {
if (aci_match_set(&sdn, be, e, conn, op, 0))
return(1);
- } else if (aci_strbvcmp( "set-ref", &bv ) == 0) {
+ } else if (ber_bvstrcasecmp( &aci_bv_set_ref, &bv ) == 0) {
if (aci_match_set(&sdn, be, e, conn, op, 1))
return(1);
static void
string_expand(
- char *newbuf,
- int bufsiz,
- char *pat,
+ struct berval *bv,
+ struct berval *pat,
char *match,
regmatch_t *matches)
{
- int size;
+ ber_len_t size;
char *sp;
char *dp;
- int flag;
+ int flag;
size = 0;
- newbuf[0] = '\0';
- bufsiz--; /* leave space for lone $ */
+ bv->bv_val[0] = '\0';
+ bv->bv_len--; /* leave space for lone $ */
flag = 0;
- for ( dp = newbuf, sp = pat; size < bufsiz && *sp ; sp++) {
+ for ( dp = bv->bv_val, sp = pat->bv_val; size < bv->bv_len &&
+ sp < pat->bv_val + pat->bv_len ; sp++) {
/* did we previously see a $ */
if (flag) {
if (*sp == '$') {
*dp++ = '$';
size++;
} else if (*sp >= '0' && *sp <= '9' ) {
- int n;
- int i;
- int l;
+ int n;
+ int i;
+ int l;
n = *sp - '0';
*dp = '\0';
i = matches[n].rm_so;
l = matches[n].rm_eo;
- for ( ; size < 512 && i < l; size++, i++ ) {
+ for ( ; size < bv->bv_len && i < l; size++, i++ ) {
*dp++ = match[i];
size++;
}
}
*dp = '\0';
+ bv->bv_len = size;
#ifdef NEW_LOGGING
- LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
- "string_expand: pattern = %s\n", pat ));
- LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
- "string_expand: expanded = %s\n", newbuf ));
+ LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
+ "string_expand: pattern = %.*s\n", pat->bv_len, pat->bv_val ));
+ LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
+ "string_expand: expanded = %s\n", bv->bv_val ));
#else
- Debug( LDAP_DEBUG_TRACE, "=> string_expand: pattern: %s\n", pat, 0, 0 );
- Debug( LDAP_DEBUG_TRACE, "=> string_expand: expanded: %s\n", newbuf, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "=> string_expand: pattern: %.*s\n", pat->bv_len, pat->bv_val, 0 );
+ Debug( LDAP_DEBUG_TRACE, "=> string_expand: expanded: %s\n", bv->bv_val, 0, 0 );
#endif
}
static int
regex_matches(
- char *pat, /* pattern to expand and match against */
+ 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 */
{
regex_t re;
char newbuf[512];
+ struct berval bv = {sizeof(newbuf), newbuf};
int rc;
if(str == NULL) str = "";
- string_expand(newbuf, sizeof(newbuf), pat, buf, matches);
+ string_expand(&bv, pat, buf, matches);
if (( rc = regcomp(&re, newbuf, REG_EXTENDED|REG_ICASE))) {
char error[512];
regerror(rc, &re, error, sizeof(error));
#ifdef NEW_LOGGING
- LDAP_LOG(( "aci", LDAP_LEVEL_ERR,
- "regex_matches: compile( \"%s\", \"%s\") failed %s\n",
- pat, str, error ));
+ LDAP_LOG(( "aci", LDAP_LEVEL_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, str, error );
+ pat->bv_val, str, error );
#endif
return( 0 );
}
regfree( &re );
#ifdef NEW_LOGGING
- LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL2,
- "regex_matches: string: %s\n", str ));
- LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL2,
- "regex_matches: rc: %d %s\n",
- rc, rc ? "matches" : "no matches" ));
+ LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL2,
+ "regex_matches: string: %s\n", str ));
+ LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL2,
+ "regex_matches: rc: %d %s\n",
+ rc, rc ? "matches" : "no matches" ));
#else
Debug( LDAP_DEBUG_TRACE,
- "=> regex_matches: string: %s\n", str, 0, 0 );
+ "=> regex_matches: string: %s\n", str, 0, 0 );
Debug( LDAP_DEBUG_TRACE,
"=> regex_matches: rc: %d %s\n",
rc, !rc ? "matches" : "no matches", 0 );