int
ldap_back_bind(
- Backend *be,
- Connection *conn,
Operation *op,
- struct berval *dn,
- struct berval *ndn,
- int method,
- struct berval *cred,
- struct berval *edn
-)
+ SlapReply *rs )
{
- struct ldapinfo *li = (struct ldapinfo *) be->be_private;
+ struct ldapinfo *li = (struct ldapinfo *) op->o_bd->be_private;
struct ldapconn *lc;
struct berval mdn = { 0, NULL };
int rc = 0;
+ ber_int_t msgid;
+ dncookie dc;
- lc = ldap_back_getconn(li, conn, op);
+ lc = ldap_back_getconn(op, rs);
if ( !lc ) {
return( -1 );
}
- if ( op->o_ctrls ) {
- if ( ldap_set_option( lc->ld, LDAP_OPT_SERVER_CONTROLS,
- op->o_ctrls ) != LDAP_SUCCESS ) {
- ldap_back_op_result( lc, conn, op );
- return( -1 );
- }
- }
-
/*
* Rewrite the bind dn if needed
*/
+ dc.rwmap = &li->rwmap;
#ifdef ENABLE_REWRITE
- switch ( rewrite_session( li->rwinfo, "bindDn", dn->bv_val, conn, &mdn.bv_val ) ) {
- case REWRITE_REGEXEC_OK:
- if ( mdn.bv_val == NULL ) {
- mdn.bv_val = ( char * )dn->bv_val;
- }
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDAP, DETAIL1,
- "[rw] bindDn: \"%s\" -> \"%s\"\n", dn->bv_val, mdn.bv_val, 0 );
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ARGS, "rw> bindDn: \"%s\" -> \"%s\"\n%s",
- dn->bv_val, mdn.bv_val, "" );
-#endif /* !NEW_LOGGING */
- break;
-
- case REWRITE_REGEXEC_UNWILLING:
- send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
- NULL, "Operation not allowed", NULL, NULL );
- return( -1 );
-
- case REWRITE_REGEXEC_ERR:
- send_ldap_result( conn, op, LDAP_OTHER,
- NULL, "Rewrite error", NULL, NULL );
- return( -1 );
+ dc.conn = op->o_conn;
+ dc.rs = rs;
+ dc.ctx = "bindDn";
+#else
+ dc.tofrom = 1;
+ dc.normalized = 0;
+#endif
+ if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) {
+ send_ldap_result( op, rs );
+ return -1;
}
-#else /* !ENABLE_REWRITE */
- ldap_back_dn_massage( li, dn, &mdn, 0, 1 );
-#endif /* !ENABLE_REWRITE */
if ( lc->bound_dn.bv_val ) {
ch_free( lc->bound_dn.bv_val );
lc->bound_dn.bv_val = NULL;
}
lc->bound = 0;
- rc = ldap_bind_s(lc->ld, mdn.bv_val, cred->bv_val, method);
- if (rc != LDAP_SUCCESS) {
- rc = ldap_back_op_result( lc, conn, op );
- } else {
+ /* method is always LDAP_AUTH_SIMPLE if we got here */
+ rs->sr_err = ldap_sasl_bind(lc->ld, mdn.bv_val, LDAP_SASL_SIMPLE,
+ &op->oq_bind.rb_cred, op->o_ctrls, NULL, &msgid);
+ rc = ldap_back_op_result( lc, op, rs, msgid, 1 );
+ if (rc == LDAP_SUCCESS) {
lc->bound = 1;
- if ( mdn.bv_val != dn->bv_val ) {
+ if ( mdn.bv_val != op->o_req_dn.bv_val ) {
lc->bound_dn = mdn;
} else {
- ber_dupbv( &lc->bound_dn, dn );
+ ber_dupbv( &lc->bound_dn, &op->o_req_dn );
}
- }
+ mdn.bv_val = NULL;
- if ( li->savecred ) {
- if ( lc->cred.bv_val )
- ch_free( lc->cred.bv_val );
- ber_dupbv( &lc->cred, cred );
- ldap_set_rebind_proc( lc->ld, ldap_back_rebind, lc );
+ if ( li->savecred ) {
+ if ( lc->cred.bv_val )
+ ch_free( lc->cred.bv_val );
+ ber_dupbv( &lc->cred, &op->oq_bind.rb_cred );
+ ldap_set_rebind_proc( lc->ld, ldap_back_rebind, lc );
+ }
}
/* must re-insert if local DN changed as result of bind */
- if ( lc->bound && ber_bvcmp(ndn, &lc->local_dn ) ) {
- int err;
+ if ( lc->bound && !bvmatch(&op->o_req_ndn, &lc->local_dn ) ) {
+ int lerr;
+
ldap_pvt_thread_mutex_lock( &li->conn_mutex );
- lc = avl_delete( &li->conntree, (caddr_t)lc, ldap_back_conn_cmp );
+ lc = avl_delete( &li->conntree, (caddr_t)lc,
+ ldap_back_conn_cmp );
if ( lc->local_dn.bv_val )
ch_free( lc->local_dn.bv_val );
- ber_dupbv( &lc->local_dn, ndn );
- err = avl_insert( &li->conntree, (caddr_t)lc,
+ ber_dupbv( &lc->local_dn, &op->o_req_ndn );
+ lerr = avl_insert( &li->conntree, (caddr_t)lc,
ldap_back_conn_cmp, ldap_back_conn_dup );
ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
- if ( err == -1 ) {
+ if ( lerr == -1 ) {
ldap_back_conn_free( lc );
}
}
+ if ( mdn.bv_val && mdn.bv_val != op->o_req_dn.bv_val ) {
+ free( mdn.bv_val );
+ }
+
return( rc );
}
printf( " " );
lc = root->avl_data;
- printf( "lc(%lx) local(%s) conn(%lx) %d\n", lc, lc->local_dn.bv_val, lc->conn, root->avl_bf );
+ printf( "lc(%lx) local(%s) conn(%lx) %d\n",
+ lc, lc->local_dn.bv_val, lc->conn, root->avl_bf );
ravl_print( root->avl_left, depth+1 );
}
#endif /* PRINT_CONNTREE */
struct ldapconn *
-ldap_back_getconn(struct ldapinfo *li, Connection *conn, Operation *op)
+ldap_back_getconn(Operation *op, SlapReply *rs)
{
+ struct ldapinfo *li = (struct ldapinfo *)op->o_bd->be_private;
struct ldapconn *lc, lc_curr;
LDAP *ld;
int is_priv = 0;
/* Searches for a ldapconn in the avl tree */
/* Explicit binds must not be shared */
- if ( op->o_tag == LDAP_REQ_BIND ) {
- lc_curr.conn = conn;
+ if ( op->o_tag == LDAP_REQ_BIND
+ || (op->o_conn
+ && (op->o_bd == op->o_conn->c_authz_backend ))) {
+ lc_curr.conn = op->o_conn;
} else {
lc_curr.conn = NULL;
}
- /* Internal searches are privileged. So is root. */
+ /* Internal searches are privileged and shared. So is root. */
if ( op->o_do_not_cache || be_isroot( li->be, &op->o_ndn ) ) {
lc_curr.local_dn = li->be->be_rootndn;
+ lc_curr.conn = NULL;
is_priv = 1;
} else {
lc_curr.local_dn = op->o_ndn;
}
+
ldap_pvt_thread_mutex_lock( &li->conn_mutex );
lc = (struct ldapconn *)avl_find( li->conntree,
(caddr_t)&lc_curr, ldap_back_conn_cmp );
/* Looks like we didn't get a bind. Open a new session... */
if (!lc) {
- int vers = conn->c_protocol;
- int err = ldap_initialize(&ld, li->url);
+ int vers = op->o_protocol;
+ rs->sr_err = ldap_initialize(&ld, li->url);
- if (err != LDAP_SUCCESS) {
- err = ldap_back_map_result(err);
- send_ldap_result( conn, op, err,
- NULL, "ldap_initialize() failed", NULL, NULL );
+ if (rs->sr_err != LDAP_SUCCESS) {
+ rs->sr_err = ldap_back_map_result(rs);
+ if (rs->sr_text == NULL) {
+ rs->sr_text = "ldap_initialize() failed";
+ }
+ if (op->o_conn) send_ldap_result( op, rs );
+ rs->sr_text = NULL;
return( NULL );
}
/* Set LDAP version. This will always succeed: If the client
* bound with a particular version, then so can we.
*/
- ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &vers);
+ ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION,
+ (const void *)&vers);
+ /* FIXME: configurable? */
+ ldap_set_option(ld, LDAP_OPT_REFERRALS, LDAP_OPT_ON);
lc = (struct ldapconn *)ch_malloc(sizeof(struct ldapconn));
lc->conn = lc_curr.conn;
lc->ld = ld;
ber_dupbv( &lc->local_dn, &lc_curr.local_dn );
- if ( is_priv ) {
- ber_str2bv( li->bindpw, 0, 1, &lc->cred );
- } else {
- lc->cred.bv_len = 0;
- lc->cred.bv_val = NULL;
- }
-
- ldap_pvt_thread_mutex_init( &lc->lc_mutex );
-
#ifdef ENABLE_REWRITE
/*
* Sets a cookie for the rewrite session
+ *
+ * FIXME: the o_conn might be no longer valid,
+ * since we may have different entries
+ * for the same connection
*/
- ( void )rewrite_session_init( li->rwinfo, conn );
+ ( void )rewrite_session_init( li->rwmap.rwm_rw, op->o_conn );
#endif /* ENABLE_REWRITE */
- if ( conn->c_dn.bv_len != 0 ) {
-
- /*
- * Rewrite the bind dn if needed
- */
-#ifdef ENABLE_REWRITE
+ ldap_pvt_thread_mutex_init( &lc->lc_mutex );
+
+ if ( is_priv ) {
+ ber_dupbv( &lc->cred, &li->bindpw );
+ ber_dupbv( &lc->bound_dn, &li->binddn );
+ } else {
+ lc->cred.bv_len = 0;
+ lc->cred.bv_val = NULL;
lc->bound_dn.bv_val = NULL;
lc->bound_dn.bv_len = 0;
- switch ( rewrite_session( li->rwinfo, "bindDn",
- conn->c_dn.bv_val, conn,
- &lc->bound_dn.bv_val ) ) {
- case REWRITE_REGEXEC_OK:
- if ( lc->bound_dn.bv_val == NULL ) {
- ber_dupbv( &lc->bound_dn,
- &conn->c_dn );
- }
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDAP, DETAIL1,
- "[rw] bindDn: \"%s\" ->"
- " \"%s\"\n%s",
- conn->c_dn.bv_val,
- lc->bound_dn.bv_val, "" );
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ARGS,
- "rw> bindDn: \"%s\" ->"
- " \"%s\"\n%s",
- conn->c_dn.bv_val,
- lc->bound_dn.bv_val, "" );
-#endif /* !NEW_LOGGING */
- break;
-
- case REWRITE_REGEXEC_UNWILLING:
- send_ldap_result( conn, op,
- LDAP_UNWILLING_TO_PERFORM,
- NULL, "Operation not allowed",
- NULL, NULL );
- return( NULL );
+ if ( op->o_conn->c_dn.bv_len != 0
+ && ( op->o_bd == op->o_conn->c_authz_backend ) ) {
- case REWRITE_REGEXEC_ERR:
- send_ldap_result( conn, op,
- LDAP_OTHER,
- NULL, "Rewrite error",
- NULL, NULL );
- return( NULL );
- }
+ dncookie dc;
+ struct berval bv;
-#else /* !ENABLE_REWRITE */
- struct berval bv;
- ldap_back_dn_massage( li, &conn->c_dn, &bv, 0, 1 );
- if ( bv.bv_val == conn->c_dn.bv_val ) {
- ber_dupbv( &lc->bound_dn, &bv );
- } else {
- lc->bound_dn = bv;
- }
-#endif /* !ENABLE_REWRITE */
+ /*
+ * Rewrite the bind dn if needed
+ */
+ dc.rwmap = &li->rwmap;
+#ifdef ENABLE_REWRITE
+ dc.conn = op->o_conn;
+ dc.rs = rs;
+ dc.ctx = "bindDn";
+#else
+ dc.tofrom = 1;
+ dc.normalized = 0;
+#endif
+
+ if ( ldap_back_dn_massage( &dc, &op->o_conn->c_dn, &bv ) ) {
+ if (op->o_conn) send_ldap_result( op, rs );
+ return NULL;
+ }
- } else {
- lc->bound_dn.bv_val = NULL;
- lc->bound_dn.bv_len = 0;
+ if ( bv.bv_val == op->o_conn->c_dn.bv_val ) {
+ ber_dupbv( &lc->bound_dn, &bv );
+ } else {
+ lc->bound_dn = bv;
+ }
+ }
}
+
lc->bound = 0;
/* Inserts the newly created ldapconn in the avl tree */
ldap_pvt_thread_mutex_lock( &li->conn_mutex );
- err = avl_insert( &li->conntree, (caddr_t)lc,
+ rs->sr_err = avl_insert( &li->conntree, (caddr_t)lc,
ldap_back_conn_cmp, ldap_back_conn_dup );
#if PRINT_CONNTREE > 0
"ldap_back_getconn: conn %lx inserted\n", lc, 0, 0);
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_TRACE,
- "=>ldap_back_getconn: conn %lx inserted\n%s%s",
- lc, "", "" );
+ "=>ldap_back_getconn: conn %lx inserted\n", lc, 0, 0 );
#endif /* !NEW_LOGGING */
/* Err could be -1 in case a duplicate ldapconn is inserted */
- if ( err != 0 ) {
+ if ( rs->sr_err != 0 ) {
ldap_back_conn_free( lc );
- send_ldap_result( conn, op, LDAP_OTHER,
- NULL, "internal server error", NULL, NULL );
+ if (op->o_conn) {
+ send_ldap_error( op, rs, LDAP_OTHER,
+ "internal server error" );
+ }
return( NULL );
}
} else {
lc, 0, 0 );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_TRACE,
- "=>ldap_back_getconn: conn %lx fetched%s%s\n",
- lc, "", "" );
+ "=>ldap_back_getconn: conn %lx fetched\n", lc, 0, 0 );
#endif /* !NEW_LOGGING */
}
* it can be used to simplify the check.
*/
int
-ldap_back_dobind( struct ldapconn *lc, Connection *conn, Operation *op )
+ldap_back_dobind( struct ldapconn *lc, Operation *op, SlapReply *rs )
{
- int rc = 0;
+ int rc;
+ ber_int_t msgid;
ldap_pvt_thread_mutex_lock( &lc->lc_mutex );
- if ( op->o_ctrls ) {
- if ( ldap_set_option( lc->ld, LDAP_OPT_SERVER_CONTROLS,
- op->o_ctrls ) != LDAP_SUCCESS ) {
- ldap_back_op_result( lc, conn, op );
- goto leave;
+ if ( !lc->bound ) {
+ rs->sr_err = ldap_sasl_bind(lc->ld, lc->bound_dn.bv_val,
+ LDAP_SASL_SIMPLE, &lc->cred, NULL, NULL, &msgid);
+ rc = ldap_back_op_result( lc, op, rs, msgid, 0 );
+ if (rc == LDAP_SUCCESS) {
+ lc->bound = 1;
}
}
-
- if ( lc->bound ) {
- rc = lc->bound;
- goto leave;
- }
-
- if ( ldap_bind_s( lc->ld, lc->bound_dn.bv_val, lc->cred.bv_val,
- LDAP_AUTH_SIMPLE ) != LDAP_SUCCESS ) {
- ldap_back_op_result( lc, conn, op );
- goto leave;
- } /* else */
-
- rc = lc->bound = 1;
-leave:
+ rc = lc->bound;
ldap_pvt_thread_mutex_unlock( &lc->lc_mutex );
return rc;
}
/* Map API errors to protocol errors... */
int
-ldap_back_map_result(int err)
+ldap_back_map_result(SlapReply *rs)
{
- switch(err)
+ switch(rs->sr_err)
{
case LDAP_SERVER_DOWN:
return LDAP_UNAVAILABLE;
case LDAP_AUTH_UNKNOWN:
return LDAP_AUTH_METHOD_NOT_SUPPORTED;
case LDAP_FILTER_ERROR:
+ rs->sr_text = "Filter error";
return LDAP_OTHER;
case LDAP_USER_CANCELLED:
+ rs->sr_text = "User cancelled";
return LDAP_OTHER;
case LDAP_PARAM_ERROR:
return LDAP_PROTOCOL_ERROR;
case LDAP_NO_RESULTS_RETURNED:
return LDAP_NO_SUCH_OBJECT;
case LDAP_MORE_RESULTS_TO_RETURN:
+ rs->sr_text = "More results to return";
return LDAP_OTHER;
case LDAP_CLIENT_LOOP:
case LDAP_REFERRAL_LIMIT_EXCEEDED:
return LDAP_LOOP_DETECT;
default:
- if LDAP_API_ERROR(err)
+ if LDAP_API_ERROR(rs->sr_err)
return LDAP_OTHER;
else
- return err;
+ return rs->sr_err;
}
}
int
-ldap_back_op_result(struct ldapconn *lc, Connection *conn, Operation *op)
+ldap_back_op_result(struct ldapconn *lc, Operation *op, SlapReply *rs,
+ ber_int_t msgid, int sendok)
{
- int err = LDAP_SUCCESS;
- char *msg = NULL;
+ struct ldapinfo *li = (struct ldapinfo *)op->o_bd->be_private;
char *match = NULL;
+ LDAPMessage *res;
+ char *text = NULL;
+
+ rs->sr_text = NULL;
+ rs->sr_matched = NULL;
- ldap_get_option(lc->ld, LDAP_OPT_ERROR_NUMBER, &err);
+ if (rs->sr_err == LDAP_SUCCESS) {
+ if (ldap_result(lc->ld, msgid, 1, NULL, &res) == -1) {
+ ldap_get_option(lc->ld, LDAP_OPT_ERROR_NUMBER,
+ &rs->sr_err);
+ } else {
+ int rc = ldap_parse_result(lc->ld, res, &rs->sr_err,
+ &match, &text, NULL, NULL, 1);
+ rs->sr_text = text;
+ if (rc != LDAP_SUCCESS) rs->sr_err = rc;
+ }
+ }
- /* internal ops must not reply to client */
- if ( !conn || op->o_do_not_cache ) goto quiet;
+ if (rs->sr_err != LDAP_SUCCESS) {
+ rs->sr_err = ldap_back_map_result(rs);
- ldap_get_option(lc->ld, LDAP_OPT_ERROR_STRING, &msg);
- ldap_get_option(lc->ld, LDAP_OPT_MATCHED_DN, &match);
- err = ldap_back_map_result(err);
+ /* internal ops must not reply to client */
+ if ( op->o_conn && !op->o_do_not_cache && match ) {
+ struct berval dn, mdn;
+ dncookie dc;
+ dc.rwmap = &li->rwmap;
#ifdef ENABLE_REWRITE
-
- /*
- * FIXME: need rewrite info for match; mmmh ...
- */
- send_ldap_result( conn, op, err, match, msg, NULL, NULL );
- /* better test the pointers before freeing? */
- if ( match ) {
- free( match );
+ dc.conn = op->o_conn;
+ dc.rs = rs;
+ dc.ctx = "matchedDn";
+#else
+ dc.tofrom = 0;
+ dc.normalized = 0;
+#endif
+ ber_str2bv(match, 0, 0, &dn);
+ ldap_back_dn_massage(&dc, &dn, &mdn);
+ rs->sr_matched = mdn.bv_val;
+
+ }
+ }
+ if (op->o_conn && (sendok || rs->sr_err != LDAP_SUCCESS)) {
+ send_ldap_result( op, rs );
}
-
-#else /* !ENABLE_REWRITE */
-
- send_ldap_result( conn, op, err, match, msg, NULL, NULL );
- /* better test the pointers before freeing? */
if ( match ) {
- free( match );
+ if ( rs->sr_matched != match ) {
+ free( (char *)rs->sr_matched );
+ }
+ rs->sr_matched = NULL;
+ ldap_memfree( match );
}
-
-#endif /* !ENABLE_REWRITE */
-
- if ( msg ) free( msg );
-quiet:
- return( (err==LDAP_SUCCESS) ? 0 : -1 );
+ if ( text ) {
+ ldap_memfree( text );
+ }
+ rs->sr_text = NULL;
+ return( (rs->sr_err == LDAP_SUCCESS) ? 0 : -1 );
}
projects / openldap / blobdiff