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

diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index b06cd71e05..d848e7a6cc 100644
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -1,8 +1,17 @@
-/* bind.c - ldbm backend bind and unbind routines */
+/* passwd.c - password extended operation routines */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -16,133 +25,449 @@
 
 #include "slap.h"
 
+#include <lber_pvt.h>
 #include <lutil.h>
 
-static int passwd_main(
-	SLAP_EXTOP_CALLBACK_FN ext_callback,
-	Connection *conn, Operation *op, char *oid,
-	struct berval *reqdata, struct berval **rspdata, char **text )
+static const char *defhash[] = {
+#ifdef LUTIL_SHA1_BYTES
+	"{SSHA}",
+#else
+	"{SMD5}",
+#endif
+	NULL
+};
+
+int passwd_extop(
+	Operation *op,
+	SlapReply *rs )
 {
-	int rc;
-	BerElement *ber;
-	struct berval *cred = NULL;
-	ber_int_t type;
+	struct berval id = {0, NULL}, hash, *rsp = NULL;
+	req_pwdexop_s *qpw = &op->oq_pwdexop;
+	Modifications *ml;
+	Operation op2;
+	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 );
+
+	if( op->o_dn.bv_len == 0 ) {
+		rs->sr_text = "only authenticated users may change passwords";
+		return LDAP_STRONG_AUTH_REQUIRED;
+	}
 
-	assert( oid != NULL );
-	assert( strcmp( LDAP_EXOP_X_MODIFY_PASSWD, oid ) == 0 );
+	qpw->rs_old.bv_val = NULL;
+	qpw->rs_new.bv_val = NULL;
+	qpw->rs_mods = NULL;
+	qpw->rs_modtail = NULL;
 
