]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/passwd.c
- LDAP_SYNCREPL defined in include/ldap.h
[openldap] / servers / slapd / passwd.c
index 381fb088fdcba8e72708bc615121af1d6c582353..b10bbe4b331820d24bc762198a4cba11e109509f 100644 (file)
@@ -1,7 +1,7 @@
 /* bind.c - ldbm backend bind and unbind routines */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 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(
-       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;
-
-       assert( reqoid != NULL );
-       assert( strcmp( LDAP_EXOP_X_MODIFY_PASSWD, reqoid ) == 0 );
+       assert( ber_bvcmp( &slap_EXOP_MODIFY_PASSWD, &op->ore_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 ) {
+               rs->sr_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->be_restrictops & SLAP_RESTRICT_OP_MODIFY ) {
-                       *text = "authorization database is read only";
-                       rc = LDAP_UNWILLING_TO_PERFORM;
+       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 && !op->o_bd->be_extended ) {
+               rs->sr_text = "operation not supported for current user";
+               return LDAP_UNWILLING_TO_PERFORM;
+       }
+
+       if (backend_check_restrictions( op, rs,
+                       (struct berval *)&slap_EXOP_MODIFY_PASSWD ) != LDAP_SUCCESS) {
+               return rs->sr_err;
+       }
 
-               } 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;
-
-               } else {
-                       rc = conn->c_authz_backend->be_extended(
-                               conn->c_authz_backend, conn, op,
-                               reqoid, reqdata,
-                               rspoid, rspdata, rspctrls,
-                               text, refs );
+       if( op->o_bd == NULL ) {
+#ifdef HAVE_CYRUS_SASL
+               rs->sr_err = slap_sasl_setpass( op, rs );
+#else
+               rs->sr_text = "no authz backend";
+               rs->sr_err = LDAP_OTHER;
+#endif
+
+#if defined(LDAP_SYNCREPL) || !defined(SLAPD_MULTIMASTER)
+       /* This does not apply to multi-master case */
+       } else if( op->o_bd->be_update_ndn.bv_len ) {
+               /* we SHOULD return a referral in this case */
+               BerVarray defref = NULL;
+#ifdef LDAP_SYNCREPL
+               if ( op->o_bd->syncinfo ) {
+                       defref = op->o_bd->syncinfo->master_bv;
+               } else
+#endif
+               {
+                       defref = referral_rewrite( op->o_bd->be_update_refs,
+                               NULL, NULL, LDAP_SCOPE_DEFAULT );
                }
+               rs->sr_ref = defref;
+               rs->sr_err = LDAP_REFERRAL;
+#endif /* !SLAPD_MULTIMASTER */
 
        } else {
-               *text = "operation not supported for current user";
-               rc = LDAP_UNWILLING_TO_PERFORM;
+               rs->sr_err = op->o_bd->be_extended( op, rs );
        }
 
-       return rc;
+       return rs->sr_err;
 }
 
 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;
+       char berbuf[LBER_ELEMENT_SIZEOF];
+       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 == LDAP_TAG_EXOP_X_MODIFY_PASSWD_ID ) {
+       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;
                        goto done;
                }
 
-               tag = ber_scanf( ber, "O", id );
+               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;
                }
 
                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 ) {
+#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;
                        goto done;
                }
 
-               tag = ber_scanf( ber, "O", oldpass );
+               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",
                                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( 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;
                        goto done;
                }
 
-               tag = ber_scanf( ber, "O", newpass );
+               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",
                                0, 0, 0 );
+#endif
+
                        goto decoding_error;
                }
 
@@ -156,33 +205,20 @@ int slap_passwd_parse( struct berval *reqdata,
 
        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;
        }
 
 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 +226,31 @@ 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;
+       char berbuf[LBER_ELEMENT_SIZEOF];
+       /* opaque structure, size unknown but smaller than berbuf */
+       BerElement *ber = (BerElement *)berbuf;
 
        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 );
-
-       if( ber == NULL ) return NULL;
+#endif
        
+       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,26 +259,27 @@ 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_PASSWD )
+#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;
                }
        }
 
-#if defined( SLAPD_CRYPT ) || defined( SLAPD_PASSWD )
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
 #ifdef SLAPD_SPASSWD
        lutil_passwd_sasl_conn = NULL;
 #endif
@@ -248,33 +289,59 @@ slap_passwd_check(
        return result;
 }
 
-struct berval * slap_passwd_generate( void )
+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
        /*
         * 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,
+       const char **text )
 {
-       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
+       
 
-#if defined( SLAPD_CRYPT ) || defined( SLAPD_PASSWD )
+#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, text );
        
-#if defined( SLAPD_CRYPT ) || defined( SLAPD_PASSWD )
+#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;
 }