X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fpasswd.c;h=d848e7a6cc2e4f7491bea1daf914d253899cc744;hb=20965abe9c5bb80d79e5ad791cd2b59ec60259b5;hp=2e083dc4bdbbd71e6b3a1c8d125d43e12d1eebab;hpb=94f7141dda9eced809d33e30892f646a31f7e4fa;p=openldap

diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index 2e083dc4bd..d848e7a6cc 100644
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,16 +28,30 @@
 #include <lber_pvt.h>
 #include <lutil.h>
 
+static const char *defhash[] = {
+#ifdef LUTIL_SHA1_BYTES
+	"{SSHA}",
+#else
+	"{SMD5}",
+#endif
+	NULL
+};
+
 int passwd_extop(
 	Operation *op,
 	SlapReply *rs )
 {
-	struct berval id = {0, NULL}, old = {0, NULL}, new = {0, NULL},
-		dn, ndn, hash, vals[2];
-	int freenew = 0;
-	Modifications ml, **modtail;
+	struct berval id = {0, NULL}, hash, *rsp = NULL;
+	req_pwdexop_s *qpw = &op->oq_pwdexop;
+	Modifications *ml;
 	Operation op2;
-	slap_callback cb = { slap_null_cb, NULL };
+	slap_callback cb = { NULL, slap_null_cb, NULL, NULL };
+	slap_callback cb2 = { NULL, slap_replog_cb, NULL, NULL };
+	int i, nhash;
+	char **hashes;
+	int	rc;
+
+	cb2.sc_next = &cb;
 
 	assert( ber_bvcmp( &slap_EXOP_MODIFY_PASSWD, &op->ore_reqoid ) == 0 );
 
@@ -46,120 +60,186 @@ int passwd_extop(
 		return LDAP_STRONG_AUTH_REQUIRED;
 	}
 
-	rs->sr_err = slap_passwd_parse( op->oq_extended.rs_reqdata, &id,
-		&old, &new, &rs->sr_text );
+	qpw->rs_old.bv_val = NULL;
+	qpw->rs_new.bv_val = NULL;
+	qpw->rs_mods = NULL;
+	qpw->rs_modtail = NULL;
+
+	rs->sr_err = slap_passwd_parse( op->ore_reqdata, &id, &qpw->rs_old,
+		&qpw->rs_new, &rs->sr_text );
+
 	if ( rs->sr_err != LDAP_SUCCESS ) {
 		return rs->sr_err;
 	}
 
 	if ( id.bv_len ) {
-		dn = id;
+		ber_dupbv_x( &op->o_req_dn, &id, op->o_tmpmemctx );
 		/* ndn is in tmpmem, so we don't need to free it */
-		rs->sr_err = dnNormalize( 0, NULL, NULL, &dn, &ndn, op->o_tmpmemctx );
+		rs->sr_err = dnNormalize( 0, NULL, NULL, &id, &op->o_req_ndn, op->o_tmpmemctx );
 		if ( rs->sr_err != LDAP_SUCCESS ) {
 			rs->sr_text = "Invalid DN";
-			return rs->sr_err;
+			rc = rs->sr_err;
+			goto error_return;
 		}
-		op->o_bd = select_backend( &ndn, 0, 0 );
+		op->o_bd = select_backend( &op->o_req_ndn, 0, 0 );
+
 	} else {
-		dn = op->o_dn;
-		ndn = op->o_ndn;
+		ber_dupbv_x( &op->o_req_dn, &op->o_dn, op->o_tmpmemctx );
+		ber_dupbv_x( &op->o_req_ndn, &op->o_ndn, op->o_tmpmemctx );
 		ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
 		op->o_bd = op->o_conn->c_authz_backend;
 		ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
 	}
 
-	if ( ndn.bv_len == 0 ) {
-		rs->sr_text = "no password is associated with the Root DSE";
-		return LDAP_UNWILLING_TO_PERFORM;
+	if( op->o_bd == NULL ) {
+#ifdef HAVE_CYRUS_SASL
+		rc = slap_sasl_setpass( op, rs );
+#else
+		rs->sr_text = "no authz backend";
+		rc = LDAP_OTHER;
+#endif
+		goto error_return;
 	}
 
-	if( op->o_bd && !op->o_bd->be_modify ) {
-		rs->sr_text = "operation not supported for current user";
-		return LDAP_UNWILLING_TO_PERFORM;
+	if ( op->o_req_ndn.bv_len == 0 ) {
+		rs->sr_text = "no password is associated with the Root DSE";
+		rc = LDAP_UNWILLING_TO_PERFORM;
+		goto error_return;
 	}
 
 	if (backend_check_restrictions( op, rs,
 			(struct berval *)&slap_EXOP_MODIFY_PASSWD ) != LDAP_SUCCESS) {
-		return rs->sr_err;
+		rc = rs->sr_err;
+		goto error_return;
 	}
 
-	if( op->o_bd == NULL ) {
-#ifdef HAVE_CYRUS_SASL
-		return slap_sasl_setpass( op, rs );
-#else
-		rs->sr_text = "no authz backend";
-		return LDAP_OTHER;
-#endif
-	}
 
 #ifndef SLAPD_MULTIMASTER
 	/* This does not apply to multi-master case */
-	if( op->o_bd->be_update_ndn.bv_len ) {
+	if(!( !SLAP_SHADOW( op->o_bd ) || be_isupdate( op ))) {
 		/* we SHOULD return a referral in this case */
-		BerVarray defref = NULL;
-		if ( !LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo )) {
-			syncinfo_t *si;
-			LDAP_STAILQ_FOREACH( si, &op->o_bd->be_syncinfo, si_next ) {
-				struct berval tmpbv;
-				ber_dupbv( &tmpbv, &si->si_provideruri_bv[0] );
-				ber_bvarray_add( &defref, &tmpbv );
-			}
-		} else {
-			defref = referral_rewrite( op->o_bd->be_update_refs,
+		BerVarray defref = op->o_bd->be_update_refs
+			? op->o_bd->be_update_refs : default_referral; 
+
+		if( defref != NULL ) {
+			rs->sr_ref = referral_rewrite( op->o_bd->be_update_refs,
 				NULL, NULL, LDAP_SCOPE_DEFAULT );
+			if(rs->sr_ref) {
+				rs->sr_flags |= REP_REF_MUSTBEFREED;
+			} else {
+				rs->sr_ref = defref;
+			}
+			rc = LDAP_REFERRAL;
+			goto error_return;
+
 		}
-		rs->sr_ref = defref;
-		return LDAP_REFERRAL;
+
+		rs->sr_text = "shadow context; no update referral";
+		rc = LDAP_UNWILLING_TO_PERFORM;
+		goto error_return;
 	}
 #endif /* !SLAPD_MULTIMASTER */
-	if ( new.bv_len == 0 ) {
-		slap_passwd_generate( &new );
-		freenew = 1;
+
+	/* generate a new password if none was provided */
+	if ( qpw->rs_new.bv_len == 0 ) {
+		slap_passwd_generate( &qpw->rs_new );
+		if ( qpw->rs_new.bv_len ) {
+			rsp = slap_passwd_return( &qpw->rs_new );
+		}
 	}
-	if ( new.bv_len == 0 ) {
+	if ( qpw->rs_new.bv_len == 0 ) {
 		rs->sr_text = "password generation failed";
-		return LDAP_OTHER;
+		rc = LDAP_OTHER;
+		goto error_return;
+	}
+
+	/* Give the backend a chance to handle this itself */
+	if ( op->o_bd->be_extended ) {
+		rs->sr_err = op->o_bd->be_extended( op, rs );
+		if ( rs->sr_err != LDAP_UNWILLING_TO_PERFORM &&
+			rs->sr_err != SLAP_CB_CONTINUE ) {
+			rc = rs->sr_err;
+			goto error_return;
+		}
+	}
+
+	/* The backend didn't handle it, so try it here */
+	if( op->o_bd && !op->o_bd->be_modify ) {
+		rs->sr_text = "operation not supported for current user";
+		rc = LDAP_UNWILLING_TO_PERFORM;
+		goto error_return;
 	}
-	slap_passwd_hash( &new, &hash, &rs->sr_text );
-	if ( freenew ) {
-		free( new.bv_val );
+
+	ml = ch_malloc( sizeof(Modifications) );
+	if ( !qpw->rs_modtail ) qpw->rs_modtail = &ml->sml_next;
+
+	if ( default_passwd_hash ) {
+		for ( nhash = 0; default_passwd_hash[nhash]; nhash++ );
+		hashes = default_passwd_hash;
+	} else {
+		nhash = 1;
+		hashes = (char **)defhash;
 	}
-	if ( hash.bv_len == 0 ) {
-		if ( !rs->sr_text ) {
-			rs->sr_text = "password hash failed";
+	ml->sml_values = ch_malloc( (nhash+1)*sizeof(struct berval) );
+	for ( i=0; hashes[i]; i++ ) {
+		slap_passwd_hash_type( &qpw->rs_new, &hash, hashes[i], &rs->sr_text );
+		if ( hash.bv_len == 0 ) {
+			if ( !rs->sr_text ) {
+				rs->sr_text = "password hash failed";
+			}
+			break;
 		}
-		return LDAP_OTHER;
+		ml->sml_values[i] = hash;
 	}
-	vals[0] = hash;
-	vals[1].bv_val = NULL;
-	ml.sml_desc = slap_schema.si_ad_userPassword;
-	ml.sml_values = vals;
-	ml.sml_nvalues = NULL;
-	ml.sml_op = LDAP_MOD_REPLACE;
-	ml.sml_next = NULL;
-
-	op2 = *op;
-	op2.o_tag = LDAP_REQ_MODIFY;
-	op2.o_callback = &cb;
-	op2.o_req_dn = dn;
-	op2.o_req_ndn = ndn;
-	op2.orm_modlist = &ml;
-
-	modtail = &ml.sml_next;
-	rs->sr_err = slap_mods_opattrs( &op2, &ml, modtail, &rs->sr_text,
-		NULL, 0 );
-	
-	if ( rs->sr_err == LDAP_SUCCESS ) {
-		rs->sr_err = op2.o_bd->be_modify( &op2, rs );
+	ml->sml_values[i].bv_val = NULL;
+	ml->sml_nvalues = NULL;
+	ml->sml_desc = slap_schema.si_ad_userPassword;
+	ml->sml_op = LDAP_MOD_REPLACE;
+	ml->sml_next = qpw->rs_mods;
+	qpw->rs_mods = ml;
+
+	if ( hashes[i] ) {
+		rs->sr_err = LDAP_OTHER;
+
+	} else {
+		op2 = *op;
+		op2.o_tag = LDAP_REQ_MODIFY;
+		op2.o_callback = &cb2;
+		op2.orm_modlist = qpw->rs_mods;
+		cb2.sc_private = qpw;	/* let Modify know this was pwdMod,
+					 * if it cares... */
+
+		rs->sr_err = slap_mods_opattrs( &op2, ml, qpw->rs_modtail, &rs->sr_text,
+			NULL, 0, 1 );
+		
+		if ( rs->sr_err == LDAP_SUCCESS ) {
+			rs->sr_err = op2.o_bd->be_modify( &op2, rs );
+			/* FIXME: in case it got rewritten... */
+			op->o_req_dn = op2.o_req_dn;
+			op->o_req_ndn = op2.o_req_ndn;
+		}
 		if ( rs->sr_err == LDAP_SUCCESS ) {
-			replog( &op2 );
+			rs->sr_rspdata = rsp;
+		} else if ( rsp ) {
+			ber_bvfree( rsp );
 		}
 	}
-	slap_mods_free( ml.sml_next );
-	free( hash.bv_val );
+	slap_mods_free( qpw->rs_mods );
+	if ( rsp ) {
+		free( qpw->rs_new.bv_val );
+	}
+
+	rc = rs->sr_err;
+
+error_return:;
+	if ( !BER_BVISNULL( &op->o_req_dn ) ) {
+		op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx );
+	}
+	if ( !BER_BVISNULL( &op->o_req_ndn ) ) {
+		op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx );
+	}
 
-	return rs->sr_err;
+	return rc;
 }
 
 int slap_passwd_parse( struct berval *reqdata,
@@ -170,7 +250,7 @@ int slap_passwd_parse( struct berval *reqdata,
 {
 	int rc = LDAP_SUCCESS;
 	ber_tag_t tag;
-	ber_len_t len;
+	ber_len_t len = -1;
 	BerElementBuffer berbuf;
 	BerElement *ber = (BerElement *)&berbuf;
 
@@ -188,19 +268,18 @@ int slap_passwd_parse( struct berval *reqdata,
 
 	tag = ber_scanf( ber, "{" /*}*/ );
 
-	if( tag != LBER_ERROR ) {
-		tag = ber_peek_tag( ber, &len );
+	if( tag == LBER_ERROR ) {
+		Debug( LDAP_DEBUG_TRACE,
+			"slap_passwd_parse: decoding error\n", 0, 0, 0 );
+		rc = LDAP_PROTOCOL_ERROR;
+		goto done;
 	}
 
+	tag = ber_peek_tag( ber, &len );
 	if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_ID ) {
 		if( id == NULL ) {
-#ifdef NEW_LOGGING
-			LDAP_LOG( OPERATION, ERR,
-			   "slap_passwd_parse: ID not allowed.\n", 0, 0, 0 );
-#else
 			Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ID not allowed.\n",
 				0, 0, 0 );
-#endif
 
 			*text = "user must change own password";
 			rc = LDAP_UNWILLING_TO_PERFORM;
@@ -210,13 +289,8 @@ int slap_passwd_parse( struct berval *reqdata,
 		tag = ber_scanf( ber, "m", id );
 
 		if( tag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
-			LDAP_LOG( OPERATION, ERR,
-			   "slap_passwd_parse:  ID parse failed.\n", 0, 0, 0 );
-#else
 			Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ID parse failed.\n",
 				0, 0, 0 );
-#endif
 
 			goto decoding_error;
 		}
@@ -226,13 +300,8 @@ int slap_passwd_parse( struct berval *reqdata,
 
 	if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_OLD ) {
 		if( oldpass == NULL ) {
-#ifdef NEW_LOGGING
-			LDAP_LOG( OPERATION, ERR,
-			   "slap_passwd_parse: OLD not allowed.\n" , 0, 0, 0 );
-#else
 			Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: OLD not allowed.\n",
 				0, 0, 0 );
-#endif
 
 			*text = "use bind to verify old password";
 			rc = LDAP_UNWILLING_TO_PERFORM;
@@ -242,13 +311,8 @@ int slap_passwd_parse( struct berval *reqdata,
 		tag = ber_scanf( ber, "m", oldpass );
 
 		if( tag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
-			LDAP_LOG( OPERATION, ERR,
-			   "slap_passwd_parse:  ID parse failed.\n" , 0, 0, 0 );
-#else
-			Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ID parse failed.\n",
+			Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: OLD parse failed.\n",
 				0, 0, 0 );
-#endif
 
 			goto decoding_error;
 		}
@@ -258,13 +322,8 @@ int slap_passwd_parse( struct berval *reqdata,
 
 	if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_NEW ) {
 		if( newpass == NULL ) {
-#ifdef NEW_LOGGING
-			LDAP_LOG( OPERATION, ERR,
-			   "slap_passwd_parse:  NEW not allowed.\n", 0, 0, 0 );
-#else
 			Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: NEW not allowed.\n",
 				0, 0, 0 );
-#endif
 
 			*text = "user specified passwords disallowed";
 			rc = LDAP_UNWILLING_TO_PERFORM;
@@ -274,13 +333,8 @@ int slap_passwd_parse( struct berval *reqdata,
 		tag = ber_scanf( ber, "m", newpass );
 
 		if( tag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
-			LDAP_LOG( OPERATION, ERR,
-			   "slap_passwd_parse:  OLD parse failed.\n", 0, 0, 0 );
-#else
-			Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: OLD parse failed.\n",
+			Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: NEW parse failed.\n",
 				0, 0, 0 );
-#endif
 
 			goto decoding_error;
 		}
@@ -290,14 +344,9 @@ int slap_passwd_parse( struct berval *reqdata,
 
 	if( len != 0 ) {
 decoding_error:
-#ifdef NEW_LOGGING
-		LDAP_LOG( OPERATION, ERR, 
-			"slap_passwd_parse: decoding error, len=%ld\n", (long)len, 0, 0 );
-#else
 		Debug( LDAP_DEBUG_TRACE,
 			"slap_passwd_parse: decoding error, len=%ld\n",
 			(long) len, 0, 0 );
-#endif
 
 		*text = "data decoding error";
 		rc = LDAP_PROTOCOL_ERROR;
@@ -318,13 +367,8 @@ struct berval * slap_passwd_return(
 
 	assert( cred != NULL );
 
-#ifdef NEW_LOGGING
-	LDAP_LOG( OPERATION, ENTRY, 
-		"slap_passwd_return: %ld\n",(long)cred->bv_len, 0, 0 );
-#else
 	Debug( LDAP_DEBUG_TRACE, "slap_passwd_return: %ld\n",
 		(long) cred->bv_len, 0, 0 );
-#endif
 	
 	ber_init_w_nullc( ber, LBER_USE_DER );
 
@@ -377,56 +421,53 @@ slap_passwd_check(
 void
 slap_passwd_generate( struct berval *pass )
 {
-	struct berval *tmp;
-#ifdef NEW_LOGGING
-	LDAP_LOG( OPERATION, ENTRY, "slap_passwd_generate: begin\n", 0, 0, 0 );
-#else
 	Debug( LDAP_DEBUG_TRACE, "slap_passwd_generate\n", 0, 0, 0 );
-#endif
+	pass->bv_val = NULL;
+	pass->bv_len = 0;
+
 	/*
 	 * generate passwords of only 8 characters as some getpass(3)
 	 * implementations truncate at 8 characters.
 	 */
-	tmp = lutil_passwd_generate( 8 );
-	if (tmp) {
-		*pass = *tmp;
-		free(tmp);
-	} else {
-		pass->bv_val = NULL;
-		pass->bv_len = 0;
-	}
+	lutil_passwd_generate( pass, 8 );
 }
 
 void
-slap_passwd_hash(
+slap_passwd_hash_type(
 	struct berval * cred,
 	struct berval * new,
+	char *hash,
 	const char **text )
 {
-	struct berval *tmp;
-#ifdef LUTIL_SHA1_BYTES
-	char* hash = default_passwd_hash ?  default_passwd_hash : "{SSHA}";
-#else
-	char* hash = default_passwd_hash ?  default_passwd_hash : "{SMD5}";
-#endif
-	
+	new->bv_len = 0;
+	new->bv_val = NULL;
+
+	assert( hash );
 
 #if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
 	ldap_pvt_thread_mutex_lock( &passwd_mutex );
 #endif
 
-	tmp = lutil_passwd_hash( cred , hash, text );
+	lutil_passwd_hash( cred , hash, new, text );
 	
 #if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
 	ldap_pvt_thread_mutex_unlock( &passwd_mutex );
 #endif
 
-	if( tmp == NULL ) {
-		new->bv_len = 0;
-		new->bv_val = NULL;
+}
+void
+slap_passwd_hash(
+	struct berval * cred,
+	struct berval * new,
+	const char **text )
+{
+	char *hash = NULL;
+	if ( default_passwd_hash ) {
+		hash = default_passwd_hash[0];
+	}
+	if ( !hash ) {
+		hash = (char *)defhash[0];
 	}
 
-	*new = *tmp;
-	free( tmp );
-	return;
+	slap_passwd_hash_type( cred, new, hash, text );
 }