X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmodrdn.c;h=7c8b4390bfeb8436ac01a9230dfd42e8343cc4aa;hb=08059f1633bfd9d0a709761b026bdb8e4441c6e6;hp=2292789beade64a18981fa747a49a95453e683c7;hpb=2395c6c23cf352c9b8dbedb9cf474be7f8bc64fe;p=openldap diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c index 2292789bea..7c8b4390bf 100644 --- a/servers/slapd/modrdn.c +++ b/servers/slapd/modrdn.c @@ -1,6 +1,6 @@ /* $OpenLDAP$ */ /* - * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* @@ -44,25 +44,32 @@ do_modrdn( Operation *op ) { - char *dn, *ndn, *newrdn; + struct berval dn = { 0, NULL }; + struct berval newrdn = { 0, NULL }; + struct berval newSuperior = { 0, NULL }; ber_int_t deloldrdn; + + struct berval pdn = { 0, NULL }; + struct berval pnewrdn = { 0, NULL }; + struct berval pnewSuperior = { 0, NULL }, *pnewS = NULL; + + struct berval ndn = { 0, NULL }; + struct berval nnewrdn = { 0, NULL }; + struct berval nnewSuperior = { 0, NULL }, *nnewS = NULL; + Backend *be; - /* Vars for LDAP v3 newSuperior support */ - char *newSuperior = NULL; - char *nnewSuperior = NULL; Backend *newSuperior_be = NULL; ber_len_t length; int rc; + const char *text; + int manageDSAit; +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ENTRY, "do_modrdn: begin\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "do_modrdn\n", 0, 0, 0 ); +#endif - if( op->o_bind_in_progress ) { - Debug( LDAP_DEBUG_ANY, "do_modrdn: SASL bind in progress.\n", - 0, 0, 0 ); - send_ldap_result( conn, op, LDAP_SASL_BIND_IN_PROGRESS, - NULL, "SASL bind in progress", NULL, NULL ); - return LDAP_SASL_BIND_IN_PROGRESS; - } /* * Parse the modrdn request. It looks like this: @@ -75,28 +82,18 @@ do_modrdn( * } */ - if ( ber_scanf( op->o_ber, "{aab", &dn, &newrdn, &deloldrdn ) - == LBER_ERROR ) { + if ( ber_scanf( op->o_ber, "{mmb", &dn, &newrdn, &deloldrdn ) + == LBER_ERROR ) + { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, "do_modrdn: ber_scanf failed\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 ); +#endif + send_ldap_disconnect( conn, op, LDAP_PROTOCOL_ERROR, "decoding error" ); - return -1; - } - - ndn = ch_strdup( dn ); - - if( dn_normalize( ndn ) == NULL ) { - Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid dn (%s)\n", dn, 0, 0 ); - send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL, - "invalid DN", NULL, NULL ); - goto cleanup; - } - - if( !rdn_validate( newrdn ) ) { - Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid rdn (%s)\n", newrdn, 0, 0 ); - send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL, - "invalid RDN", NULL, NULL ); - goto cleanup; + return SLAPD_DISCONNECT; } /* Check for newSuperior parameter, if present scan it */ @@ -106,102 +103,228 @@ do_modrdn( /* Conection record indicates v2 but field * newSuperior is present: report error. */ +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, + "do_modrdn: (v2) invalid field newSuperior.\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_ANY, - "modrdn(v2): invalid field newSuperior!\n", - 0, 0, 0 ); + "modrdn(v2): invalid field newSuperior!\n", + 0, 0, 0 ); +#endif + send_ldap_disconnect( conn, op, LDAP_PROTOCOL_ERROR, "newSuperior requires LDAPv3" ); - rc = -1; + rc = SLAPD_DISCONNECT; goto cleanup; } - if ( ber_scanf( op->o_ber, "a", &newSuperior ) + if ( ber_scanf( op->o_ber, "m", &newSuperior ) == LBER_ERROR ) { - Debug( LDAP_DEBUG_ANY, "ber_scanf(\"a\") failed\n", - 0, 0, 0 ); +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, + "do_modrdn: ber_scanf(\"m\") failed\n", 0, 0, 0 ); +#else + Debug( LDAP_DEBUG_ANY, "ber_scanf(\"m\") failed\n", + 0, 0, 0 ); +#endif + send_ldap_disconnect( conn, op, LDAP_PROTOCOL_ERROR, "decoding error" ); - rc = -1; + rc = SLAPD_DISCONNECT; goto cleanup; } - - nnewSuperior = ch_strdup( newSuperior ); - - if( dn_normalize( nnewSuperior ) == NULL ) { - Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid new superior (%s)\n", - newSuperior, 0, 0 ); - send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL, - "invalid (new superior) DN", NULL, NULL ); - goto cleanup; - } - + pnewS = &pnewSuperior; + nnewS = &nnewSuperior; } +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ARGS, + "do_modrdn: dn (%s) newrdn (%s) newsuperior(%s)\n", + dn.bv_val, newrdn.bv_val, + newSuperior.bv_len ? newSuperior.bv_val : "" ); +#else Debug( LDAP_DEBUG_ARGS, "do_modrdn: dn (%s) newrdn (%s) newsuperior (%s)\n", - dn, newrdn, - newSuperior != NULL ? newSuperior : "" ); + dn.bv_val, newrdn.bv_val, + newSuperior.bv_len ? newSuperior.bv_val : "" ); +#endif if ( ber_scanf( op->o_ber, /*{*/ "}") == LBER_ERROR ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, "do_modrdn: ber_scanf failed\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_ANY, "do_modrdn: ber_scanf failed\n", 0, 0, 0 ); +#endif + send_ldap_disconnect( conn, op, - LDAP_PROTOCOL_ERROR, "decoding error" ); - rc = -1; + LDAP_PROTOCOL_ERROR, "decoding error" ); + rc = SLAPD_DISCONNECT; goto cleanup; } if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, "do_modrdn: get_ctrls failed\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_ANY, "do_modrdn: get_ctrls failed\n", 0, 0, 0 ); - /* get_ctrls has sent results. Now clean up. */ +#endif + + /* get_ctrls has sent results. Now clean up. */ goto cleanup; } - Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d MODRDN dn=\"%s\"\n", - op->o_connid, op->o_opid, dn, 0, 0 ); + rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn ); + if( rc != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, INFO, + "do_modrdn: conn %d invalid dn (%s)\n", + conn->c_connid, dn.bv_val, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "do_modrdn: invalid dn (%s)\n", dn.bv_val, 0, 0 ); +#endif + send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL, + "invalid DN", NULL, NULL ); + goto cleanup; + } + + if( ndn.bv_len == 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, + "do_modrdn: attempt to modify root DSE.\n", 0, 0, 0 ); +#else + Debug( LDAP_DEBUG_ANY, "do_modrdn: root dse!\n", 0, 0, 0 ); +#endif + + send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, + NULL, "cannot rename the root DSE", NULL, NULL ); + goto cleanup; + +#ifdef SLAPD_SCHEMA_DN + } else if ( bvmatch( &ndn, &global_schemandn ) ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, + "do_modrdn: attempt to modify subschema subentry: %s (%ld)\n", + global_schemandn.bv_val, (long) global_schemandn.bv_len, 0 ); +#else + Debug( LDAP_DEBUG_ANY, "do_modrdn: subschema subentry: %s (%ld)\n", + global_schemandn.bv_val, (long) global_schemandn.bv_len, 0 ); +#endif + + send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, + NULL, "cannot rename subschema subentry", NULL, NULL ); + goto cleanup; +#endif + } + + /* FIXME: should have/use rdnPretty / rdnNormalize routines */ + + rc = dnPrettyNormal( NULL, &newrdn, &pnewrdn, &nnewrdn ); + if( rc != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, INFO, + "do_modrdn: conn %d invalid newrdn (%s)\n", + conn->c_connid, newrdn.bv_val, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "do_modrdn: invalid newrdn (%s)\n", newrdn.bv_val, 0, 0 ); +#endif + send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL, + "invalid new RDN", NULL, NULL ); + goto cleanup; + } + + if( rdnValidate( &pnewrdn ) != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, + "do_modrdn: invalid rdn (%s).\n", pnewrdn.bv_val, 0, 0 ); +#else + Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid rdn (%s)\n", + pnewrdn.bv_val, 0, 0 ); +#endif + + send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL, + "invalid new RDN", NULL, NULL ); + goto cleanup; + } + + if( pnewS ) { + rc = dnPrettyNormal( NULL, &newSuperior, &pnewSuperior, + &nnewSuperior ); + if( rc != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, INFO, + "do_modrdn: conn %d invalid newSuperior (%s)\n", + conn->c_connid, newSuperior.bv_val, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "do_modrdn: invalid newSuperior (%s)\n", + newSuperior.bv_val, 0, 0 ); +#endif + send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL, + "invalid newSuperior", NULL, NULL ); + goto cleanup; + } + } + + Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu MODRDN dn=\"%s\"\n", + op->o_connid, op->o_opid, pdn.bv_val, 0, 0 ); + + manageDSAit = get_manageDSAit( op ); /* * We could be serving multiple database backends. Select the * appropriate one, or send a referral to our "referral server" * if we don't hold it. */ + if ( (be = select_backend( &ndn, manageDSAit, 0 )) == NULL ) { + BerVarray ref = referral_rewrite( default_referral, + NULL, &pdn, LDAP_SCOPE_DEFAULT ); - if ( (be = select_backend( ndn )) == NULL ) { send_ldap_result( conn, op, rc = LDAP_REFERRAL, - NULL, NULL, default_referral, NULL ); + NULL, NULL, ref ? ref : default_referral, NULL ); + + ber_bvarray_free( ref ); goto cleanup; } - if ( global_readonly || be->be_readonly ) { - Debug( LDAP_DEBUG_ANY, "do_modrdn: database is read-only\n", - 0, 0, 0 ); - send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, - NULL, "database is read-only", NULL, NULL ); + /* check restrictions */ + rc = backend_check_restrictions( be, conn, op, NULL, &text ) ; + if( rc != LDAP_SUCCESS ) { + send_ldap_result( conn, op, rc, + NULL, text, NULL, NULL ); + goto cleanup; + } + + /* check for referrals */ + rc = backend_check_referrals( be, conn, op, &pdn, &ndn ); + if ( rc != LDAP_SUCCESS ) { goto cleanup; } /* Make sure that the entry being changed and the newSuperior are in * the same backend, otherwise we return an error. */ - if( newSuperior != NULL ) { - newSuperior_be = select_backend( nnewSuperior ); + if( pnewS ) { + newSuperior_be = select_backend( &nnewSuperior, 0, 0 ); if ( newSuperior_be != be ) { /* newSuperior is in same backend */ rc = LDAP_AFFECTS_MULTIPLE_DSAS; send_ldap_result( conn, op, rc, - NULL, NULL, NULL, NULL ); + NULL, "cannot rename between DSAa", NULL, NULL ); goto cleanup; } /* deref suffix alias if appropriate */ - nnewSuperior = suffix_alias( be, nnewSuperior ); + suffix_alias( be, &nnewSuperior ); } /* deref suffix alias if appropriate */ - ndn = suffix_alias( be, ndn ); + suffix_alias( be, &ndn ); /* * do the add if 1 && (2 || 3) @@ -211,43 +334,201 @@ do_modrdn( */ if ( be->be_modrdn ) { /* do the update here */ + int repl_user = be_isupdate( be, &op->o_ndn ); #ifndef SLAPD_MULTIMASTER - if ( be->be_update_ndn == NULL || - strcmp( be->be_update_ndn, op->o_ndn ) == 0 ) + if ( !be->be_update_ndn.bv_len || repl_user ) #endif { - if ( (*be->be_modrdn)( be, conn, op, dn, ndn, newrdn, - deloldrdn, newSuperior ) == 0 + if ( (*be->be_modrdn)( be, conn, op, &pdn, &ndn, + &pnewrdn, &nnewrdn, deloldrdn, + pnewS, nnewS ) == 0 #ifdef SLAPD_MULTIMASTER - && ( be->be_update_ndn == NULL || - strcmp( be->be_update_ndn, op->o_ndn ) ) + && ( !be->be_update_ndn.bv_len || !repl_user ) #endif ) { - struct replog_moddn moddn; - moddn.newrdn = newrdn; + struct slap_replog_moddn moddn; + moddn.newrdn = &pnewrdn; moddn.deloldrdn = deloldrdn; - moddn.newsup = newSuperior; + moddn.newsup = &pnewSuperior; - replog( be, op, dn, &moddn ); + replog( be, op, &pdn, &ndn, &moddn ); } #ifndef SLAPD_MULTIMASTER } else { + BerVarray defref = be->be_update_refs + ? be->be_update_refs : default_referral; + BerVarray ref = referral_rewrite( defref, + NULL, &pdn, LDAP_SCOPE_DEFAULT ); + send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL, - be->be_update_refs ? be->be_update_refs : default_referral, NULL ); + ref ? ref : defref, NULL ); + + ber_bvarray_free( ref ); #endif } } else { send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, - NULL, "Function not implemented", NULL, NULL ); + NULL, "operation not supported within namingContext", + NULL, NULL ); } cleanup: - free( dn ); - free( ndn ); - free( newrdn ); - if ( newSuperior != NULL ) - free( newSuperior ); - if ( nnewSuperior != NULL ) - free( nnewSuperior ); + free( pdn.bv_val ); + free( ndn.bv_val ); + + free( pnewrdn.bv_val ); + free( nnewrdn.bv_val ); + + if ( pnewSuperior.bv_val ) free( pnewSuperior.bv_val ); + if ( nnewSuperior.bv_val ) free( nnewSuperior.bv_val ); + + return rc; +} + +int +slap_modrdn2mods( + Backend *be, + Connection *conn, + Operation *op, + Entry *e, + LDAPRDN *old_rdn, + LDAPRDN *new_rdn, + int deleteoldrdn, + Modifications **pmod ) +{ + int rc = LDAP_SUCCESS; + const char *text; + Modifications *mod = NULL; + int a_cnt, d_cnt; + + assert( new_rdn != NULL ); + assert( !deleteoldrdn || old_rdn != NULL ); + + /* Add new attribute values to the entry */ + for ( a_cnt = 0; new_rdn[ 0 ][ a_cnt ]; a_cnt++ ) { + AttributeDescription *desc = NULL; + Modifications *mod_tmp; + + rc = slap_bv2ad( &new_rdn[ 0 ][ a_cnt ]->la_attr, + &desc, &text ); + + if ( rc != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, ERR, + "slap_modrdn2modlist: %s: %s (new)\n", + text, + new_rdn[ 0 ][ a_cnt ]->la_attr.bv_val, 0 ); +#else + Debug( LDAP_DEBUG_TRACE, + "slap_modrdn2modlist: %s: %s (new)\n", + text, + new_rdn[ 0 ][ a_cnt ]->la_attr.bv_val, 0 ); +#endif + goto done; + } + + /* ACL check of newly added attrs */ + if ( be && !access_allowed( be, conn, op, e, desc, + &new_rdn[ 0 ][ a_cnt ]->la_value, ACL_WRITE, NULL ) ) { +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, ERR, + "slap_modrdn2modlist: access to attr \"%s\" " + "(new) not allowed\n", + new_rdn[ 0 ][a_cnt]->la_attr.bv_val, 0, 0 ); +#else + Debug( LDAP_DEBUG_TRACE, + "slap_modrdn2modlist: access to attr \"%s\" " + "(new) not allowed\n", + new_rdn[ 0 ][ a_cnt ]->la_attr.bv_val, 0, 0 ); +#endif + rc = LDAP_INSUFFICIENT_ACCESS; + goto done; + } + + /* Apply modification */ + mod_tmp = ( Modifications * )ch_malloc( sizeof( Modifications ) + + 2 * sizeof( struct berval ) ); + mod_tmp->sml_desc = desc; + mod_tmp->sml_bvalues = ( BerVarray )( mod_tmp + 1 ); + mod_tmp->sml_bvalues[ 0 ] = new_rdn[ 0 ][ a_cnt ]->la_value; + mod_tmp->sml_bvalues[ 1 ].bv_val = NULL; + mod_tmp->sml_op = SLAP_MOD_SOFTADD; + mod_tmp->sml_next = mod; + mod = mod_tmp; + } + + /* Remove old rdn value if required */ + if ( deleteoldrdn ) { + for ( d_cnt = 0; old_rdn[ 0 ][ d_cnt ]; d_cnt++ ) { + AttributeDescription *desc = NULL; + Modifications *mod_tmp; + + rc = slap_bv2ad( &old_rdn[ 0 ][ d_cnt ]->la_attr, + &desc, &text ); + + if ( rc != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, ERR, + "slap_modrdn2modlist: %s: %s (old)\n", + text, + old_rdn[ 0 ][ d_cnt ]->la_attr.bv_val, + 0 ); +#else + Debug( LDAP_DEBUG_TRACE, + "slap_modrdn2modlist: %s: %s (old)\n", + text, + old_rdn[ 0 ][ d_cnt ]->la_attr.bv_val, + 0 ); +#endif + goto done; + } + + /* ACL check of newly added attrs */ + if ( be && !access_allowed( be, conn, op, e, desc, + &old_rdn[ 0 ][ d_cnt ]->la_value, ACL_WRITE, + NULL ) ) { +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, ERR, + "slap_modrdn2modlist: access " + "to attr \"%s\" (old) not allowed\n", + old_rdn[ 0 ][ d_cnt ]->la_attr.bv_val, + 0, 0 ); +#else + Debug( LDAP_DEBUG_TRACE, + "slap_modrdn2modlist: access " + "to attr \"%s\" (old) not allowed\n", + old_rdn[ 0 ][ d_cnt ]->la_attr.bv_val, + 0, 0 ); +#endif + rc = LDAP_INSUFFICIENT_ACCESS; + goto done; + } + + /* Apply modification */ + mod_tmp = ( Modifications * )ch_malloc( sizeof( Modifications ) + + 2 * sizeof ( struct berval ) ); + mod_tmp->sml_desc = desc; + mod_tmp->sml_bvalues = ( BerVarray )(mod_tmp+1); + mod_tmp->sml_bvalues[ 0 ] + = old_rdn[ 0 ][ d_cnt ]->la_value; + mod_tmp->sml_bvalues[ 1 ].bv_val = NULL; + mod_tmp->sml_op = LDAP_MOD_DELETE; + mod_tmp->sml_next = mod; + mod = mod_tmp; + } + } + +done: + /* LDAP v2 supporting correct attribute handling. */ + if ( rc != LDAP_SUCCESS && mod != NULL ) { + Modifications *tmp; + for ( ; mod; mod = tmp ) { + tmp = mod->sml_next; + ch_free( mod ); + } + } + + *pmod = mod; + return rc; }