X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-meta%2Fadd.c;h=03187a90e6e7cc75ebfa960f5aafb27f28cd5582;hb=9b1a8c1d0ab69579112e8ebe5d1db343cf3c3cce;hp=2cf5cb4961baefdbed60ea2fd974b51914f35b0e;hpb=dfbbd11bd3d74f889deef1b805e89d7e39f31173;p=openldap diff --git a/servers/slapd/back-meta/add.c b/servers/slapd/back-meta/add.c index 2cf5cb4961..03187a90e6 100644 --- a/servers/slapd/back-meta/add.c +++ b/servers/slapd/back-meta/add.c @@ -1,67 +1,23 @@ -/* - * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file +/* $OpenLDAP$ */ +/* This work is part of OpenLDAP Software . * - * Copyright 2001, Pierangelo Masarati, All rights reserved. + * Copyright 1999-2006 The OpenLDAP Foundation. + * Portions Copyright 2001-2003 Pierangelo Masarati. + * Portions Copyright 1999-2003 Howard Chu. + * All rights reserved. * - * This work has been developed to fulfill the requirements - * of SysNet s.n.c. and it has been donated - * to the OpenLDAP Foundation in the hope that it may be useful - * to the Open Source community, but WITHOUT ANY WARRANTY. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. * - * Permission is granted to anyone to use this software for any purpose - * on any computer system, and to alter it and redistribute it, subject - * to the following restrictions: - * - * 1. The author and SysNet s.n.c. are not responsible for the consequences - * of use of this software, no matter how awful, even if they arise from - * flaws in it. - * - * 2. The origin of this software must not be misrepresented, either by - * explicit claim or by omission. Since few users ever read sources, - * credits should appear in the documentation. - * - * 3. Altered versions must be plainly marked as such, and must not be - * misrepresented as being the original software. Since few users - * ever read sources, credits should appear in the documentation. - * SysNet s.n.c. cannot be responsible for the consequences of the - * alterations. - * - * 4. This notice may not be removed or altered. - * - * - * This software is based on the backend back-ldap, implemented - * by Howard Chu , and modified by Mark Valence - * , Pierangelo Masarati and other - * contributors. The contribution of the original software to the present - * implementation is acknowledged in this copyright statement. - * - * A special acknowledgement goes to Howard for the overall architecture - * (and for borrowing large pieces of code), and to Mark, who implemented - * from scratch the attribute/objectclass mapping. - * - * The original copyright statement follows. - * - * Copyright 1999, Howard Chu, All rights reserved. - * - * Permission is granted to anyone to use this software for any purpose - * on any computer system, and to alter it and redistribute it, subject - * to the following restrictions: - * - * 1. The author is not responsible for the consequences of use of this - * software, no matter how awful, even if they arise from flaws in it. - * - * 2. The origin of this software must not be misrepresented, either by - * explicit claim or by omission. Since few users ever read sources, - * credits should appear in the documentation. - * - * 3. Altered versions must be plainly marked as such, and must not be - * misrepresented as being the original software. Since few users - * ever read sources, credits should appear in the - * documentation. - * - * 4. This notice may not be removed or altered. - * + * A copy of this license is available in the file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * . + */ +/* ACKNOWLEDGEMENTS: + * This work was initially developed by the Howard Chu for inclusion + * in OpenLDAP Software and subsequently enhanced by Pierangelo + * Masarati. */ @@ -79,90 +35,71 @@ int meta_back_add( Operation *op, SlapReply *rs ) { - struct metainfo *li = ( struct metainfo * )op->o_bd->be_private; - struct metaconn *lc; - int i, candidate = -1; - Attribute *a; - LDAPMod **attrs; - struct berval mdn = { 0, NULL }, mapped; - -#ifdef NEW_LOGGING - LDAP_LOG( BACK_META, ENTRY, "meta_back_add: %s\n", - op->o_req_dn.bv_val, 0, 0 ); -#else /* !NEW_LOGGING */ + metainfo_t *mi = ( metainfo_t * )op->o_bd->be_private; + metaconn_t *mc; + int i, candidate = -1; + int isupdate; + Attribute *a; + LDAPMod **attrs; + struct berval mdn = BER_BVNULL, mapped; + dncookie dc; + int msgid; + int do_retry = 1; + Debug(LDAP_DEBUG_ARGS, "==> meta_back_add: %s\n", op->o_req_dn.bv_val, 0, 0 ); -#endif /* !NEW_LOGGING */ /* * get the current connection */ - lc = meta_back_getconn( op, rs, META_OP_REQUIRE_SINGLE, - &op->o_req_ndn, &candidate ); - if ( !lc ) { - send_ldap_result( op, rs ); + mc = meta_back_getconn( op, rs, &candidate, LDAP_BACK_SENDERR ); + if ( !mc || !meta_back_dobind( op, rs, mc, LDAP_BACK_SENDERR ) ) { + return rs->sr_err; } - if ( !meta_back_dobind( lc, op ) - || !meta_back_is_valid( lc, candidate ) ) { - rs->sr_err = LDAP_OTHER; - send_ldap_result( op, rs ); - return -1; - } + assert( mc->mc_conns[ candidate ].msc_ld != NULL ); /* * Rewrite the add dn, if needed */ - switch ( rewrite_session( li->targets[ candidate ]->rwinfo, - "addDn", op->o_req_dn.bv_val, op->o_conn, - &mdn.bv_val ) ) { - case REWRITE_REGEXEC_OK: - if ( mdn.bv_val != NULL && mdn.bv_val[ 0 ] != '\0' ) { - mdn.bv_len = strlen( mdn.bv_val ); - } else { - mdn = op->o_req_dn; - } + dc.target = &mi->mi_targets[ candidate ]; + dc.conn = op->o_conn; + dc.rs = rs; + dc.ctx = "addDN"; -#ifdef NEW_LOGGING - LDAP_LOG( BACK_META, DETAIL1, - "[rw] addDn: \"%s\" -> \"%s\"\n", - op->o_req_dn.bv_val, mdn.bv_val, 0 ); -#else /* !NEW_LOGGING */ - Debug( LDAP_DEBUG_ARGS, "rw> addDn: \"%s\" -> \"%s\"\n", - op->o_req_dn.bv_val, mdn.bv_val, 0 ); -#endif /* !NEW_LOGGING */ - break; - - case REWRITE_REGEXEC_UNWILLING: - rs->sr_err = LDAP_UNWILLING_TO_PERFORM; - rs->sr_text = "Operation not allowed"; - send_ldap_result( op, rs ); - return -1; - - case REWRITE_REGEXEC_ERR: - rs->sr_err = LDAP_OTHER; - rs->sr_text = "Rewrite error"; - send_ldap_result( op, rs ); - return -1; + if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) { + send_ldap_result( op, rs ); + goto done; } - /* Count number of attributes in entry */ - for ( i = 1, a = op->oq_add.rs_e->e_attrs; a; i++, a = a->a_next ); + /* Count number of attributes in entry ( +1 ) */ + for ( i = 1, a = op->ora_e->e_attrs; a; i++, a = a->a_next ); /* Create array of LDAPMods for ldap_add() */ attrs = ch_malloc( sizeof( LDAPMod * )*i ); - for ( i = 0, a = op->oq_add.rs_e->e_attrs; a; a = a->a_next ) { - int j; + dc.ctx = "addAttrDN"; + isupdate = be_shadow_update( op ); + for ( i = 0, a = op->ora_e->e_attrs; a; a = a->a_next ) { + int j, is_oc = 0; - if ( a->a_desc->ad_type->sat_no_user_mod ) { + if ( !isupdate && !get_manageDIT( op ) && a->a_desc->ad_type->sat_no_user_mod ) + { continue; } - ldap_back_map( &li->targets[ candidate ]->at_map, - &a->a_desc->ad_cname, &mapped, BACKLDAP_MAP ); - if ( mapped.bv_val == NULL || mapped.bv_val[0] == '\0' ) { - continue; + if ( a->a_desc == slap_schema.si_ad_objectClass + || a->a_desc == slap_schema.si_ad_structuralObjectClass ) + { + is_oc = 1; + mapped = a->a_desc->ad_cname; + + } else { + ldap_back_map( &mi->mi_targets[ candidate ].mt_rwmap.rwm_at, + &a->a_desc->ad_cname, &mapped, BACKLDAP_MAP ); + if ( BER_BVISNULL( &mapped ) || BER_BVISEMPTY( &mapped ) ) { + continue; + } } attrs[ i ] = ch_malloc( sizeof( LDAPMod ) ); @@ -172,36 +109,130 @@ meta_back_add( Operation *op, SlapReply *rs ) attrs[ i ]->mod_op = LDAP_MOD_BVALUES; attrs[ i ]->mod_type = mapped.bv_val; - /* - * FIXME: dn-valued attrs should be rewritten - * to allow their use in ACLs at the back-ldap - * level. - */ - if ( strcmp( a->a_desc->ad_type->sat_syntax->ssyn_oid, - SLAPD_DN_SYNTAX ) == 0 ) { - ldap_dnattr_rewrite( li->targets[ candidate ]->rwinfo, - a->a_vals, op->o_conn ); - } + if ( is_oc ) { + for ( j = 0; !BER_BVISNULL( &a->a_vals[ j ] ); j++ ) + ; + + attrs[ i ]->mod_bvalues = + (struct berval **)ch_malloc( ( j + 1 ) * + sizeof( struct berval * ) ); + + for ( j = 0; !BER_BVISNULL( &a->a_vals[ j ] ); ) { + struct ldapmapping *mapping; + + ldap_back_mapping( &mi->mi_targets[ candidate ].mt_rwmap.rwm_oc, + &a->a_vals[ j ], &mapping, BACKLDAP_MAP ); + + if ( mapping == NULL ) { + if ( mi->mi_targets[ candidate ].mt_rwmap.rwm_oc.drop_missing ) { + continue; + } + attrs[ i ]->mod_bvalues[ j ] = &a->a_vals[ j ]; - for ( j = 0; a->a_vals[ j ].bv_val; j++ ); - attrs[ i ]->mod_vals.modv_bvals = ch_malloc((j+1)*sizeof(struct berval *)); - for ( j = 0; a->a_vals[ j ].bv_val; j++ ) { - attrs[ i ]->mod_vals.modv_bvals[ j ] = &a->a_vals[ j ]; + } else { + attrs[ i ]->mod_bvalues[ j ] = &mapping->dst; + } + j++; + } + attrs[ i ]->mod_bvalues[ j ] = NULL; + + } else { + /* + * FIXME: dn-valued attrs should be rewritten + * to allow their use in ACLs at the back-ldap + * level. + */ + if ( a->a_desc->ad_type->sat_syntax == + slap_schema.si_syn_distinguishedName ) + { + (void)ldap_dnattr_rewrite( &dc, a->a_vals ); + if ( a->a_vals == NULL ) { + continue; + } + } + + for ( j = 0; !BER_BVISNULL( &a->a_vals[ j ] ); j++ ) + ; + + attrs[ i ]->mod_bvalues = ch_malloc( ( j + 1 ) * sizeof( struct berval * ) ); + for ( j = 0; !BER_BVISNULL( &a->a_vals[ j ] ); j++ ) { + attrs[ i ]->mod_bvalues[ j ] = &a->a_vals[ j ]; + } + attrs[ i ]->mod_bvalues[ j ] = NULL; } - attrs[ i ]->mod_vals.modv_bvals[ j ] = NULL; i++; } attrs[ i ] = NULL; - ldap_add_s( lc->conns[ candidate ].ld, mdn.bv_val, attrs ); +retry:; + rs->sr_err = ldap_add_ext( mc->mc_conns[ candidate ].msc_ld, mdn.bv_val, + attrs, op->o_ctrls, NULL, &msgid ); + if ( rs->sr_err == LDAP_UNAVAILABLE && do_retry ) { + do_retry = 0; + if ( meta_back_retry( op, rs, &mc, candidate, LDAP_BACK_SENDERR ) ) { + goto retry; + } + goto cleanup; + + } else if ( rs->sr_err == LDAP_SUCCESS ) { + struct timeval tv, *tvp = NULL; + LDAPMessage *res = NULL; + int rc; + + if ( mi->mi_targets[ candidate ].mt_timeout[ LDAP_BACK_OP_ADD ] != 0 ) { + tv.tv_sec = mi->mi_targets[ candidate ].mt_timeout[ LDAP_BACK_OP_ADD ]; + tv.tv_usec = 0; + tvp = &tv; + } + + rs->sr_err = LDAP_OTHER; + rc = ldap_result( mc->mc_conns[ candidate ].msc_ld, + msgid, LDAP_MSG_ALL, tvp, &res ); + switch ( rc ) { + case -1: + send_ldap_result( op, rs ); + goto cleanup; + + case 0: + ldap_abandon_ext( mc->mc_conns[ candidate ].msc_ld, + msgid, NULL, NULL ); + rs->sr_err = op->o_protocol >= LDAP_VERSION3 ? + LDAP_ADMINLIMIT_EXCEEDED : LDAP_OPERATIONS_ERROR; + send_ldap_result( op, rs ); + goto cleanup; + + case LDAP_RES_ADD: + rc = ldap_parse_result( mc->mc_conns[ candidate ].msc_ld, + res, &rs->sr_err, NULL, NULL, NULL, NULL, 1 ); + if ( rc != LDAP_SUCCESS ) { + rs->sr_err = rc; + } + break; + + default: + ldap_msgfree( res ); + break; + } + } + + (void)meta_back_op_result( mc, op, rs, candidate ); + +cleanup:; for ( --i; i >= 0; --i ) { - free( attrs[ i ]->mod_vals.modv_bvals ); + free( attrs[ i ]->mod_bvalues ); free( attrs[ i ] ); } free( attrs ); - if ( mdn.bv_val != op->oq_add.rs_e->e_dn ) { + if ( mdn.bv_val != op->ora_e->e_dn ) { free( mdn.bv_val ); + BER_BVZERO( &mdn ); } - return meta_back_op_result( lc, op, rs ); + +done:; + if ( mc ) { + meta_back_release_conn( op, mc ); + } + + return rs->sr_err; }