X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fcyrus.c;h=63eb7d1357cc207155ce66b5e29fbdeb759c75ff;hb=7887ef7e92a4b91d20814242322dfc33d3ebb0ee;hp=df67f06de6ab14231d741532ffd15765163b9f9f;hpb=85c2a7a2a86d9578e0d794e23b090932eab42a22;p=openldap diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c index df67f06de6..63eb7d1357 100644 --- a/libraries/libldap/cyrus.c +++ b/libraries/libldap/cyrus.c @@ -1,34 +1,34 @@ /* $OpenLDAP$ */ /* - * Copyright 1999-2000 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1999-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ #include "portable.h" -#include #include #include +#include #include #include #include +#include #include "ldap-int.h" + +#ifdef HAVE_CYRUS_SASL + #ifdef LDAP_R_COMPILE -#include "ldap_pvt_thread.h" +ldap_pvt_thread_mutex_t ldap_int_sasl_mutex; #endif -#ifdef HAVE_CYRUS_SASL #include /* * Various Cyrus SASL related stuff. */ -#define SASL_MAX_BUFF_SIZE 65536 -#define SASL_MIN_BUFF_SIZE 4096 - int ldap_int_sasl_init( void ) { /* XXX not threadsafe */ @@ -64,6 +64,8 @@ int ldap_int_sasl_init( void ) ldap_pvt_sasl_mutex_lock, ldap_pvt_sasl_mutex_unlock, ldap_pvt_sasl_mutex_dispose ); + + ldap_pvt_thread_mutex_init( &ldap_int_sasl_mutex ); #endif if ( sasl_client_init( client_callbacks ) == SASL_OK ) { @@ -126,23 +128,27 @@ sb_sasl_remove( Sockbuf_IO_Desc *sbiod ) } static ber_len_t -sb_sasl_pkt_length( const char *buf, int debuglevel ) +sb_sasl_pkt_length( const unsigned char *buf, int debuglevel ) { ber_len_t size; - long tmp; assert( buf != NULL ); - tmp = *((long *)buf); - size = ntohl( tmp ); + size = buf[0] << 24 + | buf[1] << 16 + | buf[2] << 8 + | buf[3]; + /* we really should check against actual buffer size set + * in the secopts. + */ if ( size > SASL_MAX_BUFF_SIZE ) { /* somebody is trying to mess me up. */ ber_log_printf( LDAP_DEBUG_ANY, debuglevel, "sb_sasl_pkt_length: received illegal packet length " "of %lu bytes\n", (unsigned long)size ); size = 16; /* this should lead to an error. */ -} + } return size + 4; /* include the size !!! */ } @@ -155,7 +161,7 @@ sb_sasl_drop_packet ( Sockbuf_Buf *sec_buf_in, int debuglevel ) len = sec_buf_in->buf_ptr - sec_buf_in->buf_end; if ( len > 0 ) - memmove( sec_buf_in->buf_base, sec_buf_in->buf_base + + AC_MEMCPY( sec_buf_in->buf_base, sec_buf_in->buf_base + sec_buf_in->buf_end, len ); if ( len >= 4 ) { @@ -208,8 +214,9 @@ sb_sasl_read( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len) sbiod->sbiod_sb->sb_debug ); /* Grow the packet buffer if neccessary */ - if ( ( p->sec_buf_in.buf_size < ret ) && - ber_pvt_sb_grow_buffer( &p->sec_buf_in, ret ) < 0 ) { + if ( ( p->sec_buf_in.buf_size < (ber_len_t) ret ) && + ber_pvt_sb_grow_buffer( &p->sec_buf_in, ret ) < 0 ) + { errno = ENOMEM; return -1; } @@ -325,8 +332,14 @@ int ldap_pvt_sasl_install( Sockbuf *sb, void *ctx_arg ) if ( !ber_sockbuf_ctrl( sb, LBER_SB_OPT_HAS_IO, &ldap_pvt_sockbuf_io_sasl ) ) + { +#ifdef LDAP_DEBUG + ber_sockbuf_add_io( sb, &ber_sockbuf_io_debug, + LBER_SBIOD_LEVEL_APPLICATION, (void *)"sasl_" ); +#endif ber_sockbuf_add_io( sb, &ldap_pvt_sockbuf_io_sasl, LBER_SBIOD_LEVEL_APPLICATION, ctx_arg ); + } return LDAP_SUCCESS; } @@ -340,6 +353,9 @@ sasl_err2ldap( int saslerr ) case SASL_CONTINUE: rc = LDAP_MORE_RESULTS_TO_RETURN; break; + case SASL_INTERACT: + rc = LDAP_LOCAL_ERROR; + break; case SASL_OK: rc = LDAP_SUCCESS; break; @@ -380,28 +396,37 @@ ldap_int_sasl_open( { int rc; sasl_conn_t *ctx; + + sasl_callback_t *session_callbacks = + LDAP_CALLOC( 2, sizeof( sasl_callback_t ) ); + + if( session_callbacks == NULL ) return LDAP_NO_MEMORY; + + session_callbacks[0].id = SASL_CB_USER; + session_callbacks[0].proc = NULL; + session_callbacks[0].context = ld; + + session_callbacks[1].id = SASL_CB_LIST_END; + session_callbacks[1].proc = NULL; + session_callbacks[1].context = NULL; + assert( lc->lconn_sasl_ctx == NULL ); if ( host == NULL ) { - ld->ld_errno = LDAP_UNAVAILABLE; + ld->ld_errno = LDAP_LOCAL_ERROR; return ld->ld_errno; } - rc = sasl_client_new( "ldap", host, - NULL, -#ifdef LDAP_SASL_SECURITY_LAYER - SASL_SECURITY_LAYER, -#else - 0, -#endif - &ctx ); + rc = sasl_client_new( "ldap", host, session_callbacks, + SASL_SECURITY_LAYER, &ctx ); + LDAP_FREE( session_callbacks ); if ( rc != SASL_OK ) { ld->ld_errno = sasl_err2ldap( rc ); return ld->ld_errno; } - Debug( LDAP_DEBUG_TRACE, "ldap_int_sasl_open: %s\n", + Debug( LDAP_DEBUG_TRACE, "ldap_int_sasl_open: host=%s\n", host, 0, 0 ); lc->lconn_sasl_ctx = ctx; @@ -424,9 +449,8 @@ ldap_int_sasl_open( int ldap_int_sasl_close( LDAP *ld, LDAPConn *lc ) { sasl_conn_t *ctx = lc->lconn_sasl_ctx; - assert( ctx != NULL ); - if( ctx ) { + if( ctx != NULL ) { sasl_dispose( &ctx ); lc->lconn_sasl_ctx = NULL; } @@ -440,8 +464,12 @@ ldap_int_sasl_bind( const char *dn, const char *mechs, LDAPControl **sctrls, - LDAPControl **cctrls ) + LDAPControl **cctrls, + unsigned flags, + LDAP_SASL_INTERACT_PROC *interact, + void * defaults ) { + char *data; const char *mech = NULL; const char *pmech = NULL; int saslrc, rc; @@ -449,7 +477,7 @@ ldap_int_sasl_bind( sasl_conn_t *ctx; sasl_interact_t *prompts = NULL; unsigned credlen; - struct berval ccred, *scred; + struct berval ccred; ber_socket_t sd; Debug( LDAP_DEBUG_TRACE, "ldap_int_sasl_bind: %s\n", @@ -465,13 +493,15 @@ ldap_int_sasl_bind( if ( sd == AC_SOCKET_INVALID ) { /* not connected yet */ - int rc = ldap_open_defconn( ld ); - + int rc; + + rc = ldap_open_defconn( ld ); if( rc < 0 ) return ld->ld_errno; + ber_sockbuf_ctrl( ld->ld_sb, LBER_SB_OPT_GET_FD, &sd ); if( sd == AC_SOCKET_INVALID ) { - ld->ld_errno = LDAP_UNAVAILABLE; + ld->ld_errno = LDAP_LOCAL_ERROR; return ld->ld_errno; } } @@ -479,7 +509,7 @@ ldap_int_sasl_bind( ctx = ld->ld_defconn->lconn_sasl_ctx; if( ctx == NULL ) { - ld->ld_errno = LDAP_UNAVAILABLE; + ld->ld_errno = LDAP_LOCAL_ERROR; return ld->ld_errno; } @@ -502,16 +532,18 @@ ldap_int_sasl_bind( if( pmech == NULL && mech != NULL ) { pmech = mech; - fprintf(stderr, - "SASL/%s authentication started\n", - pmech ); + if( flags != LDAP_SASL_QUIET ) { + fprintf(stderr, + "SASL/%s authentication started\n", + pmech ); + } } if( saslrc == SASL_INTERACT ) { - if( !ld->ld_options.ldo_sasl_interact ) break; - - rc = (ld->ld_options.ldo_sasl_interact)( ld, prompts ); - if( rc != LDAP_SUCCESS ) { + int res; + if( !interact ) break; + res = (interact)( ld, flags, defaults, prompts ); + if( res != LDAP_SUCCESS ) { break; } } @@ -524,25 +556,41 @@ ldap_int_sasl_bind( return ld->ld_errno; } - scred = NULL; - do { + struct berval *scred; unsigned credlen; + scred = NULL; + rc = ldap_sasl_bind_s( ld, dn, mech, &ccred, sctrls, cctrls, &scred ); - if ( rc == LDAP_SUCCESS ) { - break; - } else if ( rc != LDAP_SASL_BIND_IN_PROGRESS ) { - if ( ccred.bv_val != NULL ) { - LDAP_FREE( ccred.bv_val ); + if ( ccred.bv_val != NULL ) { + LDAP_FREE( ccred.bv_val ); + ccred.bv_val = NULL; + } + + if ( rc != LDAP_SUCCESS && rc != LDAP_SASL_BIND_IN_PROGRESS ) { + if( scred && scred->bv_len ) { + /* and server provided us with data? */ + Debug( LDAP_DEBUG_TRACE, + "ldap_int_sasl_bind: rc=%d sasl=%d len=%ld\n", + rc, saslrc, scred->bv_len ); + ber_bvfree( scred ); } return ld->ld_errno; } - if ( ccred.bv_val != NULL ) { - LDAP_FREE( ccred.bv_val ); - ccred.bv_val = NULL; + if( rc == LDAP_SUCCESS && saslrc == SASL_OK ) { + /* we're done, no need to step */ + if( scred && scred->bv_len ) { + /* but server provided us with data! */ + Debug( LDAP_DEBUG_TRACE, + "ldap_int_sasl_bind: rc=%d sasl=%d len=%ld\n", + rc, saslrc, scred->bv_len ); + ber_bvfree( scred ); + return ld->ld_errno = LDAP_LOCAL_ERROR; + } + break; } do { @@ -557,11 +605,10 @@ ldap_int_sasl_bind( saslrc, 0, 0 ); if( saslrc == SASL_INTERACT ) { - fprintf(stderr, "Interacting\n"); - if( !ld->ld_options.ldo_sasl_interact ) break; - - rc = (ld->ld_options.ldo_sasl_interact)( ld, prompts ); - if( rc != LDAP_SUCCESS ) { + int res; + if( !interact ) break; + res = (interact)( ld, flags, defaults, prompts ); + if( res != LDAP_SUCCESS ) { break; } } @@ -576,25 +623,76 @@ ldap_int_sasl_bind( } } while ( rc == LDAP_SASL_BIND_IN_PROGRESS ); - assert ( rc == LDAP_SUCCESS ); + if ( rc != LDAP_SUCCESS ) { + return rc; + } - if ( sasl_getprop( ctx, SASL_SSF, (void **) &ssf ) - == SASL_OK && ssf && *ssf > 1 ) - { -#ifdef LDAP_SASL_SECURITY_LAYER - fprintf(stderr, "Installing Security Layer: ssf=%lu\n", - (unsigned long) *ssf ); + if ( saslrc != SASL_OK ) { + return ld->ld_errno = sasl_err2ldap( saslrc ); + } - ldap_pvt_sasl_install( ld->ld_sb, ctx ); -#else - fprintf(stderr, "SASL Security Factor is %lu\n", - (unsigned long) *ssf ); -#endif + if( flags != LDAP_SASL_QUIET ) { + saslrc = sasl_getprop( ctx, SASL_USERNAME, (void **) &data ); + if( saslrc == SASL_OK && data && *data ) { + fprintf( stderr, "SASL username: %s\n", data ); + } + + saslrc = sasl_getprop( ctx, SASL_REALM, (void **) &data ); + if( saslrc == SASL_OK && data && *data ) { + fprintf( stderr, "SASL realm: %s\n", data ); + } + } + + saslrc = sasl_getprop( ctx, SASL_SSF, (void **) &ssf ); + if( saslrc == SASL_OK ) { + if( flags != LDAP_SASL_QUIET ) { + fprintf( stderr, "SASL SSF: %lu\n", + (unsigned long) *ssf ); + } + + if( ssf && *ssf ) { + if( flags != LDAP_SASL_QUIET ) { + fprintf( stderr, "SASL installing layers\n" ); + } + ldap_pvt_sasl_install( ld->ld_conns->lconn_sb, ctx ); + } } return rc; } +int +ldap_int_sasl_external( + LDAP *ld, + LDAPConn *conn, + const char * authid, + ber_len_t ssf ) +{ + int sc; + sasl_conn_t *ctx; + sasl_external_properties_t extprops; + + ctx = conn->lconn_sasl_ctx; + + if ( ctx == NULL ) { + return LDAP_LOCAL_ERROR; + } + + memset( &extprops, '\0', sizeof(extprops) ); + extprops.ssf = ssf; + extprops.auth_id = (char *) authid; + + sc = sasl_setprop( ctx, SASL_SSF_EXTERNAL, + (void *) &extprops ); + + if ( sc != SASL_OK ) { + return LDAP_LOCAL_ERROR; + } + + return LDAP_SUCCESS; +} + + int ldap_pvt_sasl_secprops( const char *in, sasl_security_properties_t *secprops ) @@ -603,11 +701,11 @@ int ldap_pvt_sasl_secprops( char **props = ldap_str2charray( in, "," ); unsigned sflags = 0; int got_sflags = 0; - sasl_ssf_t max_ssf; + sasl_ssf_t max_ssf = 0; int got_max_ssf = 0; - sasl_ssf_t min_ssf; + sasl_ssf_t min_ssf = 0; int got_min_ssf = 0; - unsigned maxbufsize; + unsigned maxbufsize = 0; int got_maxbufsize = 0; if( props == NULL || secprops == NULL ) { @@ -646,7 +744,7 @@ int ldap_pvt_sasl_secprops( "minssf=", sizeof("minssf")) ) { if( isdigit( props[i][sizeof("minssf")] ) ) { - got_max_ssf++; + got_min_ssf++; min_ssf = atoi( &props[i][sizeof("minssf")] ); } else { return LDAP_NOT_SUPPORTED; @@ -672,6 +770,13 @@ int ldap_pvt_sasl_secprops( return LDAP_NOT_SUPPORTED; } + if( maxbufsize && (( maxbufsize < SASL_MIN_BUFF_SIZE ) + || (maxbufsize > SASL_MAX_BUFF_SIZE ))) + { + /* bad maxbufsize */ + return LDAP_PARAM_ERROR; + } + } else { return LDAP_NOT_SUPPORTED; } @@ -715,6 +820,23 @@ ldap_int_sasl_get_option( LDAP *ld, int option, void *arg ) return -1; switch ( option ) { + case LDAP_OPT_X_SASL_MECH: { + *(char **)arg = ld->ld_options.ldo_def_sasl_mech + ? LDAP_STRDUP( ld->ld_options.ldo_def_sasl_mech ) : NULL; + } break; + case LDAP_OPT_X_SASL_REALM: { + *(char **)arg = ld->ld_options.ldo_def_sasl_realm + ? LDAP_STRDUP( ld->ld_options.ldo_def_sasl_realm ) : NULL; + } break; + case LDAP_OPT_X_SASL_AUTHCID: { + *(char **)arg = ld->ld_options.ldo_def_sasl_authcid + ? LDAP_STRDUP( ld->ld_options.ldo_def_sasl_authcid ) : NULL; + } break; + case LDAP_OPT_X_SASL_AUTHZID: { + *(char **)arg = ld->ld_options.ldo_def_sasl_authzid + ? LDAP_STRDUP( ld->ld_options.ldo_def_sasl_authzid ) : NULL; + } break; + case LDAP_OPT_X_SASL_SSF: { int sc; sasl_ssf_t *ssf; @@ -872,6 +994,18 @@ ldap_int_sasl_bind( const char *dn, const char *mechs, LDAPControl **sctrls, - LDAPControl **cctrls ) + LDAPControl **cctrls, + unsigned flags, + LDAP_SASL_INTERACT_PROC *interact, + void * defaults ) { return LDAP_NOT_SUPPORTED; } + +int +ldap_int_sasl_external( + LDAP *ld, + LDAPConn *conn, + const char * authid, + ber_len_t ssf ) +{ return LDAP_SUCCESS; } + #endif /* HAVE_CYRUS_SASL */