#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], tmpbv, *rsp = NULL;
- 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 = { NULL, slap_null_cb, NULL, NULL };
slap_callback cb2 = { NULL, slap_replog_cb, NULL, NULL };
+ int i, nhash;
+ char **hashes;
+
cb2.sc_next = &cb;
assert( ber_bvcmp( &slap_EXOP_MODIFY_PASSWD, &op->ore_reqoid ) == 0 );
return LDAP_STRONG_AUTH_REQUIRED;
}
- if( op->oq_extended.rs_reqdata ) {
- ber_dupbv_x( &tmpbv, op->oq_extended.rs_reqdata, op->o_tmpmemctx );
- }
- rs->sr_err = slap_passwd_parse(
- op->oq_extended.rs_reqdata ? &tmpbv : NULL,
- &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;
+ op->o_req_dn = id;
/* 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;
}
- 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;
+ op->o_req_dn = op->o_dn;
+ op->o_req_ndn = op->o_ndn;
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 );
#endif
}
- if ( ndn.bv_len == 0 ) {
+ if ( op->o_req_ndn.bv_len == 0 ) {
rs->sr_text = "no password is associated with the Root DSE";
return LDAP_UNWILLING_TO_PERFORM;
}
}
#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";
+ return LDAP_OTHER;
+ }
+
/* 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 ) {
+ if ( rs->sr_err != LDAP_UNWILLING_TO_PERFORM &&
+ rs->sr_err != SLAP_CB_CONTINUE ) {
return rs->sr_err;
}
}
return LDAP_UNWILLING_TO_PERFORM;
}
- if ( new.bv_len == 0 ) {
- slap_passwd_generate( &new );
- rsp = slap_passwd_return( &new );
+ 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 ( new.bv_len == 0 ) {
- rs->sr_text = "password generation failed";
- return LDAP_OTHER;
+ ml->sml_values = ch_malloc( (nhash+1)*sizeof(struct berval) );
+ for ( i=0; hashes[i]; i++ ) {
+ slap_passwd_hash( hashes[i], &qpw->rs_new, &hash, &rs->sr_text );
+ if ( hash.bv_len == 0 ) {
+ if ( !rs->sr_text ) {
+ rs->sr_text = "password hash failed";
+ }
+ break;
+ }
+ ml->sml_values[i] = hash;
}
- slap_passwd_hash( &new, &hash, &rs->sr_text );
+ 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 ( rsp ) {
- free( new.bv_val );
+ free( qpw->rs_new.bv_val );
}
- if ( hash.bv_len == 0 ) {
- if ( !rs->sr_text ) {
- rs->sr_text = "password hash failed";
+ 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;
+
+ rs->sr_err = slap_mods_opattrs( &op2, ml, qpw->rs_modtail, &rs->sr_text,
+ NULL, 0 );
+
+ if ( rs->sr_err == LDAP_SUCCESS ) {
+ rs->sr_err = op2.o_bd->be_modify( &op2, rs );
+ }
+ if ( rs->sr_err == LDAP_SUCCESS ) {
+ rs->sr_rspdata = rsp;
+ } else if ( rsp ) {
+ ber_bvfree( rsp );
}
- return LDAP_OTHER;
- }
- 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 = &cb2;
- 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 );
- }
- if ( rs->sr_err == LDAP_SUCCESS ) {
- 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 );
return rs->sr_err;
}
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(
+ char *hash,
struct berval * cred,
struct berval * new,
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;
#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;
- }
-
- *new = *tmp;
- free( tmp );
- return;
}