Extend value_match to extract an asserted value from a full value

[openldap] / servers / slapd / passwd.c

diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index 8d7bb84dec66d79d1591dab7f3117602adf20b02..6e0b31b0e338bc53db8e096e3662010137f67a19 100644 (file)
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -19,14 +19,13 @@
 #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,
+       const char **text,
        struct berval ***refs )
 {
        int rc;
@@ -39,9 +38,8 @@ int passwd_extop(
                return LDAP_STRONG_AUTH_REQUIRED;
        }
 
-       if( conn->c_authz_backend != NULL && conn->c_authz_backend->be_extended )
-       {
-               if( global_readonly || conn->c_authz_backend->be_readonly ) {
+       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;
 
@@ -70,7 +68,7 @@ int slap_passwd_parse( struct berval *reqdata,
        struct berval **id,
        struct berval **oldpass,
        struct berval **newpass,
-       char **text )
+       const char **text )
 {
        int rc = LDAP_SUCCESS;
        ber_tag_t tag;
@@ -84,8 +82,14 @@ int slap_passwd_parse( struct berval *reqdata,
        ber = ber_init( reqdata );
 
        if( ber == NULL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "slap_passwd_parse: ber_init failed\n" ));
+#else
                Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ber_init failed\n",
                        0, 0, 0 );
+#endif
+
                *text = "password decoding error";
                return LDAP_PROTOCOL_ERROR;
        }
@@ -98,8 +102,14 @@ int slap_passwd_parse( struct berval *reqdata,
 
        if( tag == LDAP_TAG_EXOP_X_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;
@@ -108,8 +118,14 @@ int slap_passwd_parse( struct berval *reqdata,
                tag = ber_scanf( ber, "O", 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;
                }
 
@@ -118,8 +134,14 @@ int slap_passwd_parse( struct berval *reqdata,
 
        if( tag == LDAP_TAG_EXOP_X_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;
@@ -128,8 +150,14 @@ int slap_passwd_parse( struct berval *reqdata,
                tag = ber_scanf( ber, "O", 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;
                }
 
@@ -138,8 +166,14 @@ int slap_passwd_parse( struct berval *reqdata,
 
        if( tag == LDAP_TAG_EXOP_X_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;
@@ -148,8 +182,14 @@ int slap_passwd_parse( struct berval *reqdata,
                tag = ber_scanf( ber, "O", 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;
                }
 
@@ -158,9 +198,15 @@ int slap_passwd_parse( struct berval *reqdata,
 
        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;
@@ -197,12 +243,18 @@ struct berval * slap_passwd_return(
 
        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 );
+#endif
+
 
        if( ber == NULL ) return NULL;
        
-       rc = ber_printf( ber, "{tO}",
+       rc = ber_printf( ber, "{tON}",
                LDAP_TAG_EXOP_X_MODIFY_PASSWD_GEN, cred );
 
        if( rc == -1 ) {
@@ -219,33 +271,46 @@ struct berval * slap_passwd_return(
 
 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     i;
+       int result = 1;
 
-#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 ( i = 0; a->a_vals[i] != NULL; i++ ) {
+               if( !lutil_passwd( a->a_vals[i], 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 )
 {
+#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)
@@ -257,18 +322,23 @@ struct berval * slap_passwd_generate( void )
 struct berval * slap_passwd_hash(
        struct berval * cred )
 {
-       char* hash = default_passwd_hash ? default_passwd_hash : "{SSHA}";
+#ifdef LUTIL_SHA1_BYTES
+       char* hash = default_passwd_hash ?  default_passwd_hash : "{SSHA}";
+#else
+       char* hash = default_passwd_hash ?  default_passwd_hash : "{SMD5}";
+#endif
+       
 
        struct berval *new;
 
-#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 );
        
-#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;