X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsaslauthz.c;h=24ccf062b496ce9bded6320abf307d3999edd821;hb=9fbcc90bd5578c85fd1e3d5845a3ef6121cefc7a;hp=d196a4f084ba1d4c1de2e9278fccc3d43d3dc513;hpb=6f47e1314747d4131128c49111ece4bba479edef;p=openldap diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c index d196a4f084..24ccf062b4 100644 --- a/servers/slapd/saslauthz.c +++ b/servers/slapd/saslauthz.c @@ -1,3 +1,7 @@ +/* + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ /* * Copyright (c) 2000, Mark Adamson, Carnegie Mellon. All rights reserved. * This software is not subject to any license of Carnegie Mellon University. @@ -30,11 +34,47 @@ #include +#define SASLREGEX_REPLACE 10 + +typedef struct sasl_regexp { + char *sr_match; /* regexp match pattern */ + char *sr_replace; /* regexp replace pattern */ + regex_t sr_workspace; /* workspace for regexp engine */ + regmatch_t sr_strings[SASLREGEX_REPLACE]; /* strings matching $1,$2 ... */ + int sr_offset[SASLREGEX_REPLACE+2]; /* offsets of $1,$2... in *replace */ +} SaslRegexp_t; + +static int nSaslRegexp = 0; +static SaslRegexp_t *SaslRegexp = NULL; + +/* What SASL proxy authorization policies are allowed? */ +#define SASL_AUTHZ_NONE 0 +#define SASL_AUTHZ_FROM 1 +#define SASL_AUTHZ_TO 2 + +static int authz_policy = SASL_AUTHZ_NONE; + +int slap_sasl_setpolicy( const char *arg ) +{ + int rc = LDAP_SUCCESS; + + if ( strcasecmp( arg, "none" ) == 0 ) + authz_policy = SASL_AUTHZ_NONE; + else if ( strcasecmp( arg, "from" ) == 0 ) + authz_policy = SASL_AUTHZ_FROM; + else if ( strcasecmp( arg, "to" ) == 0 ) + authz_policy = SASL_AUTHZ_TO; + else if ( strcasecmp( arg, "both" ) == 0 ) + authz_policy = SASL_AUTHZ_FROM | SASL_AUTHZ_TO; + else + rc = LDAP_OTHER; + return rc; +} + /* URI format: ldap:///[?[][?[][?[]]]] */ static int slap_parseURI( struct berval *uri, - struct berval *searchbase, int *scope, Filter **filter, - struct berval *fstr ) + struct berval *searchbase, int *scope, Filter **filter ) { struct berval bv; int rc; @@ -46,14 +86,9 @@ static int slap_parseURI( struct berval *uri, *scope = -1; *filter = NULL; - if ( fstr ) { - fstr->bv_val = NULL; - fstr->bv_len = 0; - } - #ifdef NEW_LOGGING - LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY, - "slap_parseURI: parsing %s\n", uri->bv_val )); + LDAP_LOG( TRANSPORT, ENTRY, + "slap_parseURI: parsing %s\n", uri->bv_val, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "slap_parseURI: parsing %s\n", uri->bv_val, 0, 0 ); #endif @@ -63,9 +98,10 @@ static int slap_parseURI( struct berval *uri, bv.bv_val = uri->bv_val + sizeof("dn:")-1; bv.bv_val += strspn( bv.bv_val, " " ); -is_dn: bv.bv_len = uri->bv_len - (bv.bv_val - uri->bv_val); +is_dn: bv.bv_len = uri->bv_len - (bv.bv_val - uri->bv_val); + rc = dnNormalize2( NULL, &bv, searchbase ); - if (rc == LDAP_SUCCESS) { + if( rc == LDAP_SUCCESS ) { *scope = LDAP_SCOPE_BASE; } return( rc ); @@ -78,10 +114,16 @@ is_dn: bv.bv_len = uri->bv_len - (bv.bv_val - uri->bv_val); } if ( rc != LDAP_URL_SUCCESS ) { - return( LDAP_PROTOCOL_ERROR ); + return LDAP_PROTOCOL_ERROR; } - /* could check the hostname here */ + if (( ludp->lud_host && *ludp->lud_host ) + || ludp->lud_attrs || ludp->lud_exts ) + { + /* host part should be empty */ + /* attrs and extensions parts should be empty */ + return LDAP_PROTOCOL_ERROR; + } /* Grab the scope */ *scope = ludp->lud_scope; @@ -89,21 +131,23 @@ is_dn: bv.bv_len = uri->bv_len - (bv.bv_val - uri->bv_val); /* Grab the filter */ if ( ludp->lud_filter ) { *filter = str2filter( ludp->lud_filter ); - if ( *filter == NULL ) + if ( *filter == NULL ) { rc = LDAP_PROTOCOL_ERROR; - else if ( fstr ) - ber_str2bv( ludp->lud_filter, 0, 1, fstr ); + goto done; + } } /* Grab the searchbase */ - if ( rc == LDAP_URL_SUCCESS ) { - bv.bv_val = ludp->lud_dn; - bv.bv_len = strlen( bv.bv_val ); - rc = dnNormalize2( NULL, &bv, searchbase ); + bv.bv_val = ludp->lud_dn; + bv.bv_len = strlen( bv.bv_val ); + rc = dnNormalize2( NULL, &bv, searchbase ); + +done: + if( rc != LDAP_SUCCESS ) { + if( *filter ) filter_free( *filter ); } ldap_free_urldesc( ludp ); - return( rc ); } @@ -123,10 +167,9 @@ static int slap_sasl_rx_off(char *rep, int *off) if ( *c == '$' ) { if ( n == SASLREGEX_REPLACE ) { #ifdef NEW_LOGGING - LDAP_LOG(( "sasl", LDAP_LEVEL_ERR, - "slap_sasl_regexp_config: \"%s\" has too many $n " - "placeholders (max %d)\n", - rep, SASLREGEX_REPLACE )); + LDAP_LOG( TRANSPORT, ERR, + "slap_sasl_rx_off: \"%s\" has too many $n " + "placeholders (max %d)\n", rep, SASLREGEX_REPLACE, 0 ); #else Debug( LDAP_DEBUG_ANY, "SASL replace pattern %s has too many $n " @@ -134,7 +177,7 @@ static int slap_sasl_rx_off(char *rep, int *off) rep, SASLREGEX_REPLACE, 0 ); #endif - return( LDAP_OPERATIONS_ERROR ); + return( LDAP_OTHER ); } off[n] = c - rep; n++; @@ -147,88 +190,51 @@ static int slap_sasl_rx_off(char *rep, int *off) off[n] = -1; return( LDAP_SUCCESS ); } -#endif /* HAVE_CYRUS_SASL */ int slap_sasl_regexp_config( const char *match, const char *replace ) { -#ifdef HAVE_CYRUS_SASL - const char *c; - int rc, n; + int rc; SaslRegexp_t *reg; - struct berval bv, nbv; - Filter *filter; SaslRegexp = (SaslRegexp_t *) ch_realloc( (char *) SaslRegexp, (nSaslRegexp + 1) * sizeof(SaslRegexp_t) ); - reg = &( SaslRegexp[nSaslRegexp] ); - ber_str2bv( match, 0, 0, &bv ); - rc = dnNormalize2( NULL, &bv, &nbv ); - if ( rc ) { -#ifdef NEW_LOGGING - LDAP_LOG(( "sasl", LDAP_LEVEL_ERR, - "slap_sasl_regexp_config: \"%s\" could not be normalized.\n", - match )); -#else - Debug( LDAP_DEBUG_ANY, - "SASL match pattern %s could not be normalized.\n", - match, 0, 0 ); -#endif - return( rc ); - } - reg->sr_match = nbv.bv_val; - ber_str2bv( replace, 0, 0, &bv ); - rc = slap_parseURI( &bv, ®->sr_replace.dn, ®->sr_replace.scope, - &filter, ®->sr_replace.filter ); - if ( filter ) filter_free( filter ); - if ( rc ) { -#ifdef NEW_LOGGING - LDAP_LOG(( "sasl", LDAP_LEVEL_ERR, - "slap_sasl_regexp_config: \"%s\" could not be parsed.\n", - replace )); -#else - Debug( LDAP_DEBUG_ANY, - "SASL replace pattern %s could not be parsed.\n", - replace, 0, 0 ); -#endif - return( rc ); - } + reg = &SaslRegexp[nSaslRegexp]; + + reg->sr_match = ch_strdup( match ); + reg->sr_replace = ch_strdup( replace ); /* Precompile matching pattern */ rc = regcomp( ®->sr_workspace, reg->sr_match, REG_EXTENDED|REG_ICASE ); if ( rc ) { #ifdef NEW_LOGGING - LDAP_LOG(( "sasl", LDAP_LEVEL_ERR, - "slap_sasl_regexp_config: \"%s\" could not be compiled.\n", - reg->sr_match )); + LDAP_LOG( TRANSPORT, ERR, + "slap_sasl_regexp_config: \"%s\" could not be compiled.\n", + reg->sr_match, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "SASL match pattern %s could not be compiled by regexp engine\n", reg->sr_match, 0, 0 ); #endif - return( LDAP_OPERATIONS_ERROR ); + return( LDAP_OTHER ); } - rc = slap_sasl_rx_off( reg->sr_replace.dn.bv_val, reg->sr_dn_offset ); + rc = slap_sasl_rx_off( reg->sr_replace, reg->sr_offset ); if ( rc != LDAP_SUCCESS ) return rc; - if (reg->sr_replace.filter.bv_val ) { - rc = slap_sasl_rx_off( reg->sr_replace.filter.bv_val, reg->sr_fi_offset ); - if ( rc != LDAP_SUCCESS ) return rc; - } - nSaslRegexp++; -#endif return( LDAP_SUCCESS ); } -#ifdef HAVE_CYRUS_SASL - /* Perform replacement on regexp matches */ -static void slap_sasl_rx_exp( char *rep, int *off, regmatch_t *str, - char *saslname, struct berval *out ) +static void slap_sasl_rx_exp( + const char *rep, + const int *off, + regmatch_t *str, + const char *saslname, + struct berval *out ) { int i, n, len, insert; @@ -277,18 +283,17 @@ static void slap_sasl_rx_exp( char *rep, int *off, regmatch_t *str, LDAP URI to find the matching LDAP entry, using the pattern matching strings given in the saslregexp config file directive(s) */ -static int slap_sasl_regexp( struct berval *in, SaslUri_t *out ) +static int slap_sasl_regexp( struct berval *in, struct berval *out ) { char *saslname = in->bv_val; - char *scope[] = { "base", "one", "sub" }; SaslRegexp_t *reg; int i; memset( out, 0, sizeof( *out ) ); #ifdef NEW_LOGGING - LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY, - "slap_sasl_regexp: converting SASL name %s\n", saslname )); + LDAP_LOG( TRANSPORT, ENTRY, + "slap_sasl_regexp: converting SASL name %s\n", saslname, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "slap_sasl_regexp: converting SASL name %s\n", saslname, 0, 0 ); @@ -312,39 +317,31 @@ static int slap_sasl_regexp( struct berval *in, SaslUri_t *out ) * replace pattern of the form "x$1y$2z". The returned string needs * to replace the $1,$2 with the strings that matched (b.*) and (d.*) */ - slap_sasl_rx_exp( reg->sr_replace.dn.bv_val, reg->sr_dn_offset, - reg->sr_strings, saslname, &out->dn ); - - if ( reg->sr_replace.filter.bv_val ) - slap_sasl_rx_exp( reg->sr_replace.filter.bv_val, - reg->sr_fi_offset, reg->sr_strings, saslname, &out->filter ); - - out->scope = reg->sr_replace.scope; + slap_sasl_rx_exp( reg->sr_replace, reg->sr_offset, + reg->sr_strings, saslname, out ); #ifdef NEW_LOGGING - LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY, - "slap_sasl_regexp: converted SASL name to ldap:///%s??%s?%s\n", - out->dn.bv_val, scope[out->scope], out->filter.bv_val ? - out->filter.bv_val : "" )); + LDAP_LOG( TRANSPORT, ENTRY, + "slap_sasl_regexp: converted SASL name to %s\n", + out->bv_len ? out->bv_val : "", 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, - "slap_sasl_regexp: converted SASL name to ldap:///%s??%s?%s\n", - out->dn.bv_val, scope[out->scope], out->filter.bv_val ? - out->filter.bv_val : "" ); + "slap_sasl_regexp: converted SASL name to %s\n", + out->bv_len ? out->bv_val : "", 0, 0 ); #endif return( 1 ); } /* Two empty callback functions to avoid sending results */ -static void sasl_sc_r( Connection *conn, Operation *o, ber_tag_t tag, +void slap_cb_null_response( Connection *conn, Operation *o, ber_tag_t tag, ber_int_t msgid, ber_int_t err, const char *matched, const char *text, BerVarray ref, const char *resoid, struct berval *resdata, struct berval *sasldata, LDAPControl **c) { } -static void sasl_sc_s( Connection *conn, Operation *o, ber_int_t err, +void slap_cb_null_sresult( Connection *conn, Operation *o, ber_int_t err, const char *matched, const char *text, BerVarray refs, LDAPControl **c, int nentries) { @@ -357,21 +354,22 @@ static int sasl_sc_sasl2dn( BackendDB *be, Connection *conn, Operation *o, struct berval *ndn = o->o_callback->sc_private; /* We only want to be called once */ - if (ndn->bv_val) { + if( ndn->bv_val ) { free(ndn->bv_val); ndn->bv_val = NULL; + #ifdef NEW_LOGGING - LDAP_LOG(( "sasl", LDAP_LEVEL_DETAIL1, - "slap_sasl2dn: search DN returned more than 1 entry\n" )); + LDAP_LOG( TRANSPORT, DETAIL1, + "slap_sasl2dn: search DN returned more than 1 entry\n", 0, 0, 0 ); #else - Debug( LDAP_DEBUG_TRACE, - "slap_sasl2dn: search DN returned more than 1 entry\n", 0,0,0 ); + Debug( LDAP_DEBUG_TRACE, + "slap_sasl2dn: search DN returned more than 1 entry\n", 0,0,0 ); #endif return -1; - } else { - ber_dupbv(ndn, &e->e_nname); - return 0; } + + ber_dupbv(ndn, &e->e_nname); + return 0; } /* @@ -383,83 +381,94 @@ static int sasl_sc_sasl2dn( BackendDB *be, Connection *conn, Operation *o, * entry, return the DN of that one entry. */ -void slap_sasl2dn( Connection *conn, struct berval *saslname, struct berval *dn ) +void slap_sasl2dn( Connection *conn, + struct berval *saslname, struct berval *sasldn ) { int rc; - Backend *be; - Filter *filter=NULL; - slap_callback cb = {sasl_sc_r, sasl_sc_s, sasl_sc_sasl2dn, NULL}; + Backend *be = NULL; + struct berval dn = { 0, NULL }; + int scope = LDAP_SCOPE_BASE; + Filter *filter = NULL; + slap_callback cb = {slap_cb_null_response, slap_cb_null_sresult, sasl_sc_sasl2dn, NULL}; Operation op = {0}; - SaslUri_t uri; + struct berval regout = { 0, NULL }; #ifdef NEW_LOGGING - LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY, - "slap_sasl2dn: converting SASL name %s to DN.\n", saslname->bv_val )); + LDAP_LOG( TRANSPORT, ENTRY, + "slap_sasl2dn: converting SASL name %s to DN.\n", + saslname->bv_val, 0, 0 ); #else - Debug( LDAP_DEBUG_TRACE, - "==>slap_sasl2dn: Converting SASL name %s to a DN\n", saslname->bv_val, 0,0 ); + Debug( LDAP_DEBUG_TRACE, "==>slap_sasl2dn: " + "converting SASL name %s to a DN\n", + saslname->bv_val, 0,0 ); #endif - dn->bv_val = NULL; - dn->bv_len = 0; - cb.sc_private = dn; + + sasldn->bv_val = NULL; + sasldn->bv_len = 0; + cb.sc_private = sasldn; /* Convert the SASL name into a minimal URI */ - if( !slap_sasl_regexp( saslname, &uri ) ) + if( !slap_sasl_regexp( saslname, ®out ) ) { goto FINISHED; + } - if ( uri.filter.bv_val ) - filter = str2filter( uri.filter.bv_val ); + rc = slap_parseURI( ®out, &dn, &scope, &filter ); + if( rc != LDAP_SUCCESS ) { + goto FINISHED; + } /* Must do an internal search */ - - be = select_backend( &uri.dn, 0, 1 ); - - conn->c_authz_backend = be; + be = select_backend( &dn, 0, 1 ); /* Massive shortcut: search scope == base */ - if( uri.scope == LDAP_SCOPE_BASE ) { - *dn = uri.dn; - uri.dn.bv_len = 0; - uri.dn.bv_val = NULL; + if( scope == LDAP_SCOPE_BASE ) { + *sasldn = dn; + dn.bv_len = 0; + dn.bv_val = NULL; goto FINISHED; } #ifdef NEW_LOGGING - LDAP_LOG(( "sasl", LDAP_LEVEL_DETAIL1, - "slap_sasl2dn: performing internal search (base=%s, scope=%d)\n", - uri.dn.bv_val, uri.scope )); + LDAP_LOG( TRANSPORT, DETAIL1, + "slap_sasl2dn: performing internal search (base=%s, scope=%d)\n", + dn.bv_val, scope, 0 ); #else Debug( LDAP_DEBUG_TRACE, - "slap_sasl2dn: performing internal search (base=%s, scope=%d)\n", - uri.dn.bv_val, uri.scope, 0 ); + "slap_sasl2dn: performing internal search (base=%s, scope=%d)\n", + dn.bv_val, scope, 0 ); #endif - if(( be == NULL ) || ( be->be_search == NULL)) + if(( be == NULL ) || ( be->be_search == NULL)) { goto FINISHED; - suffix_alias( be, &uri.dn ); + } + suffix_alias( be, &dn ); op.o_tag = LDAP_REQ_SEARCH; op.o_protocol = LDAP_VERSION3; op.o_ndn = *saslname; op.o_callback = &cb; op.o_time = slap_get_time(); + op.o_do_not_cache = 1; + op.o_threadctx = conn->c_sasl_bindop->o_threadctx; - (*be->be_search)( be, /*conn*/NULL, &op, /*base*/NULL, &uri.dn, - uri.scope, /*deref=*/1, /*sizelimit=*/1, /*time=*/0, filter, /*fstr=*/NULL, - /*attrs=*/NULL, /*attrsonly=*/0 ); + (*be->be_search)( be, conn, &op, NULL, &dn, + scope, LDAP_DEREF_NEVER, 1, 0, + filter, NULL, NULL, 1 ); FINISHED: - if( uri.dn.bv_len ) ch_free( uri.dn.bv_val ); - if( uri.filter.bv_len ) ch_free( uri.filter.bv_val ); + if( sasldn->bv_len ) { + conn->c_authz_backend = be; + } + if( dn.bv_len ) ch_free( dn.bv_val ); if( filter ) filter_free( filter ); #ifdef NEW_LOGGING - LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY, + LDAP_LOG( TRANSPORT, ENTRY, "slap_sasl2dn: Converted SASL name to %s\n", - dn->bv_len ? dn->bv_val : "" )); + sasldn->bv_len ? sasldn->bv_val : "", 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "<==slap_sasl2dn: Converted SASL name to %s\n", - dn->bv_len ? dn->bv_val : "", 0, 0 ); + sasldn->bv_len ? sasldn->bv_val : "", 0, 0 ); #endif return; @@ -493,7 +502,7 @@ static int sasl_sc_smatch( BackendDB *be, Connection *conn, Operation *o, */ static -int slap_sasl_match( struct berval *rule, struct berval *assertDN, struct berval *authc ) +int slap_sasl_match(Connection *conn, struct berval *rule, struct berval *assertDN, struct berval *authc ) { struct berval searchbase = {0, NULL}; int rc, scope; @@ -501,18 +510,19 @@ int slap_sasl_match( struct berval *rule, struct berval *assertDN, struct berval Filter *filter=NULL; regex_t reg; smatch_info sm; - slap_callback cb = { sasl_sc_r, sasl_sc_s, sasl_sc_smatch, NULL }; + slap_callback cb = { slap_cb_null_response, slap_cb_null_sresult, sasl_sc_smatch, NULL }; Operation op = {0}; #ifdef NEW_LOGGING - LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY, - "slap_sasl_match: comparing DN %s to rule %s\n", assertDN->bv_val, rule->bv_val )); + LDAP_LOG( TRANSPORT, ENTRY, + "slap_sasl_match: comparing DN %s to rule %s\n", + assertDN->bv_val, rule->bv_val,0 ); #else Debug( LDAP_DEBUG_TRACE, "===>slap_sasl_match: comparing DN %s to rule %s\n", assertDN->bv_val, rule->bv_val, 0 ); #endif - rc = slap_parseURI( rule, &searchbase, &scope, &filter, NULL ); + rc = slap_parseURI( rule, &searchbase, &scope, &filter ); if( rc != LDAP_SUCCESS ) goto CONCLUDED; @@ -534,9 +544,9 @@ int slap_sasl_match( struct berval *rule, struct berval *assertDN, struct berval /* Must run an internal search. */ #ifdef NEW_LOGGING - LDAP_LOG(( "sasl", LDAP_LEVEL_DETAIL1, + LDAP_LOG( TRANSPORT, DETAIL1, "slap_sasl_match: performing internal search (base=%s, scope=%d)\n", - searchbase.bv_val, scope )); + searchbase.bv_val, scope,0 ); #else Debug( LDAP_DEBUG_TRACE, "slap_sasl_match: performing internal search (base=%s, scope=%d)\n", @@ -559,8 +569,10 @@ int slap_sasl_match( struct berval *rule, struct berval *assertDN, struct berval op.o_ndn = *authc; op.o_callback = &cb; op.o_time = slap_get_time(); + op.o_do_not_cache = 1; + op.o_threadctx = conn->c_sasl_bindop->o_threadctx; - (*be->be_search)( be, /*conn=*/NULL, &op, /*base=*/NULL, &searchbase, + (*be->be_search)( be, conn, &op, /*base=*/NULL, &searchbase, scope, /*deref=*/1, /*sizelimit=*/0, /*time=*/0, filter, /*fstr=*/NULL, /*attrs=*/NULL, /*attrsonly=*/0 ); @@ -573,8 +585,8 @@ CONCLUDED: if( searchbase.bv_len ) ch_free( searchbase.bv_val ); if( filter ) filter_free( filter ); #ifdef NEW_LOGGING - LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY, - "slap_sasl_match: comparison returned %d\n", rc )); + LDAP_LOG( TRANSPORT, ENTRY, + "slap_sasl_match: comparison returned %d\n", rc, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "<===slap_sasl_match: comparison returned %d\n", rc, 0, 0); @@ -593,34 +605,33 @@ CONCLUDED: * The DNs should not have the dn: prefix */ static int -slap_sasl_check_authz(struct berval *searchDN, struct berval *assertDN, struct berval *attr, struct berval *authc) +slap_sasl_check_authz( Connection *conn, + struct berval *searchDN, + struct berval *assertDN, + AttributeDescription *ad, + struct berval *authc ) { - const char *errmsg; int i, rc; BerVarray vals=NULL; - AttributeDescription *ad=NULL; #ifdef NEW_LOGGING - LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY, - "slap_sasl_check_authz: does %s match %s rule in %s?\n", - assertDN->bv_val, attr->bv_val, searchDN->bv_val )); + LDAP_LOG( TRANSPORT, ENTRY, + "slap_sasl_check_authz: does %s match %s rule in %s?\n", + assertDN->bv_val, ad->ad_cname.bv_val, searchDN->bv_val); #else Debug( LDAP_DEBUG_TRACE, "==>slap_sasl_check_authz: does %s match %s rule in %s?\n", - assertDN->bv_val, attr->bv_val, searchDN->bv_val); + assertDN->bv_val, ad->ad_cname.bv_val, searchDN->bv_val); #endif - rc = slap_bv2ad( attr, &ad, &errmsg ); - if( rc != LDAP_SUCCESS ) - goto COMPLETE; - - rc = backend_attribute( NULL, NULL, NULL, NULL, searchDN, ad, &vals ); + rc = backend_attribute( NULL, NULL, conn->c_sasl_bindop, NULL, + searchDN, ad, &vals ); if( rc != LDAP_SUCCESS ) goto COMPLETE; /* Check if the *assertDN matches any **vals */ for( i=0; vals[i].bv_val != NULL; i++ ) { - rc = slap_sasl_match( &vals[i], assertDN, authc ); + rc = slap_sasl_match( conn, &vals[i], assertDN, authc ); if ( rc == LDAP_SUCCESS ) goto COMPLETE; } @@ -630,11 +641,13 @@ COMPLETE: if( vals ) ber_bvarray_free( vals ); #ifdef NEW_LOGGING - LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY, - "slap_sasl_check_authz: %s check returning %s\n", attr->bv_val, rc )); + LDAP_LOG( TRANSPORT, RESULTS, + "slap_sasl_check_authz: %s check returning %s\n", + ad->ad_cname.bv_val, rc, 0 ); #else Debug( LDAP_DEBUG_TRACE, - "<==slap_sasl_check_authz: %s check returning %d\n", attr->bv_val, rc, 0); + "<==slap_sasl_check_authz: %s check returning %d\n", + ad->ad_cname.bv_val, rc, 0); #endif return( rc ); @@ -646,13 +659,8 @@ COMPLETE: * The DNs should not have the dn: prefix */ -static struct berval sasl_authz_src = { - sizeof(SASL_AUTHZ_SOURCE_ATTR)-1, SASL_AUTHZ_SOURCE_ATTR }; - -static struct berval sasl_authz_dst = { - sizeof(SASL_AUTHZ_DEST_ATTR)-1, SASL_AUTHZ_DEST_ATTR }; - -int slap_sasl_authorized( struct berval *authcDN, struct berval *authzDN ) +int slap_sasl_authorized( Connection *conn, + struct berval *authcDN, struct berval *authzDN ) { int rc = LDAP_INAPPROPRIATE_AUTH; @@ -664,8 +672,9 @@ int slap_sasl_authorized( struct berval *authcDN, struct berval *authzDN ) } #ifdef NEW_LOGGING - LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY, - "slap_sasl_authorized: can %s become %s?\n", authcDN->bv_val, authzDN->bv_val )); + LDAP_LOG( TRANSPORT, ENTRY, + "slap_sasl_authorized: can %s become %s?\n", + authcDN->bv_val, authzDN->bv_val, 0 ); #else Debug( LDAP_DEBUG_TRACE, "==>slap_sasl_authorized: can %s become %s?\n", authcDN->bv_val, authzDN->bv_val, 0 ); @@ -678,17 +687,21 @@ int slap_sasl_authorized( struct berval *authcDN, struct berval *authzDN ) } /* Check source rules */ - rc = slap_sasl_check_authz( authcDN, authzDN, &sasl_authz_src, - authcDN ); - if( rc == LDAP_SUCCESS ) { - goto DONE; + if( authz_policy & SASL_AUTHZ_TO ) { + rc = slap_sasl_check_authz( conn, authcDN, authzDN, + slap_schema.si_ad_saslAuthzTo, authcDN ); + if( rc == LDAP_SUCCESS ) { + goto DONE; + } } /* Check destination rules */ - rc = slap_sasl_check_authz( authzDN, authcDN, &sasl_authz_dst, - authcDN ); - if( rc == LDAP_SUCCESS ) { - goto DONE; + if( authz_policy & SASL_AUTHZ_FROM ) { + rc = slap_sasl_check_authz( conn, authzDN, authcDN, + slap_schema.si_ad_saslAuthzFrom, authcDN ); + if( rc == LDAP_SUCCESS ) { + goto DONE; + } } rc = LDAP_INAPPROPRIATE_AUTH; @@ -697,8 +710,7 @@ DONE: #endif #ifdef NEW_LOGGING - LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY, - "slap_sasl_authorized: return %d\n", rc )); + LDAP_LOG( TRANSPORT, RESULTS, "slap_sasl_authorized: return %d\n", rc,0,0 ); #else Debug( LDAP_DEBUG_TRACE, "<== slap_sasl_authorized: return %d\n", rc, 0, 0 );