X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsets.c;h=e25d8c3fe642298f205223824dee56a2b6331a78;hb=a7f4102bbfd42681ac505f2adb3ff35d8aba3d88;hp=4583350980a54afe6e5d54af33bd12bb053d2211;hpb=1e0794f0adefcc9024a50e10bc3f0da631081c3e;p=openldap diff --git a/servers/slapd/sets.c b/servers/slapd/sets.c index 4583350980..e25d8c3fe6 100644 --- a/servers/slapd/sets.c +++ b/servers/slapd/sets.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2000-2007 The OpenLDAP Foundation. + * Copyright 2000-2009 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -120,7 +120,7 @@ set_dup( SetCookie *cp, BerVarray set, unsigned flags ) /* Join two sets according to operator op and flags op_flags. * op can be: * '|' (or): the union between the two sets is returned, - * eliminating diplicates + * eliminating duplicates * '&' (and): the intersection between the two sets * is returned * '+' (add): the inner product of the two sets is returned, @@ -151,16 +151,19 @@ slap_set_join( sizeof( struct berval ), cp->set_op->o_tmpmemctx ); BER_BVZERO( &set[ 0 ] ); - return set; + goto done2; } - return set_dup( cp, lset, SLAP_SET_LREF2REF( op_flags ) ); + set = set_dup( cp, lset, SLAP_SET_LREF2REF( op_flags ) ); + goto done2; } slap_set_dispose( cp, lset, SLAP_SET_LREF2REF( op_flags ) ); - return set_dup( cp, rset, SLAP_SET_RREF2REF( op_flags ) ); + set = set_dup( cp, rset, SLAP_SET_RREF2REF( op_flags ) ); + goto done2; } if ( rset == NULL || BER_BVISNULL( &rset[ 0 ] ) ) { slap_set_dispose( cp, rset, SLAP_SET_RREF2REF( op_flags ) ); - return set_dup( cp, lset, SLAP_SET_LREF2REF( op_flags ) ); + set = set_dup( cp, lset, SLAP_SET_LREF2REF( op_flags ) ); + goto done2; } /* worst scenario: no duplicates */ @@ -182,6 +185,9 @@ slap_set_join( } } + /* pointers to values have been used in set - don't free twice */ + op_flags |= SLAP_SET_LREFVAL; + last = i; for ( i = 0; !BER_BVISNULL( &rset[ i ] ); i++ ) { @@ -194,6 +200,7 @@ slap_set_join( cp->set_op->o_tmpfree( rset[ i ].bv_val, cp->set_op->o_tmpmemctx ); rset[ i ] = rset[ --rlast ]; BER_BVZERO( &rset[ rlast ] ); + i--; } exists = 1; break; @@ -210,6 +217,10 @@ slap_set_join( last++; } } + + /* pointers to values have been used in set - don't free twice */ + op_flags |= SLAP_SET_RREFVAL; + BER_BVZERO( &set[ last ] ); } break; @@ -232,11 +243,13 @@ slap_set_join( /* dup the shortest */ if ( llen < rlen ) { + last = llen; set = set_dup( cp, lset, SLAP_SET_LREF2REF( op_flags ) ); lset = NULL; sset = rset; } else { + last = rlen; set = set_dup( cp, rset, SLAP_SET_RREF2REF( op_flags ) ); rset = NULL; sset = lset; @@ -246,7 +259,6 @@ slap_set_join( break; } - last = slap_set_size( set ); for ( i = 0; !BER_BVISNULL( &set[ i ] ); i++ ) { for ( j = 0; !BER_BVISNULL( &sset[ j ] ); j++ ) { if ( bvmatch( &set[ i ], &sset[ j ] ) ) { @@ -268,6 +280,17 @@ slap_set_join( i = slap_set_size( rset ); j = slap_set_size( lset ); + /* handle empty set cases */ + if ( i == 0 || j == 0 ) { + set = cp->set_op->o_tmpcalloc( 1, sizeof( struct berval ), + cp->set_op->o_tmpmemctx ); + if ( set == NULL ) { + break; + } + BER_BVZERO( &set[ 0 ] ); + break; + } + set = cp->set_op->o_tmpcalloc( i * j + 1, sizeof( struct berval ), cp->set_op->o_tmpmemctx ); if ( set == NULL ) { @@ -279,17 +302,36 @@ slap_set_join( struct berval bv; long k; - bv.bv_len = lset[ i ].bv_len + rset[ j ].bv_len; - bv.bv_val = cp->set_op->o_tmpalloc( bv.bv_len + 1, - cp->set_op->o_tmpmemctx ); - if ( bv.bv_val == NULL ) { - ber_bvarray_free_x( set, cp->set_op->o_tmpmemctx ); - set = NULL; - goto done; + /* don't concatenate with the empty string */ + if ( BER_BVISEMPTY( &lset[ i ] ) ) { + ber_dupbv_x( &bv, &rset[ j ], cp->set_op->o_tmpmemctx ); + if ( bv.bv_val == NULL ) { + ber_bvarray_free_x( set, cp->set_op->o_tmpmemctx ); + set = NULL; + goto done; + } + + } else if ( BER_BVISEMPTY( &rset[ j ] ) ) { + ber_dupbv_x( &bv, &lset[ i ], cp->set_op->o_tmpmemctx ); + if ( bv.bv_val == NULL ) { + ber_bvarray_free_x( set, cp->set_op->o_tmpmemctx ); + set = NULL; + goto done; + } + + } else { + bv.bv_len = lset[ i ].bv_len + rset[ j ].bv_len; + bv.bv_val = cp->set_op->o_tmpalloc( bv.bv_len + 1, + cp->set_op->o_tmpmemctx ); + if ( bv.bv_val == NULL ) { + ber_bvarray_free_x( set, cp->set_op->o_tmpmemctx ); + set = NULL; + goto done; + } + AC_MEMCPY( bv.bv_val, lset[ i ].bv_val, lset[ i ].bv_len ); + AC_MEMCPY( &bv.bv_val[ lset[ i ].bv_len ], rset[ j ].bv_val, rset[ j ].bv_len ); + bv.bv_val[ bv.bv_len ] = '\0'; } - AC_MEMCPY( bv.bv_val, lset[ i ].bv_val, lset[ i ].bv_len ); - AC_MEMCPY( &bv.bv_val[ lset[ i ].bv_len ], rset[ j ].bv_val, rset[ j ].bv_len ); - bv.bv_val[ bv.bv_len ] = '\0'; for ( k = 0; k < last; k++ ) { if ( bvmatch( &set[ k ], &bv ) ) { @@ -314,6 +356,18 @@ done:; if ( lset ) slap_set_dispose( cp, lset, SLAP_SET_LREF2REF( op_flags ) ); if ( rset ) slap_set_dispose( cp, rset, SLAP_SET_RREF2REF( op_flags ) ); +done2:; + if ( LogTest( LDAP_DEBUG_ACL ) ) { + if ( BER_BVISNULL( set ) ) { + Debug( LDAP_DEBUG_ACL, " ACL set: empty\n", 0, 0, 0 ); + + } else { + for ( i = 0; !BER_BVISNULL( &set[ i ] ); i++ ) { + Debug( LDAP_DEBUG_ACL, " ACL set[%ld]=%s\n", i, set[i].bv_val, 0 ); + } + } + } + return set; } @@ -610,27 +664,33 @@ slap_set_filter( SLAP_SET_GATHER gatherer, case '-': if ( ( SF_TOP() == (void *)'/' ) - && ( *filter >= '0' || *filter <= '9' ) ) + && ( *filter == '*' || ASCII_DIGIT( *filter ) ) ) { - int parent = 0; - int count = 1; - int i; - for ( len = 1; - ( c = filter[ len ] ) - && ( c >= '0' && c <= '9' ); - len++ ) - /* count */ ; - for ( i = len ; i > 0 ; i-- ) { - parent += (int)( filter[ i - 1 ] - '0' ) * count; - count *= 10; - } SF_POP(); - if ( parent == 0 ) { + + if ( *filter == '*' ) { set = set_parents( cp, SF_POP() ); + filter++; + } else { - set = set_parent( cp, SF_POP(), parent ); + char *next = NULL; + long parent = strtol( filter, &next, 10 ); + + if ( next == filter ) { + SF_ERROR( syntax ); + } + + set = SF_POP(); + if ( parent != 0 ) { + set = set_parent( cp, set, parent ); + } + filter = next; } - filter += len; + + if ( set == NULL ) { + SF_ERROR( memory ); + } + SF_PUSH( set ); set = NULL; break; @@ -650,23 +710,23 @@ slap_set_filter( SLAP_SET_GATHER gatherer, break; default: - if ( ( c != '_' ) - && ( c < 'A' || c > 'Z' ) - && ( c < 'a' || c > 'z' ) ) - { + if ( !AD_LEADCHAR( c ) ) { SF_ERROR( syntax ); } filter--; for ( len = 1; - ( c = filter[ len ] ) - && ( ( c >= '0' && c <= '9' ) - || ( c >= 'A' && c <= 'Z' ) - || ( c >= 'a' && c <= 'z' ) ); - len++ ) - /* count */ ; + ( c = filter[ len ] ) && AD_CHAR( c ); + len++ ) + { + /* count */ + if ( c == '-' && !AD_CHAR( filter[ len + 1 ] ) ) { + break; + } + } if ( len == 4 && memcmp( "this", filter, len ) == 0 ) { + assert( !BER_BVISNULL( target ) ); if ( ( SF_TOP() == (void *)'/' ) || IS_SET( SF_TOP() ) ) { SF_ERROR( syntax ); } @@ -687,15 +747,15 @@ slap_set_filter( SLAP_SET_GATHER gatherer, if ( ( SF_TOP() == (void *)'/' ) || IS_SET( SF_TOP() ) ) { SF_ERROR( syntax ); } + if ( BER_BVISNULL( user ) ) { + SF_ERROR( memory ); + } set = cp->set_op->o_tmpcalloc( 2, sizeof( struct berval ), cp->set_op->o_tmpmemctx ); if ( set == NULL ) { SF_ERROR( memory ); } ber_dupbv_x( set, user, cp->set_op->o_tmpmemctx ); - if ( BER_BVISNULL( set ) ) { - SF_ERROR( memory ); - } BER_BVZERO( &set[ 1 ] ); } else if ( SF_TOP() != (void *)'/' ) {