X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fadd.c;h=6e7cb7e443f8dfb347f8074eae08d96cf7ee60ce;hb=d6449b1d57964b189259f7388f03418fb09e3000;hp=5e85be3aa7e06aa1adb5b3383819a8cef05a9048;hpb=00086db3f611e5be46e1c4840a68d1a9ce11299f;p=openldap

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 5e85be3aa7..6e7cb7e443 100644
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -1,3 +1,8 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
@@ -13,35 +18,42 @@
 #include "portable.h"
 
 #include <stdio.h>
-
 #include <ac/string.h>
 #include <ac/time.h>
 #include <ac/socket.h>
 
+#include "ldap_pvt.h"
 #include "slap.h"
 
-static void	add_created_attrs(Operation *op, Entry *e);
+static int slap_mods2entry(
+	Modifications *mods,
+	Entry **e,
+	int repl_user,
+	const char **text,
+	char *textbuf, size_t textlen );
 
 int
 do_add( Connection *conn, Operation *op )
 {
 	BerElement	*ber = op->o_ber;
-	char		*dn, *last;
+	char		*last;
+	struct berval dn = { 0, NULL };
 	ber_len_t	len;
 	ber_tag_t	tag;
 	Entry		*e;
 	Backend		*be;
+	Modifications	*modlist = NULL;
+	Modifications	**modtail = &modlist;
+	Modifications	tmp;
+	const char *text;
 	int			rc = LDAP_SUCCESS;
+	int	manageDSAit;
 
+#ifdef NEW_LOGGING
+	LDAP_LOG( OPERATION, ENTRY, "do_add: conn %d enter\n", conn->c_connid,0,0 );
+#else
 	Debug( LDAP_DEBUG_TRACE, "do_add\n", 0, 0, 0 );
-
-	if( op->o_bind_in_progress ) {
-		Debug( LDAP_DEBUG_ANY, "do_add: SASL bind in progress.\n", 0, 0, 0 );
-		send_ldap_result( conn, op, LDAP_SASL_BIND_IN_PROGRESS, NULL,
-		    "SASL bind in progress" );
-		return LDAP_SASL_BIND_IN_PROGRESS;
-	}
-
+#endif
 	/*
 	 * Parse the add request.  It looks like this:
 	 *
@@ -55,81 +67,167 @@ do_add( Connection *conn, Operation *op )
 	 */
 
 	/* get the name */
-	if ( ber_scanf( ber, "{a", /*}*/ &dn ) == LBER_ERROR ) {
+	if ( ber_scanf( ber, "{m", /*}*/ &dn ) == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, ERR, 
+			"do_add: conn %d ber_scanf failed\n", conn->c_connid,0,0 );
+#else
 		Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
-		send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL,
-		    "decoding error" );
-		return LDAP_PROTOCOL_ERROR;
+#endif
+		send_ldap_disconnect( conn, op,
+			LDAP_PROTOCOL_ERROR, "decoding error" );
+		return -1;
 	}
 
 	e = (Entry *) ch_calloc( 1, sizeof(Entry) );
 
-	e->e_dn = dn;
-	e->e_ndn = dn_normalize_case( ch_strdup( dn ) );
-	e->e_private = NULL;
+	rc = dnPrettyNormal( NULL, &dn, &e->e_name, &e->e_nname );
 
-	dn = NULL;
+	if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, ERR, 
+			"do_add: conn %d invalid dn (%s)\n", conn->c_connid, dn.bv_val, 0 );
+#else
+		Debug( LDAP_DEBUG_ANY, "do_add: 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 done;
+	}
 
-	Debug( LDAP_DEBUG_ARGS, "    do_add: ndn (%s)\n", e->e_ndn, 0, 0 );
+#ifdef NEW_LOGGING
+	LDAP_LOG( OPERATION, ARGS, 
+		"do_add: conn %d  dn (%s)\n", conn->c_connid, e->e_dn, 0 );
+#else
+	Debug( LDAP_DEBUG_ARGS, "do_add: dn (%s)\n", e->e_dn, 0, 0 );
+#endif
 
 	/* get the attrs */
