--- libraries/libldap/sasl.c 2000/01/16 00:29:15 1.9 +++ libraries/libldap/sasl.c 2010/10/13 06:43:16 1.81 @@ -1,7 +1,16 @@ -/* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.8 2000/01/08 17:42:18 kdz Exp $ */ -/* - * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file +/* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.80 2010/09/12 08:09:45 hyc Exp $ */ +/* This work is part of OpenLDAP Software . + * + * Copyright 1998-2010 The OpenLDAP Foundation. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. + * + * A copy of this license is available in the file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * . */ /* @@ -10,10 +19,8 @@ * name DistinguishedName, -- who * authentication CHOICE { * simple [0] OCTET STRING -- passwd -#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND - * krbv42ldap [1] OCTET STRING - * krbv42dsa [2] OCTET STRING -#endif + * krbv42ldap [1] OCTET STRING -- OBSOLETE + * krbv42dsa [2] OCTET STRING -- OBSOLETE * sasl [3] SaslCredentials -- LDAPv3 * } * } @@ -30,20 +37,22 @@ #include #include +#include #include #include +#include #include "ldap-int.h" - /* - * ldap_sasl_bind - bind to the ldap server (and X.500). The dn, mechanism, and - * credentials of the entry to which to bind are supplied. The message id - * of the request initiated is provided upon successful (LDAP_SUCCESS) return. + * ldap_sasl_bind - bind to the ldap server (and X.500). + * The dn (usually NULL), mechanism, and credentials are provided. + * The message id of the request initiated is provided upon successful + * (LDAP_SUCCESS) return. * * Example: - * ldap_sasl_bind( ld, "cn=manager, o=university of michigan, c=us", - * "mechanism", "secret", NULL, NULL, &msgid ) + * ldap_sasl_bind( ld, NULL, "mechanism", + * cred, NULL, NULL, &msgid ) */ int @@ -58,6 +67,7 @@ ldap_sasl_bind( { BerElement *ber; int rc; + ber_int_t id; Debug( LDAP_DEBUG_TRACE, "ldap_sasl_bind\n", 0, 0, 0 ); @@ -65,13 +75,12 @@ ldap_sasl_bind( assert( LDAP_VALID( ld ) ); assert( msgidp != NULL ); - if( msgidp == NULL ) { - ld->ld_errno = LDAP_PARAM_ERROR; - return ld->ld_errno; - } + /* check client controls */ + rc = ldap_int_client_controls( ld, cctrls ); + if( rc != LDAP_SUCCESS ) return rc; if( mechanism == LDAP_SASL_SIMPLE ) { - if( dn == NULL && cred != NULL ) { + if( dn == NULL && cred != NULL && cred->bv_len ) { /* use default binddn */ dn = ld->ld_defbinddn; } @@ -91,26 +100,27 @@ ldap_sasl_bind( return ld->ld_errno; } - assert( BER_VALID( ber ) ); + assert( LBER_VALID( ber ) ); + LDAP_NEXT_MSGID( ld, id ); if( mechanism == LDAP_SASL_SIMPLE ) { /* simple bind */ - rc = ber_printf( ber, "{it{istO}" /*}*/, - ++ld->ld_msgid, LDAP_REQ_BIND, + rc = ber_printf( ber, "{it{istON}" /*}*/, + id, LDAP_REQ_BIND, ld->ld_version, dn, LDAP_AUTH_SIMPLE, cred ); - } else if ( cred == NULL ) { - /* SASL bind w/o creditials */ - rc = ber_printf( ber, "{it{ist{s}}" /*}*/, - ++ld->ld_msgid, LDAP_REQ_BIND, + } else if ( cred == NULL || cred->bv_val == NULL ) { + /* SASL bind w/o credentials */ + rc = ber_printf( ber, "{it{ist{sN}N}" /*}*/, + id, LDAP_REQ_BIND, ld->ld_version, dn, LDAP_AUTH_SASL, mechanism ); } else { - /* SASL bind w/ creditials */ - rc = ber_printf( ber, "{it{ist{sO}}" /*}*/, - ++ld->ld_msgid, LDAP_REQ_BIND, + /* SASL bind w/ credentials */ + rc = ber_printf( ber, "{it{ist{sON}N}" /*}*/, + id, LDAP_REQ_BIND, ld->ld_version, dn, LDAP_AUTH_SASL, mechanism, cred ); } @@ -127,20 +137,15 @@ ldap_sasl_bind( return ld->ld_errno; } - if ( ber_printf( ber, /*{*/ "}" ) == -1 ) { + if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) { ld->ld_errno = LDAP_ENCODING_ERROR; ber_free( ber, 1 ); return ld->ld_errno; } -#ifndef LDAP_NOCACHE - if ( ld->ld_cache != NULL ) { - ldap_flush_cache( ld ); - } -#endif /* !LDAP_NOCACHE */ /* send the message */ - *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber ); + *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id ); if(*msgidp < 0) return ld->ld_errno; @@ -180,7 +185,13 @@ ldap_sasl_bind_s( return( rc ); } - if ( ldap_result( ld, msgid, 1, NULL, &result ) == -1 ) { +#ifdef LDAP_CONNECTIONLESS + if (LDAP_IS_UDP(ld)) { + return( rc ); + } +#endif + + if ( ldap_result( ld, msgid, LDAP_MSG_ALL, NULL, &result ) == -1 || !result ) { return( ld->ld_errno ); /* ldap_result sets ld_errno */ } @@ -190,19 +201,21 @@ ldap_sasl_bind_s( rc = ldap_parse_sasl_bind_result( ld, result, &scredp, 0 ); } - if( rc != LDAP_SUCCESS ) { + if ( rc != LDAP_SUCCESS ) { ldap_msgfree( result ); return( rc ); } rc = ldap_result2error( ld, result, 1 ); - if( rc == LDAP_SUCCESS ) { + if ( rc == LDAP_SUCCESS || rc == LDAP_SASL_BIND_IN_PROGRESS ) { if( servercredp != NULL ) { *servercredp = scredp; + scredp = NULL; } + } - } else if (scredp != NULL ) { + if ( scredp != NULL ) { ber_bvfree(scredp); } @@ -243,10 +256,6 @@ ldap_parse_sasl_bind_result( assert( LDAP_VALID( ld ) ); assert( res != NULL ); - if ( ld == NULL || res == NULL ) { - return LDAP_PARAM_ERROR; - } - if( servercredp != NULL ) { if( ld->ld_version < LDAP_VERSION2 ) { return LDAP_NOT_SUPPORTED; @@ -280,7 +289,7 @@ ldap_parse_sasl_bind_result( } if ( ld->ld_version < LDAP_VERSION2 ) { - tag = ber_scanf( ber, "{ia}", + tag = ber_scanf( ber, "{iA}", &errcode, &ld->ld_error ); if( tag == LBER_ERROR ) { @@ -292,7 +301,7 @@ ldap_parse_sasl_bind_result( } else { ber_len_t len; - tag = ber_scanf( ber, "{iaa" /*}*/, + tag = ber_scanf( ber, "{eAA" /*}*/, &errcode, &ld->ld_matched, &ld->ld_error ); if( tag == LBER_ERROR ) { @@ -338,488 +347,455 @@ ldap_parse_sasl_bind_result( ldap_msgfree( res ); } - return( ld->ld_errno ); + return( LDAP_SUCCESS ); } -#ifdef HAVE_CYRUS_SASL -/* -* Various Cyrus SASL related stuff. -*/ - -static int sasl_setup( Sockbuf *sb, void *arg ); -static int sasl_remove( Sockbuf *sb ); -static ber_slen_t sasl_read( Sockbuf *sb, void *buf, ber_len_t len ); -static ber_slen_t sasl_write( Sockbuf *sb, void *buf, ber_len_t len ); -static int sasl_close( Sockbuf *sb ); - -static Sockbuf_IO sasl_io= +int +ldap_pvt_sasl_getmechs ( LDAP *ld, char **pmechlist ) { -sasl_setup, -sasl_remove, -sasl_read, -sasl_write, -sasl_close -}; + /* we need to query the server for supported mechs anyway */ + LDAPMessage *res, *e; + char *attrs[] = { "supportedSASLMechanisms", NULL }; + char **values, *mechlist; + int rc; -#define HAS_SASL( sb ) ((sb)->sb_io==&sasl_io) + Debug( LDAP_DEBUG_TRACE, "ldap_pvt_sasl_getmech\n", 0, 0, 0 ); -static char * -array2str( char **a ) -{ - char *s, **v, *p; - int len = 0; + rc = ldap_search_s( ld, "", LDAP_SCOPE_BASE, + NULL, attrs, 0, &res ); - for ( v = a; *v != NULL; v++ ) { - len += strlen( *v ) + 1; /* for a space */ + if ( rc != LDAP_SUCCESS ) { + return ld->ld_errno; } - - if ( len == 0 ) { - return NULL; + + e = ldap_first_entry( ld, res ); + if ( e == NULL ) { + ldap_msgfree( res ); + if ( ld->ld_errno == LDAP_SUCCESS ) { + ld->ld_errno = LDAP_NO_SUCH_OBJECT; + } + return ld->ld_errno; } - s = LDAP_MALLOC ( len ); /* last space holds \0 */ - - if ( s == NULL ) { - return NULL; + values = ldap_get_values( ld, e, "supportedSASLMechanisms" ); + if ( values == NULL ) { + ldap_msgfree( res ); + ld->ld_errno = LDAP_NO_SUCH_ATTRIBUTE; + return ld->ld_errno; } - p = s; - for ( v = a; *v != NULL; v++ ) { - int len; + mechlist = ldap_charray2str( values, " " ); + if ( mechlist == NULL ) { + LDAP_VFREE( values ); + ldap_msgfree( res ); + ld->ld_errno = LDAP_NO_MEMORY; + return ld->ld_errno; + } - if ( v != a ) { - strncpy( p, " ", 1 ); - ++p; - } - len = strlen( *v ); - strncpy( p, *v, len ); - p += len; - } + LDAP_VFREE( values ); + ldap_msgfree( res ); - *p = '\0'; + *pmechlist = mechlist; - return s; + return LDAP_SUCCESS; } -int ldap_pvt_sasl_init( void ) +/* + * ldap_sasl_interactive_bind_s - interactive SASL authentication + * + * This routine uses interactive callbacks. + * + * LDAP_SUCCESS is returned upon success, the ldap error code + * otherwise. + */ +int +ldap_sasl_interactive_bind_s( + LDAP *ld, + LDAP_CONST char *dn, /* usually NULL */ + LDAP_CONST char *mechs, + LDAPControl **serverControls, + LDAPControl **clientControls, + unsigned flags, + LDAP_SASL_INTERACT_PROC *interact, + void *defaults ) { - /* XXX not threadsafe */ - static int sasl_initialized = 0; + int rc; + char *smechs = NULL; - if ( sasl_initialized ) { - return 0; - } -#ifndef CSRIMALLOC - sasl_set_alloc( ber_memalloc, ber_memcalloc, ber_memrealloc, ber_memfree ); -#endif /* CSRIMALLOC */ +#if defined( HAVE_CYRUS_SASL ) + LDAP_MUTEX_LOCK( &ldap_int_sasl_mutex ); +#endif +#ifdef LDAP_CONNECTIONLESS + if( LDAP_IS_UDP(ld) ) { + /* Just force it to simple bind, silly to make the user + * ask all the time. No, we don't ever actually bind, but I'll + * let the final bind handler take care of saving the cdn. + */ + rc = ldap_simple_bind( ld, dn, NULL ); + rc = rc < 0 ? rc : 0; + goto done; + } else +#endif - if ( sasl_client_init( NULL ) == SASL_OK ) { - sasl_initialized = 1; - return 0; +#ifdef HAVE_CYRUS_SASL + if( mechs == NULL || *mechs == '\0' ) { + mechs = ld->ld_options.ldo_def_sasl_mech; } +#endif + + if( mechs == NULL || *mechs == '\0' ) { + rc = ldap_pvt_sasl_getmechs( ld, &smechs ); + if( rc != LDAP_SUCCESS ) { + goto done; + } - return -1; -} + Debug( LDAP_DEBUG_TRACE, + "ldap_sasl_interactive_bind_s: server supports: %s\n", + smechs, 0, 0 ); -int ldap_pvt_sasl_install( Sockbuf *sb, void *ctx_arg ) -{ - /* don't install the stuff unless security has been negotiated */ + mechs = smechs; - if ( !HAS_SASL( sb ) ) { - ber_pvt_sb_clear_io( sb ); - ber_pvt_sb_set_io( sb, &sasl_io, ctx_arg ); + } else { + Debug( LDAP_DEBUG_TRACE, + "ldap_sasl_interactive_bind_s: user selected: %s\n", + mechs, 0, 0 ); } - return 0; -} + rc = ldap_int_sasl_bind( ld, dn, mechs, + serverControls, clientControls, + flags, interact, defaults ); + +done: +#if defined( HAVE_CYRUS_SASL ) + LDAP_MUTEX_UNLOCK( &ldap_int_sasl_mutex ); +#endif + if ( smechs ) LDAP_FREE( smechs ); -static int sasl_setup( Sockbuf *sb, void *arg ) -{ - sb->sb_iodata = arg; - return 0; + return rc; } -static int sasl_remove( Sockbuf *sb ) -{ - return 0; -} +#ifdef HAVE_CYRUS_SASL -static ber_slen_t sasl_read( Sockbuf *sb, void *buf, ber_len_t buflen ) +#ifdef HAVE_SASL_SASL_H +#include +#else +#include +#endif + +#endif /* HAVE_CYRUS_SASL */ + +static int +sb_sasl_generic_remove( Sockbuf_IO_Desc *sbiod ); + +static int +sb_sasl_generic_setup( Sockbuf_IO_Desc *sbiod, void *arg ) { - char *recv_tok; - unsigned recv_tok_len; - sasl_conn_t *conn = (sasl_conn_t *)sb->sb_iodata; + struct sb_sasl_generic_data *p; + struct sb_sasl_generic_install *i; - if ((ber_pvt_sb_io_tcp.sbi_read)( sb, buf, buflen ) != buflen ) { - return -1; - } + assert( sbiod != NULL ); - if ( sasl_decode( conn, buf, buflen, &recv_tok, &recv_tok_len ) != SASL_OK ) { - return -1; - } + i = (struct sb_sasl_generic_install *)arg; - if ( recv_tok_len > buflen ) { - LDAP_FREE( recv_tok ); + p = LBER_MALLOC( sizeof( *p ) ); + if ( p == NULL ) + return -1; + p->ops = i->ops; + p->ops_private = i->ops_private; + p->sbiod = sbiod; + p->flags = 0; + ber_pvt_sb_buf_init( &p->sec_buf_in ); + ber_pvt_sb_buf_init( &p->buf_in ); + ber_pvt_sb_buf_init( &p->buf_out ); + + sbiod->sbiod_pvt = p; + + p->ops->init( p, &p->min_send, &p->max_send, &p->max_recv ); + + if ( ber_pvt_sb_grow_buffer( &p->sec_buf_in, p->min_send ) < 0 ) { + sb_sasl_generic_remove( sbiod ); + sock_errset(ENOMEM); return -1; } - memcpy( buf, recv_tok, recv_tok_len ); - - LDAP_FREE( recv_tok ); - - return recv_tok_len; + return 0; } -static ber_slen_t sasl_write( Sockbuf *sb, void *buf, ber_len_t len ) +static int +sb_sasl_generic_remove( Sockbuf_IO_Desc *sbiod ) { - char *wrapped_tok; - unsigned wrapped_tok_len; - sasl_conn_t *conn = (sasl_conn_t *)sb->sb_iodata; + struct sb_sasl_generic_data *p; - if ( sasl_encode( conn, (const char *)buf, len, - &wrapped_tok, &wrapped_tok_len ) != SASL_OK ) { - return -1; - } + assert( sbiod != NULL ); - if ((ber_pvt_sb_io_tcp.sbi_write)( sb, wrapped_tok, wrapped_tok_len ) != wrapped_tok_len ) { - LDAP_FREE( wrapped_tok ); - return -1; - } + p = (struct sb_sasl_generic_data *)sbiod->sbiod_pvt; - LDAP_FREE( wrapped_tok ); + p->ops->fini(p); - return len; + ber_pvt_sb_buf_destroy( &p->sec_buf_in ); + ber_pvt_sb_buf_destroy( &p->buf_in ); + ber_pvt_sb_buf_destroy( &p->buf_out ); + LBER_FREE( p ); + sbiod->sbiod_pvt = NULL; + return 0; } -static int sasl_close( Sockbuf *sb ) +static ber_len_t +sb_sasl_generic_pkt_length( + struct sb_sasl_generic_data *p, + const unsigned char *buf, + int debuglevel ) { - (ber_pvt_sb_io_tcp.sbi_close)( sb ); -} + ber_len_t size; -int -ldap_pvt_sasl_err2ldap( int saslerr ) -{ - int rc; + assert( buf != NULL ); + + size = buf[0] << 24 + | buf[1] << 16 + | buf[2] << 8 + | buf[3]; - switch (saslerr) { - case SASL_CONTINUE: - rc = LDAP_SASL_BIND_IN_PROGRESS; - break; - case SASL_OK: - rc = LDAP_SUCCESS; - break; - case SASL_FAIL: - rc = LDAP_OPERATIONS_ERROR; - break; - case SASL_NOMEM: - rc = LDAP_NO_MEMORY; - break; - case SASL_NOMECH: - rc = LDAP_AUTH_METHOD_NOT_SUPPORTED; - break; - case SASL_BADAUTH: - rc = LDAP_INVALID_CREDENTIALS; - break; - case SASL_NOAUTHZ: - rc = LDAP_INSUFFICIENT_ACCESS; - break; - case SASL_TOOWEAK: - case SASL_ENCRYPT: - rc = LDAP_INAPPROPRIATE_AUTH; - break; - default: - rc = LDAP_OPERATIONS_ERROR; - break; + if ( size > p->max_recv ) { + /* somebody is trying to mess me up. */ + ber_log_printf( LDAP_DEBUG_ANY, debuglevel, + "sb_sasl_generic_pkt_length: " + "received illegal packet length of %lu bytes\n", + (unsigned long)size ); + size = 16; /* this should lead to an error. */ } - return rc; + return size + 4; /* include the size !!! */ } -int -ldap_pvt_sasl_getmechs ( LDAP *ld, LDAP_CONST char *desired, char **pmechlist ) +/* Drop a processed packet from the input buffer */ +static void +sb_sasl_generic_drop_packet ( + struct sb_sasl_generic_data *p, + int debuglevel ) { - /* we need to query the server for supported mechs anyway */ - LDAPMessage *res, *e; - char *attrs[] = { "supportedSASLMechanisms", NULL }; - char **values, *mechlist, **p; - int rc; + ber_slen_t len; - rc = ldap_search_s( ld, NULL, LDAP_SCOPE_BASE, - "(objectclass=*)", attrs, 0, &res ); + len = p->sec_buf_in.buf_ptr - p->sec_buf_in.buf_end; + if ( len > 0 ) + AC_MEMCPY( p->sec_buf_in.buf_base, p->sec_buf_in.buf_base + + p->sec_buf_in.buf_end, len ); - if ( rc != LDAP_SUCCESS ) { - return ld->ld_errno; + if ( len >= 4 ) { + p->sec_buf_in.buf_end = sb_sasl_generic_pkt_length(p, + (unsigned char *) p->sec_buf_in.buf_base, debuglevel); } - - e = ldap_first_entry( ld, res ); - if ( e == NULL ) { - if ( ld->ld_errno == LDAP_SUCCESS ) { - ld->ld_errno = LDAP_UNAVAILABLE; - } - return ld->ld_errno; + else { + p->sec_buf_in.buf_end = 0; } - - values = ldap_get_values( ld, e, "supportedSASLMechanisms" ); - if ( values == NULL ) { - ld->ld_errno = LDAP_NO_SUCH_ATTRIBUTE; - ldap_msgfree( res ); - return ld->ld_errno; - } - - if ( desired != NULL ) { - rc = LDAP_INAPPROPRIATE_AUTH; - - for ( p = values; *p != NULL; p++ ) { - if ( !strcmp( *p, desired ) == 0 ) { - rc = LDAP_SUCCESS; - break; - } - } - - if ( rc == LDAP_SUCCESS ) { - /* just return this */ - *pmechlist = LDAP_STRDUP( desired ); - return LDAP_SUCCESS; - } else { - /* couldn't find it */ - ld->ld_errno = LDAP_INAPPROPRIATE_AUTH; - return ld->ld_errno; - } - } - - mechlist = array2str( values ); - if ( mechlist == NULL ) { - ld->ld_errno = LDAP_NO_MEMORY; - ldap_value_free( values ); - ldap_msgfree( res ); - return ld->ld_errno; - } - - ldap_value_free( values ); - ldap_msgfree( res ); - - *pmechlist = mechlist; - - return LDAP_SUCCESS; + p->sec_buf_in.buf_ptr = len; } -int -ldap_pvt_sasl_bind( - LDAP *ld, - LDAP_CONST char *dn, - LDAP_CONST char *mechanism, - LDAP_CONST sasl_callback_t *callbacks, - LDAPControl **sctrls, - LDAPControl **cctrls ) +static ber_slen_t +sb_sasl_generic_read( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len) { - int saslrc, rc, msgid, ssf = 0; - struct berval ccred, *scred; - char *mechlist = NULL; - char *host; - sasl_interact_t *client_interact = NULL; + struct sb_sasl_generic_data *p; + ber_slen_t ret, bufptr; - Debug( LDAP_DEBUG_TRACE, "ldap_pvt_sasl_bind\n", 0, 0, 0 ); + assert( sbiod != NULL ); + assert( SOCKBUF_VALID( sbiod->sbiod_sb ) ); - /* do a quick !LDAPv3 check... ldap_sasl_bind will do the rest. */ - if (ld->ld_version < LDAP_VERSION3) { - ld->ld_errno = LDAP_NOT_SUPPORTED; - return ld->ld_errno; - } + p = (struct sb_sasl_generic_data *)sbiod->sbiod_pvt; - /* - * This connects to the host, side effect being that - * ldap_host_connected_to() works. - */ - rc = ldap_pvt_sasl_getmechs( ld, mechanism, &mechlist ); - if ( rc != LDAP_SUCCESS ) { - return ld->ld_errno; - } + /* Are there anything left in the buffer? */ + ret = ber_pvt_sb_copy_out( &p->buf_in, buf, len ); + bufptr = ret; + len -= ret; - /* XXX this doesn't work with PF_LOCAL hosts */ - host = ldap_host_connected_to( &ld->ld_sb ); + if ( len == 0 ) + return bufptr; - if ( host == NULL ) { - LDAP_FREE( mechlist ); - ld->ld_errno = LDAP_UNAVAILABLE; - return ld->ld_errno; - } + p->ops->reset_buf( p, &p->buf_in ); - if ( ld->ld_sasl_context != NULL ) { - LDAP_FREE( mechlist ); - sasl_dispose( &ld->ld_sasl_context ); - } + /* Read the length of the packet */ + while ( p->sec_buf_in.buf_ptr < 4 ) { + ret = LBER_SBIOD_READ_NEXT( sbiod, p->sec_buf_in.buf_base + + p->sec_buf_in.buf_ptr, + 4 - p->sec_buf_in.buf_ptr ); +#ifdef EINTR + if ( ( ret < 0 ) && ( errno == EINTR ) ) + continue; +#endif + if ( ret <= 0 ) + return bufptr ? bufptr : ret; - saslrc = sasl_client_new( "ldap", host, callbacks, 0, &ld->ld_sasl_context ); + p->sec_buf_in.buf_ptr += ret; + } - LDAP_FREE( host ); + /* The new packet always starts at p->sec_buf_in.buf_base */ + ret = sb_sasl_generic_pkt_length(p, (unsigned char *) p->sec_buf_in.buf_base, + sbiod->sbiod_sb->sb_debug ); - if ( (saslrc != SASL_OK) && (saslrc != SASL_CONTINUE) ) { - LDAP_FREE( mechlist ); - ld->ld_errno = ldap_pvt_sasl_err2ldap( rc ); - sasl_dispose( &ld->ld_sasl_context ); - return ld->ld_errno; + /* Grow the packet buffer if neccessary */ + if ( ( p->sec_buf_in.buf_size < (ber_len_t) ret ) && + ber_pvt_sb_grow_buffer( &p->sec_buf_in, ret ) < 0 ) + { + sock_errset(ENOMEM); + return -1; } + p->sec_buf_in.buf_end = ret; - ccred.bv_val = NULL; - ccred.bv_len = 0; + /* Did we read the whole encrypted packet? */ + while ( p->sec_buf_in.buf_ptr < p->sec_buf_in.buf_end ) { + /* No, we have got only a part of it */ + ret = p->sec_buf_in.buf_end - p->sec_buf_in.buf_ptr; + + ret = LBER_SBIOD_READ_NEXT( sbiod, p->sec_buf_in.buf_base + + p->sec_buf_in.buf_ptr, ret ); +#ifdef EINTR + if ( ( ret < 0 ) && ( errno == EINTR ) ) + continue; +#endif + if ( ret <= 0 ) + return bufptr ? bufptr : ret; - saslrc = sasl_client_start( ld->ld_sasl_context, - mechlist, - NULL, - &client_interact, - &ccred.bv_val, - (unsigned int *)&ccred.bv_len, - &mechanism ); + p->sec_buf_in.buf_ptr += ret; + } - LDAP_FREE( mechlist ); + /* Decode the packet */ + ret = p->ops->decode( p, &p->sec_buf_in, &p->buf_in ); - if ( (saslrc != SASL_OK) && (saslrc != SASL_CONTINUE) ) { - ld->ld_errno = ldap_pvt_sasl_err2ldap( saslrc ); - sasl_dispose( &ld->ld_sasl_context ); - return ld->ld_errno; + /* Drop the packet from the input buffer */ + sb_sasl_generic_drop_packet( p, sbiod->sbiod_sb->sb_debug ); + + if ( ret != 0 ) { + ber_log_printf( LDAP_DEBUG_ANY, sbiod->sbiod_sb->sb_debug, + "sb_sasl_generic_read: failed to decode packet\n" ); + sock_errset(EIO); + return -1; } - scred = NULL; + bufptr += ber_pvt_sb_copy_out( &p->buf_in, (char*) buf + bufptr, len ); - do { - sasl_interact_t *client_interact = NULL; + return bufptr; +} - rc = ldap_sasl_bind_s( ld, dn, mechanism, &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 ); - } - sasl_dispose( &ld->ld_sasl_context ); - return ld->ld_errno; - } +static ber_slen_t +sb_sasl_generic_write( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len) +{ + struct sb_sasl_generic_data *p; + int ret; + ber_len_t len2; - if ( ccred.bv_val != NULL ) { - LDAP_FREE( ccred.bv_val ); - ccred.bv_val = NULL; - } + assert( sbiod != NULL ); + assert( SOCKBUF_VALID( sbiod->sbiod_sb ) ); - saslrc = sasl_client_step( ld->ld_sasl_context, - (scred == NULL) ? NULL : scred->bv_val, - (scred == NULL) ? 0 : scred->bv_len, - &client_interact, - &ccred.bv_val, - (unsigned int *)&ccred.bv_len ); + p = (struct sb_sasl_generic_data *)sbiod->sbiod_pvt; - ber_bvfree( scred ); + /* Is there anything left in the buffer? */ + if ( p->buf_out.buf_ptr != p->buf_out.buf_end ) { + ret = ber_pvt_sb_do_write( sbiod, &p->buf_out ); + if ( ret < 0 ) return ret; - if ( (saslrc != SASL_OK) && (saslrc != SASL_CONTINUE) ) { - ld->ld_errno = ldap_pvt_sasl_err2ldap( saslrc ); - sasl_dispose( &ld->ld_sasl_context ); - return ld->ld_errno; + /* Still have something left?? */ + if ( p->buf_out.buf_ptr != p->buf_out.buf_end ) { + sock_errset(EAGAIN); + return -1; } - } while ( rc == LDAP_SASL_BIND_IN_PROGRESS ); - - assert ( rc == LDAP_SUCCESS ); - - if ( sasl_getprop( ld->ld_sasl_context, SASL_SSF, (void **)&ssf ) - == SASL_OK && ssf ) { - ldap_pvt_sasl_install( &ld->ld_sb, ld->ld_sasl_context ); } - return rc; -} + len2 = p->max_send - 100; /* For safety margin */ + len2 = len > len2 ? len2 : len; -/* based on sample/sample-client.c */ -static int -ldap_pvt_sasl_getsecret(sasl_conn_t *conn, void *context, int id, sasl_secret_t **psecret) -{ - struct berval *passphrase = (struct berval *)context; - size_t len; - - if ( conn == NULL || psecret == NULL || id != SASL_CB_PASS ) { - return SASL_BADPARAM; + /* If we're just retrying a partial write, tell the + * caller it's done. Let them call again if there's + * still more left to write. + */ + if ( p->flags & LDAP_PVT_SASL_PARTIAL_WRITE ) { + p->flags ^= LDAP_PVT_SASL_PARTIAL_WRITE; + return len2; } - len = (passphrase != NULL) ? (size_t)passphrase->bv_len: 0; + /* now encode the next packet. */ + p->ops->reset_buf( p, &p->buf_out ); + + ret = p->ops->encode( p, buf, len2, &p->buf_out ); - *psecret = (sasl_secret_t *) LDAP_MALLOC( sizeof( sasl_secret_t ) + len ); - if ( *psecret == NULL ) { - return SASL_NOMEM; + if ( ret != 0 ) { + ber_log_printf( LDAP_DEBUG_ANY, sbiod->sbiod_sb->sb_debug, + "sb_sasl_generic_write: failed to encode packet\n" ); + sock_errset(EIO); + return -1; } - (*psecret)->len = passphrase->bv_len; + ret = ber_pvt_sb_do_write( sbiod, &p->buf_out ); - if ( passphrase != NULL ) { - memcpy((*psecret)->data, passphrase->bv_val, len); + if ( ret < 0 ) { + /* error? */ + int err = sock_errno(); + /* caller can retry this */ + if ( err == EAGAIN || err == EWOULDBLOCK || err == EINTR ) + p->flags |= LDAP_PVT_SASL_PARTIAL_WRITE; + return ret; + } else if ( p->buf_out.buf_ptr != p->buf_out.buf_end ) { + /* partial write? pretend nothing got written */ + p->flags |= LDAP_PVT_SASL_PARTIAL_WRITE; + sock_errset(EAGAIN); + len2 = -1; } - return SASL_OK; + /* return number of bytes encoded, not written, to ensure + * no byte is encoded twice (even if only sent once). + */ + return len2; } static int -ldap_pvt_sasl_getsimple(void *context, int id, const char **result, int *len) +sb_sasl_generic_ctrl( Sockbuf_IO_Desc *sbiod, int opt, void *arg ) { - const char *value = (const char *)context; + struct sb_sasl_generic_data *p; - if ( result == NULL ) { - return SASL_BADPARAM; - } + p = (struct sb_sasl_generic_data *)sbiod->sbiod_pvt; - switch ( id ) { - case SASL_CB_USER: - case SASL_CB_AUTHNAME: - *result = value; - if ( len ) - *len = value ? strlen( value ) : 0; - break; - case SASL_CB_LANGUAGE: - *result = NULL; - if ( len ) - *len = 0; - break; - default: - return SASL_BADPARAM; + if ( opt == LBER_SB_OPT_DATA_READY ) { + if ( p->buf_in.buf_ptr != p->buf_in.buf_end ) return 1; } - return SASL_OK; + return LBER_SBIOD_CTRL_NEXT( sbiod, opt, arg ); } -/* - * ldap_negotiated_sasl_bind_s - bind to the ldap server (and X.500) using SASL - * authentication. The dn and password of the entry to which to bind are - * supplied. LDAP_SUCCESS is returned upon success, the ldap error code - * otherwise. - * - * Example: - * ldap_negotiated_sasl_bind_s( ld, NULL, - * "dn:cn=manager", NULL, "GSSAPI", NULL, NULL, NULL ); - */ -int -ldap_negotiated_sasl_bind_s( - LDAP *ld, - LDAP_CONST char *dn, /* usually NULL */ - LDAP_CONST char *authorizationId, - LDAP_CONST char *authenticationId, - LDAP_CONST char *saslMechanism, - struct berval *passPhrase, - LDAPControl **serverControls, - LDAPControl **clientControls) +Sockbuf_IO ldap_pvt_sockbuf_io_sasl_generic = { + sb_sasl_generic_setup, /* sbi_setup */ + sb_sasl_generic_remove, /* sbi_remove */ + sb_sasl_generic_ctrl, /* sbi_ctrl */ + sb_sasl_generic_read, /* sbi_read */ + sb_sasl_generic_write, /* sbi_write */ + NULL /* sbi_close */ +}; + +int ldap_pvt_sasl_generic_install( + Sockbuf *sb, + struct sb_sasl_generic_install *install_arg ) { - sasl_callback_t callbacks[4]; - int rc; + Debug( LDAP_DEBUG_TRACE, "ldap_pvt_sasl_generic_install\n", + 0, 0, 0 ); - callbacks[0].id = SASL_CB_USER; - callbacks[0].proc = ldap_pvt_sasl_getsimple; - callbacks[0].context = (void *)authorizationId; - callbacks[1].id = SASL_CB_AUTHNAME; - callbacks[1].proc = ldap_pvt_sasl_getsimple; - callbacks[1].context = (void *)authenticationId; - callbacks[2].id = SASL_CB_PASS; - callbacks[2].proc = ldap_pvt_sasl_getsecret; - callbacks[2].context = (void *)passPhrase; - callbacks[3].id = SASL_CB_LIST_END; - callbacks[3].proc = NULL; - callbacks[3].context = NULL; + /* don't install the stuff unless security has been negotiated */ - rc = ldap_pvt_sasl_bind(ld, dn, saslMechanism, callbacks, serverControls, clientControls); + if ( !ber_sockbuf_ctrl( sb, LBER_SB_OPT_HAS_IO, + &ldap_pvt_sockbuf_io_sasl_generic ) ) + { +#ifdef LDAP_DEBUG + ber_sockbuf_add_io( sb, &ber_sockbuf_io_debug, + LBER_SBIOD_LEVEL_APPLICATION, (void *)"sasl_generic_" ); +#endif + ber_sockbuf_add_io( sb, &ldap_pvt_sockbuf_io_sasl_generic, + LBER_SBIOD_LEVEL_APPLICATION, install_arg ); + } - return rc; + return LDAP_SUCCESS; +} + +void ldap_pvt_sasl_generic_remove( Sockbuf *sb ) +{ + ber_sockbuf_remove_io( sb, &ldap_pvt_sockbuf_io_sasl_generic, + LBER_SBIOD_LEVEL_APPLICATION ); +#ifdef LDAP_DEBUG + ber_sockbuf_remove_io( sb, &ber_sockbuf_io_debug, + LBER_SBIOD_LEVEL_APPLICATION ); +#endif } -#endif /* HAVE_CYRUS_SASL */