X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsasl.c;h=f973098617c29da2d0a0d4aa90ff124528fa3492;hb=49b0985c88ea6836a24c314aea2cb2dd0d129544;hp=3366b901a973c1a8a289fc72a20548b446da5b3d;hpb=b282339c96195c0d695168544d7f36a85aa1b0c1;p=openldap
diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 3366b901a9..f973098617 100644
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -1,7 +1,16 @@
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
#include "portable.h"
@@ -25,13 +34,21 @@
# endif
# if SASL_VERSION_MAJOR >= 2
+# ifdef HAVE_SASL_SASL_H
# include
+# else
+# include
+# endif
# define SASL_CONST const
# else
# define SASL_CONST
# endif
static sasl_security_properties_t sasl_secprops;
+
+#define SASL_VERSION_FULL ((SASL_VERSION_MAJOR << 16) |\
+ (SASL_VERSION_MINOR << 8) | SASL_VERSION_STEP)
+
#endif /* HAVE_CYRUS_SASL */
#include "ldap_pvt.h"
@@ -292,7 +309,8 @@ slap_sasl_log(
static const char *slap_propnames[] = {
"*slapConn", "*authcDN", "*authzDN", NULL };
-static Filter *generic_filter;
+static Filter generic_filter = { LDAP_FILTER_PRESENT };
+static struct berval generic_filterstr = BER_BVC("(objectclass=*)");
#define PROP_CONN 0
#define PROP_AUTHC 1
@@ -422,7 +440,7 @@ slap_auxprop_lookup(
}
if (doit) {
- slap_callback cb = { sasl_ap_lookup };
+ slap_callback cb = { sasl_ap_lookup, NULL };
cb.sc_private = &sl;
@@ -438,18 +456,124 @@ slap_auxprop_lookup(
op.o_do_not_cache = 1;
op.o_is_auth_check = 1;
op.o_threadctx = conn->c_sasl_bindop->o_threadctx;
+ op.o_tmpmemctx = conn->c_sasl_bindop->o_tmpmemctx;
+ op.o_tmpmfuncs = conn->c_sasl_bindop->o_tmpmfuncs;
op.o_conn = conn;
op.o_connid = conn->c_connid;
+ op.o_req_dn = op.o_req_ndn;
op.ors_scope = LDAP_SCOPE_BASE;
op.ors_deref = LDAP_DEREF_NEVER;
op.ors_slimit = 1;
- op.ors_filter = generic_filter;
+ op.ors_filter = &generic_filter;
+ op.ors_filterstr = generic_filterstr;
op.o_bd->be_search( &op, &rs );
}
}
}
+#if SASL_VERSION_FULL >= 0x020110
+static int
+slap_auxprop_store(
+ void *glob_context,
+ sasl_server_params_t *sparams,
+ struct propctx *prctx,
+ const char *user,
+ unsigned ulen)
+{
+ Operation op = {0};
+ SlapReply rs = {REP_RESULT};
+ int rc, i, j;
+ Connection *conn = NULL;
+ const struct propval *pr;
+ Modifications *modlist = NULL, **modtail = &modlist, *mod;
+ slap_callback cb = { slap_null_cb, NULL };
+ char textbuf[SLAP_TEXT_BUFLEN];
+ const char *text;
+ size_t textlen = sizeof(textbuf);
+
+ /* just checking if we are enabled */
+ if (!prctx) return SASL_OK;
+
+ if (!sparams || !user) return SASL_BADPARAM;
+
+ pr = sparams->utils->prop_get( sparams->propctx );
+
+ /* Find our DN and conn first */
+ for( i = 0; pr[i].name; i++ ) {
+ if ( pr[i].name[0] == '*' ) {
+ if ( !strcmp( pr[i].name, slap_propnames[PROP_CONN] ) ) {
+ if ( pr[i].values && pr[i].values[0] )
+ AC_MEMCPY( &conn, pr[i].values[0], sizeof( conn ) );
+ continue;
+ }
+ if ( !strcmp( pr[i].name, slap_propnames[PROP_AUTHC] ) ) {
+ if ( pr[i].values && pr[i].values[0] ) {
+ AC_MEMCPY( &op.o_req_ndn, pr[i].values[0], sizeof( struct berval ) );
+ }
+ }
+ }
+ }
+ if (!conn || !op.o_req_ndn.bv_val) return SASL_BADPARAM;
+
+ op.o_bd = select_backend( &op.o_req_ndn, 0, 1 );
+
+ if ( !op.o_bd || !op.o_bd->be_modify ) return SASL_FAIL;
+
+ pr = sparams->utils->prop_get( prctx );
+ if (!pr) return SASL_BADPARAM;
+
+ for (i=0; pr[i].name; i++);
+ if (!i) return SASL_BADPARAM;
+
+ for (i=0; pr[i].name; i++) {
+ mod = (Modifications *)ch_malloc( sizeof(Modifications) );
+ mod->sml_op = LDAP_MOD_REPLACE;
+ ber_str2bv( pr[i].name, 0, 0, &mod->sml_type );
+ mod->sml_values = (struct berval *)ch_malloc( (pr[i].nvalues + 1) *
+ sizeof(struct berval));
+ for (j=0; jsml_values[j]);
+ }
+ mod->sml_values[j].bv_val = NULL;
+ mod->sml_values[j].bv_len = 0;
+ mod->sml_nvalues = NULL;
+ mod->sml_desc = NULL;
+ *modtail = mod;
+ modtail = &mod->sml_next;
+ }
+ *modtail = NULL;
+
+ rc = slap_mods_check( modlist, 0, &text, textbuf, textlen, NULL );
+
+ if ( rc == LDAP_SUCCESS ) {
+ rc = slap_mods_opattrs( &op, modlist, modtail, &text, textbuf,
+ textlen );
+ }
+
+ if ( rc == LDAP_SUCCESS ) {
+ op.o_tag = LDAP_REQ_MODIFY;
+ op.o_protocol = LDAP_VERSION3;
+ op.o_ndn = op.o_req_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;
+ op.o_tmpmemctx = conn->c_sasl_bindop->o_tmpmemctx;
+ op.o_tmpmfuncs = conn->c_sasl_bindop->o_tmpmfuncs;
+ op.o_conn = conn;
+ op.o_connid = conn->c_connid;
+ op.o_req_dn = op.o_req_ndn;
+ op.orm_modlist = modlist;
+
+ rc = op.o_bd->be_modify( &op, &rs );
+ }
+ slap_mods_free( modlist );
+ return rc ? SASL_FAIL : SASL_OK;
+}
+#endif /* SASL_VERSION_FULL >= 2.1.16 */
+
static sasl_auxprop_plug_t slap_auxprop_plugin = {
0, /* Features */
0, /* spare */
@@ -457,7 +581,12 @@ static sasl_auxprop_plug_t slap_auxprop_plugin = {
NULL, /* auxprop_free */
slap_auxprop_lookup,
"slapd", /* name */
- NULL /* spare */
+#if SASL_VERSION_FULL >= 0x020110
+ slap_auxprop_store /* the declaration of this member changed
+ * in cyrus SASL from 2.1.15 to 2.1.16 */
+#else
+ NULL
+#endif
};
static int
@@ -500,7 +629,7 @@ sasl_cb_checkpass( Operation *op, SlapReply *rs )
NULL, ACL_AUTH, NULL ) ) return 0;
for ( bv = a->a_vals; bv->bv_val != NULL; bv++ ) {
- if ( !lutil_passwd( bv, &ci->cred, NULL ) ) {
+ if ( !lutil_passwd( bv, &ci->cred, NULL, &rs->sr_text ) ) {
ci->rc = SASL_OK;
break;
}
@@ -528,7 +657,7 @@ slap_sasl_checkpass(
* find an answer here.
*/
- rc = slap_sasl_getdn( conn, (char *)username, 0, NULL, &op.o_req_ndn,
+ rc = slap_sasl_getdn( conn, NULL, (char *)username, 0, NULL, &op.o_req_ndn,
SLAP_GETDN_AUTHCID );
if ( rc != LDAP_SUCCESS ) {
sasl_seterror( sconn, 0, ldap_err2string( rc ) );
@@ -546,7 +675,7 @@ slap_sasl_checkpass(
op.o_bd = select_backend( &op.o_req_ndn, 0, 1 );
if ( op.o_bd && op.o_bd->be_search ) {
- slap_callback cb = { sasl_cb_checkpass };
+ slap_callback cb = { sasl_cb_checkpass, NULL };
SlapReply rs = {REP_RESULT};
ci.cred.bv_val = (char *)pass;
@@ -561,12 +690,16 @@ slap_sasl_checkpass(
op.o_do_not_cache = 1;
op.o_is_auth_check = 1;
op.o_threadctx = conn->c_sasl_bindop->o_threadctx;
+ op.o_tmpmemctx = conn->c_sasl_bindop->o_tmpmemctx;
+ op.o_tmpmfuncs = conn->c_sasl_bindop->o_tmpmfuncs;
op.o_conn = conn;
op.o_connid = conn->c_connid;
+ op.o_req_dn = op.o_req_ndn;
op.ors_scope = LDAP_SCOPE_BASE;
op.ors_deref = LDAP_DEREF_NEVER;
op.ors_slimit = 1;
- op.ors_filter = generic_filter;
+ op.ors_filter = &generic_filter;
+ op.ors_filterstr = generic_filterstr;
op.o_bd->be_search( &op, &rs );
}
@@ -671,7 +804,7 @@ slap_sasl_canonicalize(
if ( !rc ) goto done;
}
- rc = slap_sasl_getdn( conn, (char *)in, inlen, (char *)user_realm, &dn,
+ rc = slap_sasl_getdn( conn, NULL, (char *)in, inlen, (char *)user_realm, &dn,
(flags & SASL_CU_AUTHID) ? SLAP_GETDN_AUTHCID : SLAP_GETDN_AUTHZID );
if ( rc != LDAP_SUCCESS ) {
sasl_seterror( sconn, 0, ldap_err2string( rc ) );
@@ -725,7 +858,7 @@ slap_sasl_authorize(
"slap_sasl_authorize: conn %d authcid=\"%s\" authzid=\"%s\"\n",
conn ? conn->c_connid : -1, auth_identity, requested_user);
#else
- Debug( LDAP_DEBUG_ARGS, "SASL Authorize [conn=%ld]: "
+ Debug( LDAP_DEBUG_ARGS, "SASL proxy authorize [conn=%ld]: "
"authcid=\"%s\" authzid=\"%s\"\n",
conn ? conn->c_connid : -1, auth_identity, requested_user );
#endif
@@ -748,16 +881,17 @@ slap_sasl_authorize(
AC_MEMCPY( &authzDN, auxvals[1].values[0], sizeof(authzDN) );
- rc = slap_sasl_authorized( conn, &authcDN, &authzDN );
+ rc = slap_sasl_authorized( conn->c_sasl_bindop, &authcDN, &authzDN );
ch_free( authcDN.bv_val );
if ( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG( TRANSPORT, INFO,
- "slap_sasl_authorize: conn %ld authorization disallowed (%d)\n",
+ "slap_sasl_authorize: conn %ld "
+ "proxy authorization disallowed (%d)\n",
(long)(conn ? conn->c_connid : -1), rc, 0 );
#else
- Debug( LDAP_DEBUG_TRACE, "SASL Authorize [conn=%ld]: "
- " authorization disallowed (%d)\n",
+ Debug( LDAP_DEBUG_TRACE, "SASL Proxy Authorize [conn=%ld]: "
+ "proxy authorization disallowed (%d)\n",
(long) (conn ? conn->c_connid : -1), rc, 0 );
#endif
@@ -777,11 +911,11 @@ ok:
#ifdef NEW_LOGGING
LDAP_LOG( TRANSPORT, ENTRY,
- "slap_sasl_authorize: conn %d authorization allowed\n",
+ "slap_sasl_authorize: conn %d proxy authorization allowed\n",
(long)(conn ? conn->c_connid : -1), 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "SASL Authorize [conn=%ld]: "
- " authorization allowed\n",
+ " proxy authorization allowed\n",
(long) (conn ? conn->c_connid : -1), 0, 0 );
#endif
return SASL_OK;
@@ -821,7 +955,7 @@ slap_sasl_authorize(
#endif
/* Figure out how much data we have for the dn */
- rc = sasl_getprop( conn->c_sasl_context, SASL_REALM, (void **)&realm );
+ rc = sasl_getprop( conn->c_sasl_authctx, SASL_REALM, (void **)&realm );
if( rc != SASL_OK && rc != SASL_NOTDONE ) {
#ifdef NEW_LOGGING
LDAP_LOG( TRANSPORT, ERR,
@@ -836,7 +970,7 @@ 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,
+ rc = slap_sasl_getdn( conn, NULL, (char *)authcid, 0, realm,
&authcDN, SLAP_GETDN_AUTHCID );
if( rc != LDAP_SUCCESS ) {
*errstr = ldap_err2string( rc );
@@ -855,7 +989,7 @@ slap_sasl_authorize(
conn->c_sasl_dn = authcDN;
goto ok;
}
- rc = slap_sasl_getdn( conn, (char *)authzid, 0, realm,
+ rc = slap_sasl_getdn( conn, NULL, (char *)authzid, 0, realm,
&authzDN, SLAP_GETDN_AUTHZID );
if( rc != LDAP_SUCCESS ) {
ch_free( authcDN.bv_val );
@@ -863,16 +997,17 @@ slap_sasl_authorize(
return SASL_NOAUTHZ;
}
- rc = slap_sasl_authorized(conn, &authcDN, &authzDN );
+ rc = slap_sasl_authorized(conn->c_sasl_bindop, &authcDN, &authzDN );
ch_free( authcDN.bv_val );
if( rc ) {
#ifdef NEW_LOGGING
LDAP_LOG( TRANSPORT, INFO,
- "slap_sasl_authorize: conn %ld authorization disallowed (%d)\n",
+ "slap_sasl_authorize: conn %ld "
+ "proxy authorization disallowed (%d)\n",
(long)(conn ? conn->c_connid : -1), rc, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "SASL Authorize [conn=%ld]: "
- " authorization disallowed (%d)\n",
+ "proxy authorization disallowed (%d)\n",
(long) (conn ? conn->c_connid : -1), rc, 0 );
#endif
@@ -885,7 +1020,7 @@ slap_sasl_authorize(
ok:
#ifdef NEW_LOGGING
LDAP_LOG( TRANSPORT, RESULTS,
- "slap_sasl_authorize: conn %d authorization allowed\n",
+ "slap_sasl_authorize: conn %d proxy authorization allowed\n",
(long)(conn ? conn->c_connid : -1 ), 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "SASL Authorize [conn=%ld]: "
@@ -911,6 +1046,9 @@ slap_sasl_err2ldap( int saslerr )
int rc;
switch (saslerr) {
+ case SASL_OK:
+ rc = LDAP_SUCCESS;
+ break;
case SASL_CONTINUE:
rc = LDAP_SASL_BIND_IN_PROGRESS;
break;
@@ -952,21 +1090,28 @@ int slap_sasl_init( void )
};
#ifdef HAVE_SASL_VERSION
-#define SASL_BUILD_VERSION ((SASL_VERSION_MAJOR << 24) |\
- (SASL_VERSION_MINOR << 16) | SASL_VERSION_STEP)
+ /* stringify the version number, sasl.h doesn't do it for us */
+#define VSTR0(maj, min, pat) #maj "." #min "." #pat
+#define VSTR(maj, min, pat) VSTR0(maj, min, pat)
+#define SASL_VERSION_STRING VSTR(SASL_VERSION_MAJOR, SASL_VERSION_MINOR, \
+ SASL_VERSION_STEP)
sasl_version( NULL, &rc );
if ( ((rc >> 16) != ((SASL_VERSION_MAJOR << 8)|SASL_VERSION_MINOR)) ||
(rc & 0xffff) < SASL_VERSION_STEP) {
-
+ char version[sizeof("xxx.xxx.xxxxx")];
+ sprintf( version, "%u.%d.%d", (unsigned)rc >> 24, (rc >> 16) & 0xff,
+ rc & 0xffff );
#ifdef NEW_LOGGING
LDAP_LOG( TRANSPORT, INFO,
- "slap_sasl_init: SASL version mismatch, got %x, wanted %x.\n",
- rc, SASL_BUILD_VERSION, 0 );
+ "slap_sasl_init: SASL library version mismatch:"
+ " expected " SASL_VERSION_STRING ","
+ " got %s\n", version, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
- "slap_sasl_init: SASL version mismatch, got %x, wanted %x.\n",
- rc, SASL_BUILD_VERSION, 0 );
+ "slap_sasl_init: SASL library version mismatch:"
+ " expected " SASL_VERSION_STRING ","
+ " got %s\n", version, 0, 0 );
#endif
return -1;
}
@@ -988,6 +1133,8 @@ int slap_sasl_init( void )
ldap_pvt_sasl_mutex_dispose );
#if SASL_VERSION_MAJOR >= 2
+ generic_filter.f_desc = slap_schema.si_ad_objectClass;
+
sasl_auxprop_add_plugin( "slapd", slap_auxprop_init );
#endif
/* should provide callbacks for logging */
@@ -1031,9 +1178,6 @@ 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;
@@ -1041,7 +1185,7 @@ int slap_sasl_destroy( void )
return 0;
}
-int slap_sasl_open( Connection *conn )
+int slap_sasl_open( Connection *conn, int reopen )
{
int cb, sc = LDAP_SUCCESS;
#if SASL_VERSION_MAJOR >= 2
@@ -1052,18 +1196,18 @@ int slap_sasl_open( Connection *conn )
sasl_conn_t *ctx = NULL;
sasl_callback_t *session_callbacks;
- assert( conn->c_sasl_context == NULL );
- assert( conn->c_sasl_extra == NULL );
+ assert( conn->c_sasl_authctx == NULL );
- conn->c_sasl_layers = 0;
+ if ( !reopen ) {
+ assert( conn->c_sasl_extra == NULL );
- session_callbacks =
+ session_callbacks =
#if SASL_VERSION_MAJOR >= 2
- SLAP_CALLOC( 5, sizeof(sasl_callback_t));
+ SLAP_CALLOC( 5, sizeof(sasl_callback_t));
#else
- SLAP_CALLOC( 3, sizeof(sasl_callback_t));
+ SLAP_CALLOC( 3, sizeof(sasl_callback_t));
#endif
- if( session_callbacks == NULL ) {
+ if( session_callbacks == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG( TRANSPORT, ERR,
"slap_sasl_open: SLAP_MALLOC failed", 0, 0, 0 );
@@ -1072,31 +1216,36 @@ int slap_sasl_open( Connection *conn )
"slap_sasl_open: SLAP_MALLOC failed", 0, 0, 0 );
#endif
return -1;
- }
- conn->c_sasl_extra = session_callbacks;
+ }
+ conn->c_sasl_extra = session_callbacks;
- session_callbacks[cb=0].id = SASL_CB_LOG;
- session_callbacks[cb].proc = &slap_sasl_log;
- session_callbacks[cb++].context = conn;
+ session_callbacks[cb=0].id = SASL_CB_LOG;
+ session_callbacks[cb].proc = &slap_sasl_log;
+ session_callbacks[cb++].context = conn;
- session_callbacks[cb].id = SASL_CB_PROXY_POLICY;
- session_callbacks[cb].proc = &slap_sasl_authorize;
- session_callbacks[cb++].context = conn;
+ session_callbacks[cb].id = SASL_CB_PROXY_POLICY;
+ session_callbacks[cb].proc = &slap_sasl_authorize;
+ session_callbacks[cb++].context = conn;
#if SASL_VERSION_MAJOR >= 2
- session_callbacks[cb].id = SASL_CB_CANON_USER;
- session_callbacks[cb].proc = &slap_sasl_canonicalize;
- session_callbacks[cb++].context = conn;
-
- /* XXXX: this should be conditional */
- session_callbacks[cb].id = SASL_CB_SERVER_USERDB_CHECKPASS;
- session_callbacks[cb].proc = &slap_sasl_checkpass;
- session_callbacks[cb++].context = conn;
+ session_callbacks[cb].id = SASL_CB_CANON_USER;
+ session_callbacks[cb].proc = &slap_sasl_canonicalize;
+ session_callbacks[cb++].context = conn;
+
+ /* XXXX: this should be conditional */
+ session_callbacks[cb].id = SASL_CB_SERVER_USERDB_CHECKPASS;
+ session_callbacks[cb].proc = &slap_sasl_checkpass;
+ session_callbacks[cb++].context = conn;
#endif
- session_callbacks[cb].id = SASL_CB_LIST_END;
- session_callbacks[cb].proc = NULL;
- session_callbacks[cb++].context = NULL;
+ session_callbacks[cb].id = SASL_CB_LIST_END;
+ session_callbacks[cb].proc = NULL;
+ session_callbacks[cb++].context = NULL;
+ } else {
+ session_callbacks = conn->c_sasl_extra;
+ }
+
+ conn->c_sasl_layers = 0;
if( global_host == NULL ) {
global_host = ldap_pvt_get_fqdn( NULL );
@@ -1104,9 +1253,6 @@ 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;
@@ -1158,7 +1304,7 @@ int slap_sasl_open( Connection *conn )
return -1;
}
- conn->c_sasl_context = ctx;
+ conn->c_sasl_authctx = ctx;
if( sc == SASL_OK ) {
sc = sasl_setprop( ctx,
@@ -1190,7 +1336,7 @@ int slap_sasl_external(
{
#if SASL_VERSION_MAJOR >= 2
int sc;
- sasl_conn_t *ctx = conn->c_sasl_context;
+ sasl_conn_t *ctx = conn->c_sasl_authctx;
if ( ctx == NULL ) {
return LDAP_UNAVAILABLE;
@@ -1210,7 +1356,7 @@ int slap_sasl_external(
#elif defined(HAVE_CYRUS_SASL)
int sc;
- sasl_conn_t *ctx = conn->c_sasl_context;
+ sasl_conn_t *ctx = conn->c_sasl_authctx;
sasl_external_properties_t extprops;
if ( ctx == NULL ) {
@@ -1234,13 +1380,6 @@ int slap_sasl_external(
int slap_sasl_reset( Connection *conn )
{
-#ifdef HAVE_CYRUS_SASL
- sasl_conn_t *ctx = conn->c_sasl_context;
-
- if( ctx != NULL ) {
- }
-#endif
- /* must return "anonymous" */
return LDAP_SUCCESS;
}
@@ -1249,7 +1388,9 @@ char ** slap_sasl_mechs( Connection *conn )
char **mechs = NULL;
#ifdef HAVE_CYRUS_SASL
- sasl_conn_t *ctx = conn->c_sasl_context;
+ sasl_conn_t *ctx = conn->c_sasl_authctx;
+
+ if( ctx == NULL ) ctx = conn->c_sasl_sockctx;
if( ctx != NULL ) {
int sc;
@@ -1285,13 +1426,19 @@ char ** slap_sasl_mechs( Connection *conn )
int slap_sasl_close( Connection *conn )
{
#ifdef HAVE_CYRUS_SASL
- sasl_conn_t *ctx = conn->c_sasl_context;
+ sasl_conn_t *ctx = conn->c_sasl_authctx;
if( ctx != NULL ) {
sasl_dispose( &ctx );
}
+ if ( conn->c_sasl_sockctx && conn->c_sasl_authctx != conn->c_sasl_sockctx ) {
+ ctx = conn->c_sasl_sockctx;
+ sasl_dispose( &ctx );
+ }
- conn->c_sasl_context = NULL;
+ conn->c_sasl_authctx = NULL;
+ conn->c_sasl_sockctx = NULL;
+ conn->c_sasl_done = 0;
free( conn->c_sasl_extra );
conn->c_sasl_extra = NULL;
@@ -1303,7 +1450,7 @@ int slap_sasl_close( Connection *conn )
int slap_sasl_bind( Operation *op, SlapReply *rs )
{
#ifdef HAVE_CYRUS_SASL
- sasl_conn_t *ctx = op->o_conn->c_sasl_context;
+ sasl_conn_t *ctx = op->o_conn->c_sasl_authctx;
struct berval response;
unsigned reslen = 0;
int sc;
@@ -1344,6 +1491,30 @@ int slap_sasl_bind( Operation *op, SlapReply *rs )
#endif
if ( !op->o_conn->c_sasl_bind_in_progress ) {
+ /* If we already authenticated once, must use a new context */
+ if ( op->o_conn->c_sasl_done ) {
+ slap_ssf_t ssf = 0;
+ const char *authid = NULL;
+#if SASL_VERSION_MAJOR >= 2
+ sasl_getprop( ctx, SASL_SSF_EXTERNAL, (void *)&ssf );
+ sasl_getprop( ctx, SASL_AUTH_EXTERNAL, (void *)&authid );
+ if ( authid ) authid = ch_strdup( authid );
+#endif
+ if ( ctx != op->o_conn->c_sasl_sockctx ) {
+ sasl_dispose( &ctx );
+ }
+ op->o_conn->c_sasl_authctx = NULL;
+
+ slap_sasl_open( op->o_conn, 1 );
+ ctx = op->o_conn->c_sasl_authctx;
+#if SASL_VERSION_MAJOR >= 2
+ if ( authid ) {
+ sasl_setprop( ctx, SASL_SSF_EXTERNAL, &ssf );
+ sasl_setprop( ctx, SASL_AUTH_EXTERNAL, authid );
+ ch_free( (char *)authid );
+ }
+#endif
+ }
sc = START( ctx,
op->o_conn->c_sasl_bind_mech.bv_val,
op->orb_cred.bv_val, op->orb_cred.bv_len,
@@ -1363,21 +1534,47 @@ int slap_sasl_bind( Operation *op, SlapReply *rs )
op->orb_edn = op->o_conn->c_sasl_dn;
op->o_conn->c_sasl_dn.bv_val = NULL;
op->o_conn->c_sasl_dn.bv_len = 0;
+ op->o_conn->c_sasl_done = 1;
rs->sr_err = LDAP_SUCCESS;
(void) sasl_getprop( ctx, SASL_SSF, (void *)&ssf );
op->orb_ssf = ssf ? *ssf : 0;
+ ctx = NULL;
if( op->orb_ssf ) {
ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
op->o_conn->c_sasl_layers++;
+
+ /* If there's an old layer, set sockctx to NULL to
+ * tell connection_read() to wait for us to finish.
+ * Otherwise there is a race condition: we have to
+ * send the Bind response using the old security
+ * context and then remove it before reading any
+ * new messages.
+ */
+ if ( op->o_conn->c_sasl_sockctx ) {
+ ctx = op->o_conn->c_sasl_sockctx;
+ op->o_conn->c_sasl_sockctx = NULL;
+ } else {
+ op->o_conn->c_sasl_sockctx = op->o_conn->c_sasl_authctx;
+ }
ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
}
+ /* Must send response using old security layer */
if (response.bv_len) rs->sr_sasldata = &response;
send_ldap_sasl( op, rs );
-
+
+ /* Now dispose of the old security layer.
+ */
+ if ( ctx ) {
+ ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
+ ldap_pvt_sasl_remove( op->o_conn->c_sb );
+ op->o_conn->c_sasl_sockctx = op->o_conn->c_sasl_authctx;
+ ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
+ sasl_dispose( &ctx );
+ }
} else if ( sc == SASL_CONTINUE ) {
rs->sr_err = LDAP_SASL_BIND_IN_PROGRESS,
rs->sr_sasldata = &response;
@@ -1433,7 +1630,7 @@ slap_sasl_setpass( Operation *op, SlapReply *rs )
assert( ber_bvcmp( &slap_EXOP_MODIFY_PASSWD, &op->ore_reqoid ) == 0 );
- rs->sr_err = sasl_getprop( op->o_conn->c_sasl_context, SASL_USERNAME,
+ rs->sr_err = sasl_getprop( op->o_conn->c_sasl_authctx, SASL_USERNAME,
(SASL_CONST void **)&id.bv_val );
if( rs->sr_err != SASL_OK ) {
@@ -1471,13 +1668,13 @@ slap_sasl_setpass( Operation *op, SlapReply *rs )
}
#if SASL_VERSION_MAJOR < 2
- rs->sr_err = sasl_setpass( op->o_conn->c_sasl_context,
+ rs->sr_err = sasl_setpass( op->o_conn->c_sasl_authctx,
id.bv_val, new.bv_val, new.bv_len, 0, &rs->sr_text );
#else
- rs->sr_err = sasl_setpass( op->o_conn->c_sasl_context, id.bv_val,
+ rs->sr_err = sasl_setpass( op->o_conn->c_sasl_authctx, id.bv_val,
new.bv_val, new.bv_len, old.bv_val, old.bv_len, 0 );
if( rs->sr_err != SASL_OK ) {
- rs->sr_text = sasl_errdetail( op->o_conn->c_sasl_context );
+ rs->sr_text = sasl_errdetail( op->o_conn->c_sasl_authctx );
}
#endif
switch(rs->sr_err) {
@@ -1501,14 +1698,12 @@ done:
#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.
-*/
+ * 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
@@ -1516,7 +1711,7 @@ done:
static struct berval ext_bv = BER_BVC( "EXTERNAL" );
-int slap_sasl_getdn( Connection *conn, char *id, int len,
+int slap_sasl_getdn( Connection *conn, Operation *op, char *id, int len,
char *user_realm, struct berval *dn, int flags )
{
char *c1;
@@ -1532,6 +1727,10 @@ int slap_sasl_getdn( Connection *conn, char *id, int len,
id ? ( *id ? id : "" ) : "NULL", len, 0 );
#endif
+ if ( !op ) {
+ op = conn->c_sasl_bindop;
+ }
+
dn->bv_val = NULL;
dn->bv_len = 0;
@@ -1559,7 +1758,7 @@ int slap_sasl_getdn( Connection *conn, char *id, int len,
/* EXTERNAL DNs are already normalized */
do_norm = 0;
is_dn = SET_DN;
- ber_str2bv( id, len, 1, dn );
+ ber_str2bv_x( id, len, 1, dn, op->o_tmpmemctx );
} else {
/* convert to u: form */
@@ -1606,7 +1805,7 @@ int slap_sasl_getdn( Connection *conn, char *id, int len,
/* Build the new dn */
c1 = dn->bv_val;
- dn->bv_val = SLAP_MALLOC( len+1 );
+ dn->bv_val = sl_malloc( len+1, op->o_tmpmemctx );
if( dn->bv_val == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG( TRANSPORT, ERR,
@@ -1648,16 +1847,16 @@ int slap_sasl_getdn( Connection *conn, char *id, int len,
/* 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 );
+ ber_dupbv_x( &dn2, dn, op->o_tmpmemctx );
dn->bv_val = dn2.bv_val;
}
/* All strings are in DN form now. Normalize if needed. */
if ( do_norm ) {
- rc = dnNormalize2( NULL, dn, &dn2 );
+ rc = dnNormalize( 0, NULL, NULL, dn, &dn2, op->o_tmpmemctx );
/* User DNs were constructed above and must be freed now */
- ch_free( dn->bv_val );
+ sl_free( dn->bv_val, op->o_tmpmemctx );
if ( rc != LDAP_SUCCESS ) {
dn->bv_val = NULL;
@@ -1668,9 +1867,9 @@ int slap_sasl_getdn( Connection *conn, char *id, int len,
}
/* Run thru regexp */
- slap_sasl2dn( conn, dn, &dn2 );
+ slap_sasl2dn( op, dn, &dn2 );
if( dn2.bv_val ) {
- ch_free( dn->bv_val );
+ sl_free( dn->bv_val, op->o_tmpmemctx );
*dn = dn2;
#ifdef NEW_LOGGING
LDAP_LOG( TRANSPORT, ENTRY,