-	e->e_attrs = NULL;
 	for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
-	    tag = ber_next_element( ber, &len, last ) ) {
-		char		*type;
-		struct berval	**vals;
-
-		if ( ber_scanf( ber, "{a{V}}", &type, &vals ) == LBER_ERROR ) {
-			send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR,
-			    NULL, "decoding error" );
-			entry_free( e );
-			return LDAP_PROTOCOL_ERROR;
-		}
+	    tag = ber_next_element( ber, &len, last ) )
+	{
+		Modifications *mod;
+		ber_tag_t rtag;
 
-		if ( vals == NULL ) {
-			Debug( LDAP_DEBUG_ANY, "no values for type %s\n", type,
-			    0, 0 );
-			send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL,
-			    NULL );
-			free( type );
-			entry_free( e );
-			return LDAP_PROTOCOL_ERROR;
-		}
+		rtag = ber_scanf( ber, "{m{W}}", &tmp.sml_type, &tmp.sml_bvalues );
 
-		attr_merge( e, type, vals );
+		if ( rtag == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG( OPERATION, ERR, 
+				   "do_add: conn %d	 decoding error \n", conn->c_connid, 0, 0 );
+#else
+			Debug( LDAP_DEBUG_ANY, "do_add: decoding error\n", 0, 0, 0 );
+#endif
+			send_ldap_disconnect( conn, op,
+				LDAP_PROTOCOL_ERROR, "decoding error" );
+			rc = -1;
+			goto done;
+		}
 
-		free( type );
-		ber_bvecfree( vals );
+		if ( tmp.sml_bvalues == NULL ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG( OPERATION, INFO, 
+				"do_add: conn %d	 no values for type %s\n",
+				conn->c_connid, tmp.sml_type.bv_val, 0 );
+#else
+			Debug( LDAP_DEBUG_ANY, "no values for type %s\n",
+				tmp.sml_type.bv_val, 0, 0 );
+#endif
+			send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
+				NULL, "no values for attribute type", NULL, NULL );
+			goto done;
+		}
+		mod  = (Modifications *) ch_malloc( sizeof(Modifications) );
+		
+		mod->sml_op = LDAP_MOD_ADD;
+		mod->sml_next = NULL;
+		mod->sml_desc = NULL;
+		mod->sml_type = tmp.sml_type;
+		mod->sml_bvalues = tmp.sml_bvalues;
+
+		*modtail = mod;
+		modtail = &mod->sml_next;
 	}
 
 	if ( ber_scanf( ber, /*{*/ "}") == LBER_ERROR ) {
-		entry_free( e );
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, ERR, 
+			"do_add: conn %d ber_scanf failed\n", conn->c_connid, 0, 0 );
+#else
 		Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
-		send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL,
-		    "decoding error" );
-		return LDAP_PROTOCOL_ERROR;
+#endif
+		send_ldap_disconnect( conn, op,
+			LDAP_PROTOCOL_ERROR, "decoding error" );
+		rc = -1;
+		goto done;
 	}
 
 	if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
-		entry_free( e );
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, INFO, 
+			"do_add: conn %d get_ctrls failed\n", conn->c_connid, 0, 0 );
+#else
 		Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 );
-		return rc;
+#endif
+		goto done;
 	} 
 
