X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsasl.c;h=112e37dcfd6da9aa463c7dbbe45a4c33b481ca95;hb=bc97f801bfd87b715ff1324b5219dc33301d25c0;hp=1daf41355611b9b3337ab1d22a14377a5a927f69;hpb=a54900be42f1afc9f27879d69fbc070a7c153d8c;p=openldap diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c index 1daf413556..112e37dcfd 100644 --- a/servers/slapd/sasl.c +++ b/servers/slapd/sasl.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2004 The OpenLDAP Foundation. + * Copyright 1998-2005 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -60,179 +60,10 @@ typedef struct sasl_ctx { #endif -#include "ldap_pvt.h" -#include "lber_pvt.h" #include static struct berval ext_bv = BER_BVC( "EXTERNAL" ); -int slap_sasl_config( int cargc, char **cargv, char *line, - const char *fname, int lineno ) -{ - /* set SASL proxy authorization policy */ - if ( !strcasecmp( cargv[0], "authz-policy" ) || - !strcasecmp( cargv[0], "sasl-authz-policy" )) - { - if ( cargc != 2 ) { -#ifdef NEW_LOGGING - LDAP_LOG( CONFIG, CRIT, - "%s: line %d: missing policy in" - " \"%s \" line\n", - cargv[0], fname, lineno ); -#else - Debug( LDAP_DEBUG_ANY, - "%s: line %d: missing policy in" - " \"%s \" line\n", - cargv[0], fname, lineno ); -#endif - - return( 1 ); - } - if ( slap_sasl_setpolicy( cargv[1] ) ) { -#ifdef NEW_LOGGING - LDAP_LOG( CONFIG, CRIT, "%s: line %d: " - "unable to parse value \"%s\" in \"authz-policy " - "\" line.\n", - fname, lineno, cargv[1] ); -#else - Debug( LDAP_DEBUG_ANY, "%s: line %d: " - "unable to parse value \"%s\" in \"authz-policy " - "\" line.\n", - fname, lineno, cargv[1] ); -#endif - return( 1 ); - } - - } else if ( !strcasecmp( cargv[0], "authz-regexp" ) || - !strcasecmp( cargv[0], "sasl-regexp" ) || - !strcasecmp( cargv[0], "saslregexp" ) ) - { - int rc; - if ( cargc != 3 ) { -#ifdef NEW_LOGGING - LDAP_LOG( CONFIG, CRIT, - "%s: line %d: need 2 args in " - "\"authz-regexp \"\n", - fname, lineno, 0 ); -#else - Debug( LDAP_DEBUG_ANY, - "%s: line %d: need 2 args in " - "\"authz-regexp \"\n", - fname, lineno, 0 ); -#endif - - return( 1 ); - } - rc = slap_sasl_regexp_config( cargv[1], cargv[2] ); - if ( rc ) { - return rc; - } - -#ifdef HAVE_CYRUS_SASL - /* set SASL host */ - } else if ( strcasecmp( cargv[0], "sasl-host" ) == 0 ) { - if ( cargc < 2 ) { -#ifdef NEW_LOGGING - LDAP_LOG( CONFIG, CRIT, - "%s: line %d: missing host in \"sasl-host \" line\n", - fname, lineno, 0 ); -#else - Debug( LDAP_DEBUG_ANY, - "%s: line %d: missing host in \"sasl-host \" line\n", - fname, lineno, 0 ); -#endif - - return( 1 ); - } - - if ( global_host != NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG( CONFIG, CRIT, - "%s: line %d: already set sasl-host!\n", - fname, lineno, 0 ); -#else - Debug( LDAP_DEBUG_ANY, - "%s: line %d: already set sasl-host!\n", - fname, lineno, 0 ); -#endif - - return 1; - - } else { - global_host = ch_strdup( cargv[1] ); - } - - /* set SASL realm */ - } else if ( strcasecmp( cargv[0], "sasl-realm" ) == 0 ) { - if ( cargc < 2 ) { -#ifdef NEW_LOGGING - LDAP_LOG( CONFIG, CRIT, "%s: line %d: " - "missing realm in \"sasl-realm \" line.\n", - fname, lineno, 0 ); -#else - Debug( LDAP_DEBUG_ANY, "%s: line %d: " - "missing realm in \"sasl-realm \" line.\n", - fname, lineno, 0 ); -#endif - - return( 1 ); - } - - if ( global_realm != NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG( CONFIG, CRIT, - "%s: line %d: already set sasl-realm!\n", - fname, lineno, 0 ); -#else - Debug( LDAP_DEBUG_ANY, - "%s: line %d: already set sasl-realm!\n", - fname, lineno, 0 ); -#endif - - return 1; - - } else { - global_realm = ch_strdup( cargv[1] ); - } - - /* SASL security properties */ - } else if ( strcasecmp( cargv[0], "sasl-secprops" ) == 0 ) { - char *txt; - - if ( cargc < 2 ) { -#ifdef NEW_LOGGING - LDAP_LOG( CONFIG, CRIT, "%s: line %d: " - "missing flags in \"sasl-secprops \" line\n", - fname, lineno, 0 ); -#else - Debug( LDAP_DEBUG_ANY, "%s: line %d: " - "missing flags in \"sasl-secprops \" line\n", - fname, lineno, 0 ); -#endif - - return 1; - } - - txt = slap_sasl_secprops( cargv[1] ); - if ( txt != NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG( CONFIG, CRIT, - "%s: line %d sasl-secprops: %s\n", - fname, lineno, txt ); -#else - Debug( LDAP_DEBUG_ANY, - "%s: line %d: sasl-secprops: %s\n", - fname, lineno, txt ); -#endif - - return 1; - } -#endif /* HAVE_CYRUS_SASL */ - } - - return LDAP_SUCCESS; -} - #ifdef HAVE_CYRUS_SASL int @@ -301,14 +132,9 @@ slap_sasl_log( return SASL_BADPARAM; } -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ENTRY, - "SASL [conn=%ld] %s: %s\n", conn ? conn->c_connid : -1, label, message); -#else Debug( level, "SASL [conn=%ld] %s: %s\n", conn ? conn->c_connid: -1, label, message ); -#endif return SASL_OK; @@ -368,13 +194,8 @@ sasl_ap_lookup( Operation *op, SlapReply *rs ) ad = NULL; rc = slap_str2ad( name, &ad, &text ); if ( rc != LDAP_SUCCESS ) { -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, DETAIL1, - "slap_auxprop: str2ad(%s): %s\n", name, text, 0 ); -#else Debug( LDAP_DEBUG_TRACE, - "slap_auxprop: str2ad(%s): %s\n", name, text, 0 ); -#endif + "slap_ap_lookup: str2ad(%s): %s\n", name, text, 0 ); continue; } a = attr_find( rs->sr_entry->e_attrs, ad ); @@ -467,24 +288,22 @@ slap_auxprop_lookup( if ( op.o_bd && op.o_bd->be_search ) { SlapReply rs = {REP_RESULT}; + op.o_hdr = conn->c_sasl_bindop->o_hdr; op.o_tag = LDAP_REQ_SEARCH; - op.o_protocol = LDAP_VERSION3; op.o_ndn = conn->c_ndn; op.o_callback = &cb; op.o_time = slap_get_time(); op.o_do_not_cache = 1; op.o_is_auth_check = 1; - op.o_threadctx = conn->c_sasl_bindop->o_threadctx; - op.o_tmpmemctx = conn->c_sasl_bindop->o_tmpmemctx; - op.o_tmpmfuncs = conn->c_sasl_bindop->o_tmpmfuncs; - op.o_conn = conn; - op.o_connid = conn->c_connid; op.o_req_dn = op.o_req_ndn; op.ors_scope = LDAP_SCOPE_BASE; op.ors_deref = LDAP_DEREF_NEVER; + op.ors_tlimit = SLAP_NO_LIMIT; op.ors_slimit = 1; op.ors_filter = &generic_filter; op.ors_filterstr = generic_filterstr; + /* FIXME: we want all attributes, right? */ + op.ors_attrs = NULL; op.o_bd->be_search( &op, &rs ); } @@ -562,33 +381,33 @@ slap_auxprop_store( } *modtail = NULL; - rc = slap_mods_check( modlist, 0, &text, textbuf, textlen, NULL ); - - if ( rc == LDAP_SUCCESS ) { - rc = slap_mods_opattrs( &op, modlist, modtail, &text, textbuf, - textlen ); - } + rc = slap_mods_check( modlist, &text, textbuf, textlen, NULL ); if ( rc == LDAP_SUCCESS ) { - op.o_tag = LDAP_REQ_MODIFY; - op.o_protocol = LDAP_VERSION3; - op.o_ndn = op.o_req_ndn; - op.o_callback = &cb; - op.o_time = slap_get_time(); - op.o_do_not_cache = 1; - op.o_is_auth_check = 1; - op.o_threadctx = conn->c_sasl_bindop->o_threadctx; - op.o_tmpmemctx = conn->c_sasl_bindop->o_tmpmemctx; - op.o_tmpmfuncs = conn->c_sasl_bindop->o_tmpmfuncs; - op.o_conn = conn; - op.o_connid = conn->c_connid; - op.o_req_dn = op.o_req_ndn; - op.orm_modlist = modlist; - - rc = op.o_bd->be_modify( &op, &rs ); + rc = slap_mods_no_update_check( modlist, &text, + textbuf, textlen ); + + if ( rc == LDAP_SUCCESS ) { + rc = slap_mods_opattrs( &op, modlist, modtail, + &text, textbuf, textlen, 1 ); + + if ( rc == LDAP_SUCCESS ) { + op.o_hdr = conn->c_sasl_bindop->o_hdr; + op.o_tag = LDAP_REQ_MODIFY; + op.o_ndn = op.o_req_ndn; + op.o_callback = &cb; + op.o_time = slap_get_time(); + op.o_do_not_cache = 1; + op.o_is_auth_check = 1; + op.o_req_dn = op.o_req_ndn; + op.orm_modlist = modlist; + + rc = op.o_bd->be_modify( &op, &rs ); + } + } } slap_mods_free( modlist ); - return rc ? SASL_FAIL : SASL_OK; + return rc != LDAP_SUCCESS ? SASL_FAIL : SASL_OK; } #endif /* SASL_VERSION_FULL >= 2.1.16 */ @@ -652,18 +471,10 @@ slap_sasl_canonicalize( *out_len = 0; -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ENTRY, - "slap_sasl_canonicalize: conn %d %s=\"%s\"\n", - conn ? conn->c_connid : -1, - (flags & SASL_CU_AUTHID) ? "authcid" : "authzid", - in ? in : ""); -#else Debug( LDAP_DEBUG_ARGS, "SASL Canonicalize [conn=%ld]: %s=\"%s\"\n", conn ? conn->c_connid : -1, (flags & SASL_CU_AUTHID) ? "authcid" : "authzid", in ? in : ""); -#endif /* If name is too big, just truncate. We don't care, we're * using DNs, not the usernames. @@ -738,16 +549,9 @@ slap_sasl_canonicalize( prop_set( props, names[0], (char *)&dn, sizeof( dn ) ); -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ENTRY, - "slap_sasl_canonicalize: conn %d %s=\"%s\"\n", - conn ? conn->c_connid : -1, names[0]+1, - dn.bv_val ? dn.bv_val : "" ); -#else Debug( LDAP_DEBUG_ARGS, "SASL Canonicalize [conn=%ld]: %s=\"%s\"\n", conn ? conn->c_connid : -1, names[0]+1, dn.bv_val ? dn.bv_val : "" ); -#endif done: AC_MEMCPY( out, in, inlen ); @@ -772,22 +576,16 @@ slap_sasl_authorize( { Connection *conn = (Connection *)context; struct propval auxvals[3]; - struct berval authcDN, authzDN; + struct berval authcDN, authzDN=BER_BVNULL; int rc; /* Simple Binds don't support proxy authorization, ignore it */ if ( !conn->c_sasl_bindop || conn->c_sasl_bindop->orb_method != LDAP_AUTH_SASL ) return SASL_OK; -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ENTRY, - "slap_sasl_authorize: conn %d authcid=\"%s\" authzid=\"%s\"\n", - conn ? conn->c_connid : -1, auth_identity, requested_user); -#else Debug( LDAP_DEBUG_ARGS, "SASL proxy authorize [conn=%ld]: " "authcid=\"%s\" authzid=\"%s\"\n", conn ? conn->c_connid : -1, auth_identity, requested_user ); -#endif if ( conn->c_sasl_dn.bv_val ) { ch_free( conn->c_sasl_dn.bv_val ); BER_BVZERO( &conn->c_sasl_dn ); @@ -803,52 +601,39 @@ slap_sasl_authorize( } AC_MEMCPY( &authcDN, auxvals[0].values[0], sizeof(authcDN) ); + conn->c_sasl_dn = authcDN; /* Nothing to do if no authzID was given */ if ( !auxvals[1].name || !auxvals[1].values ) { - conn->c_sasl_dn = authcDN; goto ok; } AC_MEMCPY( &authzDN, auxvals[1].values[0], sizeof(authzDN) ); rc = slap_sasl_authorized( conn->c_sasl_bindop, &authcDN, &authzDN ); - ch_free( authcDN.bv_val ); if ( rc != LDAP_SUCCESS ) { -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, INFO, - "slap_sasl_authorize: conn %ld " - "proxy authorization disallowed (%d)\n", - (long)(conn ? conn->c_connid : -1), rc, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "SASL Proxy Authorize [conn=%ld]: " "proxy authorization disallowed (%d)\n", (long) (conn ? conn->c_connid : -1), rc, 0 ); -#endif sasl_seterror( sconn, 0, "not authorized" ); ch_free( authzDN.bv_val ); return SASL_NOAUTHZ; } - conn->c_sasl_dn = authzDN; + conn->c_sasl_authz_dn = authzDN; ok: if (conn->c_sasl_bindop) { Statslog( LDAP_DEBUG_STATS, - "conn=%lu op=%lu BIND authcid=\"%s\"\n", + "conn=%lu op=%lu BIND authcid=\"%s\" authzid=\"%s\"\n", conn->c_connid, conn->c_sasl_bindop->o_opid, - auth_identity, 0, 0); + auth_identity, requested_user, 0); } -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ENTRY, - "slap_sasl_authorize: conn %d proxy authorization allowed\n", - (long)(conn ? conn->c_connid : -1), 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "SASL Authorize [conn=%ld]: " - " proxy authorization allowed\n", - (long) (conn ? conn->c_connid : -1), 0, 0 ); -#endif + " proxy authorization allowed authzDN=\"%s\"\n", + (long) (conn ? conn->c_connid : -1), + authzDN.bv_val ? authzDN.bv_val : "", 0 ); return SASL_OK; } #else @@ -872,29 +657,17 @@ slap_sasl_authorize( BER_BVZERO( &conn->c_sasl_dn ); } -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ENTRY, - "slap_sasl_authorize: conn %d authcid=\"%s\" authzid=\"%s\"\n", - conn ? conn->c_connid : -1, authcid ? authcid : "", - authzid ? authzid : "" ); -#else Debug( LDAP_DEBUG_ARGS, "SASL Authorize [conn=%ld]: " "authcid=\"%s\" authzid=\"%s\"\n", (long) (conn ? conn->c_connid : -1), authcid ? authcid : "", authzid ? authzid : "" ); -#endif /* Figure out how much data we have for the dn */ rc = sasl_getprop( conn->c_sasl_authctx, SASL_REALM, (void **)&realm ); if( rc != SASL_OK && rc != SASL_NOTDONE ) { -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ERR, - "slap_sasl_authorize: getprop(REALM) failed.\n", 0, 0, 0 ); -#else Debug(LDAP_DEBUG_TRACE, "authorize: getprop(REALM) failed!\n", 0,0,0); -#endif *errstr = "Could not extract realm"; return SASL_NOAUTHZ; } @@ -909,17 +682,11 @@ slap_sasl_authorize( *errstr = ldap_err2string( rc ); return SASL_NOAUTHZ; } + conn->c_sasl_dn = authcDN; if( ( authzid == NULL ) || !strcmp( authcid, authzid ) ) { -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ENTRY, - "slap_sasl_authorize: conn %d Using authcDN=%s\n", - conn ? conn->c_connid : -1, authcDN.bv_val, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "SASL Authorize [conn=%ld]: " "Using authcDN=%s\n", (long) (conn ? conn->c_connid : -1), authcDN.bv_val,0 ); -#endif - conn->c_sasl_dn = authcDN; goto ok; } @@ -928,47 +695,33 @@ slap_sasl_authorize( rc = slap_sasl_getdn( conn, NULL, &bvauthzid, realm, &authzDN, SLAP_GETDN_AUTHZID ); if( rc != LDAP_SUCCESS ) { - ch_free( authcDN.bv_val ); *errstr = ldap_err2string( rc ); return SASL_NOAUTHZ; } rc = slap_sasl_authorized(conn->c_sasl_bindop, &authcDN, &authzDN ); - ch_free( authcDN.bv_val ); if( rc ) { -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, INFO, - "slap_sasl_authorize: conn %ld " - "proxy authorization disallowed (%d)\n", - (long)(conn ? conn->c_connid : -1), rc, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "SASL Authorize [conn=%ld]: " "proxy authorization disallowed (%d)\n", (long) (conn ? conn->c_connid : -1), rc, 0 ); -#endif *errstr = "not authorized"; ch_free( authzDN.bv_val ); return SASL_NOAUTHZ; } - conn->c_sasl_dn = authzDN; + conn->c_sasl_authz_dn = authzDN; ok: -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, RESULTS, - "slap_sasl_authorize: conn %d proxy authorization allowed\n", - (long)(conn ? conn->c_connid : -1 ), 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "SASL Authorize [conn=%ld]: " - " authorization allowed\n", - (long) (conn ? conn->c_connid : -1), 0, 0 ); -#endif + " authorization allowed authzDN=\"%s\"\n", + (long) (conn ? conn->c_connid : -1), + authzDN.bv_val ? authzDN.bv_val : "", 0 ); if (conn->c_sasl_bindop) { Statslog( LDAP_DEBUG_STATS, - "conn=%lu op=%lu BIND authcid=\"%s\"\n", + "conn=%lu op=%lu BIND authcid=\"%s\" authzid=\"%s\"\n", conn->c_connid, conn->c_sasl_bindop->o_opid, - authcid, 0, 0); + authcid, authzid ? authzid : "", 0); } *errstr = NULL; @@ -1014,7 +767,66 @@ slap_sasl_err2ldap( int saslerr ) return rc; } -#endif + +#ifdef SLAPD_SPASSWD + +static struct berval sasl_pwscheme = BER_BVC("{SASL}"); + +static int chk_sasl( + const struct berval *sc, + const struct berval * passwd, + const struct berval * cred, + const char **text ) +{ + unsigned int i; + int rtn; + void *ctx, *sconn = NULL; + + for( i=0; ibv_len; i++) { + if(cred->bv_val[i] == '\0') { + return LUTIL_PASSWD_ERR; /* NUL character in password */ + } + } + + if( cred->bv_val[i] != '\0' ) { + return LUTIL_PASSWD_ERR; /* cred must behave like a string */ + } + + for( i=0; ibv_len; i++) { + if(passwd->bv_val[i] == '\0') { + return LUTIL_PASSWD_ERR; /* NUL character in password */ + } + } + + if( passwd->bv_val[i] != '\0' ) { + return LUTIL_PASSWD_ERR; /* passwd must behave like a string */ + } + + rtn = LUTIL_PASSWD_ERR; + + ctx = ldap_pvt_thread_pool_context(); + ldap_pvt_thread_pool_getkey( ctx, slap_sasl_bind, &sconn, NULL ); + + if( sconn != NULL ) { + int sc; +# if SASL_VERSION_MAJOR < 2 + sc = sasl_checkpass( sconn, + passwd->bv_val, passwd->bv_len, + cred->bv_val, cred->bv_len, + text ); +# else + sc = sasl_checkpass( sconn, + passwd->bv_val, passwd->bv_len, + cred->bv_val, cred->bv_len ); +# endif + rtn = ( sc != SASL_OK ) ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK; + } + + return rtn; +} +#endif /* SLAPD_SPASSWD */ + +#endif /* HAVE_CYRUS_SASL */ int slap_sasl_init( void ) { @@ -1039,17 +851,9 @@ int slap_sasl_init( void ) char version[sizeof("xxx.xxx.xxxxx")]; sprintf( version, "%u.%d.%d", (unsigned)rc >> 24, (rc >> 16) & 0xff, rc & 0xffff ); -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, INFO, - "slap_sasl_init: SASL library version mismatch:" - " expected " SASL_VERSION_STRING "," - " got %s\n", version, 0, 0 ); -#else - Debug( LDAP_DEBUG_ANY, - "slap_sasl_init: SASL library version mismatch:" - " expected " SASL_VERSION_STRING "," - " got %s\n", version, 0, 0 ); -#endif + Debug( LDAP_DEBUG_ANY, "slap_sasl_init: SASL library version mismatch:" + " expected " SASL_VERSION_STRING "," + " got %s\n", version, 0, 0 ); return -1; } #endif @@ -1072,19 +876,20 @@ int slap_sasl_init( void ) #if SASL_VERSION_MAJOR >= 2 generic_filter.f_desc = slap_schema.si_ad_objectClass; - sasl_auxprop_add_plugin( "slapd", slap_auxprop_init ); + rc = sasl_auxprop_add_plugin( "slapd", slap_auxprop_init ); + if( rc != SASL_OK ) { + Debug( LDAP_DEBUG_ANY, "slap_sasl_init: auxprop add plugin failed\n", + 0, 0, 0 ); + return -1; + } #endif /* should provide callbacks for logging */ /* server name should be configurable */ rc = sasl_server_init( server_callbacks, "slapd" ); if( rc != SASL_OK ) { -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, INFO, "slap_sasl_init: init failed.\n", 0, 0, 0 ); -#else - Debug( LDAP_DEBUG_ANY, "sasl_server_init failed\n", + Debug( LDAP_DEBUG_ANY, "slap_sasl_init: server init failed\n", 0, 0, 0 ); -#endif #if SASL_VERSION_MAJOR < 2 /* A no-op used to make sure we linked with Cyrus 1.5 */ sasl_client_auth( NULL, NULL, NULL, 0, NULL, NULL ); @@ -1093,12 +898,12 @@ int slap_sasl_init( void ) return -1; } -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, INFO, "slap_sasl_init: initialized!\n", 0, 0, 0 ); -#else +#ifdef SLAPD_SPASSWD + lutil_passwd_add( &sasl_pwscheme, chk_sasl, NULL ); +#endif + Debug( LDAP_DEBUG_TRACE, "slap_sasl_init: initialized!\n", 0, 0, 0 ); -#endif /* default security properties */ memset( &sasl_secprops, '\0', sizeof(sasl_secprops) ); @@ -1146,13 +951,8 @@ int slap_sasl_open( Connection *conn, int reopen ) SLAP_CALLOC( 3, sizeof(sasl_callback_t)); #endif if( session_callbacks == NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ERR, - "slap_sasl_open: SLAP_MALLOC failed", 0, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "slap_sasl_open: SLAP_MALLOC failed", 0, 0, 0 ); -#endif return -1; } conn->c_sasl_extra = session_callbacks; @@ -1226,13 +1026,8 @@ int slap_sasl_open( Connection *conn, int reopen ) #endif if( sc != SASL_OK ) { -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ERR, - "slap_sasl_open: sasl_server_new failed: %d\n", sc, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "sasl_server_new failed: %d\n", sc, 0, 0 ); -#endif return -1; } @@ -1244,13 +1039,8 @@ int slap_sasl_open( Connection *conn, int reopen ) SASL_SEC_PROPS, &sasl_secprops ); if( sc != SASL_OK ) { -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ERR, - "slap_sasl_open: sasl_setprop failed: %d \n", sc, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "sasl_setprop failed: %d\n", sc, 0, 0 ); -#endif slap_sasl_close( conn ); return -1; @@ -1358,13 +1148,8 @@ char ** slap_sasl_mechs( Connection *conn ) &mechstr, NULL, NULL ); if( sc != SASL_OK ) { -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ERR, - "slap_sasl_mechs: sasl_listmech failed: %d\n", sc, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "slap_sasl_listmech failed: %d\n", sc, 0, 0 ); -#endif return NULL; } @@ -1432,21 +1217,12 @@ int slap_sasl_bind( Operation *op, SlapReply *rs ) unsigned reslen = 0; int sc; -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ENTRY, - "sasl_bind: dn=\"%s\" mech=%s datalen=%ld\n", - op->o_req_dn.bv_len ? op->o_req_dn.bv_val : "", - op->o_conn->c_sasl_bind_in_progress ? "" : - op->o_conn->c_sasl_bind_mech.bv_val, - op->orb_cred.bv_len ); -#else Debug(LDAP_DEBUG_ARGS, "==> sasl_bind: dn=\"%s\" mech=%s datalen=%ld\n", op->o_req_dn.bv_len ? op->o_req_dn.bv_val : "", op->o_conn->c_sasl_bind_in_progress ? "" : op->o_conn->c_sasl_bind_mech.bv_val, op->orb_cred.bv_len ); -#endif if( ctx == NULL ) { send_ldap_error( op, rs, LDAP_UNAVAILABLE, @@ -1569,11 +1345,7 @@ int slap_sasl_bind( Operation *op, SlapReply *rs ) } #endif -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, RESULTS, "slap_sasl_bind: rc=%d\n", rs->sr_err, 0, 0 ); -#else Debug(LDAP_DEBUG_TRACE, "<== slap_sasl_bind: rc=%d\n", rs->sr_err, 0, 0); -#endif #elif defined(SLAP_BUILTIN_SASL) /* built-in SASL implementation */ @@ -1621,6 +1393,13 @@ char* slap_sasl_secprops( const char *in ) #endif } +void slap_sasl_secprops_unparse( struct berval *bv ) +{ +#ifdef HAVE_CYRUS_SASL + ldap_pvt_sasl_secprops_unparse( &sasl_secprops, bv ); +#endif +} + #ifdef HAVE_CYRUS_SASL int slap_sasl_setpass( Operation *op, SlapReply *rs ) @@ -1640,14 +1419,8 @@ slap_sasl_setpass( Operation *op, SlapReply *rs ) goto done; } -#ifdef NEW_LOGGING - LDAP_LOG( BACKEND, ENTRY, - "slap_sasl_setpass: \"%s\"\n", - id.bv_val ? id.bv_val : "", 0, 0); -#else Debug( LDAP_DEBUG_ARGS, "==> slap_sasl_setpass: \"%s\"\n", id.bv_val ? id.bv_val : "", 0, 0 ); -#endif rs->sr_err = slap_passwd_parse( op->ore_reqdata, NULL, &old, &new, &rs->sr_text ); @@ -1719,18 +1492,10 @@ int slap_sasl_getdn( Connection *conn, Operation *op, struct berval *id, assert( conn ); assert( id ); -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ENTRY, - "slap_sasl_getdn: conn %d id=%s [len=%d]\n", - conn->c_connid, - BER_BVISNULL( id ) ? "NULL" : ( BER_BVISEMPTY( id ) ? "" : id->bv_val ), - BER_BVISNULL( id ) ? 0 : ( BER_BVISEMPTY( id ) ? 0 : id->bv_len ) ); -#else Debug( LDAP_DEBUG_ARGS, "slap_sasl_getdn: conn %d id=%s [len=%d]\n", conn->c_connid, BER_BVISNULL( id ) ? "NULL" : ( BER_BVISEMPTY( id ) ? "" : id->bv_val ), BER_BVISNULL( id ) ? 0 : ( BER_BVISEMPTY( id ) ? 0 : id->bv_len ) ); -#endif if ( !op ) { op = conn->c_sasl_bindop; @@ -1799,54 +1564,63 @@ int slap_sasl_getdn( Connection *conn, Operation *op, struct berval *id, /* Username strings */ if( is_dn == SET_U ) { - char *p; - struct berval realm = BER_BVNULL, c1 = *dn; - ber_len_t len; - - len = dn->bv_len + STRLENOF( "uid=" ) + STRLENOF( ",cn=auth" ); - - if( user_realm && *user_realm ) { - ber_str2bv( user_realm, 0, 0, &realm ); - len += realm.bv_len + STRLENOF( ",cn=" ); + /* ITS#3419: values may need escape */ + LDAPRDN DN[ 5 ]; + LDAPAVA *RDNs[ 4 ][ 2 ]; + LDAPAVA AVAs[ 4 ]; + int irdn; + + irdn = 0; + DN[ irdn ] = RDNs[ irdn ]; + RDNs[ irdn ][ 0 ] = &AVAs[ irdn ]; + AVAs[ irdn ].la_attr = slap_schema.si_ad_uid->ad_cname; + AVAs[ irdn ].la_value = *dn; + AVAs[ irdn ].la_flags = LDAP_AVA_NULL; + AVAs[ irdn ].la_private = NULL; + RDNs[ irdn ][ 1 ] = NULL; + + if ( user_realm && *user_realm ) { + irdn++; + DN[ irdn ] = RDNs[ irdn ]; + RDNs[ irdn ][ 0 ] = &AVAs[ irdn ]; + AVAs[ irdn ].la_attr = slap_schema.si_ad_cn->ad_cname; + ber_str2bv( user_realm, 0, 0, &AVAs[ irdn ].la_value ); + AVAs[ irdn ].la_flags = LDAP_AVA_NULL; + AVAs[ irdn ].la_private = NULL; + RDNs[ irdn ][ 1 ] = NULL; } - if( mech->bv_len ) { - len += mech->bv_len + STRLENOF( ",cn=" ); + if ( !BER_BVISNULL( mech ) ) { + irdn++; + DN[ irdn ] = RDNs[ irdn ]; + RDNs[ irdn ][ 0 ] = &AVAs[ irdn ]; + AVAs[ irdn ].la_attr = slap_schema.si_ad_cn->ad_cname; + AVAs[ irdn ].la_value = *mech; + AVAs[ irdn ].la_flags = LDAP_AVA_NULL; + AVAs[ irdn ].la_private = NULL; + RDNs[ irdn ][ 1 ] = NULL; } - /* Build the new dn */ - dn->bv_val = sl_malloc( len + 1, op->o_tmpmemctx ); - if( dn->bv_val == NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ERR, - "slap_sasl_getdn: SLAP_MALLOC failed", 0, 0, 0 ); -#else - Debug( LDAP_DEBUG_ANY, - "slap_sasl_getdn: SLAP_MALLOC failed", 0, 0, 0 ); -#endif - return LDAP_OTHER; - } - p = lutil_strcopy( dn->bv_val, "uid=" ); - p = lutil_strncopy( p, c1.bv_val, c1.bv_len ); + irdn++; + DN[ irdn ] = RDNs[ irdn ]; + RDNs[ irdn ][ 0 ] = &AVAs[ irdn ]; + AVAs[ irdn ].la_attr = slap_schema.si_ad_cn->ad_cname; + BER_BVSTR( &AVAs[ irdn ].la_value, "auth" ); + AVAs[ irdn ].la_flags = LDAP_AVA_NULL; + AVAs[ irdn ].la_private = NULL; + RDNs[ irdn ][ 1 ] = NULL; - if( realm.bv_len ) { - p = lutil_strcopy( p, ",cn=" ); - p = lutil_strncopy( p, realm.bv_val, realm.bv_len ); - } + irdn++; + DN[ irdn ] = NULL; - if( mech->bv_len ) { - p = lutil_strcopy( p, ",cn=" ); - p = lutil_strcopy( p, mech->bv_val ); + rc = ldap_dn2bv_x( DN, dn, LDAP_DN_FORMAT_LDAPV3, op->o_tmpmemctx ); + if ( rc != LDAP_SUCCESS ) { + BER_BVZERO( dn ); + return rc; } - p = lutil_strcopy( p, ",cn=auth" ); - dn->bv_len = p - dn->bv_val; -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ENTRY, - "slap_sasl_getdn: u:id converted to %s.\n", dn->bv_val, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "slap_sasl_getdn: u:id converted to %s\n", dn->bv_val,0,0 ); -#endif + } else { /* Dup the DN in any case, so we don't risk @@ -1861,7 +1635,7 @@ int slap_sasl_getdn( Connection *conn, Operation *op, struct berval *id, rc = dnNormalize( 0, NULL, NULL, dn, &dn2, op->o_tmpmemctx ); /* User DNs were constructed above and must be freed now */ - sl_free( dn->bv_val, op->o_tmpmemctx ); + slap_sl_free( dn->bv_val, op->o_tmpmemctx ); if ( rc != LDAP_SUCCESS ) { BER_BVZERO( dn ); @@ -1873,15 +1647,10 @@ int slap_sasl_getdn( Connection *conn, Operation *op, struct berval *id, /* Run thru regexp */ slap_sasl2dn( op, dn, &dn2, flags ); if( !BER_BVISNULL( &dn2 ) ) { - sl_free( dn->bv_val, op->o_tmpmemctx ); + slap_sl_free( dn->bv_val, op->o_tmpmemctx ); *dn = dn2; -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ENTRY, - "slap_sasl_getdn: dn:id converted to %s.\n", dn->bv_val, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "getdn: dn:id converted to %s\n", dn->bv_val, 0, 0 ); -#endif } return( LDAP_SUCCESS );