X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmodify.c;h=7f4a34b0deb66b87fa385195c0cb469a013c986a;hb=f90ed5aef8f41ee90e1f67b0badbb793cb99f3ed;hp=fcc040a18ec9af22c206fdf4d5acd72402f33cc1;hpb=0503205c9343b3fb3231baa74718cd484f5bffec;p=openldap diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c index fcc040a18e..7f4a34b0de 100644 --- a/servers/slapd/modify.c +++ b/servers/slapd/modify.c @@ -21,10 +21,10 @@ #include "slap.h" static void modlist_free(LDAPModList *ml); -static void add_lastmods(Operation *op, LDAPModList **ml); +static int add_modified_attrs( Operation *op, LDAPModList **modlist ); -void +int do_modify( Connection *conn, Operation *op @@ -32,13 +32,26 @@ do_modify( { char *ndn; char *last; - unsigned long tag, len; - LDAPModList *modlist, *tmp; + ber_tag_t tag; + ber_len_t len; + LDAPModList *modlist; LDAPModList **modtail; +#ifdef LDAP_DEBUG + LDAPModList *tmp; +#endif Backend *be; + int rc; Debug( LDAP_DEBUG_TRACE, "do_modify\n", 0, 0, 0 ); + if( op->o_bind_in_progress ) { + Debug( LDAP_DEBUG_ANY, "do_modify: 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 modify request. It looks like this: * @@ -59,14 +72,21 @@ do_modify( */ if ( ber_scanf( op->o_ber, "{a" /*}*/, &ndn ) == LBER_ERROR ) { - Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 ); - send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL, "" ); - return; + Debug( LDAP_DEBUG_ANY, "do_modify: ber_scanf failed\n", 0, 0, 0 ); + send_ldap_disconnect( conn, op, + LDAP_PROTOCOL_ERROR, "decoding error" ); + return -1; } Debug( LDAP_DEBUG_ARGS, "do_modify: dn (%s)\n", ndn, 0, 0 ); - (void) dn_normalize_case( ndn ); + if( dn_normalize_case( ndn ) == NULL ) { + Debug( LDAP_DEBUG_ANY, "do_modify: invalid dn (%s)\n", ndn, 0, 0 ); + send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL, + "invalid DN", NULL, NULL ); + free( ndn ); + return rc; + } /* collect modifications & save for later */ modlist = NULL; @@ -76,40 +96,44 @@ do_modify( tag != LBER_DEFAULT; tag = ber_next_element( op->o_ber, &len, last ) ) { + ber_int_t mop; + (*modtail) = (LDAPModList *) ch_calloc( 1, sizeof(LDAPModList) ); - if ( ber_scanf( op->o_ber, "{i{a[V]}}", &(*modtail)->ml_op, + if ( ber_scanf( op->o_ber, "{i{a[V]}}", &mop, &(*modtail)->ml_type, &(*modtail)->ml_bvalues ) == LBER_ERROR ) { - send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL, - "decoding error" ); + send_ldap_disconnect( conn, op, + LDAP_PROTOCOL_ERROR, "decoding modlist error" ); free( ndn ); free( *modtail ); *modtail = NULL; modlist_free( modlist ); - return; + return -1; } + (*modtail)->ml_op = mop; + if ( (*modtail)->ml_op != LDAP_MOD_ADD && (*modtail)->ml_op != LDAP_MOD_DELETE && (*modtail)->ml_op != LDAP_MOD_REPLACE ) { - send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL, - "unrecognized modify operation" ); + send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, + NULL, "unrecognized modify operation", NULL, NULL ); free( ndn ); modlist_free( modlist ); - return; + return LDAP_PROTOCOL_ERROR; } if ( (*modtail)->ml_bvalues == NULL && (*modtail)->ml_op != LDAP_MOD_DELETE ) { - send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL, - "no values given" ); + send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, + NULL, "unrecognized modify operation", NULL, NULL ); free( ndn ); modlist_free( modlist ); - return; + return LDAP_PROTOCOL_ERROR; } attr_normalize( (*modtail)->ml_type ); @@ -127,8 +151,15 @@ do_modify( } #endif + if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) { + free( ndn ); + modlist_free( modlist ); + Debug( LDAP_DEBUG_ANY, "do_modify: get_ctrls failed\n", 0, 0, 0 ); + return rc; + } + Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d MOD dn=\"%s\"\n", - conn->c_connid, op->o_opid, ndn, 0, 0 ); + op->o_connid, op->o_opid, ndn, 0, 0 ); /* * We could be serving multiple database backends. Select the @@ -138,13 +169,13 @@ do_modify( if ( (be = select_backend( ndn )) == NULL ) { free( ndn ); modlist_free( modlist ); - send_ldap_result( conn, op, LDAP_PARTIAL_RESULTS, NULL, - default_referral ); - return; + send_ldap_result( conn, op, rc = LDAP_REFERRAL, + NULL, NULL, default_referral, NULL ); + return rc; } - /* alias suffix if approp */ - ndn = suffixAlias ( ndn, op, be ); + /* deref suffix alias if appropriate */ + ndn = suffix_alias( be, ndn ); /* * do the modify if 1 && (2 || 3) @@ -152,87 +183,64 @@ do_modify( * 2) this backend is master for what it holds; * 3) it's a replica and the dn supplied is the update_ndn. */ - if ( be->be_modify != NULL ) { + if ( be->be_modify ) { /* do the update here */ if ( be->be_update_ndn == NULL || strcmp( be->be_update_ndn, op->o_ndn ) == 0 ) { - if ( (be->be_lastmod == ON || ( be->be_lastmod == UNDEFINED && - global_lastmod == ON ) ) && be->be_update_ndn == NULL ) { - add_lastmods( op, &modlist ); + if ( (be->be_lastmod == ON || (be->be_lastmod == UNDEFINED && + global_lastmod == ON)) && be->be_update_ndn == NULL ) + { + rc = add_modified_attrs( op, &modlist ); + + if( rc != LDAP_SUCCESS ) { + free( ndn ); + modlist_free( modlist ); + send_ldap_result( conn, op, rc, + NULL, "no-user-modification attribute type", + NULL, NULL ); + return rc; + } } + if ( (*be->be_modify)( be, conn, op, ndn, modlist ) == 0 ) { - replog( be, LDAP_REQ_MODIFY, ndn, modlist, 0 ); + replog( be, op, ndn, modlist ); } /* send a referral */ } else { - send_ldap_result( conn, op, LDAP_PARTIAL_RESULTS, NULL, - default_referral ); + send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL, + be->be_update_refs ? be->be_update_refs : default_referral, NULL ); } } else { - send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL, - "Function not implemented" ); + send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, + NULL, "Function not implemented", NULL, NULL ); } free( ndn ); modlist_free( modlist ); + return rc; } -static void -modlist_free( - LDAPModList *ml -) -{ - LDAPModList *next; - - for ( ; ml != NULL; ml = next ) { - next = ml->ml_next; - - free( ml->ml_type ); - if ( ml->ml_bvalues != NULL ) - ber_bvecfree( ml->ml_bvalues ); - - free( ml ); - } -} - -static void -add_lastmods( Operation *op, LDAPModList **modlist ) +static int +add_modified_attrs( Operation *op, LDAPModList **modlist ) { char buf[22]; struct berval bv; struct berval *bvals[2]; - LDAPModList **m; - LDAPModList *tmp; + LDAPModList *m; struct tm *ltm; - - Debug( LDAP_DEBUG_TRACE, "add_lastmods\n", 0, 0, 0 ); + time_t currenttime; bvals[0] = &bv; bvals[1] = NULL; /* remove any attempts by the user to modify these attrs */ - for ( m = modlist; *m != NULL; m = &(*m)->ml_next ) { - if ( strcasecmp( (*m)->ml_type, "modifytimestamp" ) == 0 || - strcasecmp( (*m)->ml_type, "modifiersname" ) == 0 || - strcasecmp( (*m)->ml_type, "createtimestamp" ) == 0 || - strcasecmp( (*m)->ml_type, "creatorsname" ) == 0 ) { - - Debug( LDAP_DEBUG_TRACE, - "add_lastmods: found lastmod attr: %s\n", - (*m)->ml_type, 0, 0 ); - tmp = *m; - *m = (*m)->ml_next; - free( tmp->ml_type ); - if ( tmp->ml_bvalues != NULL ) { - ber_bvecfree( tmp->ml_bvalues ); - } - free( tmp ); - if (!*m) - break; - } - } + for ( m = *modlist; m != NULL; m = m->ml_next ) { + if ( oc_check_no_usermod_attr( m->ml_type ) ) { + return LDAP_CONSTRAINT_VIOLATION; + } + } if ( op->o_dn == NULL || op->o_dn[0] == '\0' ) { bv.bv_val = "NULLDN"; @@ -241,16 +249,16 @@ add_lastmods( Operation *op, LDAPModList **modlist ) bv.bv_val = op->o_dn; bv.bv_len = strlen( bv.bv_val ); } - tmp = (LDAPModList *) ch_calloc( 1, sizeof(LDAPModList) ); - tmp->ml_type = ch_strdup( "modifiersname" ); - tmp->ml_op = LDAP_MOD_REPLACE; - tmp->ml_bvalues = (struct berval **) ch_calloc( 1, - 2 * sizeof(struct berval *) ); - tmp->ml_bvalues[0] = ber_bvdup( &bv ); - tmp->ml_next = *modlist; - *modlist = tmp; - - pthread_mutex_lock( ¤ttime_mutex ); + m = (LDAPModList *) ch_calloc( 1, sizeof(LDAPModList) ); + m->ml_type = ch_strdup( "modifiersname" ); + m->ml_op = LDAP_MOD_REPLACE; + m->ml_bvalues = (struct berval **) ch_calloc(2, sizeof(struct berval *)); + m->ml_bvalues[0] = ber_bvdup( &bv ); + m->ml_next = *modlist; + *modlist = m; + + currenttime = slap_get_time(); + ldap_pvt_thread_mutex_lock( &gmtime_mutex ); #ifndef LDAP_LOCALTIME ltm = gmtime( ¤ttime ); strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm ); @@ -258,14 +266,35 @@ add_lastmods( Operation *op, LDAPModList **modlist ) ltm = localtime( ¤ttime ); strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm ); #endif - pthread_mutex_unlock( ¤ttime_mutex ); + ldap_pvt_thread_mutex_unlock( &gmtime_mutex ); + bv.bv_val = buf; bv.bv_len = strlen( bv.bv_val ); - tmp = (LDAPModList *) ch_calloc( 1, sizeof(LDAPModList) ); - tmp->ml_type = ch_strdup( "modifytimestamp" ); - tmp->ml_op = LDAP_MOD_REPLACE; - tmp->ml_bvalues = (struct berval **) ch_calloc( 1, 2 * sizeof(struct berval *) ); - tmp->ml_bvalues[0] = ber_bvdup( &bv ); - tmp->ml_next = *modlist; - *modlist = tmp; + m = (LDAPModList *) ch_calloc( 1, sizeof(LDAPModList) ); + m->ml_type = ch_strdup( "modifytimestamp" ); + m->ml_op = LDAP_MOD_REPLACE; + m->ml_bvalues = (struct berval **) ch_calloc(2, sizeof(struct berval *)); + m->ml_bvalues[0] = ber_bvdup( &bv ); + m->ml_next = *modlist; + *modlist = m; + + return LDAP_SUCCESS; +} + +static void +modlist_free( + LDAPModList *ml +) +{ + LDAPModList *next; + + for ( ; ml != NULL; ml = next ) { + next = ml->ml_next; + + free( ml->ml_type ); + if ( ml->ml_bvalues != NULL ) + ber_bvecfree( ml->ml_bvalues ); + + free( ml ); + } }