X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsaslauthz.c;h=7b44cd6768e06c6566a3165d057a5edb08939ca0;hb=ca9bb44089145bdb7435135714590d48f4a6eabd;hp=b243542d9e259894b8db74bee2d054388438b276;hpb=4e4818771c26a4c02808130970f2a5e4c216ef52;p=openldap diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c index b243542d9e..7b44cd6768 100644 --- a/servers/slapd/saslauthz.c +++ b/servers/slapd/saslauthz.c @@ -1,5 +1,5 @@ /* - * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* @@ -67,7 +67,7 @@ int slap_sasl_setpolicy( const char *arg ) /* URI format: ldap:///[?[][?[][?[]]]] */ -static int slap_parseURI( struct berval *uri, +static int slap_parseURI( Operation *op, struct berval *uri, struct berval *searchbase, int *scope, Filter **filter ) { struct berval bv; @@ -94,7 +94,7 @@ static int slap_parseURI( struct berval *uri, is_dn: bv.bv_len = uri->bv_len - (bv.bv_val - uri->bv_val); - rc = dnNormalize2( NULL, &bv, searchbase ); + rc = dnNormalize2( NULL, &bv, searchbase, op->o_tmpmemctx ); if( rc == LDAP_SUCCESS ) { *scope = LDAP_SCOPE_BASE; } @@ -124,7 +124,7 @@ 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 ); + *filter = str2filter_x( op, ludp->lud_filter ); if ( *filter == NULL ) { rc = LDAP_PROTOCOL_ERROR; goto done; @@ -134,11 +134,11 @@ is_dn: bv.bv_len = uri->bv_len - (bv.bv_val - uri->bv_val); /* Grab the searchbase */ bv.bv_val = ludp->lud_dn; bv.bv_len = strlen( bv.bv_val ); - rc = dnNormalize2( NULL, &bv, searchbase ); + rc = dnNormalize2( NULL, &bv, searchbase, op->o_tmpmemctx ); done: if( rc != LDAP_SUCCESS ) { - if( *filter ) filter_free( *filter ); + if( *filter ) filter_free_x( op, *filter ); } ldap_free_urldesc( ludp ); @@ -228,7 +228,8 @@ static void slap_sasl_rx_exp( const int *off, regmatch_t *str, const char *saslname, - struct berval *out ) + struct berval *out, + void *ctx ) { int i, n, len, insert; @@ -247,7 +248,7 @@ static void slap_sasl_rx_exp( len += str[i].rm_eo - str[i].rm_so; n++; } - out->bv_val = ch_malloc( len + 1 ); + out->bv_val = sl_malloc( len + 1, ctx ); out->bv_len = len; /* Fill in URI with replace string, replacing $i as we go */ @@ -277,7 +278,7 @@ static void slap_sasl_rx_exp( 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 ) +static int slap_sasl_regexp( struct berval *in, struct berval *out, void *ctx ) { char *saslname = in->bv_val; SaslRegexp_t *reg; @@ -312,7 +313,7 @@ static int slap_sasl_regexp( struct berval *in, struct berval *out ) * 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 ); + reg->sr_strings, saslname, out, ctx ); #ifdef NEW_LOGGING LDAP_LOG( TRANSPORT, ENTRY, @@ -327,34 +328,21 @@ static int slap_sasl_regexp( struct berval *in, struct berval *out ) return( 1 ); } -/* Two empty callback functions to avoid sending results */ -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) -{ -} - -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) -{ -} - /* This callback actually does some work...*/ -static int sasl_sc_sasl2dn( BackendDB *be, Connection *conn, Operation *o, - Entry *e, AttributeName *an, int ao, LDAPControl **c) +static int sasl_sc_sasl2dn( Operation *o, SlapReply *rs ) { struct berval *ndn = o->o_callback->sc_private; + if (rs->sr_type != REP_SEARCH) return 0; + /* We only want to be called once */ if( ndn->bv_val ) { - free(ndn->bv_val); + o->o_tmpfree(ndn->bv_val, o->o_tmpmemctx); ndn->bv_val = NULL; #ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, DETAIL1, - "slap_sasl2dn: search DN returned more than 1 entry\n", 0, 0, 0 ); + 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 ); @@ -362,7 +350,7 @@ static int sasl_sc_sasl2dn( BackendDB *be, Connection *conn, Operation *o, return -1; } - ber_dupbv(ndn, &e->e_nname); + ber_dupbv_x(ndn, &rs->sr_entry->e_nname, o->o_tmpmemctx); return 0; } @@ -372,12 +360,13 @@ typedef struct smatch_info { int match; } smatch_info; -static int sasl_sc_smatch( BackendDB *be, Connection *conn, Operation *o, - Entry *e, AttributeName *an, int ao, LDAPControl **c) +static int sasl_sc_smatch( Operation *o, SlapReply *rs ) { smatch_info *sm = o->o_callback->sc_private; - if (dn_match(sm->dn, &e->e_nname)) { + if (rs->sr_type != REP_SEARCH) return 0; + + if (dn_match(sm->dn, &rs->sr_entry->e_nname)) { sm->match = 1; return -1; /* short-circuit the search */ } @@ -395,16 +384,14 @@ static int sasl_sc_smatch( BackendDB *be, Connection *conn, Operation *o, */ static -int slap_sasl_match(Connection *conn, struct berval *rule, struct berval *assertDN, struct berval *authc ) +int slap_sasl_match(Operation *opx, struct berval *rule, struct berval *assertDN, struct berval *authc ) { - struct berval searchbase = {0, NULL}; - int rc, scope; - Backend *be; - Filter *filter=NULL; + int rc; regex_t reg; smatch_info sm; - slap_callback cb = { slap_cb_null_response, slap_cb_null_sresult, sasl_sc_smatch, NULL }; + slap_callback cb = { sasl_sc_smatch }; Operation op = {0}; + SlapReply rs = {REP_RESULT}; #ifdef NEW_LOGGING LDAP_LOG( TRANSPORT, ENTRY, @@ -416,12 +403,12 @@ int slap_sasl_match(Connection *conn, struct berval *rule, struct berval *assert assertDN->bv_val, rule->bv_val, 0 ); #endif - rc = slap_parseURI( rule, &searchbase, &scope, &filter ); + rc = slap_parseURI( opx, rule, &op.o_req_ndn, &op.oq_search.rs_scope, &op.oq_search.rs_filter ); if( rc != LDAP_SUCCESS ) goto CONCLUDED; /* Massive shortcut: search scope == base */ - if( scope == LDAP_SCOPE_BASE ) { - rc = regcomp(®, searchbase.bv_val, + if( op.oq_search.rs_scope == LDAP_SCOPE_BASE ) { + rc = regcomp(®, op.o_req_ndn.bv_val, REG_EXTENDED|REG_ICASE|REG_NOSUB); if ( rc == 0 ) { rc = regexec(®, assertDN->bv_val, 0, NULL, 0); @@ -440,19 +427,18 @@ int slap_sasl_match(Connection *conn, struct berval *rule, struct berval *assert #ifdef NEW_LOGGING LDAP_LOG( TRANSPORT, DETAIL1, "slap_sasl_match: performing internal search (base=%s, scope=%d)\n", - searchbase.bv_val, scope,0 ); + op.o_req_ndn.bv_val, op.oq_search.rs_scope, 0 ); #else Debug( LDAP_DEBUG_TRACE, "slap_sasl_match: performing internal search (base=%s, scope=%d)\n", - searchbase.bv_val, scope, 0 ); + op.o_req_ndn.bv_val, op.oq_search.rs_scope, 0 ); #endif - be = select_backend( &searchbase, 0, 1 ); - if(( be == NULL ) || ( be->be_search == NULL)) { + op.o_bd = select_backend( &op.o_req_ndn, 0, 1 ); + if(( op.o_bd == NULL ) || ( op.o_bd->be_search == NULL)) { rc = LDAP_INAPPROPRIATE_AUTH; goto CONCLUDED; } - suffix_alias( be, &searchbase ); sm.dn = assertDN; sm.match = 0; @@ -464,11 +450,14 @@ int slap_sasl_match(Connection *conn, struct berval *rule, struct berval *assert 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; + op.o_is_auth_check = 1; + op.o_threadctx = opx->o_threadctx; + op.o_tmpmemctx = opx->o_tmpmemctx; + op.o_tmpmfuncs = opx->o_tmpmfuncs; + op.o_conn = opx->o_conn; + op.o_connid = opx->o_connid; - (*be->be_search)( be, conn, &op, /*base=*/NULL, &searchbase, - scope, /*deref=*/1, /*sizelimit=*/0, /*time=*/0, filter, /*fstr=*/NULL, - /*attrs=*/NULL, /*attrsonly=*/0 ); + op.o_bd->be_search( &op, &rs ); if (sm.match) { rc = LDAP_SUCCESS; @@ -477,8 +466,8 @@ int slap_sasl_match(Connection *conn, struct berval *rule, struct berval *assert } CONCLUDED: - if( searchbase.bv_len ) ch_free( searchbase.bv_val ); - if( filter ) filter_free( filter ); + if( op.o_req_ndn.bv_len ) sl_free( op.o_req_ndn.bv_val, opx->o_tmpmemctx ); + if( op.oq_search.rs_filter ) filter_free_x( opx, op.oq_search.rs_filter ); #ifdef NEW_LOGGING LDAP_LOG( TRANSPORT, ENTRY, @@ -520,13 +509,13 @@ slap_sasl_check_authz( Connection *conn, assertDN->bv_val, ad->ad_cname.bv_val, searchDN->bv_val); #endif - rc = backend_attribute( NULL, NULL, conn->c_sasl_bindop, NULL, + rc = backend_attribute( 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( conn, &vals[i], assertDN, authc ); + rc = slap_sasl_match( conn->c_sasl_bindop, &vals[i], assertDN, authc ); if ( rc == LDAP_SUCCESS ) goto COMPLETE; } rc = LDAP_INAPPROPRIATE_AUTH; @@ -555,17 +544,13 @@ COMPLETE: * an internal search must be done, and if that search returns exactly one * entry, return the DN of that one entry. */ -void slap_sasl2dn( Connection *conn, +void slap_sasl2dn( Operation *opx, struct berval *saslname, struct berval *sasldn ) { int rc; - 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}; + slap_callback cb = { sasl_sc_sasl2dn }; Operation op = {0}; + SlapReply rs = {REP_RESULT}; struct berval regout = { 0, NULL }; #ifdef NEW_LOGGING @@ -583,60 +568,65 @@ void slap_sasl2dn( Connection *conn, cb.sc_private = sasldn; /* Convert the SASL name into a minimal URI */ - if( !slap_sasl_regexp( saslname, ®out ) ) { + if( !slap_sasl_regexp( saslname, ®out, opx->o_tmpmemctx ) ) { goto FINISHED; } - rc = slap_parseURI( ®out, &dn, &scope, &filter ); - if( regout.bv_val ) ch_free( regout.bv_val ); + rc = slap_parseURI( opx, ®out, &op.o_req_ndn, &op.oq_search.rs_scope, &op.oq_search.rs_filter ); + if( regout.bv_val ) sl_free( regout.bv_val, opx->o_tmpmemctx ); if( rc != LDAP_SUCCESS ) { goto FINISHED; } /* Must do an internal search */ - be = select_backend( &dn, 0, 1 ); + op.o_bd = select_backend( &op.o_req_ndn, 0, 1 ); /* Massive shortcut: search scope == base */ - if( scope == LDAP_SCOPE_BASE ) { - *sasldn = dn; - dn.bv_len = 0; - dn.bv_val = NULL; + if( op.oq_search.rs_scope == LDAP_SCOPE_BASE ) { + *sasldn = op.o_req_ndn; + op.o_req_ndn.bv_len = 0; + op.o_req_ndn.bv_val = NULL; goto FINISHED; } #ifdef NEW_LOGGING LDAP_LOG( TRANSPORT, DETAIL1, "slap_sasl2dn: performing internal search (base=%s, scope=%d)\n", - dn.bv_val, scope, 0 ); + op.o_req_ndn.bv_val, op.oq_search.rs_scope, 0 ); #else Debug( LDAP_DEBUG_TRACE, "slap_sasl2dn: performing internal search (base=%s, scope=%d)\n", - dn.bv_val, scope, 0 ); + op.o_req_ndn.bv_val, op.oq_search.rs_scope, 0 ); #endif - if(( be == NULL ) || ( be->be_search == NULL)) { + if(( op.o_bd == NULL ) || ( op.o_bd->be_search == NULL)) { goto FINISHED; } - suffix_alias( be, &dn ); + op.o_conn = opx->o_conn; + op.o_connid = opx->o_connid; op.o_tag = LDAP_REQ_SEARCH; op.o_protocol = LDAP_VERSION3; - op.o_ndn = conn->c_ndn; + op.o_ndn = opx->o_conn->c_ndn; 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, &op, NULL, &dn, - scope, LDAP_DEREF_NEVER, 1, 0, - filter, NULL, NULL, 1 ); + op.o_is_auth_check = 1; + op.o_threadctx = opx->o_threadctx; + op.o_tmpmemctx = opx->o_tmpmemctx; + op.o_tmpmfuncs = opx->o_tmpmfuncs; + op.oq_search.rs_deref = LDAP_DEREF_NEVER; + op.oq_search.rs_slimit = 1; + op.oq_search.rs_attrsonly = 1; + + op.o_bd->be_search( &op, &rs ); FINISHED: if( sasldn->bv_len ) { - conn->c_authz_backend = be; + opx->o_conn->c_authz_backend = op.o_bd; } - if( dn.bv_len ) ch_free( dn.bv_val ); - if( filter ) filter_free( filter ); + if( op.o_req_ndn.bv_len ) ch_free( op.o_req_ndn.bv_val ); + if( op.oq_search.rs_filter ) filter_free_x( opx, op.oq_search.rs_filter ); #ifdef NEW_LOGGING LDAP_LOG( TRANSPORT, ENTRY, @@ -683,7 +673,7 @@ int slap_sasl_authorized( Connection *conn, } /* Allow the manager to authorize as any DN. */ - if( be_isroot( conn->c_authz_backend, authcDN )) { + if( conn->c_authz_backend && be_isroot( conn->c_authz_backend, authcDN )) { rc = LDAP_SUCCESS; goto DONE; }