/* 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
*/
Operation *op;
} AciSetCookie;
-char **aci_set_gather (void *cookie, char *name, struct berval *attr);
+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 );
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
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,
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.bv_len && op->o_ndn.bv_len ) {
char buf[1024];
- struct berval bv = {1024, buf };
- struct berval *ndn = NULL;
+ 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
/* see if asker is listed in dnattr */
if ( b->a_group_style == ACL_STYLE_REGEX ) {
string_expand(&bv, b->a_group_pat.bv_val, e->e_ndn, matches);
- if ( dnNormalize(NULL, &bv, &ndn) != LDAP_SUCCESS ) {
+ if ( dnNormalize2(NULL, &bv, &ndn) != LDAP_SUCCESS ) {
/* did not expand to a valid dn */
continue;
}
- bv = *ndn;
+ bv = ndn;
} else {
bv = b->a_group_pat;
}
rc = backend_group(be, conn, op, e, &bv, &op->o_ndn,
b->a_group_oc, b->a_group_at);
- if ( ndn )
- ber_bvfree( ndn );
+ if ( ndn.bv_val )
+ free( ndn.bv_val );
if ( rc != 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 );
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 **
+BVarray
aci_set_gather (void *cookie, char *name, struct berval *attr)
{
AciSetCookie *cp = cookie;
- struct berval **bvals = NULL;
- char **vals = NULL;
- struct berval bv, *ndn = NULL;
- int i;
+ 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
bv.bv_val = name;
bv.bv_len = strlen( name );
- if (dnNormalize(NULL, &bv, &ndn) == LDAP_SUCCESS) {
+ 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);
- 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);
- }
+ cp->e, &ndn, desc, &bvals);
}
- ber_bvfree(ndn);
+ free(ndn.bv_val);
}
- return(vals);
+ return(bvals);
}
static int
int setref
)
{
- char *set = NULL;
+ struct berval set = { 0, NULL };
int rc = 0;
AciSetCookie cookie;
if (setref == 0) {
- set = aci_bvstrdup(subj);
+ ber_dupbv( &set, subj );
} else {
- struct berval subjdn, *ndn = NULL;
+ struct berval subjdn, ndn = { 0, NULL };
struct berval setat;
- struct berval **bvals;
+ BVarray bvals;
const char *text;
AttributeDescription *desc = NULL;
setat.bv_len = sizeof(SLAPD_ACI_SET_ATTR)-1;
}
if ( setat.bv_val != NULL ) {
- if ( dnNormalize(NULL, &subjdn, &ndn) == LDAP_SUCCESS
+ if ( dnNormalize2(NULL, &subjdn, &ndn) == LDAP_SUCCESS
&& slap_bv2ad(&setat, &desc, &text) == LDAP_SUCCESS )
{
backend_attribute(be, NULL, NULL, e,
- ndn, 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);
}
}
- if (ndn)
- ber_bvfree(ndn);
+ if (ndn.bv_val)
+ free(ndn.bv_val);
}
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);
}
grp_oc = oc_bvfind( &grpoc );
if (grp_oc != NULL && grp_ad != NULL ) {
- struct berval *ndn = NULL;
+ struct berval ndn;
bv.bv_val = (char *)ch_malloc(1024);
bv.bv_len = 1024;
string_expand(&bv, subjdn, e->e_ndn, matches);
- if ( dnNormalize(NULL, &bv, &ndn) == LDAP_SUCCESS ) {
- rc = (backend_group(be, conn, op, e, &bv, &op->o_ndn, grp_oc, grp_ad) == 0);
- ber_bvfree( ndn );
+ 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);
}
return(0);
if (aci_strbvcmp( "access-id", &bv ) == 0) {
- struct berval *ndn = NULL;
+ struct berval ndn;
rc = 1;
- if ( dnNormalize(NULL, &sdn, &ndn) == LDAP_SUCCESS ) {
- if (strcasecmp(op->o_ndn.bv_val, ndn->bv_val) != 0)
+ if ( dnNormalize2(NULL, &sdn, &ndn) == LDAP_SUCCESS ) {
+ if (strcasecmp(op->o_ndn.bv_val, ndn.bv_val) != 0)
rc = 0;
- ber_bvfree(ndn);
+ free(ndn.bv_val);
}
return(rc);
}
projects / openldap / blobdiff