]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/acl.c
Fix passwd clearing bug
[openldap] / servers / slapd / acl.c
index f5c141bc4a0846fe5f905c04f76aec728910334f..7b5d30bff6dbeab941499291d6a038abff3e9232 100644 (file)
@@ -1,7 +1,7 @@
 /* acl.c - routines to parse and check acl's */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
 #include <ac/string.h>
 
 #include "slap.h"
+#include "sets.h"
 
 static AccessControl * acl_get(
        AccessControl *ac, int *count,
        Backend *be, Operation *op,
-       Entry *e, char *attr,
+       Entry *e,
+       AttributeDescription *desc,
        int nmatches, regmatch_t *matches );
 
 static slap_control_t acl_mask(
-       AccessControl *ac, slap_access_mask_t *mask,
+       AccessControl *ac, slap_mask_t *mask,
        Backend *be, Connection *conn, Operation *op,
-       Entry *e, char *attr, struct berval *val,
+       Entry *e,
+       AttributeDescription *desc,
+       struct berval *val,
        regmatch_t *matches );
 
 #ifdef SLAPD_ACI_ENABLED
 static int aci_mask(
        Backend *be,
+    Connection *conn,
        Operation *op,
-       Entry *e, char *attr, struct berval *val, struct berval *aci,
-       regmatch_t *matches, slap_access_t *grant, slap_access_t *deny );
-
-char *supportedACIMechs[] = {
-       "1.3.6.1.4.1.4203.666.7.1",     /* experimental IETF aci family */
-       "1.3.6.1.4.1.4203.666.7.2",     /* experimental OpenLDAP aci family */
-       NULL
-};
+       Entry *e,
+       AttributeDescription *desc,
+       struct berval *val,
+       struct berval *aci,
+       regmatch_t *matches,
+       slap_access_t *grant,
+       slap_access_t *deny );
 #endif
 
