X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsasl.c;h=518db4ec92b08b6362daedab1ade8d101d323956;hb=40454ccec8d26babd8ddcfc50c9863032880a9a1;hp=63f9f4b5d92b2c3e94ca13fcd1401c6d95bf8fcb;hpb=d38d19edc1074041b5831d132de7d348d90e242f;p=openldap diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c index 63f9f4b5d9..518db4ec92 100644 --- a/servers/slapd/sasl.c +++ b/servers/slapd/sasl.c @@ -1,6 +1,6 @@ /* $OpenLDAP$ */ /* - * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -15,34 +15,28 @@ #include "slap.h" -#ifdef HAVE_CYRUS_SASL #include -#ifdef HAVE_SASL_SASL_H -#include -#else -#include -#endif - -#include -#if SASL_VERSION_MAJOR >= 2 -#include -#define SASL_CONST const -#else -#define SASL_CONST -#endif +#ifdef HAVE_CYRUS_SASL +# ifdef HAVE_SASL_SASL_H +# include +# else +# include +# endif + +# if SASL_VERSION_MAJOR >= 2 +# include +# define SASL_CONST const +# else +# define SASL_CONST +# endif -#include +static sasl_security_properties_t sasl_secprops; +#endif /* HAVE_CYRUS_SASL */ -#ifdef SLAPD_SPASSWD +#include "ldap_pvt.h" +#include "lber_pvt.h" #include -#endif - -/* Flags for telling slap_sasl_getdn() what type of identity is being passed */ -#define FLAG_GETDN_AUTHCID 2 -#define FLAG_GETDN_AUTHZID 4 - -static sasl_security_properties_t sasl_secprops; int slap_sasl_config( int cargc, char **cargv, char *line, const char *fname, int lineno ) @@ -52,11 +46,13 @@ int slap_sasl_config( int cargc, char **cargv, char *line, if ( cargc != 2 ) { #ifdef NEW_LOGGING LDAP_LOG( CONFIG, CRIT, - "%s: line %d: missing policy in \"sasl-authz-policy \" line\n", - fname, lineno, 0 ); + "%s: line %d: missing policy in" + " \"sasl-authz-policy \" line\n", + fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, - "%s: line %d: missing policy in \"sasl-authz-policy \" line\n", + "%s: line %d: missing policy in" + " \"sasl-authz-policy \" line\n", fname, lineno, 0 ); #endif @@ -80,18 +76,42 @@ int slap_sasl_config( int cargc, char **cargv, char *line, #endif return( 1 ); } - + } else if ( !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 " + "\"saslregexp \"\n", + fname, lineno, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "%s: line %d: need 2 args in " + "\"saslregexp \"\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 ); + "%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", + "%s: line %d: missing host in \"sasl-host \" line\n", fname, lineno, 0 ); #endif @@ -101,8 +121,8 @@ int slap_sasl_config( int cargc, char **cargv, char *line, if ( global_host != NULL ) { #ifdef NEW_LOGGING LDAP_LOG( CONFIG, CRIT, - "%s: line %d: already set sasl-host!\n", - fname, lineno, 0 ); + "%s: line %d: already set sasl-host!\n", + fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: already set sasl-host!\n", @@ -119,12 +139,12 @@ int slap_sasl_config( int cargc, char **cargv, char *line, } 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 ); + 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", + Debug( LDAP_DEBUG_ANY, "%s: line %d: " + "missing realm in \"sasl-realm \" line.\n", fname, lineno, 0 ); #endif @@ -134,8 +154,8 @@ int slap_sasl_config( int cargc, char **cargv, char *line, if ( global_realm != NULL ) { #ifdef NEW_LOGGING LDAP_LOG( CONFIG, CRIT, - "%s: line %d: already set sasl-realm!\n", - fname, lineno, 0 ); + "%s: line %d: already set sasl-realm!\n", + fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: already set sasl-realm!\n", @@ -148,42 +168,18 @@ int slap_sasl_config( int cargc, char **cargv, char *line, global_realm = ch_strdup( cargv[1] ); } - } else if ( !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 " - "\"saslregexp \"\n", - fname, lineno, 0 ); -#else - Debug( LDAP_DEBUG_ANY, - "%s: line %d: need 2 args in \"saslregexp \"\n", - fname, lineno, 0 ); -#endif - - return( 1 ); - } - rc = slap_sasl_regexp_config( cargv[1], cargv[2] ); - if ( rc ) { - return rc; - } - /* 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 ); + 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", + Debug( LDAP_DEBUG_ANY, "%s: line %d: " + "missing flags in \"sasl-secprops \" line\n", fname, lineno, 0 ); #endif @@ -194,22 +190,25 @@ int slap_sasl_config( int cargc, char **cargv, char *line, if ( txt != NULL ) { #ifdef NEW_LOGGING LDAP_LOG( CONFIG, CRIT, - "%s: line %d sasl-secprops: %s\n", - fname, lineno, txt ); + "%s: line %d sasl-secprops: %s\n", + fname, lineno, txt ); #else Debug( LDAP_DEBUG_ANY, - "%s: line %d: sasl-secprops: %s\n", + "%s: line %d: sasl-secprops: %s\n", fname, lineno, txt ); #endif return 1; } +#endif /* HAVE_CYRUS_SASL */ } return LDAP_SUCCESS; } -static int +#ifdef HAVE_CYRUS_SASL + +int slap_sasl_log( void *context, int priority, @@ -289,181 +288,79 @@ slap_sasl_log( } -/* Take any sort of identity string and return a DN with the "dn:" prefix. The - string returned in *dn is in its own allocated memory, and must be free'd - by the calling process. - -Mark Adamson, Carnegie Mellon +#if SASL_VERSION_MAJOR >= 2 +static const char *slap_propnames[] = { + "*slapConn", "*authcDN", "*authzDN", NULL }; - The "dn:" prefix is no longer used anywhere inside slapd. It is only used - on strings passed in directly from SASL. - -Howard Chu, Symas Corp. -*/ +static Filter *generic_filter; -#define SET_DN 1 -#define SET_U 2 +#define PROP_CONN 0 +#define PROP_AUTHC 1 +#define PROP_AUTHZ 2 -static struct berval ext_bv = { sizeof("EXTERNAL")-1, "EXTERNAL" }; +typedef struct lookup_info { + int last; + int flags; + const struct propval *list; + sasl_server_params_t *sparams; +} lookup_info; -int slap_sasl_getdn( Connection *conn, char *id, int len, - char *user_realm, struct berval *dn, int flags ) +static int +sasl_ap_lookup( + BackendDB *be, + Connection *conn, + Operation *op, + Entry *e, + AttributeName *an, + int attrsonly, + LDAPControl **ctrls ) { - char *c1; - int rc, is_dn = 0, do_norm = 1; - sasl_conn_t *ctx; - struct berval dn2; - -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ENTRY, - "slap_sasl_getdn: conn %d id=%s\n", - conn ? conn->c_connid : -1, id ? (*id ? id : "") : "NULL", 0 ); -#else - Debug( LDAP_DEBUG_ARGS, "slap_sasl_getdn: id=%s\n", - id?(*id?id:""):"NULL",0,0 ); -#endif - - dn->bv_val = NULL; - dn->bv_len = 0; - - if ( id ) { - if ( len == 0 ) len = strlen( id ); - - /* Blatantly anonymous ID */ - if ( len == sizeof("anonymous") - 1 && - !strcasecmp( id, "anonymous" ) ) { - return( LDAP_SUCCESS ); - } - } else { - len = 0; - } - - ctx = conn->c_sasl_context; - - /* An authcID needs to be converted to authzID form. Set the - * values directly into *dn; they will be normalized later. (and - * normalizing always makes a new copy.) An ID from a TLS certificate - * is already normalized, so copy it and skip normalization. - */ - if( flags & FLAG_GETDN_AUTHCID ) { -#ifdef HAVE_TLS - if( conn->c_is_tls && conn->c_sasl_bind_mech.bv_len == ext_bv.bv_len - && ( strcasecmp( ext_bv.bv_val, conn->c_sasl_bind_mech.bv_val ) == 0 ) ) { - /* X.509 DN is already normalized */ - do_norm = 0; - is_dn = SET_DN; - ber_str2bv( id, len, 1, dn ); - - } else -#endif - { - /* convert to u: form */ - is_dn = SET_U; - dn->bv_val = id; - dn->bv_len = len; - } - } - if( !is_dn ) { - if( !strncasecmp( id, "u:", sizeof("u:")-1 )) { - is_dn = SET_U; - dn->bv_val = id+2; - dn->bv_len = len-2; - } else if ( !strncasecmp( id, "dn:", sizeof("dn:")-1) ) { - is_dn = SET_DN; - dn->bv_val = id+3; - dn->bv_len = len-3; - } - } - - /* No other possibilities from here */ - if( !is_dn ) { - dn->bv_val = NULL; - dn->bv_len = 0; - return( LDAP_INAPPROPRIATE_AUTH ); - } - - /* Username strings */ - if( is_dn == SET_U ) { - char *p, *realm; - len = dn->bv_len + sizeof("uid=")-1 + sizeof(",cn=auth")-1; - - /* username may have embedded realm name */ - if( realm = strchr( dn->bv_val, '@') ) { - *realm++ = '\0'; - len += sizeof(",cn=")-2; - } else if( user_realm && *user_realm ) { - len += strlen( user_realm ) + sizeof(",cn=")-1; - } + BerVarray bv; + AttributeDescription *ad; + Attribute *a; + const char *text; + int rc, i; + slap_callback *tmp = op->o_callback; + lookup_info *sl = tmp->sc_private; - if( conn->c_sasl_bind_mech.bv_len ) { - len += conn->c_sasl_bind_mech.bv_len + sizeof(",cn=")-1; - } + for( i = 0; i < sl->last; i++ ) { + const char *name = sl->list[i].name; - /* Build the new dn */ - c1 = dn->bv_val; - dn->bv_val = ch_malloc( len+1 ); - p = lutil_strcopy( dn->bv_val, "uid=" ); - p = lutil_strncopy( p, c1, dn->bv_len ); - - if( realm ) { - int rlen = dn->bv_len - ( realm - c1 ); - p = lutil_strcopy( p, ",cn=" ); - p = lutil_strncopy( p, realm, rlen ); - realm[-1] = '@'; - } else if( user_realm && *user_realm ) { - p = lutil_strcopy( p, ",cn=" ); - p = lutil_strcopy( p, user_realm ); - } + if ( name[0] == '*' ) { + if ( sl->flags & SASL_AUXPROP_AUTHZID ) continue; + name++; + } else if ( !(sl->flags & SASL_AUXPROP_AUTHZID ) ) + continue; - if( conn->c_sasl_bind_mech.bv_len ) { - p = lutil_strcopy( p, ",cn=" ); - p = lutil_strcopy( p, conn->c_sasl_bind_mech.bv_val ); + if ( sl->list[i].values ) { + if ( !(sl->flags & SASL_AUXPROP_OVERRIDE) ) continue; } - 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, "getdn: u:id converted to %s\n", dn->bv_val,0,0 ); -#endif - } - - /* All strings are in DN form now. Normalize if needed. */ - if ( do_norm ) { - rc = dnNormalize2( NULL, dn, &dn2 ); - - /* User DNs were constructed above and must be freed now */ - if ( is_dn == SET_U ) - ch_free( dn->bv_val ); - + ad = NULL; + rc = slap_str2ad( name, &ad, &text ); if ( rc != LDAP_SUCCESS ) { - dn->bv_val = NULL; - dn->bv_len = 0; - return rc; - } - *dn = dn2; - } - - /* Run thru regexp */ - slap_sasl2dn( conn, dn, &dn2 ); - if( dn2.bv_val ) { - ch_free( dn->bv_val ); - *dn = dn2; #ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ENTRY, - "slap_sasl_getdn: dn:id converted to %s.\n", dn->bv_val, 0, 0 ); + LDAP_LOG( TRANSPORT, DETAIL1, + "slap_auxprop: str2ad(%s): %s\n", name, text, 0 ); #else - Debug( LDAP_DEBUG_TRACE, "getdn: dn:id converted to %s\n", - dn->bv_val, 0, 0 ); + Debug( LDAP_DEBUG_TRACE, + "slap_auxprop: str2ad(%s): %s\n", name, text, 0 ); #endif + continue; + } + a = attr_find( e->e_attrs, ad ); + if ( !a ) continue; + if ( ! access_allowed( be, conn, op, e, ad, NULL, ACL_AUTH, NULL ) ) + continue; + if ( sl->list[i].values && ( sl->flags & SASL_AUXPROP_OVERRIDE ) ) + sl->sparams->utils->prop_erase( sl->sparams->propctx, sl->list[i].name ); + for ( bv = a->a_vals; bv->bv_val; bv++ ) { + sl->sparams->utils->prop_set( sl->sparams->propctx, sl->list[i].name, + bv->bv_val, bv->bv_len ); + } } - - return( LDAP_SUCCESS ); + return LDAP_SUCCESS; } -#if SASL_VERSION_MAJOR >= 2 -static const char *slap_propnames[] = { "*authcDN", "*authzDN", NULL }; - static void slap_auxprop_lookup( void *glob_context, @@ -472,29 +369,35 @@ slap_auxprop_lookup( const char *user, unsigned ulen) { - int rc, i, last; + int rc, i, doit=0; struct berval dn; - const struct propval *list; - BerVarray vals, bv; - AttributeDescription *ad; - const char *text; - - list = sparams->utils->prop_get( sparams->propctx ); - - /* Find our DN first */ - for( i = 0, last = 0; list[i].name; i++ ) { - if ( list[i].name[0] == '*' ) { + Connection *conn = NULL; + lookup_info sl; + + sl.list = sparams->utils->prop_get( sparams->propctx ); + sl.sparams = sparams; + sl.flags = flags; + + /* Find our DN and conn first */ + for( i = 0, sl.last = 0; sl.list[i].name; i++ ) { + if ( sl.list[i].name[0] == '*' ) { + if ( !strcmp( sl.list[i].name, slap_propnames[PROP_CONN] ) ) { + if ( sl.list[i].values && sl.list[i].values[0] ) + AC_MEMCPY( &conn, sl.list[i].values[0], sizeof( conn ) ); + if ( !sl.last ) sl.last = i; + } if ( (flags & SASL_AUXPROP_AUTHZID) && - !strcmp( list[i].name, slap_propnames[1] ) ) { - if ( list[i].values && list[i].values[0] ) - AC_MEMCPY( &dn, list[i].values[0], sizeof( dn ) ); - if ( !last ) last = i; + !strcmp( sl.list[i].name, slap_propnames[PROP_AUTHZ] ) ) { + + if ( sl.list[i].values && sl.list[i].values[0] ) + AC_MEMCPY( &dn, sl.list[i].values[0], sizeof( dn ) ); + if ( !sl.last ) sl.last = i; break; } - if ( !strcmp( list[i].name, slap_propnames[0] ) ) { - if ( !last ) last = i; - if ( list[i].values && list[i].values[0] ) { - AC_MEMCPY( &dn, list[i].values[0], sizeof( dn ) ); + if ( !strcmp( sl.list[i].name, slap_propnames[PROP_AUTHC] ) ) { + if ( !sl.last ) sl.last = i; + if ( sl.list[i].values && sl.list[i].values[0] ) { + AC_MEMCPY( &dn, sl.list[i].values[0], sizeof( dn ) ); if ( !(flags & SASL_AUXPROP_AUTHZID) ) break; } @@ -502,9 +405,9 @@ slap_auxprop_lookup( } } - /* Now fetch the rest */ - for( i = 0; i < last; i++ ) { - const char *name = list[i].name; + /* Now see what else needs to be fetched */ + for( i = 0; i < sl.last; i++ ) { + const char *name = sl.list[i].name; if ( name[0] == '*' ) { if ( flags & SASL_AUXPROP_AUTHZID ) continue; @@ -512,30 +415,36 @@ slap_auxprop_lookup( } else if ( !(flags & SASL_AUXPROP_AUTHZID ) ) continue; - if ( list[i].values ) { + if ( sl.list[i].values ) { if ( !(flags & SASL_AUXPROP_OVERRIDE) ) continue; - sparams->utils->prop_erase( sparams->propctx, list[i].name ); } - 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 - rc = slap_str2undef_ad( name, &ad, &text ); - if ( rc != LDAP_SUCCESS ) continue; - } - rc = backend_attribute( NULL,NULL,NULL,NULL, &dn, ad, &vals ); - if ( rc != LDAP_SUCCESS ) continue; - for ( bv = vals; bv->bv_val; bv++ ) { - sparams->utils->prop_set( sparams->propctx, list[i].name, - bv->bv_val, bv->bv_len ); + doit = 1; + } + + if (doit) { + Backend *be; + Operation op = {0}; + slap_callback cb = { slap_cb_null_response, + slap_cb_null_sresult, sasl_ap_lookup, slap_cb_null_sreference, NULL }; + + cb.sc_private = &sl; + + be = select_backend( &dn, 0, 1 ); + + if ( be && be->be_search ) { + 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; + + (*be->be_search)( be, conn, &op, NULL, &dn, + LDAP_SCOPE_BASE, LDAP_DEREF_NEVER, 1, 0, + generic_filter, NULL, NULL, 0 ); } - ber_bvarray_free( vals ); } } @@ -566,6 +475,42 @@ slap_auxprop_init( return SASL_OK; } +typedef struct checkpass_info { + int rc; + struct berval cred; +} checkpass_info; + +static int +sasl_cb_checkpass( + BackendDB *be, + Connection *conn, + Operation *op, + Entry *e, + AttributeName *an, + int attrsonly, + LDAPControl **ctrls ) +{ + slap_callback *tmp = op->o_callback; + checkpass_info *ci = tmp->sc_private; + Attribute *a; + struct berval *bv; + + ci->rc = SASL_NOVERIFY; + + a = attr_find( e->e_attrs, slap_schema.si_ad_userPassword ); + if ( !a ) return 0; + if ( ! access_allowed( be, conn, op, e, slap_schema.si_ad_userPassword, + NULL, ACL_AUTH, NULL ) ) return 0; + + for ( bv = a->a_vals; bv->bv_val != NULL; bv++ ) { + if ( !lutil_passwd( bv, &ci->cred, NULL ) ) { + ci->rc = SASL_OK; + break; + } + } + return 0; +} + static int slap_sasl_checkpass( sasl_conn_t *sconn, @@ -576,19 +521,19 @@ slap_sasl_checkpass( struct propctx *propctx) { Connection *conn = (Connection *)context; - struct berval dn, cred; + struct berval dn; int rc; - BerVarray vals, bv; + Backend *be; + checkpass_info ci; - cred.bv_val = (char *)pass; - cred.bv_len = passlen; + ci.rc = SASL_NOUSER; /* SASL will fallback to its own mechanisms if we don't * find an answer here. */ rc = slap_sasl_getdn( conn, (char *)username, 0, NULL, &dn, - FLAG_GETDN_AUTHCID ); + SLAP_GETDN_AUTHCID ); if ( rc != LDAP_SUCCESS ) { sasl_seterror( sconn, 0, ldap_err2string( rc ) ); return SASL_NOUSER; @@ -603,34 +548,37 @@ slap_sasl_checkpass( return SASL_NOUSER; } - rc = backend_attribute( NULL, NULL, NULL, NULL, &dn, - slap_schema.si_ad_userPassword, &vals); - if ( rc != LDAP_SUCCESS ) { - ch_free( dn.bv_val ); - sasl_seterror( sconn, 0, ldap_err2string( rc ) ); - return SASL_NOVERIFY; + be = select_backend( &dn, 0, 1 ); + if ( be && be->be_search ) { + Operation op = {0}; + slap_callback cb = { slap_cb_null_response, + slap_cb_null_sresult, sasl_cb_checkpass, slap_cb_null_sreference, NULL }; + + ci.cred.bv_val = (char *)pass; + ci.cred.bv_len = passlen; + + cb.sc_private = &ci; + 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; + + (*be->be_search)( be, conn, &op, NULL, &dn, + LDAP_SCOPE_BASE, LDAP_DEREF_NEVER, 1, 0, + generic_filter, NULL, NULL, 0 ); } - - rc = SASL_NOVERIFY; - - if ( vals != NULL ) { - for ( bv = vals; bv->bv_val != NULL; bv++ ) { - if ( !lutil_passwd( bv, &cred, NULL ) ) { - rc = SASL_OK; - break; - } - } - ber_bvarray_free( vals ); - } - - if ( rc != SASL_OK ) { + if ( ci.rc != SASL_OK ) { sasl_seterror( sconn, 0, ldap_err2string( LDAP_INVALID_CREDENTIALS ) ); } ch_free( dn.bv_val ); - return rc; + return ci.rc; } /* Convert a SASL authcid or authzid into a DN. Store the DN in an @@ -664,13 +612,13 @@ slap_sasl_canonicalize( 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 : ""); + (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 : "" ); + 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 @@ -685,29 +633,47 @@ slap_sasl_canonicalize( prop_request( props, slap_propnames ); if ( flags & SASL_CU_AUTHID ) - which = 0; + which = PROP_AUTHC; else - which = 1; + which = PROP_AUTHZ; + /* Need to store the Connection for auxprop_lookup */ + if ( !auxvals[PROP_CONN].values ) { + names[0] = slap_propnames[PROP_CONN]; + names[1] = NULL; + prop_set( props, names[0], (char *)&conn, sizeof( conn ) ); + } + /* Already been here? */ if ( auxvals[which].values ) goto done; - if ( flags == SASL_CU_AUTHZID ) { - /* If we got unqualified authzid's, they probably came from SASL - * itself just passing the authcid to us. Look inside the oparams - * structure to see if that's true. (HACK: the out_len pointer is - * the address of a member of a sasl_out_params_t structure...) + /* Normally we require an authzID to have a u: or dn: prefix. + * However, SASL frequently gives us an authzID that is just + * an exact copy of the authcID, without a prefix. We need to + * detect and allow this condition. If SASL calls canonicalize + * with SASL_CU_AUTHID|SASL_CU_AUTHZID this is a no-brainer. + * But if it's broken into two calls, we need to remember the + * authcID so that we can compare the authzID later. We store + * the authcID temporarily in conn->c_sasl_dn. We necessarily + * finish Canonicalizing before Authorizing, so there is no + * conflict with slap_sasl_authorize's use of this temp var. + * + * The SASL EXTERNAL mech is backwards from all the other mechs, + * it does authzID before the authcID. If we see that authzID + * has already been done, don't do anything special with authcID. */ - sasl_out_params_t dummy; - int offset = (void *)&dummy.ulen - (void *)&dummy.authid; - char **authid = (void *)out_len - offset; - if ( *authid && !strcmp( in, *authid ) ) - goto done; + if ( flags == SASL_CU_AUTHID && !auxvals[PROP_AUTHZ].values ) { + conn->c_sasl_dn.bv_val = (char *) in; + } else if ( flags == SASL_CU_AUTHZID && conn->c_sasl_dn.bv_val ) { + rc = strcmp( in, conn->c_sasl_dn.bv_val ); + conn->c_sasl_dn.bv_val = NULL; + /* They were equal, no work needed */ + if ( !rc ) goto done; } rc = slap_sasl_getdn( conn, (char *)in, inlen, (char *)user_realm, &dn, - (flags & SASL_CU_AUTHID) ? FLAG_GETDN_AUTHCID : FLAG_GETDN_AUTHZID ); + (flags & SASL_CU_AUTHID) ? SLAP_GETDN_AUTHCID : SLAP_GETDN_AUTHZID ); if ( rc != LDAP_SUCCESS ) { sasl_seterror( sconn, 0, ldap_err2string( rc ) ); return SASL_NOAUTHZ; @@ -721,14 +687,16 @@ slap_sasl_canonicalize( #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 ); + 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 ); + 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 ); + +done: + AC_MEMCPY( out, in, inlen ); out[inlen] = '\0'; *out_len = inlen; @@ -768,14 +736,15 @@ slap_sasl_authorize( conn->c_sasl_dn.bv_len = 0; } - prop_getnames( props, slap_propnames, auxvals ); + /* Skip PROP_CONN */ + prop_getnames( props, slap_propnames+1, auxvals ); AC_MEMCPY( &authcDN, auxvals[0].values[0], sizeof(authcDN) ); /* Nothing to do if no authzID was given */ if ( !auxvals[1].name || !auxvals[1].values ) { conn->c_sasl_dn = authcDN; - return SASL_OK; + goto ok; } AC_MEMCPY( &authzDN, auxvals[1].values[0], sizeof(authzDN) ); @@ -799,6 +768,13 @@ slap_sasl_authorize( } conn->c_sasl_dn = authzDN; +ok: + if (conn->c_sasl_bindop) { + Statslog( LDAP_DEBUG_STATS, + "conn=%lu op=%lu BIND authcid=\"%s\"\n", + conn->c_connid, conn->c_sasl_bindop->o_opid, + auth_identity, 0, 0); + } #ifdef NEW_LOGGING LDAP_LOG( TRANSPORT, ENTRY, @@ -861,7 +837,8 @@ slap_sasl_authorize( /* Convert the identities to DN's. If no authzid was given, client will be bound as the DN matching their username */ - rc = slap_sasl_getdn( conn, (char *)authcid, 0, realm, &authcDN, FLAG_GETDN_AUTHCID ); + rc = slap_sasl_getdn( conn, (char *)authcid, 0, realm, + &authcDN, SLAP_GETDN_AUTHCID ); if( rc != LDAP_SUCCESS ) { *errstr = ldap_err2string( rc ); return SASL_NOAUTHZ; @@ -877,10 +854,10 @@ slap_sasl_authorize( #endif conn->c_sasl_dn = authcDN; - *errstr = NULL; - return SASL_OK; + goto ok; } - rc = slap_sasl_getdn( conn, (char *)authzid, 0, realm, &authzDN, FLAG_GETDN_AUTHZID ); + rc = slap_sasl_getdn( conn, (char *)authzid, 0, realm, + &authzDN, SLAP_GETDN_AUTHZID ); if( rc != LDAP_SUCCESS ) { ch_free( authcDN.bv_val ); *errstr = ldap_err2string( rc ); @@ -904,7 +881,9 @@ slap_sasl_authorize( ch_free( authzDN.bv_val ); return SASL_NOAUTHZ; } + conn->c_sasl_dn = authzDN; +ok: #ifdef NEW_LOGGING LDAP_LOG( TRANSPORT, RESULTS, "slap_sasl_authorize: conn %d authorization allowed\n", @@ -915,7 +894,13 @@ slap_sasl_authorize( (long) (conn ? conn->c_connid : -1), 0, 0 ); #endif - conn->c_sasl_dn = authzDN; + if (conn->c_sasl_bindop) { + Statslog( LDAP_DEBUG_STATS, + "conn=%lu op=%lu BIND authcid=\"%s\"\n", + conn->c_connid, conn->c_sasl_bindop->o_opid, + authcid, 0, 0); + } + *errstr = NULL; return SASL_OK; } @@ -958,7 +943,6 @@ slap_sasl_err2ldap( int saslerr ) } #endif - int slap_sasl_init( void ) { #ifdef HAVE_CYRUS_SASL @@ -968,11 +952,35 @@ int slap_sasl_init( void ) { SASL_CB_LIST_END, NULL, NULL } }; +#ifdef HAVE_SASL_VERSION +#define SASL_BUILD_VERSION ((SASL_VERSION_MAJOR << 24) |\ + (SASL_VERSION_MINOR << 16) | SASL_VERSION_STEP) + + sasl_version( NULL, &rc ); + if ( ((rc >> 16) != ((SASL_VERSION_MAJOR << 8)|SASL_VERSION_MINOR)) || + (rc & 0xffff) < SASL_VERSION_STEP) { + +#ifdef NEW_LOGGING + LDAP_LOG( TRANSPORT, INFO, + "slap_sasl_init: SASL version mismatch, got %x, wanted %x.\n", + rc, SASL_BUILD_VERSION, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "slap_sasl_init: SASL version mismatch, got %x, wanted %x.\n", + rc, SASL_BUILD_VERSION, 0 ); +#endif + return -1; + } +#endif + + /* SASL 2 does its own memory management internally */ +#if SASL_VERSION_MAJOR < 2 sasl_set_alloc( - ch_malloc, - ch_calloc, - ch_realloc, - ch_free ); + ber_memalloc, + ber_memcalloc, + ber_memrealloc, + ber_memfree ); +#endif sasl_set_mutex( ldap_pvt_sasl_mutex_new, @@ -994,6 +1002,10 @@ int slap_sasl_init( void ) Debug( LDAP_DEBUG_ANY, "sasl_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 ); +#endif return -1; } @@ -1020,6 +1032,9 @@ int slap_sasl_destroy( void ) { #ifdef HAVE_CYRUS_SASL sasl_done(); +#endif +#if SASL_VERSION_MAJOR >= 2 + filter_free( generic_filter ); #endif free( global_host ); global_host = NULL; @@ -1045,10 +1060,20 @@ int slap_sasl_open( Connection *conn ) session_callbacks = #if SASL_VERSION_MAJOR >= 2 - ch_calloc( 5, sizeof(sasl_callback_t)); + SLAP_CALLOC( 5, sizeof(sasl_callback_t)); +#else + 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 - ch_calloc( 3, sizeof(sasl_callback_t)); + Debug( LDAP_DEBUG_ANY, + "slap_sasl_open: SLAP_MALLOC failed", 0, 0, 0 ); #endif + return -1; + } conn->c_sasl_extra = session_callbacks; session_callbacks[cb=0].id = SASL_CB_LOG; @@ -1080,6 +1105,9 @@ int slap_sasl_open( Connection *conn ) /* create new SASL context */ #if SASL_VERSION_MAJOR >= 2 + if ( generic_filter == NULL ) { + generic_filter = str2filter( "(objectclass=*)" ); + } if ( conn->c_sock_name.bv_len != 0 && strncmp( conn->c_sock_name.bv_val, "IP=", 3 ) == 0) { char *p; @@ -1107,7 +1135,7 @@ int slap_sasl_open( Connection *conn ) } } sc = sasl_server_new( "ldap", global_host, global_realm, - iplocalport, ipremoteport, session_callbacks, 0, &ctx ); + iplocalport, ipremoteport, session_callbacks, SASL_SUCCESS_DATA, &ctx ); if ( iplocalport != NULL ) { ch_free( iplocalport ); } @@ -1244,7 +1272,7 @@ char ** slap_sasl_mechs( Connection *conn ) return NULL; } - mechs = str2charray( mechstr, "," ); + mechs = ldap_str2charray( mechstr, "," ); #if SASL_VERSION_MAJOR < 2 ch_free( mechstr ); @@ -1328,8 +1356,7 @@ int slap_sasl_bind( if ( !conn->c_sasl_bind_in_progress ) { sc = START( ctx, conn->c_sasl_bind_mech.bv_val, - cred->bv_len ? cred->bv_val : "", - cred->bv_len, + cred->bv_val, cred->bv_len, (SASL_CONST char **)&response.bv_val, &reslen, &errstr ); } else { @@ -1411,7 +1438,7 @@ int slap_sasl_setpass( Connection *conn, Operation *op, - const char *reqoid, + struct berval *reqoid, struct berval *reqdata, char **rspoid, struct berval **rspdata, @@ -1424,7 +1451,7 @@ slap_sasl_setpass( struct berval old = { 0, NULL }; assert( reqoid != NULL ); - assert( strcmp( LDAP_EXOP_MODIFY_PASSWD, reqoid ) == 0 ); + assert( ber_bvcmp( &slap_EXOP_MODIFY_PASSWD, reqoid ) == 0 ); rc = sasl_getprop( conn->c_sasl_context, SASL_USERNAME, (SASL_CONST void **)&id.bv_val ); @@ -1491,4 +1518,188 @@ slap_sasl_setpass( done: return rc; } +#endif /* HAVE_CYRUS_SASL */ + +/* Take any sort of identity string and return a DN with the "dn:" prefix. The + string returned in *dn is in its own allocated memory, and must be free'd + by the calling process. + -Mark Adamson, Carnegie Mellon + + The "dn:" prefix is no longer used anywhere inside slapd. It is only used + on strings passed in directly from SASL. + -Howard Chu, Symas Corp. +*/ + +#define SET_NONE 0 +#define SET_DN 1 +#define SET_U 2 + +static struct berval ext_bv = BER_BVC( "EXTERNAL" ); + +int slap_sasl_getdn( Connection *conn, char *id, int len, + char *user_realm, struct berval *dn, int flags ) +{ + char *c1; + int rc, is_dn = SET_NONE, do_norm = 1; + struct berval dn2; + +#ifdef NEW_LOGGING + LDAP_LOG( TRANSPORT, ENTRY, + "slap_sasl_getdn: conn %d id=%s [len=%d]\n", + conn ? conn->c_connid : -1, id ? (*id ? id : "") : "NULL", len ); +#else + Debug( LDAP_DEBUG_ARGS, "slap_sasl_getdn: id=%s [len=%d]\n", + id ? ( *id ? id : "" ) : "NULL", len, 0 ); +#endif + + dn->bv_val = NULL; + dn->bv_len = 0; + + if ( id ) { + if ( len == 0 ) len = strlen( id ); + + /* Blatantly anonymous ID */ + if ( len == sizeof("anonymous") - 1 && + !strcasecmp( id, "anonymous" ) ) { + return( LDAP_SUCCESS ); + } + } else { + len = 0; + } + + /* An authcID needs to be converted to authzID form. Set the + * values directly into *dn; they will be normalized later. (and + * normalizing always makes a new copy.) An ID from a TLS certificate + * is already normalized, so copy it and skip normalization. + */ + if( flags & SLAP_GETDN_AUTHCID ) { + if( conn->c_sasl_bind_mech.bv_len == ext_bv.bv_len && + strcasecmp( ext_bv.bv_val, conn->c_sasl_bind_mech.bv_val ) == 0 ) + { + /* EXTERNAL DNs are already normalized */ + do_norm = 0; + is_dn = SET_DN; + ber_str2bv( id, len, 1, dn ); + + } else { + /* convert to u: form */ + is_dn = SET_U; + dn->bv_val = id; + dn->bv_len = len; + } + } + if( is_dn == SET_NONE ) { + if( !strncasecmp( id, "u:", sizeof("u:")-1 )) { + is_dn = SET_U; + dn->bv_val = id+2; + dn->bv_len = len-2; + } else if ( !strncasecmp( id, "dn:", sizeof("dn:")-1) ) { + is_dn = SET_DN; + dn->bv_val = id+3; + dn->bv_len = len-3; + } + } + + /* No other possibilities from here */ + if( is_dn == SET_NONE ) { + dn->bv_val = NULL; + dn->bv_len = 0; + return( LDAP_INAPPROPRIATE_AUTH ); + } + + /* Username strings */ + if( is_dn == SET_U ) { + char *p, *realm; + len = dn->bv_len + sizeof("uid=")-1 + sizeof(",cn=auth")-1; + + /* username may have embedded realm name */ + if( ( realm = strchr( dn->bv_val, '@') ) ) { + *realm++ = '\0'; + len += sizeof(",cn=")-2; + } else if( user_realm && *user_realm ) { + len += strlen( user_realm ) + sizeof(",cn=")-1; + } + + if( conn->c_sasl_bind_mech.bv_len ) { + len += conn->c_sasl_bind_mech.bv_len + sizeof(",cn=")-1; + } + + /* Build the new dn */ + c1 = dn->bv_val; + dn->bv_val = SLAP_MALLOC( len+1 ); + 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, dn->bv_len ); + + if( realm ) { + int rlen = dn->bv_len - ( realm - c1 ); + p = lutil_strcopy( p, ",cn=" ); + p = lutil_strncopy( p, realm, rlen ); + realm[-1] = '@'; + } else if( user_realm && *user_realm ) { + p = lutil_strcopy( p, ",cn=" ); + p = lutil_strcopy( p, user_realm ); + } + + if( conn->c_sasl_bind_mech.bv_len ) { + p = lutil_strcopy( p, ",cn=" ); + p = lutil_strcopy( p, conn->c_sasl_bind_mech.bv_val ); + } + 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, "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 + * leaks or dangling pointers later, + * and the DN value is '\0' terminated */ + ber_dupbv( &dn2, dn ); + dn->bv_val = dn2.bv_val; + } + + /* All strings are in DN form now. Normalize if needed. */ + if ( do_norm ) { + rc = dnNormalize2( NULL, dn, &dn2 ); + + /* User DNs were constructed above and must be freed now */ + ch_free( dn->bv_val ); + + if ( rc != LDAP_SUCCESS ) { + dn->bv_val = NULL; + dn->bv_len = 0; + return rc; + } + *dn = dn2; + } + + /* Run thru regexp */ + slap_sasl2dn( conn, dn, &dn2 ); + if( dn2.bv_val ) { + ch_free( dn->bv_val ); + *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 ); +}