X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Facl.c;h=58e6a55a5a7db3a87bbd395fdf96115b43e07d8c;hb=d23c55964651929e7b2b5a1730b33efee9661033;hp=95594f56cc0c750eec389e8d0b44a2d60d8ee113;hpb=fafce1601e5bcd0eca185a2a0366cd2b198121a6;p=openldap diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c index 95594f56cc..58e6a55a5a 100644 --- a/servers/slapd/acl.c +++ b/servers/slapd/acl.c @@ -15,6 +15,27 @@ #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, @@ -29,7 +50,9 @@ static slap_control_t acl_mask( Entry *e, AttributeDescription *desc, struct berval *val, - regmatch_t *matches ); + regmatch_t *matches, + int count, + AccessControlState *state ); #ifdef SLAPD_ACI_ENABLED static int aci_mask( @@ -46,9 +69,9 @@ static int aci_mask( #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( - struct berval *newbuf, char *pattern, + struct berval *newbuf, struct berval *pattern, char *match, regmatch_t *matches); typedef struct AciSetCookie { @@ -58,7 +81,7 @@ typedef struct AciSetCookie { Operation *op; } AciSetCookie; -BVarray aci_set_gather (void *cookie, char *name, struct berval *attr); +SLAP_SET_GATHER aci_set_gather; static int aci_match_set ( struct berval *subj, Backend *be, Entry *e, Connection *conn, Operation *op, int setref ); @@ -85,8 +108,10 @@ access_allowed( Entry *e, AttributeDescription *desc, struct berval *val, - slap_access_t access ) + slap_access_t access, + AccessControlState *state ) { + int ret = 1; int count; AccessControl *a; #ifdef LDAP_DEBUG @@ -105,6 +130,19 @@ access_allowed( assert( attr != NULL ); + if( state && state->as_recorded ) { + if( state->as_recorded & ACL_STATE_RECORDED_NV && + val == NULL ) + { + return state->as_result; + + } else if ( state->as_recorded & ACL_STATE_RECORDED_VD && + val != NULL && state->as_vd_acl == NULL ) + { + return state->as_result; + } + } + #ifdef NEW_LOGGING LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY, "access_allowed: conn %d %s access to \"%s\" \"%s\" requested\n", @@ -117,7 +155,7 @@ access_allowed( if ( op == NULL ) { /* no-op call */ - return 1; + goto done; } if ( be == NULL ) be = &backends[0]; @@ -134,7 +172,7 @@ access_allowed( "<= root access granted\n", 0, 0, 0 ); #endif - return 1; + goto done; } /* @@ -155,7 +193,7 @@ access_allowed( " %s access granted\n", attr, 0, 0 ); #endif - return 1; + goto done; } /* use backend default access if no backend acls */ @@ -171,7 +209,8 @@ access_allowed( access2str( access ), be->be_dfltaccess >= access ? "granted" : "denied", op->o_dn.bv_val ); #endif - return be->be_dfltaccess >= access; + ret = be->be_dfltaccess >= access; + goto done; #ifdef notdef /* be is always non-NULL */ @@ -188,29 +227,45 @@ access_allowed( access2str( access ), global_default_access >= access ? "granted" : "denied", op->o_dn.bv_val ); #endif - return global_default_access >= access; + ret = global_default_access >= access; + goto done; #endif } - ACL_INIT(mask); - memset(matches, '\0', sizeof(matches)); - + ret = 0; control = ACL_BREAK; - a = NULL; - count = 0; - while((a = acl_get( a, &count, be, op, e, desc, MAXREMATCHES, matches )) != NULL) + if( state && ( state->as_recorded & ACL_STATE_RECORDED_VD )) { + assert( state->as_vd_acl != NULL ); + + a = state->as_vd_acl; + mask = state->as_vd_acl_mask; + count = state->as_vd_acl_count; + AC_MEMCPY( matches, state->as_vd_acl_matches, + sizeof(matches) ); + goto vd_access; + + } else { + a = NULL; + ACL_INIT(mask); + count = 0; + memset(matches, '\0', sizeof(matches)); + } + + while((a = acl_get( a, &count, be, op, e, desc, + MAXREMATCHES, matches )) != NULL) { int i; 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 )); + "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 ); + (int)matches[i].rm_so, (int)matches[i].rm_eo ); #endif if( matches[i].rm_so <= matches[0].rm_eo ) { int n; @@ -225,8 +280,9 @@ access_allowed( #endif } +vd_access: control = acl_mask( a, &mask, be, conn, op, - e, desc, val, matches ); + e, desc, val, matches, count, state ); if ( control != ACL_BREAK ) { break; @@ -238,14 +294,14 @@ access_allowed( 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 )); + "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", e->e_dn, attr, 0 ); #endif - ACL_INIT( mask ); + ACL_INIT(mask); } else if ( control == ACL_BREAK ) { #ifdef NEW_LOGGING @@ -255,16 +311,17 @@ access_allowed( Debug( LDAP_DEBUG_ACL, "=> access_allowed: no more rules\n", 0, 0, 0); #endif - ACL_INIT( mask ); + + goto done; } #ifdef NEW_LOGGING 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 ) )); + "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", @@ -272,7 +329,15 @@ access_allowed( ACL_GRANT(mask, access) ? "granted" : "denied", accessmask2str( mask, accessmaskbuf ) ); #endif - return ACL_GRANT(mask, access); + + ret = ACL_GRANT(mask, access); + +done: + if( state != NULL ) { + state->as_recorded |= ACL_STATE_RECORDED; + state->as_result = ret; + } + return ret; } /* @@ -358,7 +423,7 @@ acl_get( if ( dnlen <= patlen ) continue; - if ( !DN_SEPARATOR( e->e_ndn[dnlen - patlen - 1] ) || DN_ESCAPE( e->e_ndn[dnlen - patlen - 2] ) ) + if ( !DN_SEPARATOR( e->e_ndn[dnlen - patlen - 1] ) ) continue; rdnlen = dn_rdnlen( NULL, &e->e_nname ); @@ -366,13 +431,13 @@ acl_get( continue; } else if ( a->acl_dn_style == ACL_STYLE_SUBTREE ) { - if ( dnlen > patlen && ( !DN_SEPARATOR( e->e_ndn[dnlen - patlen - 1] ) || DN_ESCAPE( e->e_ndn[dnlen - patlen - 2] ) ) ) + 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 ( !DN_SEPARATOR( e->e_ndn[dnlen - patlen - 1] ) || DN_ESCAPE( e->e_ndn[dnlen - patlen - 2] ) ) + if ( !DN_SEPARATOR( e->e_ndn[dnlen - patlen - 1] ) ) continue; } @@ -431,6 +496,20 @@ acl_get( return( NULL ); } +/* + * Record value-dependent access control state + */ +#define ACL_RECORD_VALUE_STATE do { \ + if( state && !( state->as_recorded & ACL_STATE_RECORDED_VD )) { \ + state->as_recorded |= ACL_STATE_RECORDED_VD; \ + state->as_vd_acl = a; \ + AC_MEMCPY( state->as_vd_acl_matches, matches, \ + sizeof( state->as_vd_acl_matches )) ; \ + state->as_vd_acl_count = count; \ + state->as_vd_access = b; \ + state->as_vd_access_count = i; \ + } \ + } while( 0 ) /* * acl_mask - modifies mask based upon the given acl and the @@ -451,10 +530,12 @@ acl_mask( Entry *e, AttributeDescription *desc, struct berval *val, - regmatch_t *matches -) + regmatch_t *matches, + int count, + AccessControlState *state ) { int i, odnlen, patlen; + int vd_recorded = 0; Access *b; #ifdef LDAP_DEBUG char accessmaskbuf[ACCESSMASK_MAXLEN]; @@ -491,7 +572,18 @@ acl_mask( accessmask2str( *mask, accessmaskbuf ) ); #endif - for ( i = 1, b = a->acl_access; b != NULL; b = b->a_next, i++ ) { + if( state && ( state->as_recorded & ACL_STATE_RECORDED_VD ) + && state->as_vd_acl == a ) + { + b = state->as_vd_access; + i = state->as_vd_access_count; + + } else { + b = a->acl_access; + i = 1; + } + + for ( ; b != NULL; b = b->a_next, i++ ) { slap_mask_t oldmask, modmask; ACL_INVALIDATE( modmask ); @@ -511,32 +603,28 @@ acl_mask( * user is bound as somebody in the same namespace as * the entry, OR the given dn matches the dn pattern */ - if ( b->a_dn_pat.bv_len == sizeof("anonymous") -1 && - strcmp( b->a_dn_pat.bv_val, "anonymous" ) == 0 ) { - if (op->o_ndn.bv_len != 0 ) { + if ( ber_bvcmp( &b->a_dn_pat, &aci_bv_anonymous ) == 0 ) { + if ( op->o_ndn.bv_len != 0 ) { continue; } - } else if ( b->a_dn_pat.bv_len == sizeof("users") - 1 && - strcmp( b->a_dn_pat.bv_val, "users" ) == 0 ) { - if (op->o_ndn.bv_len == 0 ) { + } else if ( ber_bvcmp( &b->a_dn_pat, &aci_bv_users ) == 0 ) { + if ( op->o_ndn.bv_len == 0 ) { continue; } - } else if ( b->a_dn_pat.bv_len == sizeof("self") - 1 && - strcmp( b->a_dn_pat.bv_val, "self" ) == 0 ) { - if( op->o_ndn.bv_len == 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.bv_val ) != 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 ( b->a_dn_pat.bv_len != 1 || - strcmp( b->a_dn_pat.bv_val, "*" ) != 0 ) { - int ret = regex_matches( b->a_dn_pat.bv_val, + 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 ) { @@ -564,7 +652,7 @@ acl_mask( if ( odnlen <= patlen ) continue; - if ( !DN_SEPARATOR( op->o_ndn.bv_val[odnlen - patlen - 1] ) || DN_ESCAPE( op->o_ndn.bv_val[odnlen - patlen - 2] ) ) + if ( !DN_SEPARATOR( op->o_ndn.bv_val[odnlen - patlen - 1] ) ) continue; rdnlen = dn_rdnlen( NULL, &op->o_ndn ); @@ -572,110 +660,109 @@ acl_mask( continue; } else if ( b->a_dn_style == ACL_STYLE_SUBTREE ) { - if ( odnlen > patlen && ( !DN_SEPARATOR( op->o_ndn.bv_val[odnlen - patlen - 1] ) || DN_ESCAPE( op->o_ndn.bv_val[odnlen - patlen - 2] ) ) ) + 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 ( !DN_SEPARATOR( op->o_ndn.bv_val[odnlen - patlen - 1] ) || DN_ESCAPE( op->o_ndn.bv_val[odnlen - patlen - 2] ) ) + if ( !DN_SEPARATOR( op->o_ndn.bv_val[odnlen - patlen - 1] ) ) continue; } 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 )); + 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 )); + 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 )); + 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 )); + 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; } } @@ -734,11 +821,15 @@ acl_mask( /* no dnattr match, check if this is a self clause */ if ( ! b->a_dn_self ) continue; + + ACL_RECORD_VALUE_STATE; + /* this is a self clause, check if the target is an * attribute. */ if ( val == NULL ) continue; + /* target is attribute, check if the attribute value * is the op dn. */ @@ -764,7 +855,7 @@ acl_mask( */ /* 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); + 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; @@ -778,8 +869,7 @@ acl_mask( b->a_group_oc, b->a_group_at); if ( ndn.bv_val ) free( ndn.bv_val ); - if ( rc != 0 ) - { + if ( rc != 0 ) { continue; } } @@ -877,6 +967,8 @@ acl_mask( continue; } + ACL_RECORD_VALUE_STATE; + /* start out with nothing granted, nothing denied */ ACL_INIT(tgrant); ACL_INIT(tdeny); @@ -1071,6 +1163,9 @@ acl_check_modlist( } for ( ; mlist != NULL; mlist = mlist->sml_next ) { + static AccessControlState state_init = ACL_STATE_INIT; + AccessControlState state; + /* * no-user-modification operational attributes are ignored * by ACL_WRITE checking as any found here are not provided @@ -1089,15 +1184,31 @@ acl_check_modlist( continue; } + state = state_init; + 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, &state ) ) + { + return( 0 ); } + + 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, bv, ACL_WRITE ) ) + mlist->sml_desc, bv, ACL_WRITE, &state ) ) { return( 0 ); } @@ -1107,7 +1218,7 @@ acl_check_modlist( case LDAP_MOD_DELETE: if ( mlist->sml_bvalues == NULL ) { if ( ! access_allowed( be, conn, op, e, - mlist->sml_desc, NULL, ACL_WRITE ) ) + mlist->sml_desc, NULL, ACL_WRITE, NULL ) ) { return( 0 ); } @@ -1115,12 +1226,20 @@ acl_check_modlist( } for ( bv = mlist->sml_bvalues; bv->bv_val != NULL; bv++ ) { if ( ! access_allowed( be, conn, op, e, - mlist->sml_desc, bv, ACL_WRITE ) ) + mlist->sml_desc, bv, ACL_WRITE, &state ) ) { return( 0 ); } } break; + + case SLAP_MOD_SOFTADD: + /* allow adding attribute via modrdn thru */ + break; + + default: + assert( 0 ); + return( 0 ); } } @@ -1140,26 +1259,6 @@ aci_bvstrdup( struct berval *bv ) return(s); } -#ifdef SLAPD_ACI_ENABLED -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); -} -#endif - static int aci_get_part( struct berval *list, @@ -1199,21 +1298,19 @@ aci_get_part( return(bv->bv_len); } -BVarray -aci_set_gather (void *cookie, char *name, struct berval *attr) +BerVarray +aci_set_gather (void *cookie, struct berval *name, struct berval *attr) { AciSetCookie *cp = cookie; - BVarray bvals = NULL; - struct berval bv, ndn; + 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". */ - bv.bv_val = name; - bv.bv_len = strlen( name ); - if (dnNormalize2(NULL, &bv, &ndn) == LDAP_SUCCESS) { + if (dnNormalize2(NULL, name, &ndn) == LDAP_SUCCESS) { const char *text; AttributeDescription *desc = NULL; if (slap_bv2ad(attr, &desc, &text) == LDAP_SUCCESS) { @@ -1244,7 +1341,7 @@ aci_match_set ( } else { struct berval subjdn, ndn = { 0, NULL }; struct berval setat; - BVarray bvals; + BerVarray bvals; const char *text; AttributeDescription *desc = NULL; @@ -1281,7 +1378,7 @@ aci_match_set ( bvals[0].bv_val = bvals[i-1].bv_val; bvals[i-1].bv_val = NULL; } - bvarray_free(bvals); + ber_bvarray_free(bvals); } } if (ndn.bv_val) @@ -1296,7 +1393,7 @@ aci_match_set ( cookie.conn = conn; cookie.op = op; rc = (slap_set_filter(aci_set_gather, &cookie, &set, - op->o_ndn.bv_val, e->e_ndn, NULL) > 0); + &op->o_ndn, &e->e_nname, NULL) > 0); ch_free(set.bv_val); } return(rc); @@ -1351,7 +1448,7 @@ aci_list_map_rights( static int aci_list_has_attr( struct berval *list, - const char *attr, + const struct berval *attr, struct berval *val ) { struct berval bv, left, right; @@ -1361,13 +1458,13 @@ aci_list_has_attr( 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 @@ -1385,7 +1482,7 @@ aci_list_has_attr( 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) @@ -1400,7 +1497,7 @@ aci_list_has_attr( 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; @@ -1422,7 +1519,7 @@ aci_list_get_attr_rights( 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 ) @@ -1431,8 +1528,9 @@ aci_list_get_rights( 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; @@ -1442,9 +1540,9 @@ aci_list_get_rights( 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; @@ -1452,7 +1550,7 @@ aci_list_get_rights( 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); } @@ -1470,7 +1568,7 @@ aci_group_member ( ) { struct berval bv; - char *subjdn; + struct berval subjdn; struct berval grpoc; struct berval grpat; ObjectClass *grp_oc = NULL; @@ -1479,12 +1577,7 @@ aci_group_member ( int rc; /* format of string is "group/objectClassValue/groupAttrName" */ - 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); } @@ -1509,7 +1602,7 @@ aci_group_member ( struct berval ndn; bv.bv_val = (char *)ch_malloc(1024); bv.bv_len = 1024; - string_expand(&bv, subjdn, e->e_ndn, matches); + 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 ); @@ -1518,7 +1611,6 @@ aci_group_member ( } done: - ch_free(subjdn); return(rc); } @@ -1547,9 +1639,9 @@ aci_mask( { struct berval bv, perms, sdn; int rc; - char *attr = desc->ad_cname.bv_val; + - assert( attr != NULL ); + 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 @@ -1570,7 +1662,7 @@ aci_mask( /* 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); } @@ -1580,7 +1672,7 @@ aci_mask( 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 */ @@ -1590,29 +1682,27 @@ aci_mask( if (aci_get_part(aci, 4, '#', &sdn) < 0) return(0); - if (aci_strbvcmp( "access-id", &bv ) == 0) { + if (ber_bvstrcasecmp( &aci_bv_access_id, &bv ) == 0) { struct berval ndn; rc = 1; if ( dnNormalize2(NULL, &sdn, &ndn) == LDAP_SUCCESS ) { - if (strcasecmp(op->o_ndn.bv_val, ndn.bv_val) != 0) + if (!dn_match( &op->o_ndn, &ndn)) rc = 0; free(ndn.bv_val); } return(rc); } - if (aci_strbvcmp( "self", &bv ) == 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; @@ -1635,19 +1725,19 @@ aci_mask( return rc; - } else if (aci_strbvcmp( "group", &bv ) == 0) { + } 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) { + } 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); @@ -1661,7 +1751,7 @@ aci_mask( static void string_expand( struct berval *bv, - char *pat, + struct berval *pat, char *match, regmatch_t *matches) { @@ -1675,7 +1765,8 @@ string_expand( bv->bv_len--; /* leave space for lone $ */ flag = 0; - for ( dp = bv->bv_val, sp = pat; size < bv->bv_len && *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 == '$') { @@ -1718,18 +1809,18 @@ string_expand( #ifdef NEW_LOGGING LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1, - "string_expand: pattern = %s\n", pat )); + "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: 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 */ @@ -1750,11 +1841,11 @@ regex_matches( #ifdef NEW_LOGGING LDAP_LOG(( "aci", LDAP_LEVEL_ERR, "regex_matches: compile( \"%s\", \"%s\") failed %s\n", - pat, str, error )); + 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 ); }