/* 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
*/
static int regex_matches(
char *pat, char *str, char *buf, regmatch_t *matches);
static void string_expand(
- char *newbuf, int bufsiz, char *pattern,
+ struct berval *newbuf, char *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;
+
+BVarray aci_set_gather (void *cookie, char *name, struct berval *attr);
static int aci_match_set ( struct berval *subj, Backend *be,
Entry *e, Connection *conn, Operation *op, int setref );
assert( be != NULL );
/* grant database root access */
- if ( be != NULL && be_isroot( be, op->o_ndn.bv_val ) ) {
+ 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",
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 ));
+ 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;
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 ));
+ 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
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 ));
+ *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;
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_get: dn [%d] %s\n",
- *count, a->acl_dn_pat ));
+ *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;
if ( !DN_SEPARATOR( e->e_ndn[dnlen - patlen - 1] ) || DN_ESCAPE( e->e_ndn[dnlen - patlen - 2] ) )
continue;
- rdnlen = dn_rdnlen( NULL, e->e_ndn );
+ rdnlen = dn_rdnlen( NULL, &e->e_nname );
if ( rdnlen != dnlen - patlen - 1 )
continue;
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;
}
LDAP_LOG(( "acl", LDAP_LEVEL_ARGS,
" 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 ) ));
#else
Debug( LDAP_DEBUG_ACL,
if ( !DN_SEPARATOR( op->o_ndn.bv_val[odnlen - patlen - 1] ) || DN_ESCAPE( op->o_ndn.bv_val[odnlen - patlen - 2] ) )
continue;
- rdnlen = dn_rdnlen( NULL, op->o_ndn.bv_val );
+ rdnlen = dn_rdnlen( NULL, &op->o_ndn );
if ( rdnlen != odnlen - patlen - 1 )
continue;
continue;
}
} else {
- if ( strcasecmp( b->a_sockurl_pat, conn->c_listener_url ) == 0 )
+ if ( strcasecmp( b->a_sockurl_pat, conn->c_listener_url ) != 0 )
continue;
}
}
continue;
}
} else {
- if ( strcasecmp( b->a_domain_pat, conn->c_peer_domain ) == 0 )
+ if ( strcasecmp( b->a_domain_pat, conn->c_peer_domain ) != 0 )
continue;
}
}
continue;
}
} else {
- if ( strcasecmp( b->a_peername_pat, conn->c_peer_name ) == 0 )
+ if ( strcasecmp( b->a_peername_pat, conn->c_peer_name ) != 0 )
continue;
}
}
continue;
}
} else {
- if ( strcasecmp( b->a_sockname_pat, conn->c_sock_name ) == 0 )
+ if ( strcasecmp( b->a_sockname_pat, conn->c_sock_name ) != 0 )
continue;
}
}
}
}
- if ( b->a_group_pat != NULL && op->o_ndn.bv_len != 0 ) {
+ 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.bv_val, 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.bv_val,
- 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;
}
}
* to first check b->a_access_mask, the ACL's access level.
*/
- if( op->o_ndn == NULL || op->o_ndn[0] == '\0' ) {
+ if( op->o_ndn.bv_len == 0 ) {
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;
Modifications *mlist
)
{
- int i;
+ struct berval *bv;
assert( be != NULL );
/* short circuit root database access */
- if ( be_isroot( be, op->o_ndn.bv_val ) ) {
+ 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",
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 ));
+ 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;
if ( mlist->sml_bvalues == NULL ) {
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;
}
- 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 );
}
return(bv->bv_len);
}
-char **
-aci_set_gather (void *cookie, char *name, char *attr)
+BVarray
+aci_set_gather (void *cookie, char *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;
+ BVarray bvals = NULL;
+ struct berval bv, 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);
- }
- }
+ bv.bv_val = name;
+ bv.bv_len = strlen( name );
+ if (dnNormalize2(NULL, &bv, &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;
+ BVarray 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);
+ &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;
+ }
+ 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.bv_val, e->e_ndn, NULL) > 0);
- ch_free(set);
+ rc = (slap_set_filter(aci_set_gather, &cookie, &set,
+ op->o_ndn.bv_val, e->e_ndn, NULL) > 0);
+ ch_free(set.bv_val);
}
return(rc);
}
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;
+ char *subjdn;
+ struct berval grpoc;
+ struct berval grpat;
ObjectClass *grp_oc = NULL;
AttributeDescription *grp_ad = NULL;
const char *text;
return(0);
}
- if (aci_get_part(subj, 1, '/', &bv) < 0) {
- grpoc = ch_strdup( defgrpoc );
- } else {
- grpoc = aci_bvstrdup(&bv);
+ if (aci_get_part(subj, 1, '/', &grpoc) < 0) {
+ grpoc = *defgrpoc;
}
- 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:
- 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;
return(0);
if (aci_strbvcmp( "access-id", &bv ) == 0) {
- subjdn = aci_bvstrdup(&sdn);
- if (subjdn == NULL)
- return(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 (strcasecmp(op->o_ndn.bv_val, ndn.bv_val) != 0)
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 (strcmp(op->o_ndn.bv_val, e->e_ndn) == 0)
return(1);
} else if (aci_strbvcmp( "dnattr", &bv ) == 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;
} else if (aci_strbvcmp( "group", &bv ) == 0) {
- if (aci_group_member(&sdn, SLAPD_GROUP_CLASS, SLAPD_GROUP_ATTR, be, e, conn, op, matches))
+ 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))
+ if (aci_group_member(&sdn, &RoleClass, &RoleAttr, be, e, conn, op, matches))
return(1);
} else if (aci_strbvcmp( "set", &bv ) == 0) {
static void
string_expand(
- char *newbuf,
- int bufsiz,
+ struct berval *bv,
char *pat,
char *match,
regmatch_t *matches)
{
- int size;
+ ber_len_t size;
char *sp;
char *dp;
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; size < bv->bv_len && *sp ; sp++) {
/* did we previously see a $ */
if (flag) {
if (*sp == '$') {
*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 ));
+ "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: expanded: %s\n", bv->bv_val, 0, 0 );
#endif
}
{
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));