don't return entry if requested attr is not present (ITS#5650)

[openldap] / servers / slapd / acl.c

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 0ff7b389285128b55f62221d31ded5e8f89a3928..5913ea9907e0456ce8ea4f5453011284d6ba4537 100644 (file)
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -63,7 +63,8 @@ static slap_control_t slap_acl_mask(
        int nmatch,
        regmatch_t *matches,
        int count,
-       AccessControlState *state );
+       AccessControlState *state,
+       slap_access_t access );
 
 static int     regex_matches(
        struct berval *pat, char *str, char *buf,
@@ -246,7 +247,7 @@ slap_access_allowed(
                }
 
                control = slap_acl_mask( a, &mask, op,
-                       e, desc, val, MAXREMATCHES, matches, count, state );
+                       e, desc, val, MAXREMATCHES, matches, count, state, access );
 
                if ( control != ACL_BREAK ) {
                        break;
@@ -1053,7 +1054,8 @@ slap_acl_mask(
        int                     nmatch,
        regmatch_t              *matches,
        int                     count,
-       AccessControlState      *state )
+       AccessControlState      *state,
+       slap_access_t   access )
 {
        int             i;
        Access          *b;
@@ -1061,7 +1063,7 @@ slap_acl_mask(
        char            accessmaskbuf[ACCESSMASK_MAXLEN];
 #endif /* DEBUG */
        const char      *attr;
-       slap_mask_t     a2pmask = ACL_ACCESS2PRIV( *mask );
+       slap_mask_t     a2pmask = ACL_ACCESS2PRIV( access );
 
        assert( a != NULL );
        assert( mask != NULL );
@@ -1790,8 +1792,6 @@ slap_acl_mask(
                        *mask = modmask;
                }
 
-               a2pmask = *mask;
-
                Debug( LDAP_DEBUG_ACL,
                        "<= acl_mask: [%d] mask: %s\n",
                        i, accessmask2str(*mask, accessmaskbuf, 1), 0 );
@@ -2031,6 +2031,10 @@ acl_set_cb_gather( Operation *op, SlapReply *rs )
 
                for ( j = 0; !BER_BVISNULL( &rs->sr_attrs[ j ].an_name ); j++ ) {
                        AttributeDescription    *desc = rs->sr_attrs[ j ].an_desc;
+
+                       if ( desc == NULL ) {
+                               continue;
+                       }
                        
                        if ( desc == slap_schema.si_ad_entryDN ) {
                                bvalsp = bvals;
@@ -2045,11 +2049,11 @@ acl_set_cb_gather( Operation *op, SlapReply *rs )
                                        bvalsp = a->a_nvals;
                                }
                        }
-               }
 
-               if ( bvalsp ) {
-                       p->bvals = slap_set_join( p->cookie, p->bvals,
-                                       ( '|' | SLAP_SET_RREF ), bvalsp );
+                       if ( bvalsp ) {
+                               p->bvals = slap_set_join( p->cookie, p->bvals,
+                                               ( '|' | SLAP_SET_RREF ), bvalsp );
+                       }
                }
 
        } else {
@@ -2071,7 +2075,6 @@ acl_set_gather( SetCookie *cookie, struct berval *name, AttributeDescription *de
        int                     nattrs = 0;
        slap_callback           cb = { NULL, acl_set_cb_gather, NULL, NULL };
        acl_set_gather_t        p = { 0 };
-       const char              *text = NULL;
 
        /* this routine needs to return the bervals instead of
         * plain strings, since syntax is not known.  It should
@@ -2083,6 +2086,10 @@ acl_set_gather( SetCookie *cookie, struct berval *name, AttributeDescription *de
 
        rc = ldap_url_parse( name->bv_val, &ludp );
        if ( rc != LDAP_URL_SUCCESS ) {
+               Debug( LDAP_DEBUG_TRACE,
+                       "%s acl_set_gather: unable to parse URL=\"%s\"\n",
+                       cp->asc_op->o_log_prefix, name->bv_val, 0 );
+
                rc = LDAP_PROTOCOL_ERROR;
                goto url_done;
        }
@@ -2091,6 +2098,10 @@ acl_set_gather( SetCookie *cookie, struct berval *name, AttributeDescription *de
        {
                /* host part must be empty */
                /* extensions parts must be empty */
+               Debug( LDAP_DEBUG_TRACE,
+                       "%s acl_set_gather: host/exts must be absent in URL=\"%s\"\n",
+                       cp->asc_op->o_log_prefix, name->bv_val, 0 );
+
                rc = LDAP_PROTOCOL_ERROR;
                goto url_done;
        }
@@ -2101,11 +2112,19 @@ acl_set_gather( SetCookie *cookie, struct berval *name, AttributeDescription *de
                        &op2.o_req_ndn, cp->asc_op->o_tmpmemctx );
        BER_BVZERO( &op2.o_req_dn );
        if ( rc != LDAP_SUCCESS ) {
+               Debug( LDAP_DEBUG_TRACE,
+                       "%s acl_set_gather: DN=\"%s\" normalize failed\n",
+                       cp->asc_op->o_log_prefix, ludp->lud_dn, 0 );
+
                goto url_done;
        }
 
        op2.o_bd = select_backend( &op2.o_req_ndn, 1 );
        if ( ( op2.o_bd == NULL ) || ( op2.o_bd->be_search == NULL ) ) {
+               Debug( LDAP_DEBUG_TRACE,
+                       "%s acl_set_gather: no database could be selected for DN=\"%s\"\n",
+                       cp->asc_op->o_log_prefix, op2.o_req_ndn.bv_val, 0 );
+
                rc = LDAP_NO_SUCH_OBJECT;
                goto url_done;
        }
@@ -2116,6 +2135,10 @@ acl_set_gather( SetCookie *cookie, struct berval *name, AttributeDescription *de
                                cp->asc_op->o_tmpmemctx );
                op2.ors_filter = str2filter_x( cp->asc_op, op2.ors_filterstr.bv_val );
                if ( op2.ors_filter == NULL ) {
+                       Debug( LDAP_DEBUG_TRACE,
+                               "%s acl_set_gather: unable to parse filter=\"%s\"\n",
+                               cp->asc_op->o_log_prefix, op2.ors_filterstr.bv_val, 0 );
+
                        rc = LDAP_PROTOCOL_ERROR;
                        goto url_done;
                }
@@ -2131,19 +2154,25 @@ acl_set_gather( SetCookie *cookie, struct berval *name, AttributeDescription *de
 
        /* Grap the attributes */
        if ( ludp->lud_attrs ) {
+               int i;
+
                for ( ; ludp->lud_attrs[ nattrs ]; nattrs++ )
                        ;
 
-               anlistp = slap_sl_malloc( sizeof( AttributeName ) * ( nattrs + 2 ),
+               anlistp = slap_sl_calloc( sizeof( AttributeName ), nattrs + 2,
                                cp->asc_op->o_tmpmemctx );
 
-               for ( ; ludp->lud_attrs[ nattrs ]; nattrs++ ) {
-                       ber_str2bv( ludp->lud_attrs[ nattrs ], 0, 0, &anlistp[ nattrs ].an_name );
-                       anlistp[ nattrs ].an_desc = NULL;
-                       rc = slap_bv2ad( &anlistp[ nattrs ].an_name,
-                                       &anlistp[ nattrs ].an_desc, &text );
-                       if ( rc != LDAP_SUCCESS ) {
-                               goto url_done;
+               for ( i = 0, nattrs = 0; ludp->lud_attrs[ i ]; i++ ) {
+                       struct berval           name;
+                       AttributeDescription    *desc = NULL;
+                       const char              *text = NULL;
+
+                       ber_str2bv( ludp->lud_attrs[ i ], 0, 0, &name );
+                       rc = slap_bv2ad( &name, &desc, &text );
+                       if ( rc == LDAP_SUCCESS ) {
+                               anlistp[ nattrs ].an_name = name;
+                               anlistp[ nattrs ].an_desc = desc;
+                               nattrs++;
                        }
                }
 
@@ -2171,6 +2200,7 @@ acl_set_gather( SetCookie *cookie, struct berval *name, AttributeDescription *de
        op2.ors_attrs = anlistp;
        op2.ors_attrsonly = 0;
        op2.o_private = cp->asc_op->o_private;
+       op2.o_extra = cp->asc_op->o_extra;
 
        cb.sc_private = &p;
 
@@ -2245,7 +2275,7 @@ acl_match_set (
        AclSetCookie    cookie;
 
        if ( default_set_attribute == NULL ) {
-               ber_dupbv_x( &set, subj, op->o_tmpmemctx );
+               set = *subj;
 
        } else {
                struct berval           subjdn, ndn = BER_BVNULL;
@@ -2294,7 +2324,9 @@ acl_match_set (
                        acl_set_gather,
                        (SetCookie *)&cookie, &set,
                        &op->o_ndn, &e->e_nname, NULL ) > 0 );
-               slap_sl_free( set.bv_val, op->o_tmpmemctx );
+               if ( set.bv_val != subj->bv_val ) {
+                       slap_sl_free( set.bv_val, op->o_tmpmemctx );
+               }
        }
 
        return(rc);