-	if( op->o_dn == NULL || op->o_dn[0] == '\0' ) {
-		*text = ch_strdup("only authenicated users may change passwords");
-		return LDAP_STRONG_AUTH_REQUIRED;
+	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( reqdata == NULL || reqdata->bv_len == 0 ) {
-		*text = ch_strdup("data missing");
-		return LDAP_PROTOCOL_ERROR;
+	if ( id.bv_len ) {
+		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, &id, &op->o_req_ndn, op->o_tmpmemctx );
+		if ( rs->sr_err != LDAP_SUCCESS ) {
+			rs->sr_text = "Invalid DN";
+			rc = rs->sr_err;
+			goto error_return;
+		}
+		op->o_bd = select_backend( &op->o_req_ndn, 0, 0 );
+
+	} else {
+		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( 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;
 	}
 
-	ber = ber_init( reqdata );
+	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( ber == NULL ) {
-		*text = ch_strdup("password decoding error");
-		return LDAP_PROTOCOL_ERROR;
+	if (backend_check_restrictions( op, rs,
+			(struct berval *)&slap_EXOP_MODIFY_PASSWD ) != LDAP_SUCCESS) {
+		rc = rs->sr_err;
+		goto error_return;
 	}
 
-	rc = ber_scanf(ber, "{iO}", &type, &cred );
-	ber_free( ber, 1 );
 
-	if( rc == LBER_ERROR ) {
-		*text = ch_strdup("data decoding error");
-		return LDAP_PROTOCOL_ERROR;
+#ifndef SLAPD_MULTIMASTER
+	/* This does not apply to multi-master case */
+	if(!( !SLAP_SHADOW( op->o_bd ) || be_isupdate( op ))) {
+		/* we SHOULD return a referral in this case */
+		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_text = "shadow context; no update referral";
+		rc = LDAP_UNWILLING_TO_PERFORM;
+		goto error_return;
+	}
+#endif /* !SLAPD_MULTIMASTER */
+
+	/* 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 ( qpw->rs_new.bv_len == 0 ) {
+		rs->sr_text = "password generation failed";
+		rc = LDAP_OTHER;
+		goto error_return;
 	}
 
-	if( cred == NULL || cred->bv_len == 0 ) {
-		*text = ch_strdup("password missing");
-		return LDAP_PROTOCOL_ERROR;
+	/* 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;
+		}
 	}
 
-	if( type != 0 ) {
-		ber_bvfree( cred );
-		*text = ch_strdup("password type unknown");
-		return LDAP_PROTOCOL_ERROR;
+	/* 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;
 	}
 
-	if( conn->c_authz_backend != NULL &&
-		conn->c_authz_backend->be_extended )
-	{
-		rc = conn->c_authz_backend->be_extended(
-			conn->c_authz_backend,
-			conn, op,
-			oid, cred, rspdata, text );
+	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 {
-		*text = ch_strdup("operation not supported for current user");
-		rc = LDAP_UNWILLING_TO_PERFORM;
+		nhash = 1;
+		hashes = (char **)defhash;
+	}
+	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;
+		}
+		ml->sml_values[i] = hash;
+	}
+	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 ) {
+			rs->sr_rspdata = rsp;
+		} else if ( rsp ) {
+			ber_bvfree( rsp );
+		}
+	}
+	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 );
 	}
 
-	ber_bvfree( cred );
 	return rc;
 }
 
-int
-slap_passwd_init( void )
+int slap_passwd_parse( struct berval *reqdata,
+	struct berval *id,
+	struct berval *oldpass,
+	struct berval *newpass,
+	const char **text )
 {
-	return load_extop( LDAP_EXOP_X_MODIFY_PASSWD, passwd_main );
+	int rc = LDAP_SUCCESS;
+	ber_tag_t tag;
+	ber_len_t len = -1;
+	BerElementBuffer berbuf;
+	BerElement *ber = (BerElement *)&berbuf;
+
+	if( reqdata == NULL ) {
+		return LDAP_SUCCESS;
+	}
+
+	if( reqdata->bv_len == 0 ) {
+		*text = "empty request data field";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	/* ber_init2 uses reqdata directly, doesn't allocate new buffers */
+	ber_init2( ber, reqdata, 0 );
+
+	tag = ber_scanf( ber, "{" /*}*/ );
+
+	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 ) {
+			Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ID not allowed.\n",
+				0, 0, 0 );
+
+			*text = "user must change own password";
+			rc = LDAP_UNWILLING_TO_PERFORM;
+			goto done;
+		}
+
+		tag = ber_scanf( ber, "m", id );
+
+		if( tag == LBER_ERROR ) {
+			Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ID parse failed.\n",
+				0, 0, 0 );
+
+			goto decoding_error;
+		}
+
+		tag = ber_peek_tag( ber, &len);
+	}
+
+	if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_OLD ) {
+		if( oldpass == NULL ) {
+			Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: OLD not allowed.\n",
+				0, 0, 0 );
+
+			*text = "use bind to verify old password";
+			rc = LDAP_UNWILLING_TO_PERFORM;
+			goto done;
+		}
+
+		tag = ber_scanf( ber, "m", oldpass );
+
+		if( tag == LBER_ERROR ) {
+			Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: OLD parse failed.\n",
+				0, 0, 0 );
+
+			goto decoding_error;
+		}
+
+		tag = ber_peek_tag( ber, &len );
+	}
+
+	if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_NEW ) {
+		if( newpass == NULL ) {
+			Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: NEW not allowed.\n",
+				0, 0, 0 );
+
+			*text = "user specified passwords disallowed";
+			rc = LDAP_UNWILLING_TO_PERFORM;
+			goto done;
+		}
+
+		tag = ber_scanf( ber, "m", newpass );
+
+		if( tag == LBER_ERROR ) {
+			Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: NEW parse failed.\n",
+				0, 0, 0 );
+
+			goto decoding_error;
+		}
+
+		tag = ber_peek_tag( ber, &len );
+	}
+
+	if( len != 0 ) {
+decoding_error:
+		Debug( LDAP_DEBUG_TRACE,
+			"slap_passwd_parse: decoding error, len=%ld\n",
+			(long) len, 0, 0 );
+
+		*text = "data decoding error";
+		rc = LDAP_PROTOCOL_ERROR;
+	}
+
+done:
+	return rc;
+}
+
+struct berval * slap_passwd_return(
+	struct berval		*cred )
+{
+	int rc;
+	struct berval *bv = NULL;
+	BerElementBuffer berbuf;
+	/* opaque structure, size unknown but smaller than berbuf */
+	BerElement *ber = (BerElement *)&berbuf;
+
+	assert( cred != NULL );
+
+	Debug( LDAP_DEBUG_TRACE, "slap_passwd_return: %ld\n",
+		(long) cred->bv_len, 0, 0 );
+	
+	ber_init_w_nullc( ber, LBER_USE_DER );
+
+	rc = ber_printf( ber, "{tON}",
+		LDAP_TAG_EXOP_MODIFY_PASSWD_GEN, cred );
+
+	if( rc >= 0 ) {
+		(void) ber_flatten( ber, &bv );
+	}
+
+	ber_free_buf( ber );
+
+	return bv;
 }
 
 int
 slap_passwd_check(
+	Connection *conn,
 	Attribute *a,
-	struct berval *cred )
+	struct berval *cred,
+	const char **text )
 {
-	int     i;
-	for ( i = 0; a->a_vals[i] != NULL; i++ ) {
-		int result;
+	int result = 1;
+	struct berval *bv;
 
-#ifdef SLAPD_CRYPT
-		ldap_pvt_thread_mutex_lock( &crypt_mutex );
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
+	ldap_pvt_thread_mutex_lock( &passwd_mutex );
+#ifdef SLAPD_SPASSWD
+	lutil_passwd_sasl_conn = conn->c_sasl_authctx;
 #endif
-
-		result = lutil_passwd(
-			a->a_vals[i]->bv_val,
-			cred->bv_val,
-			NULL );
-
-#ifdef SLAPD_CRYPT
-		ldap_pvt_thread_mutex_unlock( &crypt_mutex );
 #endif
 
-		return result;
+	for ( bv = a->a_vals; bv->bv_val != NULL; bv++ ) {
+		if( !lutil_passwd( bv, cred, NULL, text ) ) {
+			result = 0;
+			break;
+		}
 	}
 
-	return( 1 );
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
+#ifdef SLAPD_SPASSWD
+	lutil_passwd_sasl_conn = NULL;
+#endif
+	ldap_pvt_thread_mutex_unlock( &passwd_mutex );
+#endif
+
+	return result;
 }
 
-struct berval * slap_passwd_generate(
-	struct berval * cred )
+void
+slap_passwd_generate( struct berval *pass )
 {
-	char* hash = default_passwd_hash ? default_passwd_hash : "{SSHA}";
+	Debug( LDAP_DEBUG_TRACE, "slap_passwd_generate\n", 0, 0, 0 );
+	pass->bv_val = NULL;
+	pass->bv_len = 0;
+
+	/*
+	 * generate passwords of only 8 characters as some getpass(3)
+	 * implementations truncate at 8 characters.
+	 */
+	lutil_passwd_generate( pass, 8 );
+}
 
-	struct berval *new = ber_memalloc( sizeof(struct berval) );
+void
+slap_passwd_hash_type(
+	struct berval * cred,
+	struct berval * new,
+	char *hash,
+	const char **text )
+{
+	new->bv_len = 0;
+	new->bv_val = NULL;
 
-	if( new == NULL ) return NULL;
+	assert( hash );
 
-#ifdef SLAPD_CRYPT
-	ldap_pvt_thread_mutex_lock( &crypt_mutex );
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
+	ldap_pvt_thread_mutex_lock( &passwd_mutex );
 #endif
 
-	new->bv_val = lutil_passwd_generate( cred->bv_val , hash );
+	lutil_passwd_hash( cred , hash, new, text );
 	
-#ifdef SLAPD_CRYPT
-	ldap_pvt_thread_mutex_unlock( &crypt_mutex );
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
+	ldap_pvt_thread_mutex_unlock( &passwd_mutex );
 #endif
 
-	if( new->bv_val == NULL ) {
-		ber_bvfree( new );
-		return 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->bv_len = strlen( new->bv_val );
-
-	return new;
+	slap_passwd_hash_type( cred, new, hash, text );
 }