X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fpasswd.c;h=d848e7a6cc2e4f7491bea1daf914d253899cc744;hb=9c550e7235830af9d031d8d7ba86b87f36dcc99f;hp=63110da27139c33830be51c5fdc79db42bb7c1ed;hpb=c42c2847cf4ad818df2f67fb2833293a84453cda;p=openldap
diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index 63110da271..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-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * 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
+ * .
*/
#include "portable.h"
@@ -16,138 +25,317 @@
#include "slap.h"
+#include
#include
+static const char *defhash[] = {
+#ifdef LUTIL_SHA1_BYTES
+ "{SSHA}",
+#else
+ "{SMD5}",
+#endif
+ NULL
+};
+
int passwd_extop(
- Connection *conn, Operation *op,
- const char *reqoid,
- struct berval *reqdata,
- char **rspoid,
- struct berval **rspdata,
- LDAPControl ***rspctrls,
- const char **text,
- struct berval ***refs )
+ Operation *op,
+ SlapReply *rs )
{
- int rc;
+ 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( reqoid != NULL );
- assert( strcmp( LDAP_EXOP_X_MODIFY_PASSWD, reqoid ) == 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 = "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( conn->c_authz_backend != NULL && conn->c_authz_backend->be_extended ) {
- if( conn->c_authz_backend->be_restrictops & SLAP_RESTRICT_OP_MODIFY ) {
- *text = "authorization database is read only";
- rc = LDAP_UNWILLING_TO_PERFORM;
+ 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;
+ }
- } else if( conn->c_authz_backend->be_update_ndn != NULL ) {
- /* we SHOULD return a referral in this case */
- *refs = conn->c_authz_backend->be_update_refs;
+ 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) {
+ rc = rs->sr_err;
+ goto error_return;
+ }
+
+
+#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;
- } else {
- rc = conn->c_authz_backend->be_extended(
- conn->c_authz_backend, conn, op,
- reqoid, reqdata,
- rspoid, rspdata, rspctrls,
- text, refs );
}
- } else {
- *text = "operation not supported for current user";
+ 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;
+ }
+
+ /* 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;
+ }
+
+ 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;
+ }
+ 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 );
}
return rc;
}
int slap_passwd_parse( struct berval *reqdata,
- struct berval **id,
- struct berval **oldpass,
- struct berval **newpass,
+ struct berval *id,
+ struct berval *oldpass,
+ struct berval *newpass,
const char **text )
{
int rc = LDAP_SUCCESS;
ber_tag_t tag;
- ber_len_t len;
- BerElement *ber;
+ ber_len_t len = -1;
+ BerElementBuffer berbuf;
+ BerElement *ber = (BerElement *)&berbuf;
if( reqdata == NULL ) {
return LDAP_SUCCESS;
}
- ber = ber_init( reqdata );
-
- if( ber == NULL ) {
- Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ber_init failed\n",
- 0, 0, 0 );
- *text = "password decoding error";
+ 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 ) {
- 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;
}
- if( tag == LDAP_TAG_EXOP_X_MODIFY_PASSWD_ID ) {
+ 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, "O", id );
+ 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_X_MODIFY_PASSWD_OLD ) {
+ 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, "O", oldpass );
+ tag = ber_scanf( ber, "m", oldpass );
if( tag == LBER_ERROR ) {
- 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 );
+
goto decoding_error;
}
- tag = ber_peek_tag( ber, &len);
+ tag = ber_peek_tag( ber, &len );
}
- if( tag == LDAP_TAG_EXOP_X_MODIFY_PASSWD_NEW ) {
+ 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, "O", newpass );
+ tag = ber_scanf( ber, "m", newpass );
if( tag == LBER_ERROR ) {
- 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 );
+
goto decoding_error;
}
@@ -165,24 +353,6 @@ decoding_error:
}
done:
- if( rc != LDAP_SUCCESS ) {
- if( id != NULL ) {
- ber_bvfree( *id );
- *id = NULL;
- }
-
- if( oldpass != NULL ) {
- ber_bvfree( *oldpass );
- *oldpass = NULL;
- }
-
- if( newpass != NULL ) {
- ber_bvfree( *newpass );
- *newpass = NULL;
- }
- }
-
- ber_free( ber, 1 );
return rc;
}
@@ -190,27 +360,26 @@ struct berval * slap_passwd_return(
struct berval *cred )
{
int rc;
- struct berval *bv;
- BerElement *ber = ber_alloc_t(LBER_USE_DER);
+ 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 );
-
- if( ber == NULL ) return NULL;
+ ber_init_w_nullc( ber, LBER_USE_DER );
+
rc = ber_printf( ber, "{tON}",
- LDAP_TAG_EXOP_X_MODIFY_PASSWD_GEN, cred );
+ LDAP_TAG_EXOP_MODIFY_PASSWD_GEN, cred );
- if( rc == -1 ) {
- ber_free( ber, 1 );
- return NULL;
+ if( rc >= 0 ) {
+ (void) ber_flatten( ber, &bv );
}
- (void) ber_flatten( ber, &bv );
-
- ber_free( ber, 1 );
+ ber_free_buf( ber );
return bv;
}
@@ -219,20 +388,21 @@ int
slap_passwd_check(
Connection *conn,
Attribute *a,
- struct berval *cred )
+ struct berval *cred,
+ const char **text )
{
- int i;
int result = 1;
+ struct berval *bv;
#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
ldap_pvt_thread_mutex_lock( &passwd_mutex );
#ifdef SLAPD_SPASSWD
- lutil_passwd_sasl_conn = conn->c_sasl_context;
+ lutil_passwd_sasl_conn = conn->c_sasl_authctx;
#endif
#endif
- for ( i = 0; a->a_vals[i] != NULL; i++ ) {
- if( !lutil_passwd( a->a_vals[i], cred, NULL ) ) {
+ for ( bv = a->a_vals; bv->bv_val != NULL; bv++ ) {
+ if( !lutil_passwd( bv, cred, NULL, text ) ) {
result = 0;
break;
}
@@ -248,33 +418,56 @@ slap_passwd_check(
return result;
}
-struct berval * slap_passwd_generate( void )
+void
+slap_passwd_generate( struct berval *pass )
{
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.
*/
- return lutil_passwd_generate( 8 );
+ lutil_passwd_generate( pass, 8 );
}
-struct berval * slap_passwd_hash(
- struct berval * cred )
+void
+slap_passwd_hash_type(
+ struct berval * cred,
+ struct berval * new,
+ char *hash,
+ const char **text )
{
- char* hash = default_passwd_hash ? default_passwd_hash : "{SSHA}";
+ new->bv_len = 0;
+ new->bv_val = NULL;
- struct berval *new;
+ assert( hash );
#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
ldap_pvt_thread_mutex_lock( &passwd_mutex );
#endif
- new = lutil_passwd_hash( cred , hash );
+ lutil_passwd_hash( cred , hash, new, text );
#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
ldap_pvt_thread_mutex_unlock( &passwd_mutex );
#endif
- return new;
+}
+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];
+ }
+
+ slap_passwd_hash_type( cred, new, hash, text );
}