X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsaslauthz.c;h=d6511b8256235b63c94e61ef7e7ee99bf9929365;hb=3b3232f21c000d7562c27e0ea65abc195bd16105;hp=5c1d6505a6d50b534a7236575241650a257ab839;hpb=02e8527248f2b085880f146f4cbf5b6778c09c28;p=openldap diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c index 5c1d6505a6..d6511b8256 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. @@ -29,7 +33,43 @@ #endif #include -#endif + +#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:///[?[][?[][?[]]]] */ @@ -47,8 +87,8 @@ static int slap_parseURI( struct berval *uri, *filter = NULL; #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 @@ -59,8 +99,9 @@ static int slap_parseURI( struct berval *uri, bv.bv_val += strspn( bv.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 ); @@ -73,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; @@ -84,86 +131,35 @@ 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; + 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 ); } - -int slap_sasl_regexp_config( const char *match, const char *replace ) +static int slap_sasl_rx_off(char *rep, int *off) { -#ifdef HAVE_CYRUS_SASL const char *c; - int rc, n; - SaslRegexp_t *reg; - struct berval bv, nbv; - - 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 = 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", - replace )); -#else - Debug( LDAP_DEBUG_ANY, - "SASL replace pattern %s could not be normalized.\n", - replace, 0, 0 ); -#endif - return( rc ); - } - reg->sr_replace = nbv.bv_val; - - /* 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 )); -#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 ); - } + int n; /* Precompile replace pattern. Find the $ placeholders */ - reg->sr_offset[0] = -2; + off[0] = -2; n = 1; - for ( c = reg->sr_replace; *c; c++ ) { + for ( c = rep; *c; c++ ) { if ( *c == '\\' && c[1] ) { c++; continue; @@ -171,90 +167,88 @@ int slap_sasl_regexp_config( const char *match, const char *replace ) 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", - reg->sr_replace, 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 " "placeholders (max %d)\n", - reg->sr_replace, SASLREGEX_REPLACE, 0 ); + rep, SASLREGEX_REPLACE, 0 ); #endif - return( LDAP_OPERATIONS_ERROR ); + return( LDAP_OTHER ); } - reg->sr_offset[n] = c - reg->sr_replace; + off[n] = c - rep; n++; } } /* Final placeholder, after the last $n */ - reg->sr_offset[n] = c - reg->sr_replace; + off[n] = c - rep; n++; - reg->sr_offset[n] = -1; - - nSaslRegexp++; -#endif + off[n] = -1; return( LDAP_SUCCESS ); } - -#ifdef HAVE_CYRUS_SASL - -/* Take the passed in SASL name and attempt to convert it into an - 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, struct berval *out ) +int slap_sasl_regexp_config( const char *match, const char *replace ) { - char *saslname = in->bv_val; - int i, n, len, insert; + int rc; SaslRegexp_t *reg; - out->bv_val = NULL; - out->bv_len = 0; + SaslRegexp = (SaslRegexp_t *) ch_realloc( (char *) SaslRegexp, + (nSaslRegexp + 1) * sizeof(SaslRegexp_t) ); + + 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_ENTRY, - "slap_sasl_regexp: converting SASL name %s\n", saslname )); + LDAP_LOG( TRANSPORT, ERR, + "slap_sasl_regexp_config: \"%s\" could not be compiled.\n", + reg->sr_match, 0, 0 ); #else - Debug( LDAP_DEBUG_TRACE, "slap_sasl_regexp: converting SASL name %s\n", - saslname, 0, 0 ); + Debug( LDAP_DEBUG_ANY, + "SASL match pattern %s could not be compiled by regexp engine\n", + reg->sr_match, 0, 0 ); #endif - if (( saslname == NULL ) || ( nSaslRegexp == 0 )) - return( 0 ); - - /* Match the normalized SASL name to the saslregexp patterns */ - for( reg = SaslRegexp,i=0; isr_workspace, saslname, SASLREGEX_REPLACE, - reg->sr_strings, 0) == 0 ) - break; + return( LDAP_OTHER ); } - if( i >= nSaslRegexp ) - return( 0 ); + rc = slap_sasl_rx_off( reg->sr_replace, reg->sr_offset ); + if ( rc != LDAP_SUCCESS ) return rc; - /* - * The match pattern may have been of the form "a(b.*)c(d.*)e" and the - * 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.*) - */ + nSaslRegexp++; + return( LDAP_SUCCESS ); +} +/* Perform replacement on regexp matches */ +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; + /* Get the total length of the final URI */ n=1; len = 0; - while( reg->sr_offset[n] >= 0 ) { + while( off[n] >= 0 ) { /* Len of next section from replacement string (x,y,z above) */ - len += reg->sr_offset[n] - reg->sr_offset[n-1] - 2; - if( reg->sr_offset[n+1] < 0) + len += off[n] - off[n-1] - 2; + if( off[n+1] < 0) break; /* Len of string from saslname that matched next $i (b,d above) */ - i = reg->sr_replace[ reg->sr_offset[n] + 1 ] - '0'; - len += reg->sr_strings[i].rm_eo - reg->sr_strings[i].rm_so; + i = rep[ off[n] + 1 ] - '0'; + len += str[i].rm_eo - str[i].rm_so; n++; } out->bv_val = ch_malloc( len + 1 ); @@ -263,30 +257,76 @@ static int slap_sasl_regexp( struct berval *in, struct berval *out ) /* Fill in URI with replace string, replacing $i as we go */ n=1; insert = 0; - while( reg->sr_offset[n] >= 0) { + while( off[n] >= 0) { /* Paste in next section from replacement string (x,y,z above) */ - len = reg->sr_offset[n] - reg->sr_offset[n-1] - 2; - strncpy( out->bv_val+insert, reg->sr_replace + reg->sr_offset[n-1] + 2, len); + len = off[n] - off[n-1] - 2; + strncpy( out->bv_val+insert, rep + off[n-1] + 2, len); insert += len; - if( reg->sr_offset[n+1] < 0) + if( off[n+1] < 0) break; /* Paste in string from saslname that matched next $i (b,d above) */ - i = reg->sr_replace[ reg->sr_offset[n] + 1 ] - '0'; - len = reg->sr_strings[i].rm_eo - reg->sr_strings[i].rm_so; - strncpy( out->bv_val+insert, saslname + reg->sr_strings[i].rm_so, len ); + i = rep[ off[n] + 1 ] - '0'; + len = str[i].rm_eo - str[i].rm_so; + strncpy( out->bv_val+insert, saslname + str[i].rm_so, len ); insert += len; n++; } out->bv_val[insert] = '\0'; +} + +/* Take the passed in SASL name and attempt to convert it into an + 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, 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: converted SASL name to %s\n", out->bv_val )); + 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 ); +#endif + + if (( saslname == NULL ) || ( nSaslRegexp == 0 )) + return( 0 ); + + /* Match the normalized SASL name to the saslregexp patterns */ + for( reg = SaslRegexp,i=0; isr_workspace, saslname, SASLREGEX_REPLACE, + reg->sr_strings, 0) == 0 ) + break; + } + + if( i >= nSaslRegexp ) + return( 0 ); + + /* + * The match pattern may have been of the form "a(b.*)c(d.*)e" and the + * 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, reg->sr_offset, + reg->sr_strings, saslname, out ); + +#ifdef NEW_LOGGING + 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 %s\n", out->bv_val, 0, 0 ); + "slap_sasl_regexp: converted SASL name to ldap:///%s??%s?%s\n", + out->bv_len ? out->bv_val : "", 0, 0 ); #endif return( 1 ); @@ -313,21 +353,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; } /* @@ -339,83 +380,93 @@ static int sasl_sc_sasl2dn( BackendDB *be, Connection *conn, Operation *o, * entry, return the DN of that one entry. */ -void slap_sasl2dn( struct berval *saslname, struct berval *dn ) +void slap_sasl2dn( Connection *conn, + struct berval *saslname, struct berval *sasldn ) { - struct berval uri = {0, NULL}; - struct berval searchbase = {0, NULL}; - int rc, scope; + int rc; Backend *be; - Filter *filter=NULL; + struct berval dn = { 0, NULL }; + int scope = LDAP_SCOPE_BASE; + Filter *filter = NULL; slap_callback cb = {sasl_sc_r, sasl_sc_s, sasl_sc_sasl2dn, NULL}; Operation op = {0}; + 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; - /* Convert the SASL name into an LDAP URI */ - if( !slap_sasl_regexp( saslname, &uri ) ) + 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, ®out ) ) { goto FINISHED; + } - rc = slap_parseURI( &uri, &searchbase, &scope, &filter ); - if( rc ) { + rc = slap_parseURI( ®out, &dn, &scope, &filter ); + if( rc != LDAP_SUCCESS ) { goto FINISHED; } + /* Must do an internal search */ + be = select_backend( &dn, 0, 1 ); + /* Massive shortcut: search scope == base */ if( scope == LDAP_SCOPE_BASE ) { - *dn = searchbase; - searchbase.bv_len = 0; - searchbase.bv_val = NULL; + *sasldn = dn; + dn.bv_len = 0; + dn.bv_val = NULL; goto FINISHED; } - /* Must do an internal search */ - #ifdef NEW_LOGGING - LDAP_LOG(( "sasl", LDAP_LEVEL_DETAIL1, - "slap_sasl2dn: performing internal search (base=%s, scope=%d)\n", - searchbase.bv_val, 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", - searchbase.bv_val, scope, 0 ); + "slap_sasl2dn: performing internal search (base=%s, scope=%d)\n", + dn.bv_val, scope, 0 ); #endif - be = select_backend( &searchbase, 0, 1 ); - if(( be == NULL ) || ( be->be_search == NULL)) + if(( be == NULL ) || ( be->be_search == NULL)) { goto FINISHED; - suffix_alias( be, &searchbase ); + } + 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; - (*be->be_search)( be, /*conn*/NULL, &op, /*base*/NULL, &searchbase, - 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( searchbase.bv_len ) ch_free( searchbase.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 ); - if( uri.bv_val ) ch_free( uri.bv_val ); #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; @@ -449,7 +500,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; @@ -461,8 +512,9 @@ int slap_sasl_match( struct berval *rule, struct berval *assertDN, struct berval 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 ); @@ -490,9 +542,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", @@ -515,8 +567,9 @@ 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; - (*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 ); @@ -529,8 +582,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); @@ -546,42 +599,35 @@ CONCLUDED: * attribute named by *attr. If any of those rules map to the *assertDN, the * authorization is approved. * - * DN's passed in should have a dn: prefix + * 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; - struct berval bv; #ifdef NEW_LOGGING - LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY, + LDAP_LOG( TRANSPORT, ENTRY, "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); #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 ); + rc = backend_attribute( NULL, NULL, NULL, NULL, searchDN, ad, &vals ); if( rc != LDAP_SUCCESS ) goto COMPLETE; - bv.bv_val = searchDN->bv_val + 3; - bv.bv_len = searchDN->bv_len - 3; - rc = backend_attribute( NULL, NULL, NULL, NULL, &bv, ad, &vals ); - if( rc != LDAP_SUCCESS ) - goto COMPLETE; - - bv.bv_val = assertDN->bv_val + 3; - bv.bv_len = assertDN->bv_len - 3; /* Check if the *assertDN matches any **vals */ for( i=0; vals[i].bv_val != NULL; i++ ) { - rc = slap_sasl_match( &vals[i], &bv, authc ); + rc = slap_sasl_match( conn, &vals[i], assertDN, authc ); if ( rc == LDAP_SUCCESS ) goto COMPLETE; } @@ -591,11 +637,12 @@ 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 ); @@ -604,15 +651,11 @@ COMPLETE: /* Check if a bind can SASL authorize to another identity. - Accepts authorization DN's with "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 }; + * The DNs should not have the dn: prefix + */ -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; @@ -624,8 +667,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 ); @@ -638,17 +682,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; @@ -657,8 +705,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 );