X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foverlays%2Fdynlist.c;h=f424c50e3e1a5d43f281946114432f30b571ae17;hb=b8bbe985b8a3f03c0531744d6ddcd2ee43a9db1e;hp=71c0eb0b3a3666393b142c0ddf6ad4723e8de532;hpb=9be58de517ec098c5ada688f0641dcec8d6b40e9;p=openldap diff --git a/servers/slapd/overlays/dynlist.c b/servers/slapd/overlays/dynlist.c index 71c0eb0b3a..f424c50e3e 100644 --- a/servers/slapd/overlays/dynlist.c +++ b/servers/slapd/overlays/dynlist.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2003-2008 The OpenLDAP Foundation. + * Copyright 2003-2012 The OpenLDAP Foundation. * Portions Copyright 2004-2005 Pierangelo Masarati. * Portions Copyright 2008 Emmanuel Dreyfus. * All rights reserved. @@ -24,59 +24,40 @@ #ifdef SLAPD_OVER_DYNLIST -#if LDAP_VENDOR_VERSION_MINOR == X || LDAP_VENDOR_VERSION_MINOR > 3 #if SLAPD_OVER_DYNGROUP != SLAPD_MOD_STATIC #define TAKEOVER_DYNGROUP #endif -#else -#if LDAP_VENDOR_VERSION_MINOR < 3 -#define OL_2_2_COMPAT -#endif -#endif #include #include #include "slap.h" -#ifndef OL_2_2_COMPAT #include "config.h" -#endif #include "lutil.h" -/* FIXME: the code differs if SLAP_OPATTRS is defined or not; - * SLAP_OPATTRS is not defined in 2.2 yet, while this overlay - * expects HEAD code at least later than August 6, 2004. */ -/* FIXME: slap_anlist_no_attrs was introduced in 2.3; here it - * is anticipated to allow using this overlay with 2.2. */ - -#ifdef OL_2_2_COMPAT -static AttributeName anlist_no_attrs[] = { - { BER_BVC( LDAP_NO_ATTRS ), NULL, 0, NULL }, - { BER_BVNULL, NULL, 0, NULL } -}; - -static AttributeName *slap_anlist_no_attrs = anlist_no_attrs; -#endif - static AttributeDescription *ad_dgIdentity, *ad_dgAuthz; typedef struct dynlist_map_t { - AttributeDescription *dlm_member_ad; - AttributeDescription *dlm_mapped_ad; - struct dynlist_map_t *dlm_next; + AttributeDescription *dlm_member_ad; + AttributeDescription *dlm_mapped_ad; + struct dynlist_map_t *dlm_next; } dynlist_map_t; typedef struct dynlist_info_t { ObjectClass *dli_oc; AttributeDescription *dli_ad; struct dynlist_map_t *dli_dlm; + struct berval dli_uri; + LDAPURLDesc *dli_lud; + struct berval dli_uri_nbase; + Filter *dli_uri_filter; struct berval dli_default_filter; struct dynlist_info_t *dli_next; } dynlist_info_t; #define DYNLIST_USAGE \ - "\"dynlist-attrset [[:] ...]\": " + "\"dynlist-attrset [uri] [[:] ...]\": " static dynlist_info_t * dynlist_is_dynlist_next( Operation *op, SlapReply *rs, dynlist_info_t *old_dli ) @@ -102,6 +83,22 @@ dynlist_is_dynlist_next( Operation *op, SlapReply *rs, dynlist_info_t *old_dli ) } for ( ; dli; dli = dli->dli_next ) { + if ( dli->dli_lud != NULL ) { + /* check base and scope */ + if ( !BER_BVISNULL( &dli->dli_uri_nbase ) + && !dnIsSuffixScope( &rs->sr_entry->e_nname, + &dli->dli_uri_nbase, + dli->dli_lud->lud_scope ) ) + { + continue; + } + + /* check filter */ + if ( dli->dli_uri_filter && test_filter( op, rs->sr_entry, dli->dli_uri_filter ) != LDAP_COMPARE_TRUE ) { + continue; + } + } + if ( attr_valfind( a, SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH | SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH, @@ -116,20 +113,27 @@ dynlist_is_dynlist_next( Operation *op, SlapReply *rs, dynlist_info_t *old_dli ) } static int -dynlist_make_filter( Operation *op, struct berval *oldf, struct berval *newf ) +dynlist_make_filter( Operation *op, Entry *e, const char *url, struct berval *oldf, struct berval *newf ) { slap_overinst *on = (slap_overinst *)op->o_bd->bd_info; dynlist_info_t *dli = (dynlist_info_t *)on->on_bi.bi_private; char *ptr; + int needBrackets = 0; assert( oldf != NULL ); assert( newf != NULL ); assert( !BER_BVISNULL( oldf ) ); assert( !BER_BVISEMPTY( oldf ) ); + if ( oldf->bv_val[0] != '(' ) { + Debug( LDAP_DEBUG_ANY, "%s: dynlist, DN=\"%s\": missing brackets in URI=\"%s\" filter\n", + op->o_log_prefix, e->e_name.bv_val, url ); + needBrackets = 2; + } + newf->bv_len = STRLENOF( "(&(!(objectClass=" "))" ")" ) - + dli->dli_oc->soc_cname.bv_len + oldf->bv_len; + + dli->dli_oc->soc_cname.bv_len + oldf->bv_len + needBrackets; newf->bv_val = op->o_tmpalloc( newf->bv_len + 1, op->o_tmpmemctx ); if ( newf->bv_val == NULL ) { return -1; @@ -137,13 +141,16 @@ dynlist_make_filter( Operation *op, struct berval *oldf, struct berval *newf ) ptr = lutil_strcopy( newf->bv_val, "(&(!(objectClass=" ); ptr = lutil_strcopy( ptr, dli->dli_oc->soc_cname.bv_val ); ptr = lutil_strcopy( ptr, "))" ); + if ( needBrackets ) *ptr++ = '('; ptr = lutil_strcopy( ptr, oldf->bv_val ); + if ( needBrackets ) *ptr++ = ')'; ptr = lutil_strcopy( ptr, ")" ); newf->bv_len = ptr - newf->bv_val; return 0; } +/* dynlist_sc_update() callback info set by dynlist_prepare_entry() */ typedef struct dynlist_sc_t { dynlist_info_t *dlc_dli; Entry *dlc_e; @@ -211,13 +218,8 @@ dynlist_sc_update( Operation *op, SlapReply *rs ) goto done; } -#ifndef SLAP_OPATTRS - opattrs = ( rs->sr_attrs == NULL ) ? 0 : an_find( rs->sr_attrs, &AllOper ); - userattrs = ( rs->sr_attrs == NULL ) ? 1 : an_find( rs->sr_attrs, &AllUser ); -#else /* SLAP_OPATTRS */ opattrs = SLAP_OPATTRS( rs->sr_attr_flags ); userattrs = SLAP_USERATTRS( rs->sr_attr_flags ); -#endif /* SLAP_OPATTRS */ for ( a = rs->sr_entry->e_attrs; a != NULL; a = a->a_next ) { BerVarray vals, nvals = NULL; @@ -334,7 +336,7 @@ done:; if ( rs->sr_flags & REP_ENTRY_MUSTBEFREED ) { entry_free( rs->sr_entry ); rs->sr_entry = NULL; - rs->sr_flags ^= REP_ENTRY_MUSTBEFREED; + rs->sr_flags &= ~REP_ENTRY_MASK; } return 0; @@ -346,10 +348,8 @@ dynlist_prepare_entry( Operation *op, SlapReply *rs, dynlist_info_t *dli ) Attribute *a, *id = NULL; slap_callback cb; Operation o = *op; - SlapReply r = { REP_SEARCH }; struct berval *url; Entry *e; - slap_mask_t e_flags; int opattrs, userattrs; dynlist_sc_t dlc = { 0 }; @@ -361,13 +361,8 @@ dynlist_prepare_entry( Operation *op, SlapReply *rs, dynlist_info_t *dli ) return SLAP_CB_CONTINUE; } -#ifndef SLAP_OPATTRS - opattrs = ( rs->sr_attrs == NULL ) ? 0 : an_find( rs->sr_attrs, &AllOper ); - userattrs = ( rs->sr_attrs == NULL ) ? 1 : an_find( rs->sr_attrs, &AllUser ); -#else /* SLAP_OPATTRS */ opattrs = SLAP_OPATTRS( rs->sr_attr_flags ); userattrs = SLAP_USERATTRS( rs->sr_attr_flags ); -#endif /* SLAP_OPATTRS */ /* Don't generate member list if it wasn't requested */ for ( dlm = dli->dli_dlm; dlm; dlm = dlm->dlm_next ) { @@ -398,12 +393,12 @@ dynlist_prepare_entry( Operation *op, SlapReply *rs, dynlist_info_t *dli ) o.o_groups = NULL; } + e = rs->sr_entry; + /* ensure e is modifiable, but do not replace + * sr_entry yet since we have pointers into it */ if ( !( rs->sr_flags & REP_ENTRY_MODIFIABLE ) ) { e = entry_dup( rs->sr_entry ); - } else { - e = rs->sr_entry; } - e_flags = rs->sr_flags | ( REP_ENTRY_MODIFIABLE | REP_ENTRY_MUSTBEFREED ); dlc.dlc_e = e; dlc.dlc_dli = dli; @@ -556,7 +551,7 @@ dynlist_prepare_entry( Operation *op, SlapReply *rs, dynlist_info_t *dli ) } else { struct berval flt; ber_str2bv( lud->lud_filter, 0, 0, &flt ); - if ( dynlist_make_filter( op, &flt, &o.ors_filterstr ) ) { + if ( dynlist_make_filter( op, rs->sr_entry, url->bv_val, &flt, &o.ors_filterstr ) ) { /* error */ goto cleanup; } @@ -568,9 +563,8 @@ dynlist_prepare_entry( Operation *op, SlapReply *rs, dynlist_info_t *dli ) o.o_bd = select_backend( &o.o_req_ndn, 1 ); if ( o.o_bd && o.o_bd->be_search ) { -#ifdef SLAP_OPATTRS + SlapReply r = { REP_SEARCH }; r.sr_attr_flags = slap_attr_flags( o.ors_attrs ); -#endif /* SLAP_OPATTRS */ (void)o.o_bd->be_search( &o, &r ); } @@ -579,7 +573,7 @@ cleanup:; slap_op_groups_free( &o ); } if ( o.ors_filter ) { - filter_free_x( &o, o.ors_filter ); + filter_free_x( &o, o.ors_filter, 1 ); } if ( o.ors_attrs && o.ors_attrs != rs->sr_attrs && o.ors_attrs != slap_anlist_no_attrs ) @@ -598,21 +592,38 @@ cleanup:; ldap_free_urldesc( lud ); } - rs->sr_entry = e; - rs->sr_flags = e_flags; + if ( e != rs->sr_entry ) { + rs_replace_entry( op, rs, (slap_overinst *)op->o_bd->bd_info, e ); + rs->sr_flags |= REP_ENTRY_MODIFIABLE | REP_ENTRY_MUSTBEFREED; + } return SLAP_CB_CONTINUE; } +/* dynlist_sc_compare_entry() callback set by dynlist_compare() */ +typedef struct dynlist_cc_t { + slap_callback dc_cb; +# define dc_ava dc_cb.sc_private /* attr:val to compare with */ + int *dc_res; +} dynlist_cc_t; + static int -dynlist_sc_save_entry( Operation *op, SlapReply *rs ) +dynlist_sc_compare_entry( Operation *op, SlapReply *rs ) { - /* save the entry in the private field of the callback, - * so it doesn't get freed (it's temporary!) */ - if ( rs->sr_entry != NULL ) { - dynlist_sc_t *dlc = (dynlist_sc_t *)op->o_callback->sc_private; - dlc->dlc_e = rs->sr_entry; - rs->sr_entry = NULL; + if ( rs->sr_type == REP_SEARCH && rs->sr_entry != NULL ) { + dynlist_cc_t *dc = (dynlist_cc_t *)op->o_callback; + AttributeAssertion *ava = dc->dc_ava; + Attribute *a = attrs_find( rs->sr_entry->e_attrs, ava->aa_desc ); + + if ( a != NULL ) { + while ( LDAP_SUCCESS != attr_valfind( a, + SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH | + SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH, + &ava->aa_value, NULL, op->o_tmpmemctx ) + && (a = attrs_find( a->a_next, ava->aa_desc )) != NULL ) + ; + *dc->dc_res = a ? LDAP_COMPARE_TRUE : LDAP_COMPARE_FALSE; + } } return 0; @@ -626,13 +637,14 @@ dynlist_compare( Operation *op, SlapReply *rs ) Operation o = *op; Entry *e = NULL; dynlist_map_t *dlm; + BackendDB *be; for ( ; dli != NULL; dli = dli->dli_next ) { for ( dlm = dli->dli_dlm; dlm; dlm = dlm->dlm_next ) if ( op->oq_compare.rs_ava->aa_desc == dlm->dlm_member_ad ) break; - if ( dli->dli_dlm && dlm ) { + if ( dlm ) { /* This compare is for one of the attributes we're * interested in. We'll use slapd's existing dyngroup * evaluator to get the answer we want. @@ -690,12 +702,26 @@ done:; } } + be = select_backend( &o.o_req_ndn, 1 ); + if ( !be || !be->be_search ) { + return SLAP_CB_CONTINUE; + } + if ( overlay_entry_get_ov( &o, &o.o_req_ndn, NULL, NULL, 0, &e, on ) != LDAP_SUCCESS || e == NULL ) { return SLAP_CB_CONTINUE; } + /* check for dynlist objectClass; done if not found */ + dli = (dynlist_info_t *)on->on_bi.bi_private; + while ( dli != NULL && !is_entry_objectclass_or_sub( e, dli->dli_oc ) ) { + dli = dli->dli_next; + } + if ( dli == NULL ) { + goto release; + } + if ( ad_dgIdentity ) { Attribute *id = attrs_find( e->e_attrs, ad_dgIdentity ); if ( id ) { @@ -719,37 +745,21 @@ done:; } } - dli = (dynlist_info_t *)on->on_bi.bi_private; - for ( ; dli != NULL && rs->sr_err != LDAP_COMPARE_TRUE; dli = dli->dli_next ) { - Attribute *a; - slap_callback cb; + /* generate dynamic list with dynlist_response() and compare */ + { SlapReply r = { REP_SEARCH }; + dynlist_cc_t dc = { { 0, dynlist_sc_compare_entry, 0, 0 }, 0 }; AttributeName an[2]; - int rc; - dynlist_sc_t dlc = { 0 }; - if ( !is_entry_objectclass_or_sub( e, dli->dli_oc )) - continue; - - /* if the entry has the right objectClass, generate - * the dynamic list and compare */ - dlc.dlc_dli = dli; - cb.sc_private = &dlc; - cb.sc_response = dynlist_sc_save_entry; - cb.sc_cleanup = NULL; - cb.sc_next = NULL; - o.o_callback = &cb; + dc.dc_ava = op->orc_ava; + dc.dc_res = &rs->sr_err; + o.o_callback = (slap_callback *) &dc; o.o_tag = LDAP_REQ_SEARCH; o.ors_limit = NULL; o.ors_tlimit = SLAP_NO_LIMIT; o.ors_slimit = SLAP_NO_LIMIT; - o.o_bd = select_backend( &o.o_req_ndn, 1 ); - if ( !o.o_bd || !o.o_bd->be_search ) { - goto release; - } - o.ors_filterstr = *slap_filterstr_objectClass_pres; o.ors_filter = (Filter *) slap_filter_objectClass_pres; @@ -763,50 +773,17 @@ done:; o.o_acl_priv = ACL_COMPARE; - rc = o.o_bd->be_search( &o, &r ); + o.o_bd = be; + (void)be->be_search( &o, &r ); if ( o.o_dn.bv_val != op->o_dn.bv_val ) { slap_op_groups_free( &o ); } - - if ( rc != 0 ) { - goto release; - } - - if ( dlc.dlc_e != NULL ) { - r.sr_entry = dlc.dlc_e; - } - - if ( r.sr_err != LDAP_SUCCESS || r.sr_entry == NULL ) { - /* error? */ - goto release; - } - - for ( a = attrs_find( r.sr_entry->e_attrs, op->orc_ava->aa_desc ); - a != NULL; - a = attrs_find( a->a_next, op->orc_ava->aa_desc ) ) - { - /* if we're here, we got a match... */ - rs->sr_err = LDAP_COMPARE_FALSE; - - if ( attr_valfind( a, - SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH | - SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH, - &op->orc_ava->aa_value, NULL, op->o_tmpmemctx ) == 0 ) - { - rs->sr_err = LDAP_COMPARE_TRUE; - break; - } - } - - if ( r.sr_flags & REP_ENTRY_MUSTBEFREED ) { - entry_free( r.sr_entry ); - } } release:; if ( e != NULL ) { - overlay_entry_release_ov( op, e, 0, on ); + overlay_entry_release_ov( &o, e, 0, on ); } return SLAP_CB_CONTINUE; @@ -815,24 +792,18 @@ release:; static int dynlist_response( Operation *op, SlapReply *rs ) { - dynlist_info_t *dli; - switch ( op->o_tag ) { case LDAP_REQ_SEARCH: if ( rs->sr_type == REP_SEARCH && !get_manageDSAit( op ) ) { - int rc = LDAP_OTHER; + int rc = SLAP_CB_CONTINUE; + dynlist_info_t *dli = NULL; - for ( dli = dynlist_is_dynlist_next( op, rs, NULL ); - dli; - dli = dynlist_is_dynlist_next( op, rs, dli ) ) - { + while ( (dli = dynlist_is_dynlist_next( op, rs, dli )) != NULL ) { rc = dynlist_prepare_entry( op, rs, dli ); } - if ( rc != LDAP_OTHER ) { - return rc; - } + return rc; } break; @@ -851,9 +822,6 @@ dynlist_response( Operation *op, SlapReply *rs ) return dynlist_compare( op, rs ); } break; - - default: - break; } return SLAP_CB_CONTINUE; @@ -877,261 +845,11 @@ dynlist_build_def_filter( dynlist_info_t *dli ) ptr = lutil_strcopy( ptr, dli->dli_oc->soc_cname.bv_val ); ptr = lutil_strcopy( ptr, "))" ); - assert( dli->dli_default_filter.bv_len == ptr - dli->dli_default_filter.bv_val ); + assert( ptr == &dli->dli_default_filter.bv_val[dli->dli_default_filter.bv_len] ); return 0; } -#ifdef OL_2_2_COMPAT -static int -dynlist_db_config( - BackendDB *be, - const char *fname, - int lineno, - int argc, - char **argv ) -{ - slap_overinst *on = (slap_overinst *)be->bd_info; - - int rc = 0; - - if ( strcasecmp( argv[0], "dynlist-attrset" ) == 0 ) { - dynlist_info_t **dlip; - ObjectClass *oc; - AttributeDescription *ad = NULL, - *member_ad = NULL; - dynlist_map_t *dlm = NULL; - const char *text; - - if ( argc < 3 ) { - Debug( LDAP_DEBUG_ANY, "%s: line %d: " DYNLIST_USAGE - "invalid arg number #%d.\n", - fname, lineno, argc ); - return 1; - } - - oc = oc_find( argv[1] ); - if ( oc == NULL ) { - Debug( LDAP_DEBUG_ANY, "%s: line %d: " DYNLIST_USAGE - "unable to find ObjectClass \"%s\"\n", - fname, lineno, argv[ 1 ] ); - return 1; - } - - rc = slap_str2ad( argv[2], &ad, &text ); - if ( rc != LDAP_SUCCESS ) { - Debug( LDAP_DEBUG_ANY, "%s: line %d: " DYNLIST_USAGE - "unable to find AttributeDescription \"%s\"\n", - fname, lineno, argv[2] ); - return 1; - } - - if ( !is_at_subtype( ad->ad_type, slap_schema.si_ad_labeledURI->ad_type ) ) { - Debug( LDAP_DEBUG_ANY, "%s: line %d: " DYNLIST_USAGE - "AttributeDescription \"%s\" " - "must be a subtype of \"labeledURI\"\n", - fname, lineno, argv[2] ); - return 1; - } - - for ( i = 3; i < argc; i++ ) { - char *arg; - char *cp; - AttributeDescription *member_ad = NULL; - AttributeDescription *mapped_ad = NULL; - dynlist_map_t *dlmp; - dynlist_map_t *dlml; - - - /* - * If no mapped attribute is given, dn is used - * for backward compatibility. - */ - arg = argv[i]; - if ( cp = strchr( arg, (int)':' ) != NULL ) { - struct berval bv; - ber_str2bv( arg, cp - arg, 0, &bv ); - rc = slap_bv2ad( &bv, &mapped_ad, &text ); - if ( rc != LDAP_SUCCESS ) { - Debug( LDAP_DEBUG_ANY, "%s: line %d: " - DYNLIST_USAGE - "unable to find mapped AttributeDescription \"%s\"\n", - fname, lineno, arg ); - return 1; - } - - arg = cp + 1; - } - - rc = slap_str2ad( arg, &member_ad, &text ); - if ( rc != LDAP_SUCCESS ) { - Debug( LDAP_DEBUG_ANY, "%s: line %d: " - DYNLIST_USAGE - "unable to find AttributeDescription \"%s\"\n", - fname, lineno, arg ); - return 1; - } - - dlmp = (dynlist_map_t *)ch_calloc( 1, sizeof( dynlist_map_t ) ); - if ( dlm == NULL ) { - dlm = dlmp; - dlml = NULL; - } - dlmp->dlm_member_ad = member_ad; - dlmp->dlm_mapped_ad = mapped_ad; - dlmp->dlm_next = NULL; - - if ( dlml != NULL ) - dlml->dlm_next = dlmp; - dlml = dlmp; - } - - for ( dlip = (dynlist_info_t **)&on->on_bi.bi_private; - *dlip; dlip = &(*dlip)->dli_next ) - { - /* - * The same URL attribute / member attribute pair - * cannot be repeated, but we enforce this only - * when the member attribute is unique. Performing - * the check for multiple values would require - * sorting and comparing the lists, which is left - * as a future improvement - */ - if ( (*dlip)->dli_ad == ad && - (*dlip)->dli_dlm->dlm_next == NULL && - dlm->dlm_next == NULL && - dlm->dlm_member_ad == (*dlip)->dli_dlm->dlm_member_ad && - dlm->dlm_mapped_ad == (*dlip)->dli_dlm->dlm_mapped_ad ) { - Debug( LDAP_DEBUG_ANY, "%s: line %d: " - DYNLIST_USAGE - "URL attributeDescription \"%s\" already mapped.\n", - fname, lineno, ad->ad_cname.bv_val ); -#if 0 - /* make it a warning... */ - return 1; -#endif - } - } - - *dlip = (dynlist_info_t *)ch_calloc( 1, sizeof( dynlist_info_t ) ); - (*dlip)->dli_oc = oc; - (*dlip)->dli_ad = ad; - (*dlip)->dli_dlm = dlm; - - if ( dynlist_build_def_filter( *dlip ) ) { - dynlist_map_t *dlm = (*dlip)->ldi_dlm; - dynlist_map_t *dlm_next; - - while ( dlm != NULL ) { - dlm_next = dlm->dlm_next; - ch_free( dlm ); - dlm = dlm_next; - } - - ch_free( *dlip ); - *dlip = NULL; - return 1; - } - - /* allow dyngroup syntax */ - } else if ( strcasecmp( argv[0], "dynlist-attrpair" ) == 0 ) { - dynlist_info_t **dlip; - ObjectClass *oc; - AttributeDescription *ad = NULL, - *member_ad = NULL; - const char *text; - - if ( argc != 3 ) { - Debug( LDAP_DEBUG_ANY, "%s: line %d: " - "\"dynlist-attrpair \": " - "invalid arg number #%d.\n", - fname, lineno, argc ); - return 1; - } - - oc = oc_find( "groupOfURLs" ); - if ( oc == NULL ) { - Debug( LDAP_DEBUG_ANY, "%s: line %d: " - "\"dynlist-attrpair \": " - "unable to find default ObjectClass \"groupOfURLs\"\n", - fname, lineno, 0 ); - return 1; - } - - rc = slap_str2ad( argv[1], &member_ad, &text ); - if ( rc != LDAP_SUCCESS ) { - Debug( LDAP_DEBUG_ANY, "%s: line %d: " - "\"dynlist-attrpair \": " - "unable to find AttributeDescription \"%s\"\n", - fname, lineno, argv[1] ); - return 1; - } - - rc = slap_str2ad( argv[2], &ad, &text ); - if ( rc != LDAP_SUCCESS ) { - Debug( LDAP_DEBUG_ANY, "%s: line %d: " - "\"dynlist-attrpair \": " - "unable to find AttributeDescription \"%s\"\n", - fname, lineno, argv[2] ); - return 1; - } - - if ( !is_at_subtype( ad->ad_type, slap_schema.si_ad_labeledURI->ad_type ) ) { - Debug( LDAP_DEBUG_ANY, "%s: line %d: " - "\"dynlist-attrpair \": " - "AttributeDescription \"%s\" " - "must be a subtype of \"labeledURI\"\n", - fname, lineno, argv[2] ); - return 1; - } - - for ( dlip = (dynlist_info_t **)&on->on_bi.bi_private; - *dlip; dlip = &(*dlip)->dli_next ) - { - /* - * The same URL attribute / member attribute pair - * cannot be repeated, but we enforce this only - * when the member attribute is unique. Performing - * the check for multiple values would require - * sorting and comparing the lists, which is left - * as a future improvement - */ - if ( (*dlip)->dli_ad == ad && - (*dlip)->dli_dlm->dlm_next == NULL && - member_ad == (*dlip)->dli_dlm->dlm_member_ad ) { - Debug( LDAP_DEBUG_ANY, "%s: line %d: " - "\"dynlist-attrpair \": " - "URL attributeDescription \"%s\" already mapped.\n", - fname, lineno, ad->ad_cname.bv_val ); -#if 0 - /* make it a warning... */ - return 1; -#endif - } - } - - *dlip = (dynlist_info_t *)ch_calloc( 1, sizeof( dynlist_info_t ) ); - (*dlip)->dli_oc = oc; - (*dlip)->dli_ad = ad; - (*dlip)->dli_dlm = (dynlist_map_t *)ch_calloc( 1, sizeof( dynlist_map_t ) ); - (*dlip)->dli_dlm->dlm_member_ad = member_ad; - (*dlip)->dli_dlm->dlm_mapped_ad = NULL; - - if ( dynlist_build_def_filter( *dlip ) ) { - ch_free( (*dlip)->dli_dlm ); - ch_free( *dlip ); - *dlip = NULL; - return 1; - } - - } else { - rc = SLAP_CONF_UNKNOWN; - } - - return rc; -} - -#else enum { DL_ATTRSET = 1, DL_ATTRPAIR, @@ -1143,9 +861,9 @@ static ConfigDriver dl_cfgen; /* XXXmanu 255 is the maximum arguments we allow. Can we go beyond? */ static ConfigTable dlcfg[] = { - { "dynlist-attrset", "group-oc> [uri] <[mapped:]member-ad> [...]", + 3, 0, 0, ARG_MAGIC|DL_ATTRSET, dl_cfgen, + "( OLcfgOvAt:8.1 NAME 'olcDlAttrSet' " "DESC 'Dynamic list: , , ' " "EQUALITY caseIgnoreMatch " "SYNTAX OMsDirectoryString " @@ -1191,10 +909,22 @@ dl_cfgen( ConfigArgs *c ) assert( dli->dli_oc != NULL ); assert( dli->dli_ad != NULL ); + /* FIXME: check buffer overflow! */ ptr += snprintf( c->cr_msg, sizeof( c->cr_msg ), - SLAP_X_ORDERED_FMT "%s %s", i, - dli->dli_oc->soc_cname.bv_val, - dli->dli_ad->ad_cname.bv_val ); + SLAP_X_ORDERED_FMT "%s", i, + dli->dli_oc->soc_cname.bv_val ); + + if ( !BER_BVISNULL( &dli->dli_uri ) ) { + *ptr++ = ' '; + *ptr++ = '"'; + ptr = lutil_strncopy( ptr, dli->dli_uri.bv_val, + dli->dli_uri.bv_len ); + *ptr++ = '"'; + } + + *ptr++ = ' '; + ptr = lutil_strncopy( ptr, dli->dli_ad->ad_cname.bv_val, + dli->dli_ad->ad_cname.bv_len ); for ( dlm = dli->dli_dlm; dlm; dlm = dlm->dlm_next ) { ptr[ 0 ] = ' '; @@ -1238,6 +968,22 @@ dl_cfgen( ConfigArgs *c ) dli_next = dli->dli_next; + if ( !BER_BVISNULL( &dli->dli_uri ) ) { + ch_free( dli->dli_uri.bv_val ); + } + + if ( dli->dli_lud != NULL ) { + ldap_free_urldesc( dli->dli_lud ); + } + + if ( !BER_BVISNULL( &dli->dli_uri_nbase ) ) { + ber_memfree( dli->dli_uri_nbase.bv_val ); + } + + if ( dli->dli_uri_filter != NULL ) { + filter_free( dli->dli_uri_filter ); + } + ch_free( dli->dli_default_filter.bv_val ); while ( dlm != NULL ) { @@ -1266,6 +1012,23 @@ dl_cfgen( ConfigArgs *c ) dli = *dlip; *dlip = dli->dli_next; + + if ( !BER_BVISNULL( &dli->dli_uri ) ) { + ch_free( dli->dli_uri.bv_val ); + } + + if ( dli->dli_lud != NULL ) { + ldap_free_urldesc( dli->dli_lud ); + } + + if ( !BER_BVISNULL( &dli->dli_uri_nbase ) ) { + ber_memfree( dli->dli_uri_nbase.bv_val ); + } + + if ( dli->dli_uri_filter != NULL ) { + filter_free( dli->dli_uri_filter ); + } + ch_free( dli->dli_default_filter.bv_val ); dlm = dli->dli_dlm; @@ -1299,7 +1062,12 @@ dl_cfgen( ConfigArgs *c ) *dli_next = NULL; ObjectClass *oc = NULL; AttributeDescription *ad = NULL; - dynlist_map_t *dlm = NULL; + int attridx = 2; + LDAPURLDesc *lud = NULL; + struct berval nbase = BER_BVNULL; + Filter *filter = NULL; + struct berval uri = BER_BVNULL; + dynlist_map_t *dlm = NULL, *dlml = NULL; const char *text; oc = oc_find( c->argv[ 1 ] ); @@ -1312,11 +1080,98 @@ dl_cfgen( ConfigArgs *c ) return 1; } - rc = slap_str2ad( c->argv[ 2 ], &ad, &text ); + if ( strncasecmp( c->argv[ attridx ], "ldap://", STRLENOF("ldap://") ) == 0 ) { + if ( ldap_url_parse( c->argv[ attridx ], &lud ) != LDAP_URL_SUCCESS ) { + snprintf( c->cr_msg, sizeof( c->cr_msg ), DYNLIST_USAGE + "unable to parse URI \"%s\"", + c->argv[ attridx ] ); + rc = 1; + goto done_uri; + } + + if ( lud->lud_host != NULL ) { + if ( lud->lud_host[0] == '\0' ) { + ch_free( lud->lud_host ); + lud->lud_host = NULL; + + } else { + snprintf( c->cr_msg, sizeof( c->cr_msg ), DYNLIST_USAGE + "host not allowed in URI \"%s\"", + c->argv[ attridx ] ); + rc = 1; + goto done_uri; + } + } + + if ( lud->lud_attrs != NULL ) { + snprintf( c->cr_msg, sizeof( c->cr_msg ), DYNLIST_USAGE + "attrs not allowed in URI \"%s\"", + c->argv[ attridx ] ); + rc = 1; + goto done_uri; + } + + if ( lud->lud_exts != NULL ) { + snprintf( c->cr_msg, sizeof( c->cr_msg ), DYNLIST_USAGE + "extensions not allowed in URI \"%s\"", + c->argv[ attridx ] ); + rc = 1; + goto done_uri; + } + + if ( lud->lud_dn != NULL && lud->lud_dn[ 0 ] != '\0' ) { + struct berval dn; + ber_str2bv( lud->lud_dn, 0, 0, &dn ); + rc = dnNormalize( 0, NULL, NULL, &dn, &nbase, NULL ); + if ( rc != LDAP_SUCCESS ) { + snprintf( c->cr_msg, sizeof( c->cr_msg ), DYNLIST_USAGE + "DN normalization failed in URI \"%s\"", + c->argv[ attridx ] ); + goto done_uri; + } + } + + if ( lud->lud_filter != NULL && lud->lud_filter[ 0 ] != '\0' ) { + filter = str2filter( lud->lud_filter ); + if ( filter == NULL ) { + snprintf( c->cr_msg, sizeof( c->cr_msg ), DYNLIST_USAGE + "filter parsing failed in URI \"%s\"", + c->argv[ attridx ] ); + rc = 1; + goto done_uri; + } + } + + ber_str2bv( c->argv[ attridx ], 0, 1, &uri ); + +done_uri:; + if ( rc ) { + if ( lud ) { + ldap_free_urldesc( lud ); + } + + if ( !BER_BVISNULL( &nbase ) ) { + ber_memfree( nbase.bv_val ); + } + + if ( filter != NULL ) { + filter_free( filter ); + } + + Debug( LDAP_DEBUG_ANY, "%s: %s.\n", + c->log, c->cr_msg, 0 ); + + return rc; + } + + attridx++; + } + + rc = slap_str2ad( c->argv[ attridx ], &ad, &text ); if ( rc != LDAP_SUCCESS ) { snprintf( c->cr_msg, sizeof( c->cr_msg ), DYNLIST_USAGE "unable to find AttributeDescription \"%s\"", - c->argv[ 2 ] ); + c->argv[ attridx ] ); Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 ); return 1; @@ -1326,19 +1181,20 @@ dl_cfgen( ConfigArgs *c ) snprintf( c->cr_msg, sizeof( c->cr_msg ), DYNLIST_USAGE "AttributeDescription \"%s\" " "must be a subtype of \"labeledURI\"", - c->argv[ 2 ] ); + c->argv[ attridx ] ); Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 ); return 1; } - for ( i = 3; i < c->argc; i++ ) { + attridx++; + + for ( i = attridx; i < c->argc; i++ ) { char *arg; char *cp; AttributeDescription *member_ad = NULL; AttributeDescription *mapped_ad = NULL; dynlist_map_t *dlmp; - dynlist_map_t *dlml; /* @@ -1376,7 +1232,6 @@ dl_cfgen( ConfigArgs *c ) dlmp = (dynlist_map_t *)ch_calloc( 1, sizeof( dynlist_map_t ) ); if ( dlm == NULL ) { dlm = dlmp; - dlml = NULL; } dlmp->dlm_member_ad = member_ad; dlmp->dlm_mapped_ad = mapped_ad; @@ -1419,6 +1274,11 @@ dl_cfgen( ConfigArgs *c ) (*dlip)->dli_dlm = dlm; (*dlip)->dli_next = dli_next; + (*dlip)->dli_lud = lud; + (*dlip)->dli_uri_nbase = nbase; + (*dlip)->dli_uri_filter = filter; + (*dlip)->dli_uri = uri; + rc = dynlist_build_def_filter( *dlip ); } break; @@ -1526,7 +1386,6 @@ dl_cfgen( ConfigArgs *c ) return rc; } -#endif static int dynlist_db_open( @@ -1625,7 +1484,24 @@ dynlist_db_destroy( dli_next = dli->dli_next; + if ( !BER_BVISNULL( &dli->dli_uri ) ) { + ch_free( dli->dli_uri.bv_val ); + } + + if ( dli->dli_lud != NULL ) { + ldap_free_urldesc( dli->dli_lud ); + } + + if ( !BER_BVISNULL( &dli->dli_uri_nbase ) ) { + ber_memfree( dli->dli_uri_nbase.bv_val ); + } + + if ( dli->dli_uri_filter != NULL ) { + filter_free( dli->dli_uri_filter ); + } + ch_free( dli->dli_default_filter.bv_val ); + dlm = dli->dli_dlm; while ( dlm != NULL ) { dlm_next = dlm->dlm_next; @@ -1653,9 +1529,7 @@ static int dynlist_initialize(void) { -#ifndef OL_2_2_COMPAT int rc = 0; -#endif dynlist.on_bi.bi_type = "dynlist"; @@ -1664,24 +1538,18 @@ dynlist_initialize(void) dynlist.on_bi.bi_obsolete_names = obsolete_names; #endif -#ifdef OL_2_2_COMPAT - dynlist.on_bi.bi_db_config = dynlist_db_config; -#else dynlist.on_bi.bi_db_config = config_generic_wrapper; -#endif dynlist.on_bi.bi_db_open = dynlist_db_open; dynlist.on_bi.bi_db_destroy = dynlist_db_destroy; dynlist.on_response = dynlist_response; -#ifndef OL_2_2_COMPAT dynlist.on_bi.bi_cf_ocs = dlocs; rc = config_register_schema( dlcfg, dlocs ); if ( rc ) { return rc; } -#endif return overlay_register( &dynlist ); }