/* bind.c - ldbm backend bind and unbind routines */
/* $OpenLDAP$ */
/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include "slap.h"
+#include <lber_pvt.h>
#include <lutil.h>
int passwd_extop(
- SLAP_EXTOP_CALLBACK_FN ext_callback,
Connection *conn, Operation *op,
- char *reqoid,
+ const char *reqoid,
struct berval *reqdata,
char **rspoid,
struct berval **rspdata,
LDAPControl ***rspctrls,
- char **text,
- struct berval ***refs )
+ const char **text,
+ BerVarray *refs )
{
int rc;
assert( reqoid != NULL );
- assert( strcmp( LDAP_EXOP_X_MODIFY_PASSWD, reqoid ) == 0 );
+ assert( strcmp( LDAP_EXOP_MODIFY_PASSWD, reqoid ) == 0 );
- if( op->o_dn == NULL || op->o_dn[0] == '\0' ) {
- *text = "only authenicated users may change passwords";
+ if( op->o_dn.bv_len == 0 ) {
+ *text = "only authenticated users may change passwords";
return LDAP_STRONG_AUTH_REQUIRED;
}
- if( conn->c_authz_backend != NULL && conn->c_authz_backend->be_extended )
+ if( conn->c_authz_backend == NULL || !conn->c_authz_backend->be_extended ) {
+ *text = "operation not supported for current user";
+ return LDAP_UNWILLING_TO_PERFORM;
+ }
+
{
- if( global_readonly || conn->c_authz_backend->be_readonly ) {
- *text = "authorization database is read only";
- rc = LDAP_UNWILLING_TO_PERFORM;
+ struct berval passwd = BER_BVC( LDAP_EXOP_MODIFY_PASSWD );
- } 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;
- rc = LDAP_REFERRAL;
+ rc = backend_check_restrictions( conn->c_authz_backend,
+ conn, op, &passwd, text );
+ }
- } else {
- rc = conn->c_authz_backend->be_extended(
- conn->c_authz_backend, conn, op,
- reqoid, reqdata,
- rspoid, rspdata, rspctrls,
- text, refs );
- }
+ if( rc != LDAP_SUCCESS ) {
+ return rc;
+ }
+
+ if( conn->c_authz_backend->be_update_ndn.bv_len ) {
+ /* we SHOULD return a referral in this case */
+ *refs = referral_rewrite( conn->c_authz_backend->be_update_refs,
+ NULL, NULL, LDAP_SCOPE_DEFAULT );
+ rc = LDAP_REFERRAL;
} else {
- *text = "operation not supported for current user";
- rc = LDAP_UNWILLING_TO_PERFORM;
+ rc = conn->c_authz_backend->be_extended(
+ conn->c_authz_backend, conn, op,
+ reqoid, reqdata,
+ rspoid, rspdata, rspctrls,
+ text, refs );
}
return rc;
}
int slap_passwd_parse( struct berval *reqdata,
- struct berval **id,
- struct berval **old,
- struct berval **new,
- char **text )
+ 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;
+ char berbuf[256];
+ 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";
- return LDAP_PROTOCOL_ERROR;
- }
+ /* ber_init2 uses reqdata directly, doesn't allocate new buffers */
+ ber_init2( ber, reqdata, 0 );
tag = ber_scanf( ber, "{" /*}*/ );
tag = ber_peek_tag( ber, &len );
}
- if( tag == LDAP_TAG_EXOP_X_MODIFY_PASSWD_ID ) {
+ if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_ID ) {
if( id == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "slap_passwd_parse: ID not allowed.\n"));
+#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;
goto done;
}
- tag = ber_scanf( ber, "O", id );
+ tag = ber_scanf( ber, "m", id );
if( tag == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "slap_passwd_parse: ID parse failed.\n"));
+#else
Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ID parse failed.\n",
0, 0, 0 );
+#endif
+
goto decoding_error;
}
tag = ber_peek_tag( ber, &len);
}
- if( tag == LDAP_TAG_EXOP_X_MODIFY_PASSWD_OLD ) {
- if( old == NULL ) {
+ if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_OLD ) {
+ if( oldpass == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "slap_passwd_parse: OLD not allowed.\n" ));
+#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;
goto done;
}
- tag = ber_scanf( ber, "O", old );
+ tag = ber_scanf( ber, "m", oldpass );
if( tag == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "slap_passwd_parse: ID parse failed.\n" ));
+#else
Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ID parse failed.\n",
0, 0, 0 );
+#endif
+
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( new == NULL ) {
+ if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_NEW ) {
+ if( newpass == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "slap_passwd_parse: NEW not allowed.\n" ));
+#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;
goto done;
}
- tag = ber_scanf( ber, "O", new );
+ tag = ber_scanf( ber, "m", newpass );
if( tag == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "slap_passwd_parse: OLD parse failed.\n"));
+#else
Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: OLD parse failed.\n",
0, 0, 0 );
+#endif
+
goto decoding_error;
}
if( len != 0 ) {
decoding_error:
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "slap_passwd_parse: decoding error, len=%ld\n", (long)len ));
+#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;
}
done:
- if( rc != LDAP_SUCCESS ) {
- if( id != NULL ) {
- ber_bvfree( *id );
- *id = NULL;
- }
-
- if( old != NULL ) {
- ber_bvfree( *old );
- *old = NULL;
- }
-
- if( new != NULL ) {
- ber_bvfree( *new );
- *new = NULL;
- }
- }
-
- ber_free( ber, 1 );
return rc;
}
struct berval *cred )
{
int rc;
- struct berval *bv;
- BerElement *ber = ber_alloc_t(LBER_USE_DER);
+ struct berval *bv = NULL;
+ char berbuf[256];
+ /* opaque structure, size unknown but smaller than berbuf */
+ BerElement *ber = (BerElement *)berbuf;
assert( cred != NULL );
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+ "slap_passwd_return: %ld\n",(long)cred->bv_len ));
+#else
Debug( LDAP_DEBUG_TRACE, "slap_passwd_return: %ld\n",
(long) cred->bv_len, 0, 0 );
-
- if( ber == NULL ) return NULL;
+#endif
- rc = ber_printf( ber, "{tO}",
- LDAP_TAG_EXOP_X_MODIFY_PASSWD_GEN, cred );
+ ber_init_w_nullc( ber, LBER_USE_DER );
- if( rc == -1 ) {
- ber_free( ber, 1 );
- return NULL;
- }
+ rc = ber_printf( ber, "{tON}",
+ LDAP_TAG_EXOP_MODIFY_PASSWD_GEN, cred );
- (void) ber_flatten( ber, &bv );
+ if( rc >= 0 ) {
+ (void) ber_flatten( ber, &bv );
+ }
- ber_free( ber, 1 );
+ ber_free_buf( ber );
return bv;
}
int
slap_passwd_check(
+ Connection *conn,
Attribute *a,
struct berval *cred )
{
- 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_context;
#endif
-
- result = lutil_passwd( a->a_vals[i], cred, NULL );
-
-#ifdef SLAPD_CRYPT
- ldap_pvt_thread_mutex_unlock( &crypt_mutex );
#endif
- if( !result )
- return result;
+ for ( bv = a->a_vals; bv->bv_val != NULL; bv++ ) {
+ if( !lutil_passwd( bv, cred, NULL ) ) {
+ 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( void )
+void
+slap_passwd_generate( struct berval *pass )
{
+ struct berval *tmp;
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+ "slap_passwd_generate: begin\n" ));
+#else
Debug( LDAP_DEBUG_TRACE, "slap_passwd_generate\n", 0, 0, 0 );
-
+#endif
/*
* generate passwords of only 8 characters as some getpass(3)
* implementations truncate at 8 characters.
*/
- return lutil_passwd_generate( 8 );
+ tmp = lutil_passwd_generate( 8 );
+ if (tmp) {
+ *pass = *tmp;
+ free(tmp);
+ } else {
+ pass->bv_val = NULL;
+ pass->bv_len = 0;
+ }
}
-struct berval * slap_passwd_hash(
- struct berval * cred )
+void
+slap_passwd_hash(
+ struct berval * cred,
+ struct berval * new )
{
- char* hash = default_passwd_hash ? default_passwd_hash : "{SSHA}";
-
- struct berval *new;
+ 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
+
-#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 = lutil_passwd_hash( cred , hash );
+ tmp = lutil_passwd_hash( cred , hash );
-#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
- return new;
+ if( tmp == NULL ) {
+ new->bv_len = 0;
+ new->bv_val = NULL;
+ }
+
+ *new = *tmp;
+ free( tmp );
+ return;
}