/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include <lber_pvt.h>
#include <lutil.h>
+#include <lutil_sha1.h>
static const char *defhash[] = {
#ifdef LUTIL_SHA1_BYTES
{
struct berval id = {0, NULL}, hash, *rsp = NULL;
req_pwdexop_s *qpw = &op->oq_pwdexop;
+ req_extended_s qext = op->oq_extended;
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;
+ BackendDB *op_be;
cb2.sc_next = &cb;
}
if ( id.bv_len ) {
- op->o_req_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, &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( &op->o_req_ndn, 0, 0 );
+ op->o_bd = select_backend( &op->o_req_ndn, 0, 1 );
+
} else {
- op->o_req_dn = op->o_dn;
- op->o_req_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( op->o_bd == NULL ) {
#ifdef HAVE_CYRUS_SASL
- return slap_sasl_setpass( op, rs );
+ rc = slap_sasl_setpass( op, rs );
#else
rs->sr_text = "no authz backend";
- return LDAP_OTHER;
+ rc = LDAP_OTHER;
#endif
+ goto error_return;
}
if ( op->o_req_ndn.bv_len == 0 ) {
rs->sr_text = "no password is associated with the Root DSE";
- return LDAP_UNWILLING_TO_PERFORM;
+ rc = LDAP_UNWILLING_TO_PERFORM;
+ goto error_return;
+ }
+
+ /* If we've got a glued backend, check the real backend */
+ op_be = op->o_bd;
+ if ( SLAP_GLUE_INSTANCE( op->o_bd )) {
+ op->o_bd = select_backend( &op->o_req_ndn, 0, 0 );
}
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;
}
+ /* check for referrals */
+ if ( backend_check_referrals( op, rs ) != LDAP_SUCCESS ) {
+ rc = rs->sr_err;
+ goto error_return;
+ }
#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 ( qpw->rs_new.bv_len == 0 ) {
rs->sr_text = "password generation failed";
- return LDAP_OTHER;
+ rc = LDAP_OTHER;
+ goto error_return;
}
+ op->o_bd = op_be;
+
/* 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 ) {
- return rs->sr_err;
+ 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";
- return LDAP_UNWILLING_TO_PERFORM;
+ rc = LDAP_UNWILLING_TO_PERFORM;
+ goto error_return;
}
ml = ch_malloc( sizeof(Modifications) );
}
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 );
+ 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";
ml->sml_values[i].bv_val = NULL;
ml->sml_nvalues = NULL;
ml->sml_desc = slap_schema.si_ad_userPassword;
- ml->sml_op = qpw->rs_old.bv_val ? LDAP_MOD_ADD : LDAP_MOD_REPLACE;
+ ml->sml_op = LDAP_MOD_REPLACE;
ml->sml_next = qpw->rs_mods;
qpw->rs_mods = ml;
- if ( qpw->rs_old.bv_val ) {
- ml = ch_malloc( sizeof(Modifications) );
- ml->sml_values = ch_malloc( (nhash+1)*sizeof(struct berval) );
- for ( i=0; hashes[i]; i++ ) {
- slap_passwd_hash( hashes[i], &qpw->rs_old, &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;
- }
- ml->sml_values[i].bv_val = NULL;
- ml->sml_desc = slap_schema.si_ad_userPassword;
- ml->sml_op = LDAP_MOD_DELETE;
- ml->sml_next = qpw->rs_mods;
- qpw->rs_mods = ml;
- }
+
if ( hashes[i] ) {
rs->sr_err = LDAP_OTHER;
+
} else {
+ slap_callback *sc = op->o_callback;
- op2 = *op;
- op2.o_tag = LDAP_REQ_MODIFY;
- op2.o_callback = &cb2;
- op2.orm_modlist = qpw->rs_mods;
+ op->o_tag = LDAP_REQ_MODIFY;
+ op->o_callback = &cb2;
+ op->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 );
+ rs->sr_err = slap_mods_opattrs( op, 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 );
+ rs->sr_err = op->o_bd->be_modify( op, rs );
}
if ( rs->sr_err == LDAP_SUCCESS ) {
rs->sr_rspdata = rsp;
} else if ( rsp ) {
ber_bvfree( rsp );
}
+ op->o_tag = LDAP_REQ_EXTENDED;
+ op->o_callback = sc;
}
slap_mods_free( qpw->rs_mods );
if ( rsp ) {
free( qpw->rs_new.bv_val );
}
- return rs->sr_err;
+ rc = rs->sr_err;
+ op->oq_extended = qext;
+
+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,
tag = ber_scanf( ber, "{" /*}*/ );
if( tag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "slap_passwd_parse: decoding error\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_TRACE,
"slap_passwd_parse: decoding error\n", 0, 0, 0 );
-#endif
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;
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;
}
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;
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;
}
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;
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;
}
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;
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 );
return bv;
}
+/*
+ * if "e" is provided, access to each value of the password is checked first
+ */
int
slap_passwd_check(
- Connection *conn,
- Attribute *a,
- struct berval *cred,
- const char **text )
+ Operation *op,
+ Entry *e,
+ Attribute *a,
+ struct berval *cred,
+ const char **text )
{
- int result = 1;
- struct berval *bv;
+ int result = 1;
+ struct berval *bv;
+ AccessControlState acl_state = ACL_STATE_INIT;
#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;
+ lutil_passwd_sasl_conn = op->o_conn->c_sasl_authctx;
#endif
#endif
for ( bv = a->a_vals; bv->bv_val != NULL; bv++ ) {
- if( !lutil_passwd( bv, cred, NULL, text ) ) {
+ /* if e is provided, check access */
+ if ( e && access_allowed( op, e, a->a_desc, bv,
+ ACL_AUTH, &acl_state ) == 0 )
+ {
+ continue;
+ }
+
+ if ( !lutil_passwd( bv, cred, NULL, text ) ) {
result = 0;
break;
}
void
slap_passwd_generate( struct berval *pass )
{
-#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;
}
void
-slap_passwd_hash(
- char *hash,
+slap_passwd_hash_type(
struct berval * cred,
struct berval * new,
+ char *hash,
const char **text )
{
new->bv_len = 0;
new->bv_val = NULL;
- if ( !hash ) {
- if ( default_passwd_hash ) {
- hash = default_passwd_hash[0];
- }
- if ( !hash ) {
- hash = (char *)defhash[0];
- }
- }
+ assert( hash );
#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
ldap_pvt_thread_mutex_lock( &passwd_mutex );
#endif
}
+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 );
+}
projects / openldap / blobdiff