-	Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d ADD dn=\"%s\"\n",
-	    conn->c_connid, op->o_opid, e->e_ndn, 0, 0 );
+	if ( modlist == NULL ) {
+		send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
+			NULL, "no attributes provided", NULL, NULL );
+		goto done;
+	}
+
+	Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu ADD dn=\"%s\"\n",
+	    op->o_connid, op->o_opid, e->e_dn, 0, 0 );
+
+	if( e->e_nname.bv_len == 0 ) {
+		/* protocolError may be a more appropriate error */
+		send_ldap_result( conn, op, rc = LDAP_ALREADY_EXISTS,
+			NULL, "root DSE already exists",
+			NULL, NULL );
+		goto done;
+
+#if defined( SLAPD_SCHEMA_DN )
+	} else if ( bvmatch( &e->e_nname, &global_schemandn ) ) {
+		send_ldap_result( conn, op, rc = LDAP_ALREADY_EXISTS,
+			NULL, "subschema subentry already exists",
+			NULL, NULL );
+		goto done;
+#endif
+	}
+
+	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.
 	 */
-	be = select_backend( e->e_ndn );
+	be = select_backend( &e->e_nname, manageDSAit, 0 );
 	if ( be == NULL ) {
-		entry_free( e );
-		send_ldap_result( conn, op, LDAP_PARTIAL_RESULTS, NULL,
-		    default_referral );
-		return rc;
+		BerVarray ref = referral_rewrite( default_referral,
+			NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
+
+		send_ldap_result( conn, op, rc = LDAP_REFERRAL,
+			NULL, NULL, ref ? ref : default_referral, NULL );
+
+		if ( ref ) ber_bvarray_free( ref );
+		goto done;
+	}
+
+	/* 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 done;
+	}
+
+	/* check for referrals */
+	rc = backend_check_referrals( be, conn, op, &e->e_name, &e->e_nname );
+	if ( rc != LDAP_SUCCESS ) {
+		goto done;
 	}
 
 	/*
@@ -140,83 +238,226 @@ do_add( Connection *conn, Operation *op )
 	 */
 	if ( be->be_add ) {
 		/* do the update here */
-		if ( be->be_update_ndn == NULL ||
-			strcmp( be->be_update_ndn, op->o_ndn ) == 0 )
+		int repl_user = be_isupdate(be, &op->o_ndn );
+#ifndef SLAPD_MULTIMASTER
+		if ( !be->be_update_ndn.bv_len || repl_user )
+#endif
 		{
-			if ( (be->be_lastmod == ON || (be->be_lastmod == UNDEFINED &&
-				global_lastmod == ON)) && be->be_update_ndn == NULL ) {
+			int update = be->be_update_ndn.bv_len;
+			char textbuf[SLAP_TEXT_BUFLEN];
+			size_t textlen = sizeof textbuf;
 
-				add_created_attrs( op, e );
+			rc = slap_mods_check( modlist, update, &text,
+				textbuf, textlen );
+
+			if( rc != LDAP_SUCCESS ) {
+				send_ldap_result( conn, op, rc,
+					NULL, text, NULL, NULL );
+				goto done;
+			}
+
+			if ( !repl_user ) {
+				for( modtail = &modlist;
+					*modtail != NULL;
+					modtail = &(*modtail)->sml_next )
+				{
+					assert( (*modtail)->sml_op == LDAP_MOD_ADD );
+					assert( (*modtail)->sml_desc != NULL );
+				}
+				rc = slap_mods_opattrs( be, op, modlist, modtail, &text,
+					textbuf, textlen );
+				if( rc != LDAP_SUCCESS ) {
+					send_ldap_result( conn, op, rc,
+						NULL, text, NULL, NULL );
+					goto done;
+				}
 			}
+
+			rc = slap_mods2entry( modlist, &e, repl_user, &text,
+				textbuf, textlen );
+			if( rc != LDAP_SUCCESS ) {
+				send_ldap_result( conn, op, rc,
+					NULL, text, NULL, NULL );
+				goto done;
+			}
+
 			if ( (*be->be_add)( be, conn, op, e ) == 0 ) {
-				replog( be, LDAP_REQ_ADD, e->e_dn, e, 0 );
-				be_entry_release_w( be, e );
+#ifdef SLAPD_MULTIMASTER
+				if ( !repl_user )
+#endif
+				{
+					replog( be, op, &e->e_name, &e->e_nname, e );
+				}
+				be_entry_release_w( be, conn, op, e );
+				e = NULL;
 			}
 
+#ifndef SLAPD_MULTIMASTER
 		} else {
-			entry_free( e );
-			send_ldap_result( conn, op, rc = LDAP_PARTIAL_RESULTS, NULL,
-			    default_referral );
+			BerVarray defref = be->be_update_refs
+				? be->be_update_refs : default_referral;
+			BerVarray ref = referral_rewrite( defref,
+				NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
+
+			send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
+				ref ? ref : defref, NULL );
+
+			if ( ref ) ber_bvarray_free( ref );
+#endif
 		}
 	} else {
-	    Debug( LDAP_DEBUG_ARGS, "    do_add: HHH\n", 0, 0, 0 );
+#ifdef NEW_LOGGING
+	    LDAP_LOG( OPERATION, INFO, 
+		       "do_add: conn %d	 no backend support\n", conn->c_connid, 0, 0 );
+#else
+	    Debug( LDAP_DEBUG_ARGS, "	 do_add: no backend support\n", 0, 0, 0 );
+#endif
+	    send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
+			      NULL, "operation not supported within namingContext", NULL, NULL );
+	}
+
+done:
+	if( modlist != NULL ) {
+		slap_mods_free( modlist );
+	}
+	if( e != NULL ) {
 		entry_free( e );
-		send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, NULL,
-		    "Function not implemented" );
 	}
 
 	return rc;
 }
 