-static int     regex_matches(char *pat, char *str, char *buf, regmatch_t *matches);
-static void    string_expand(char *newbuf, int bufsiz, char *pattern,
+static int     regex_matches(
+       char *pat, char *str, char *buf, regmatch_t *matches);
+static void    string_expand(
+       char *newbuf, int bufsiz, char *pattern,
        char *match, regmatch_t *matches);
 
+char **aci_set_gather (void *cookie, char *name, char *attr);
+static int aci_match_set ( struct berval *subj, Backend *be,
+    Entry *e, Connection *conn, Operation *op, int setref );
 
 /*
  * access_allowed - check whether op->o_ndn is allowed the requested access
@@ -67,19 +76,20 @@ access_allowed(
     Connection         *conn,
     Operation          *op,
     Entry              *e,
-    char               *attr,
+       AttributeDescription    *desc,
     struct berval      *val,
-    slap_access_t      access
-)
+    slap_access_t      access )
 {
        int                             count;
        AccessControl   *a;
 #ifdef LDAP_DEBUG
        char accessmaskbuf[ACCESSMASK_MAXLEN];
 #endif
-       slap_access_mask_t mask;
+       slap_mask_t mask;
        slap_control_t control;
 
+       const char *attr = desc ? desc->ad_cname->bv_val : NULL;
+
        regmatch_t       matches[MAXREMATCHES];
 
        Debug( LDAP_DEBUG_ACL,
@@ -105,7 +115,10 @@ access_allowed(
         * by ACL_WRITE checking as any found here are not provided
         * by the user
         */
-       if ( access >= ACL_WRITE && oc_check_op_no_usermod_attr( attr ) ) {
+       if ( access >= ACL_WRITE && is_at_no_user_mod( desc->ad_type )
+               && desc != slap_schema.si_ad_entry
+               && desc != slap_schema.si_ad_children )
+       {
                Debug( LDAP_DEBUG_ACL, "NoUserMod Operational attribute:"
                        " %s access granted\n",
                        attr, 0, 0 );
@@ -135,13 +148,13 @@ access_allowed(
        }
 
        ACL_INIT(mask);
-       memset(matches, 0, sizeof(matches));
+       memset(matches, '\0', sizeof(matches));
        
        control = ACL_BREAK;
        a = NULL;
        count = 0;
 
-       while( a = acl_get( a, &count, be, op, e, attr, MAXREMATCHES, matches ) )
+       while((a = acl_get( a, &count, be, op, e, desc, MAXREMATCHES, matches )) != NULL)
        {
                int i;
 
@@ -159,13 +172,13 @@ access_allowed(
                }
 
                control = acl_mask( a, &mask, be, conn, op,
-                       e, attr, val, matches );
+                       e, desc, val, matches );
 
                if ( control != ACL_BREAK ) {
                        break;
                }
 
-               memset(matches, 0, sizeof(matches));
+               memset(matches, '\0', sizeof(matches));
        }
 
        if ( ACL_IS_INVALID( mask ) ) {
@@ -202,14 +215,18 @@ acl_get(
     Backend            *be,
     Operation  *op,
     Entry              *e,
-    char               *attr,
+       AttributeDescription *desc,
     int                        nmatch,
-    regmatch_t *matches
-)
+    regmatch_t *matches )
 {
+       const char *attr;
+       int dnlen, patlen;
+
        assert( e != NULL );
        assert( count != NULL );
 
+       attr = desc ? desc->ad_cname->bv_val : NULL;
+
        if( a == NULL ) {
                if( be == NULL ) {
                        a = global_acl;
@@ -223,20 +240,67 @@ acl_get(
                a = a->acl_next;
        }
 
+       dnlen = strlen(e->e_ndn);
+
        for ( ; a != NULL; a = a->acl_next ) {
                (*count) ++;
 
                if (a->acl_dn_pat != NULL) {
-                       Debug( LDAP_DEBUG_ACL, "=> dnpat: [%d] %s nsub: %d\n", 
-                               *count, a->acl_dn_pat, (int) a->acl_dn_re.re_nsub );
+                       if ( a->acl_dn_style == ACL_STYLE_REGEX ) {
+                               Debug( LDAP_DEBUG_ACL, "=> dnpat: [%d] %s nsub: %d\n", 
+                                       *count, a->acl_dn_pat, (int) a->acl_dn_re.re_nsub );
 
-                       if (regexec(&a->acl_dn_re, e->e_ndn, nmatch, matches, 0)) {
-                               continue;
+                               if (regexec(&a->acl_dn_re, e->e_ndn, nmatch, matches, 0))
+                                       continue;
 
                        } else {
-                               Debug( LDAP_DEBUG_ACL, "=> acl_get: [%d] matched\n",
-                                       *count, 0, 0);
+                               Debug( LDAP_DEBUG_ACL, "=> dn: [%d] %s\n", 
+                                       *count, a->acl_dn_pat, 0 );
+
+                               patlen = strlen( a->acl_dn_pat );
+                               if ( dnlen < patlen )
+                                       continue;
+
+                               if ( a->acl_dn_style == ACL_STYLE_BASE ) {
+                                       /* base dn -- entire object DN must match */
+                                       if ( dnlen != patlen )
+                                               continue;
+
+                               } else if ( a->acl_dn_style == ACL_STYLE_ONE ) {
+                                       char *rdn;
+                                       int rdnlen = -1;
+
+                                       if ( dnlen <= patlen )
+                                               continue;
+
+                                       if ( e->e_ndn[dnlen - patlen - 1] != ',' )
+                                               continue;
+
+                                       rdn = dn_rdn( NULL, e->e_ndn );
+                                       if ( rdn != NULL ) {
+                                               rdnlen = strlen( rdn );
+                                               ch_free( rdn );
+                                       }
+                                       if ( rdnlen != dnlen - patlen - 1 )
+                                               continue;
+
+                               } else if ( a->acl_dn_style == ACL_STYLE_SUBTREE ) {
+                                       if ( dnlen > patlen && e->e_ndn[dnlen - patlen - 1] != ',' )
+                                               continue;
+
+                               } else if ( a->acl_dn_style == ACL_STYLE_CHILDREN ) {
+                                       if ( dnlen <= patlen )
+                                               continue;
+                                       if ( e->e_ndn[dnlen - patlen - 1] != ',' )
+                                               continue;
+                               }
+
+                               if ( strcmp( a->acl_dn_pat, e->e_ndn + dnlen - patlen ) != 0 )
+                                       continue;
                        }
+
+                       Debug( LDAP_DEBUG_ACL, "=> acl_get: [%d] matched\n",
+                               *count, 0, 0 );
                }
 
                if ( a->acl_filter != NULL ) {
@@ -250,7 +314,7 @@ acl_get(
                        *count, attr, 0);
 
                if ( attr == NULL || a->acl_attrs == NULL ||
-                       charray_inlist( a->acl_attrs, attr ) )
+                       ad_inlist( desc, a->acl_attrs ) )
                {
                        Debug( LDAP_DEBUG_ACL,
                                "<= acl_get: [%d] acl %s attr: %s\n",
@@ -277,21 +341,22 @@ acl_get(
 static slap_control_t
 acl_mask(
     AccessControl      *a,
-       slap_access_mask_t *mask,
+       slap_mask_t *mask,
     Backend            *be,
     Connection *conn,
     Operation  *op,
     Entry              *e,
-    char               *attr,
+       AttributeDescription *desc,
     struct berval      *val,
        regmatch_t      *matches
 )
 {
-       int             i;
+       int             i, odnlen, patlen;
        Access  *b;
 #ifdef LDAP_DEBUG
        char accessmaskbuf[ACCESSMASK_MAXLEN];
 #endif
+       const char *attr = desc ? desc->ad_cname->bv_val : NULL;
 
        assert( a != NULL );
        assert( mask != NULL );
@@ -301,13 +366,13 @@ acl_mask(
                e->e_dn, attr, 0 );
 
        Debug( LDAP_DEBUG_ACL,
-               "=> acl_mask: to value \"%s\" by \"%s\", (%s) \n",
-               val ? val->bv_val : "*",
+               "=> acl_mask: to %s by \"%s\", (%s) \n",
+               val ? "value" : "all values",
                op->o_ndn ?  op->o_ndn : "",
                accessmask2str( *mask, accessmaskbuf ) );
 
        for ( i = 1, b = a->acl_access; b != NULL; b = b->a_next, i++ ) {
-               slap_access_mask_t oldmask, modmask;
+               slap_mask_t oldmask, modmask;
 
                ACL_INVALIDATE( modmask );
 
@@ -339,13 +404,62 @@ acl_mask(
                                        continue;
                                }
 
-                       } else if ( strcmp( b->a_dn_pat, "*" ) != 0 ) {
-                               int ret = regex_matches( b->a_dn_pat,
-                                       op->o_ndn, e->e_ndn, matches );
+                       } else if ( b->a_dn_style == ACL_STYLE_REGEX ) {
+                               if ( strcmp( b->a_dn_pat, "*" ) != 0 ) {
+                                       int ret = regex_matches( b->a_dn_pat,
+                                               op->o_ndn, e->e_ndn, matches );
+
+                                       if( ret == 0 ) {
+                                               continue;
+                                       }
+                               }
 
-                               if( ret == 0 ) {
+                       } else {
+                               if ( e->e_dn == NULL )
+                                       continue;
+
+                               patlen = strlen( b->a_dn_pat );
+                               odnlen = strlen( op->o_ndn );
+                               if ( odnlen < patlen )
                                        continue;
+
+                               if ( b->a_dn_style == ACL_STYLE_BASE ) {
+                                       /* base dn -- entire object DN must match */
+                                       if ( odnlen != patlen )
+                                               continue;
+
+                               } else if ( b->a_dn_style == ACL_STYLE_ONE ) {
+                                       char *rdn;
+                                       int rdnlen = -1;
+
+                                       if ( odnlen <= patlen )
+                                               continue;
+
+                                       if ( op->o_ndn[odnlen - patlen - 1] != ',' )
+                                               continue;
+
+                                       rdn = dn_rdn( NULL, op->o_ndn );
+                                       if ( rdn != NULL ) {
+                                               rdnlen = strlen( rdn );
+                                               ch_free( rdn );
+                                       }
+                                       if ( rdnlen != odnlen - patlen - 1 )
+                                               continue;
+
+                               } else if ( b->a_dn_style == ACL_STYLE_SUBTREE ) {
+                                       if ( odnlen > patlen && op->o_ndn[odnlen - patlen - 1] != ',' )
+                                               continue;
+
+                               } else if ( b->a_dn_style == ACL_STYLE_CHILDREN ) {
+                                       if ( odnlen <= patlen )
+                                               continue;
+                                       if ( op->o_ndn[odnlen - patlen - 1] != ',' )
+                                               continue;
                                }
+
+                               if ( strcmp( b->a_dn_pat, op->o_ndn + odnlen - patlen ) != 0 )
+                                       continue;
+
                        }
                }
 
@@ -353,11 +467,17 @@ acl_mask(
                        Debug( LDAP_DEBUG_ACL, "<= check a_sockurl_pat: %s\n",
                                b->a_sockurl_pat, 0, 0 );
 
-                       if ( strcmp( b->a_sockurl_pat, "*" ) != 0 &&
-                               !regex_matches( b->a_sockurl_pat, conn->c_listener_url,
-                               e->e_ndn, matches ) ) 
-                       {
-                               continue;
+                       if ( strcmp( b->a_sockurl_pat, "*" ) != 0) {
+                               if ( b->a_sockurl_style == ACL_STYLE_REGEX) {
+                                       if (!regex_matches( b->a_sockurl_pat, conn->c_listener_url,
+                                                       e->e_ndn, matches ) ) 
+                                       {
+                                               continue;
+                                       }
+                               } else {
+                                       if ( strcasecmp( b->a_sockurl_pat, conn->c_listener_url ) == 0 )
+                                               continue;
+                               }
                        }
                }
 
@@ -365,11 +485,17 @@ acl_mask(
                        Debug( LDAP_DEBUG_ACL, "<= check a_domain_pat: %s\n",
                                b->a_domain_pat, 0, 0 );
 
-                       if ( strcmp( b->a_domain_pat, "*" ) != 0 &&
-                               !regex_matches( b->a_domain_pat, conn->c_peer_domain,
-                               e->e_ndn, matches ) ) 
-                       {
-                               continue;
+                       if ( strcmp( b->a_domain_pat, "*" ) != 0) {
+                               if ( b->a_domain_style == ACL_STYLE_REGEX) {
+                                       if (!regex_matches( b->a_domain_pat, conn->c_peer_domain,
+                                                       e->e_ndn, matches ) ) 
+                                       {
+                                               continue;
+                                       }
+                               } else {
+                                       if ( strcasecmp( b->a_domain_pat, conn->c_peer_domain ) == 0 )
+                                               continue;
+                               }
                        }
                }
 
@@ -377,11 +503,17 @@ acl_mask(
                        Debug( LDAP_DEBUG_ACL, "<= check a_peername_path: %s\n",
                                b->a_peername_pat, 0, 0 );
 
-                       if ( strcmp( b->a_peername_pat, "*" ) != 0 &&
-                               !regex_matches( b->a_peername_pat, conn->c_peer_name,
-                               e->e_ndn, matches ) )
-                       {
-                               continue;
+                       if ( strcmp( b->a_peername_pat, "*" ) != 0) {
+                               if ( b->a_peername_style == ACL_STYLE_REGEX) {
+                                       if (!regex_matches( b->a_peername_pat, conn->c_peer_name,
+                                                       e->e_ndn, matches ) ) 
+                                       {
+                                               continue;
+                                       }
+                               } else {
+                                       if ( strcasecmp( b->a_peername_pat, conn->c_peer_name ) == 0 )
+                                               continue;
+                               }
                        }
                }
 
@@ -389,62 +521,82 @@ acl_mask(
                        Debug( LDAP_DEBUG_ACL, "<= check a_sockname_path: %s\n",
                                b->a_sockname_pat, 0, 0 );
 
-                       if ( strcmp( b->a_sockname_pat, "*" ) != 0 &&
-                               !regex_matches( b->a_sockname_pat, conn->c_sock_name,
-                               e->e_ndn, matches ) )
-                       {
-                               continue;
+                       if ( strcmp( b->a_sockname_pat, "*" ) != 0) {
+                               if ( b->a_sockname_style == ACL_STYLE_REGEX) {
+                                       if (!regex_matches( b->a_sockname_pat, conn->c_sock_name,
+                                                       e->e_ndn, matches ) ) 
+                                       {
+                                               continue;
+                                       }
+                               } else {
+                                       if ( strcasecmp( b->a_sockname_pat, conn->c_sock_name ) == 0 )
+                                               continue;
+                               }
                        }
                }
 
                if ( b->a_dn_at != NULL && op->o_ndn != NULL ) {
-                       char *dn_at;
                        Attribute       *at;
                        struct berval   bv;
+                       int rc, match = 0;
+                       const char *text;
+                       const char *desc = b->a_dn_at->ad_cname->bv_val;
 
                        Debug( LDAP_DEBUG_ACL, "<= check a_dn_at: %s\n",
-                               b->a_dn_at, 0, 0);
+                               desc, 0, 0);
 
                        bv.bv_val = op->o_ndn;
                        bv.bv_len = strlen( bv.bv_val );
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-                       dn_at = at_canonical_name( b->a_dn_at );
-#else
-                       dn_at = b->a_dn_at;
-#endif
-
-                       /* see if asker is listed in dnattr */ 
-                       if ( (at = attr_find( e->e_attrs, dn_at )) != NULL
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-                               /* not yet implemented */
-#else
-                               && value_find( at->a_vals, &bv, at->a_syntax, 3 ) == 0
-#endif
-                       )
+                       /* see if asker is listed in dnattr */
+                       for( at = attrs_find( e->e_attrs, b->a_dn_at );
+                               at != NULL;
+                               at = attrs_find( at->a_next, b->a_dn_at ) )
                        {
-                               if ( b->a_dn_self && 
-                                       (val == NULL
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-                                       /* not yet implemented */
-#else
-                                       || value_cmp( &bv, val, at->a_syntax, 2 )
-#endif
-                                       ) )
-                               {
-                                       continue;
+                               if( value_find( b->a_dn_at, at->a_vals, &bv ) == 0 ) {
+                                       /* found it */
+                                       match = 1;
+                                       break;
                                }
+                       }
 
-                       /* asker not listed in dnattr - check for self access */
-                       } else if ( ! b->a_dn_self || val == NULL
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-                                       /* not yet implemented */
-#else
-                               || value_cmp( &bv, val, at->a_syntax, 2 ) != 0
-#endif
-                       )
-                       {
-                               continue;
+                       if( match ) {
+                               /* have a dnattr match. if this is a self clause then
+                                * the target must also match the op dn.
+                                */
+                               if ( b->a_dn_self ) {
+                                       /* check if the target is an attribute. */
+                                       if ( val == NULL )
+                                               continue;
+                                       /* target is attribute, check if the attribute value
+                                        * is the op dn.
+                                        */
+                                       rc = value_match( &match, b->a_dn_at,
+                                               b->a_dn_at->ad_type->sat_equality, 0,
+                                               val, &bv, &text );
+                                       /* on match error or no match, fail the ACL clause */
+                                       if (rc != LDAP_SUCCESS || match != 0 )
+                                               continue;
+                               }
+                       } else {
+                               /* no dnattr match, check if this is a self clause */
+                               if ( ! b->a_dn_self )
+                                       continue;
+                               /* 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.
+                                */
+                               rc = value_match( &match, b->a_dn_at,
+                                       b->a_dn_at->ad_type->sat_equality, 0,
+                                       val, &bv, &text );
+
+                               /* on match error or no match, fail the ACL clause */
+                               if (rc != LDAP_SUCCESS || match != 0 )
+                                       continue;
                        }
                }
 
@@ -456,19 +608,73 @@ acl_mask(
                         * the values in the attribute group
                         */
                        /* see if asker is listed in dnattr */
-                       string_expand(buf, sizeof(buf), b->a_group_pat, e->e_ndn, matches);
-                       if ( dn_normalize(buf) == NULL ) {
-                               /* did not expand to a valid dn */
-                               continue;
+                       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 ) {
+                                       /* did not expand to a valid dn */
+                                       continue;
+                               }
+                       } else {
+                               strncpy( buf, b->a_group_pat, sizeof(buf) - 1 );
+                               buf[sizeof(buf) - 1] = 0;
                        }
 
-                       if (backend_group(be, e, buf, op->o_ndn,
+                       if (backend_group(be, conn, op, e, buf, op->o_ndn,
                                b->a_group_oc, b->a_group_at) != 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) {
+                               continue;
+                       }
+               }
+
+               if ( b->a_authz.sai_ssf ) {
+                       Debug( LDAP_DEBUG_ACL, "<= check a_authz.sai_ssf: ACL %u > OP %u\n",
+                               b->a_authz.sai_ssf, op->o_ssf, 0 );
+
+                       if ( b->a_authz.sai_ssf >  op->o_ssf ) {
+                               continue;
+                       }
+               }
+
+               if ( b->a_authz.sai_transport_ssf ) {
+                       Debug( LDAP_DEBUG_ACL,
+                               "<= check a_authz.sai_transport_ssf: ACL %u > OP %u\n",
+                               b->a_authz.sai_transport_ssf, op->o_transport_ssf, 0 );
+
+                       if ( b->a_authz.sai_transport_ssf >  op->o_transport_ssf ) {
+                               continue;
+                       }
+               }
+
+               if ( b->a_authz.sai_tls_ssf ) {
+                       Debug( LDAP_DEBUG_ACL,
+                               "<= check a_authz.sai_tls_ssf: ACL %u > OP %u\n",
+                               b->a_authz.sai_tls_ssf, op->o_tls_ssf, 0 );
+
+                       if ( b->a_authz.sai_tls_ssf >  op->o_tls_ssf ) {
+                               continue;
+                       }
+               }
+
+               if ( b->a_authz.sai_sasl_ssf ) {
+                       Debug( LDAP_DEBUG_ACL,
+                               "<= check a_authz.sai_sasl_ssf: ACL %u > OP %u\n",
+                               b->a_authz.sai_sasl_ssf, op->o_sasl_ssf, 0 );
+
+                       if ( b->a_authz.sai_sasl_ssf >  op->o_sasl_ssf ) {
+                               continue;
+                       }
+               }
+
 #ifdef SLAPD_ACI_ENABLED
                if ( b->a_aci_at != NULL ) {
                        Attribute       *at;
@@ -476,7 +682,7 @@ acl_mask(
 
                        /* this case works different from the others above.
                         * since aci's themselves give permissions, we need
-                        * to first check b->a_mask, the ACL's access level.
+                        * to first check b->a_access_mask, the ACL's access level.
                         */
 
                        if( op->o_ndn == NULL || op->o_ndn[0] == '\0' ) {
@@ -490,7 +696,7 @@ acl_mask(
                        /* first check if the right being requested
                         * is allowed by the ACL clause.
                         */
-                       if ( ! ACL_GRANT( b->a_mask, *mask ) ) {
+                       if ( ! ACL_GRANT( b->a_access_mask, *mask ) ) {
                                continue;
                        }
 
@@ -509,8 +715,8 @@ acl_mask(
                         * rights given by the acis.
                         */
                        for ( i = 0; at->a_vals[i] != NULL; i++ ) {
-                               if (aci_mask( be, op,
-                                       e, attr, val, at->a_vals[i],
+                               if (aci_mask( be, conn, op,
+                                       e, desc, val, at->a_vals[i],
                                        matches, &grant, &deny ) != 0)
                                {
                                        tgrant |= grant;
@@ -519,7 +725,7 @@ acl_mask(
                        }
 
                        /* remove anything that the ACL clause does not allow */
-                       tgrant &= b->a_mask & ACL_PRIV_MASK;
+                       tgrant &= b->a_access_mask & ACL_PRIV_MASK;
                        tdeny &= ACL_PRIV_MASK;
 
                        /* see if we have anything to contribute */
@@ -548,7 +754,7 @@ acl_mask(
                } else
 #endif
                {
-                       modmask = b->a_mask;
+                       modmask = b->a_access_mask;
                }
 
 
@@ -617,7 +823,7 @@ acl_check_modlist(
     Connection *conn,
     Operation  *op,
     Entry      *e,
-    LDAPModList        *mlist
+    Modifications      *mlist
 )
 {
        int             i;
@@ -654,29 +860,28 @@ acl_check_modlist(
 #endif
        }
 
-       for ( ; mlist != NULL; mlist = mlist->ml_next ) {
+       for ( ; mlist != NULL; mlist = mlist->sml_next ) {
                /*
                 * no-user-modification operational attributes are ignored
                 * by ACL_WRITE checking as any found here are not provided
                 * by the user
                 */
-               if ( oc_check_op_no_usermod_attr( mlist->ml_type ) ) {
-                       Debug( LDAP_DEBUG_ACL, "NoUserMod Operational attribute:"
+               if ( is_at_no_user_mod( mlist->sml_desc->ad_type ) ) {
+                       Debug( LDAP_DEBUG_ACL, "acl: no-user-mod %s:"
                                " modify access granted\n",
-                               mlist->ml_type, 0, 0 );
+                               mlist->sml_desc->ad_cname->bv_val, 0, 0 );
                        continue;
                }
 
-               switch ( mlist->ml_op & ~LDAP_MOD_BVALUES ) {
+               switch ( mlist->sml_op ) {
                case LDAP_MOD_REPLACE:
                case LDAP_MOD_ADD:
-                       if ( mlist->ml_bvalues == NULL ) {
+                       if ( mlist->sml_bvalues == NULL ) {
                                break;
                        }
-                       for ( i = 0; mlist->ml_bvalues[i] != NULL; i++ ) {
+                       for ( i = 0; mlist->sml_bvalues[i] != NULL; i++ ) {
                                if ( ! access_allowed( be, conn, op, e,
-                                       mlist->ml_type, mlist->ml_bvalues[i],
-                                       ACL_WRITE ) )
+                                       mlist->sml_desc, mlist->sml_bvalues[i], ACL_WRITE ) )
                                {
                                        return( 0 );
                                }
@@ -684,19 +889,17 @@ acl_check_modlist(
                        break;
 
                case LDAP_MOD_DELETE:
-                       if ( mlist->ml_bvalues == NULL ) {
+                       if ( mlist->sml_bvalues == NULL ) {
                                if ( ! access_allowed( be, conn, op, e,
-                                       mlist->ml_type, NULL, 
-                                       ACL_WRITE ) )
+                                       mlist->sml_desc, NULL, ACL_WRITE ) )
                                {
                                        return( 0 );
                                }
                                break;
                        }
-                       for ( i = 0; mlist->ml_bvalues[i] != NULL; i++ ) {
+                       for ( i = 0; mlist->sml_bvalues[i] != NULL; i++ ) {
                                if ( ! access_allowed( be, conn, op, e,
-                                       mlist->ml_type, mlist->ml_bvalues[i],
-                                       ACL_WRITE ) )
+                                       mlist->sml_desc, mlist->sml_bvalues[i], ACL_WRITE ) )
                                {
                                        return( 0 );
                                }
@@ -708,22 +911,23 @@ acl_check_modlist(
        return( 1 );
 }
 
-#ifdef SLAPD_ACI_ENABLED
 static char *
-aci_bvstrdup (struct berval *bv)
+aci_bvstrdup( struct berval *bv )
 {
        char *s;
 
        s = (char *)ch_malloc(bv->bv_len + 1);
        if (s != NULL) {
-               memcpy(s, bv->bv_val, bv->bv_len);
+               AC_MEMCPY(s, bv->bv_val, bv->bv_len);
                s[bv->bv_len] = 0;
        }
        return(s);
 }
 
 static int
-aci_strbvcmp (char *s, struct berval *bv)
+aci_strbvcmp(
+       const char *s,
+       struct berval *bv )
 {
        int res, len;
 
@@ -739,7 +943,11 @@ aci_strbvcmp (char *s, struct berval *bv)
 }
 
 static int
-aci_get_part (struct berval *list, int ix, char sep, struct berval *bv)
+aci_get_part(
+       struct berval *list,
+       int ix,
+       char sep,
+       struct berval *bv )
 {
        int len;
        char *p;
@@ -773,9 +981,129 @@ aci_get_part (struct berval *list, int ix, char sep, struct berval *bv)
        return(bv->bv_len);
 }
 
+char **
+aci_set_gather (void *cookie, char *name, char *attr)
+{
+       struct {
+       Backend *be;
+       Entry *e;
+       Connection *conn;
+       Operation *op;
+       } *cp = (void *)cookie;
+       struct berval **bvals = NULL;
+       char **vals = NULL;
+       char *ndn;
+       int i;
+
+       /* 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);
+                               }
+                               ad_free(desc, 1);
+                       }
+               }
+               ch_free(ndn);
+       }
+       return(vals);
+}
+
 static int
-aci_list_map_rights (
-       struct berval *list)
+aci_match_set (
+       struct berval *subj,
+    Backend *be,
+    Entry *e,
+    Connection *conn,
+    Operation *op,
+    int setref
+)
+{
+       char *set = NULL;
+       int rc = 0;
+       struct {
+       Backend *be;
+       Entry *e;
+       Connection *conn;
+       Operation *op;
+       } cookie;
+
+       if (setref == 0) {
+               set = aci_bvstrdup(subj);
+       } else {
+               struct berval bv;
+               char *subjdn;
+               char *setat;
+               struct berval **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 ) {
+                       return(0);
+               }
+
+               if ( aci_get_part(subj, 1, '/', &bv) < 0 ) {
+                       setat = ch_strdup( SLAPD_ACI_SET_ATTR );
+               } else {
+                       setat = aci_bvstrdup(&bv);
+               }
+               if ( setat != NULL ) {
+                       if ( dn_normalize(subjdn) != NULL
+                               && slap_str2ad(setat, &desc, &text) == LDAP_SUCCESS )
+                       {
+                               backend_attribute(be, NULL, NULL, e,
+                                                               subjdn, desc, &bvals);
+                               ad_free(desc, 1);
+                               if ( bvals != NULL ) {
+                                       if ( bvals[0] != NULL )
+                                               set = ch_strdup(bvals[0]->bv_val);
+                                       ber_bvecfree(bvals);
+                               }
+                       }
+                       ch_free(setat);
+               }
+               ch_free(subjdn);
+       }
+
+       if (set != NULL) {
+               cookie.be = be;
+               cookie.e = e;
+               cookie.conn = conn;
+               cookie.op = op;
+               rc = (set_filter(aci_set_gather, &cookie, set, op->o_ndn, e->e_ndn, NULL) > 0);
+               ch_free(set);
+       }
+       return(rc);
+}
+
+#ifdef SLAPD_ACI_ENABLED
+static int
+aci_list_map_rights(
+       struct berval *list )
 {
        struct berval bv;
        slap_access_t mask;
@@ -819,7 +1147,10 @@ aci_list_map_rights (
 }
 
 static int
-aci_list_has_attr (struct berval *list, char *attr, struct berval *val)
+aci_list_has_attr(
+       struct berval *list,
+       const char *attr,
+       struct berval *val )
 {
        struct berval bv, left, right;
        int i;
@@ -865,7 +1196,10 @@ aci_list_has_attr (struct berval *list, char *attr, struct berval *val)
 }
 
 static slap_access_t
-aci_list_get_attr_rights (struct berval *list, char *attr, struct berval *val)
+aci_list_get_attr_rights(
+       struct berval *list,
+       const char *attr,
+       struct berval *val )
 {
     struct berval bv;
     slap_access_t mask;
@@ -884,12 +1218,12 @@ aci_list_get_attr_rights (struct berval *list, char *attr, struct berval *val)
 }
 
 static int
-aci_list_get_rights (
+aci_list_get_rights(
        struct berval *list,
-       char *attr,
+       const char *attr,
        struct berval *val,
        slap_access_t *grant,
-       slap_access_t *deny)
+       slap_access_t *deny )
 {
     struct berval perm, actn;
     slap_access_t *mask;
@@ -924,57 +1258,79 @@ aci_list_get_rights (
 static int
 aci_group_member (
        struct berval *subj,
-       char *grpoc,
-       char *grpat,
+       const char *defgrpoc,
+       const char *defgrpat,
     Backend            *be,
     Entry              *e,
+    Connection         *conn,
     Operation          *op,
        regmatch_t      *matches
 )
 {
        struct berval bv;
-       char *subjdn, *grpdn;
-       int rc = 0;
+       char *subjdn, *grpdn = NULL;
+       char *grpoc;
+       char *grpat;
+       ObjectClass *grp_oc = NULL;
+       AttributeDescription *grp_ad = NULL;
+       char *text;
+       int rc;
 
        /* format of string is "group/objectClassValue/groupAttrName" */
-       if (aci_get_part(subj, 0, '/', &bv) < 0)
+       if (aci_get_part(subj, 0, '/', &bv) < 0) {
                return(0);
+       }
+
        subjdn = aci_bvstrdup(&bv);
-       if (subjdn == NULL)
+       if (subjdn == NULL) {
                return(0);
+       }
 
-       if (aci_get_part(subj, 1, '/', &bv) < 0)
-               grpoc = ch_strdup(grpoc);
-       else
+       if (aci_get_part(subj, 1, '/', &bv) < 0) {
+               grpoc = ch_strdup( defgrpoc );
+       } else {
                grpoc = aci_bvstrdup(&bv);
+       }
 
-       if (aci_get_part(subj, 2, '/', &bv) < 0)
-               grpat = ch_strdup(grpat);
-       else
+       if (aci_get_part(subj, 2, '/', &bv) < 0) {
+               grpat = ch_strdup( defgrpat );
+       } else {
                grpat = aci_bvstrdup(&bv);
+       }
+
+       rc = slap_str2ad( grpat, &grp_ad, &text );
+       if( rc != LDAP_SUCCESS ) {
+               rc = 0;
+               goto done;
+       }
+       rc = 0;
 
+       grp_oc = oc_find( grpoc );
        grpdn = (char *)ch_malloc(1024);
-       if (grpoc != NULL && grpat != NULL && grpdn != NULL) {
+
+       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, e, grpdn, op->o_ndn, grpoc, grpat) == 0);
+                       rc = (backend_group(be, conn, op, e, grpdn, op->o_ndn, grp_oc, grp_ad) == 0);
                }
-               ch_free(grpdn);
        }
-       if (grpat != NULL)
-               ch_free(grpat);
-       if (grpoc != NULL)
-               ch_free(grpoc);
+
+done:
+       if( grp_ad != NULL ) ad_free( grp_ad, 1 );
+       ch_free(grpdn);
+       ch_free(grpat);
+       ch_free(grpoc);
        ch_free(subjdn);
        return(rc);
 }
 
 static int
-aci_mask (
+aci_mask(
     Backend                    *be,
+    Connection         *conn,
     Operation          *op,
     Entry                      *e,
-    char                       *attr,
+       AttributeDescription *desc,
     struct berval      *val,
     struct berval      *aci,
        regmatch_t              *matches,
@@ -984,7 +1340,8 @@ aci_mask (
 {
     struct berval bv, perms, sdn;
     char *subjdn;
-       int rc, i;
+       int rc;
+       char *attr = desc->ad_cname->bv_val;
 
        /* parse an aci of the form:
                oid#scope#action;rights;attr;rights;attr$action;rights;attr;rights;attr#dnType#subjectDN
@@ -1002,12 +1359,6 @@ aci_mask (
        /* check that the aci family is supported */
        if (aci_get_part(aci, 0, '#', &bv) < 0)
                return(0);
-       for (i = 0; supportedACIMechs[i] != NULL; i++) {
-               if (aci_strbvcmp( supportedACIMechs[i], &bv ) == 0)
-                       break;
-       }
-       if (supportedACIMechs[i] == NULL)
-               return(0);
 
        /* check that the scope is "entry" */
        if (aci_get_part(aci, 1, '#', &bv) < 0
@@ -1048,41 +1399,58 @@ aci_mask (
                        return(1);
 
        } else if (aci_strbvcmp( "dnattr", &bv ) == 0) {
+               char *dnattr = aci_bvstrdup(&sdn);
                Attribute *at;
-               char *attrname;
+               AttributeDescription *ad = NULL;
+               const char *text;
 
-               attrname = aci_bvstrdup(&sdn);
-               at = attr_find(e->e_attrs, attrname);
-               ch_free(attrname);
+               rc = slap_str2ad( dnattr, &ad, &text );
+               ch_free( dnattr );
 
-               if (at != NULL) {
-                       bv.bv_val = op->o_ndn;
-                       bv.bv_len = strlen( bv.bv_val );
+               if( rc != LDAP_SUCCESS ) {
+                       return 0;
+               }
 
-                       if (value_find( at->a_vals, &bv, at->a_syntax, 3 ) == 0 )
-                               return(1);
+               rc = 0;
+
+               bv.bv_val = op->o_ndn;
+               bv.bv_len = strlen( bv.bv_val );
+
+               for(at = attrs_find( e->e_attrs, ad );
+                       at != NULL;
+                       at = attrs_find( at->a_next, ad ) )
+               {
+                       if (value_find( ad, at->a_vals, &bv) == 0 ) {
+                               rc = 1;
+                               break;
+                       }
                }
 
+               ad_free( ad, 1 );
+               return rc;
+
+
        } else if (aci_strbvcmp( "group", &bv ) == 0) {
-               if (aci_group_member(&sdn, "groupOfNames", "member", be, e, op, matches))
+               if (aci_group_member(&sdn, SLAPD_GROUP_CLASS, SLAPD_GROUP_ATTR, be, e, conn, op, matches))
                        return(1);
 
        } else if (aci_strbvcmp( "role", &bv ) == 0) {
-               if (aci_group_member(&sdn, "organizationalRole", "roleOccupant", be, e, op, matches))
+               if (aci_group_member(&sdn, SLAPD_ROLE_CLASS, SLAPD_ROLE_ATTR, be, e, conn, op, matches))
+                       return(1);
+
+       } else if (aci_strbvcmp( "set", &bv ) == 0) {
+               if (aci_match_set(&sdn, be, e, conn, op, 0))
+                       return(1);
+
+       } else if (aci_strbvcmp( "set-ref", &bv ) == 0) {
+               if (aci_match_set(&sdn, be, e, conn, op, 1))
                        return(1);
+
        }
 
        return(0);
 }
 
-char *
-get_supported_acimech (int index)
-{
-       if (index < 0 || index >= (sizeof(supportedACIMechs) / sizeof(char *)))
-               return(NULL);
-       return(supportedACIMechs[index]);
-}
-
 #endif /* SLAPD_ACI_ENABLED */
 
 static void