-static void
-add_created_attrs( Operation *op, Entry *e )
+static int slap_mods2entry(
+	Modifications *mods,
+	Entry **e,
+	int repl_user,
+	const char **text,
+	char *textbuf, size_t textlen )
 {
-	char		buf[22];
-	struct berval	bv;
-	struct berval	*bvals[2];
-	Attribute	**a, **next;
-	Attribute	*tmp;
-	struct tm	*ltm;
-	time_t		currenttime;
-
-	Debug( LDAP_DEBUG_TRACE, "add_created_attrs\n", 0, 0, 0 );
-
-	bvals[0] = &bv;
-	bvals[1] = NULL;
-
-	/* remove any attempts by the user to add these attrs */
-	for ( a = &e->e_attrs; *a != NULL; a = next ) {
-		if ( oc_check_operational( (*a)->a_type ) ) {
-			tmp = *a;
-			*a = (*a)->a_next;
-			attr_free( tmp );
-			next = a;
-		} else {
-			next = &(*a)->a_next;
-		}
-	}
+	Attribute **tail = &(*e)->e_attrs;
+	assert( *tail == NULL );
 
-	if ( op->o_dn == NULL || op->o_dn[0] == '\0' ) {
-		bv.bv_val = "NULLDN";
-		bv.bv_len = strlen( bv.bv_val );
-	} else {
-		bv.bv_val = op->o_dn;
-		bv.bv_len = strlen( bv.bv_val );
-	}
-	attr_merge( e, "creatorsname", bvals );
+	*text = textbuf;
+
+	for( ; mods != NULL; mods = mods->sml_next ) {
+		Attribute *attr;
 
-	currenttime = slap_get_time();
-	ldap_pvt_thread_mutex_lock( &gmtime_mutex );
-#ifndef LDAP_LOCALTIME
-	ltm = gmtime( &currenttime );
-	strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm );
+		assert( mods->sml_op == LDAP_MOD_ADD );
+		assert( mods->sml_desc != NULL );
+
+		attr = attr_find( (*e)->e_attrs, mods->sml_desc );
+
+		if( attr != NULL ) {
+#define SLURPD_FRIENDLY
+#ifdef SLURPD_FRIENDLY
+			ber_len_t i,j;
+
+			if( !repl_user ) {
+				snprintf( textbuf, textlen,
+					"attribute '%s' provided more than once",
+					mods->sml_desc->ad_cname.bv_val );
+				return LDAP_TYPE_OR_VALUE_EXISTS;
+			}
+
+			for( i=0; attr->a_vals[i].bv_val; i++ ) {
+				/* count them */
+			}
+			for( j=0; mods->sml_bvalues[j].bv_val; j++ ) {
+				/* count them */
+			}
+			j++;	/* NULL */
+			
+			attr->a_vals = ch_realloc( attr->a_vals,
+				sizeof( struct berval ) * (i+j) );
+
+			/* should check for duplicates */
+
+			AC_MEMCPY( &attr->a_vals[i], mods->sml_bvalues,
+				sizeof( struct berval ) * j );
+
+			/* trim the mods array */
+			ch_free( mods->sml_bvalues );
+			mods->sml_bvalues = NULL;
+
+			continue;
 #else
-	ltm = localtime( &currenttime );
-	strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm );
+			snprintf( textbuf, textlen,
+				"attribute '%s' provided more than once",
+				mods->sml_desc->ad_cname.bv_val );
+			return LDAP_TYPE_OR_VALUE_EXISTS;
 #endif
-	ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+		}
+
+		if( mods->sml_bvalues[1].bv_val != NULL ) {
+			/* check for duplicates */
+			int		i, j;
+			MatchingRule *mr = mods->sml_desc->ad_type->sat_equality;
+
+			/* check if the values we're adding already exist */
+			if( mr == NULL || !mr->smr_match ) {
+				for ( i = 0; mods->sml_bvalues[i].bv_val != NULL; i++ ) {
+					/* test asserted values against themselves */
+					for( j = 0; j < i; j++ ) {
+						int rc = ber_bvcmp( &mods->sml_bvalues[i],
+							&mods->sml_bvalues[j] );
+
+						if( rc == 0 ) {
+							/* value exists already */
+							snprintf( textbuf, textlen,
+								"%s: value #%d provided more than once",
+								mods->sml_desc->ad_cname.bv_val, j );
+							return LDAP_TYPE_OR_VALUE_EXISTS;
+						}
+					}
+				}
+
+			} else {
+				for ( i = 0; mods->sml_bvalues[i].bv_val != NULL; i++ ) {
+					int rc, match;
+					const char *text = NULL;
+					struct berval asserted;
+
+					rc = value_normalize( mods->sml_desc,
+						SLAP_MR_EQUALITY,
+						&mods->sml_bvalues[i],
+						&asserted,
+						&text );
+
+					if( rc != LDAP_SUCCESS ) return rc;
+
+					for ( j = 0; j < i; j++ ) {
+						int rc = value_match( &match, mods->sml_desc, mr,
+							SLAP_MR_VALUE_SYNTAX_MATCH,
+							&mods->sml_bvalues[j], &asserted, &text );
+
+						if( rc == LDAP_SUCCESS && match == 0 ) {
+							free( asserted.bv_val );
+							snprintf( textbuf, textlen,
+								"%s: value #%d provided more than once",
+								mods->sml_desc->ad_cname.bv_val, j );
+							return LDAP_TYPE_OR_VALUE_EXISTS;
+						}
+					}
+
+					free( asserted.bv_val );
+				}
+			}
+		}
+
+		attr = ch_calloc( 1, sizeof(Attribute) );
+
+		/* move ad to attr structure */
+		attr->a_desc = mods->sml_desc;
+		mods->sml_desc = NULL;
+
+		/* move values to attr structure */
+		/*	should check for duplicates */
+		attr->a_vals = mods->sml_bvalues;
+		mods->sml_bvalues = NULL;
+
+		*tail = attr;
+		tail = &attr->a_next;
+	}
 
-	bv.bv_val = buf;
-	bv.bv_len = strlen( bv.bv_val );
-	attr_merge( e, "createtimestamp", bvals );
+	return LDAP_SUCCESS;
 }