/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include "portable.h"
-#include <ac/stdlib.h>
#include <stdio.h>
-
-#include "slap.h"
-#include "proto-slap.h"
+#include <ac/stdlib.h>
+#include <ac/string.h>
#include <lber.h>
#include <ldap_log.h>
+#include "slap.h"
+
#ifdef HAVE_CYRUS_SASL
#include <limits.h>
#include <sasl.h>
#include <lutil.h>
#endif
-static sasl_security_properties_t sasl_secprops;
+/* Flags for telling slap_sasl_getdn() what type of identity is being passed */
+#define FLAG_GETDN_FINAL 1
+#define FLAG_GETDN_AUTHCID 2
+#define FLAG_GETDN_AUTHZID 4
+static sasl_security_properties_t sasl_secprops;
static int
slap_sasl_log(
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
- "SASL [conn=%d] %s: %s\n",
- conn ? conn->c_connid : -1,
- label, message ));
+ "SASL [conn=%ld] %s: %s\n",
+ conn ? conn->c_connid : -1,
+ label, message ));
#else
- Debug( level, "SASL [conn=%d] %s: %s\n",
+ Debug( level, "SASL [conn=%ld] %s: %s\n",
conn ? conn->c_connid: -1,
label, message );
#endif
/* Take any sort of identity string and return a DN with the "dn:" prefix. The
- string returned in *dnptr is in its own allocated memory, and must be free'd
+ string returned in *dn is in its own allocated memory, and must be free'd
by the calling process.
-Mark Adamson, Carnegie Mellon
*/
-int slap_sasl_getdn( Connection *conn, char *id, char **dnptr, int flags )
+#define SET_DN 1
+#define SET_U 2
+
+static struct berval ext_bv = { sizeof("EXTERNAL")-1, "EXTERNAL" };
+
+int slap_sasl_getdn( Connection *conn, char *id, struct berval *dn, int flags )
{
- char *c, *c1, *dn=NULL;
- int rc, len, len1;
+ char *c=NULL, *c1;
+ int rc, len, is_dn = 0;
sasl_conn_t *ctx;
-
+ struct berval dn2;
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
- "slap_sasl_getdn: conn %d id=%s\n",
- conn ? conn->c_connid : -1,
- id ? (*id ? id : "<empty>") : "NULL" ));
+ "slap_sasl_getdn: conn %d id=%s\n",
+ conn ? conn->c_connid : -1,
+ id ? (*id ? id : "<empty>") : "NULL" ));
#else
Debug( LDAP_DEBUG_ARGS, "slap_sasl_getdn: id=%s\n",
id?(*id?id:"<empty>"):"NULL",0,0 );
#endif
+ dn->bv_val = NULL;
+ dn->bv_len = 0;
/* Blatantly anonymous ID */
- len = strlen( "anonymous" );
- if( id && !strncasecmp( id, "anonymous", len) &&
- ( id[len] == '\0' || id[len] == '@' ) ) {
- *dnptr = NULL;
+ if( id &&
+ ( id[sizeof( "anonymous" )-1] == '\0'
+ || id[sizeof( "anonymous" )-1] == '@' ) &&
+ !strncasecmp( id, "anonymous", sizeof( "anonymous" )-1) ) {
return( LDAP_SUCCESS );
}
ctx = conn->c_sasl_context;
- dn = ch_strdup( id );
len = strlen( id );
- /* An authcID will need to be prefixed with u: */
+ /* An authcID needs to be converted to authzID form */
if( flags & FLAG_GETDN_AUTHCID ) {
- dn = ch_realloc( dn, len+3 );
- memmove( dn+2, dn, len+1 );
- dn[0] = 'u';
- dn[1] = ':';
- len += 2;
+ if( sasl_external_x509dn_convert
+ && conn->c_sasl_bind_mech.bv_len == ext_bv.bv_len
+ && ( strcasecmp( ext_bv.bv_val, conn->c_sasl_bind_mech.bv_val ) == 0 )
+ && id[0] == '/' )
+ {
+ /* check SASL external for X.509 style DN and */
+ /* convert to dn:<dn> form */
+ dn->bv_val = ldap_dcedn2dn( id );
+ dn->bv_len = strlen(dn->bv_val);
+ is_dn = SET_DN;
+
+ } else {
+ /* convert to u:<username> form */
+ ber_str2bv( id, len, 1, dn );
+ is_dn = SET_U;
+ }
+ }
+ if( !is_dn ) {
+ if( !strncasecmp( id, "u:", sizeof("u:")-1 )) {
+ is_dn = SET_U;
+ ber_str2bv( id+2, len-2, 1, dn );
+ } else if ( !strncasecmp( id, "dn:", sizeof("dn:")-1) ) {
+ is_dn = SET_DN;
+ ber_str2bv( id+3, len-3, 1, dn );
+ }
}
/* An authzID must be properly prefixed */
- if( flags & FLAG_GETDN_AUTHZID && strncasecmp( dn, "u:", 2 ) &&
- strncasecmp( dn, "dn:", 3 ) ) {
- ch_free( dn );
- *dnptr = NULL;
+ if( (flags & FLAG_GETDN_AUTHZID) && !is_dn ) {
+ free( dn->bv_val );
+ dn->bv_val = NULL;
+ dn->bv_len = 0;
return( LDAP_INAPPROPRIATE_AUTH );
}
/* Username strings */
- len1 = strlen( ",cn=authzid" );
- if( !strncasecmp( dn, "u:", 2 ) ) {
- len += strlen( "dn:uid=" ) + len1;
+ if( is_dn == SET_U ) {
+ char *p;
+ len = dn->bv_len + sizeof("uid=")-1 + sizeof(",cn=auth")-1;
/* Figure out how much data we have for the dn */
rc = sasl_getprop( ctx, SASL_REALM, (void **)&c );
- if( rc != SASL_OK ) {
+ if( rc != SASL_OK && rc != SASL_NOTDONE ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
- "slap_sasl_getdn: getprop(REALM) failed.\n" ));
+ "slap_sasl_getdn: getprop(REALM) failed.\n" ));
#else
Debug(LDAP_DEBUG_TRACE,
"getdn: getprop(REALM) failed!\n", 0,0,0);
#endif
- ch_free( dn );
- *dnptr = NULL;
+ ch_free( dn->bv_val );
+ *dn = slap_empty_bv;
return( LDAP_OPERATIONS_ERROR );
}
- if( c ) {
- len += strlen( c ) + strlen(",cn=" );
+
+ if( c && *c ) {
+ len += strlen( c ) + sizeof(",cn=")-1;
}
- if( conn->c_sasl_bind_mech ) {
- len += strlen( conn->c_sasl_bind_mech ) + strlen( ",cn=mech" );
+
+ if( conn->c_sasl_bind_mech.bv_len ) {
+ len += conn->c_sasl_bind_mech.bv_len + sizeof(",cn=")-1;
}
/* Build the new dn */
- c1 = dn;
- dn = ch_malloc( len );
- len = sprintf( dn, "dn:uid=%s", c1+2 );
+ c1 = dn->bv_val;
+ dn->bv_val = ch_malloc( len );
+ p = slap_strcopy( dn->bv_val, "uid=" );
+ p = slap_strcopy( p, c1 );
ch_free( c1 );
if( c ) {
- len += sprintf( dn+len, ",cn=%s", c );
+ p = slap_strcopy( p, ",cn=" );
+ p = slap_strcopy( p, c );
}
- if( conn->c_sasl_bind_mech ) {
- len += sprintf( dn+len, ",cn=%s", conn->c_sasl_bind_mech );
+ if( conn->c_sasl_bind_mech.bv_len ) {
+ p = slap_strcopy( p, ",cn=" );
+ p = slap_strcopy( p, conn->c_sasl_bind_mech.bv_val );
}
- strcpy( dn+len, ",cn=authzid" );
- len += len1;
+ p = slap_strcopy( p, ",cn=auth" );
+ dn->bv_len = p - dn->bv_val;
+ is_dn = SET_DN;
+
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
- "getdn: u:id converted to %s.\n", dn ));
+ "slap_sasl_getdn: u:id converted to %s.\n", dn->bv_val ));
#else
- Debug( LDAP_DEBUG_TRACE, "getdn: u:id converted to %s\n", dn,0,0 );
+ Debug( LDAP_DEBUG_TRACE, "getdn: u:id converted to %s\n", dn->bv_val,0,0 );
#endif
-
}
- /* DN strings that are a cn=authzid identity to run through regexp */
- if( !strncasecmp( dn, "dn:", 3) && ( ( flags & FLAG_GETDN_FINAL ) == 0 ) ) {
- c1 = slap_sasl2dn( dn + 3 );
- if( c1 ) {
- ch_free( dn );
- dn = c1;
- /* Reaffix the dn: prefix if it was removed */
- if( strncasecmp( dn, "dn:", 3) ) {
- c1 = dn;
- dn = ch_malloc( strlen( c1 ) + 4 );
- sprintf( dn, "dn:%s", c1 );
- ch_free( c1 );
- }
+ /* DN strings that are a cn=auth identity to run through regexp */
+ if( is_dn == SET_DN && ( ( flags & FLAG_GETDN_FINAL ) == 0 ) )
+ {
+ slap_sasl2dn( dn, &dn2 );
+ if( dn2.bv_val ) {
+ ch_free( dn->bv_val );
+ *dn = dn2;
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
- "slap_sasl_getdn: dn:id converted to %s.\n", dn ));
+ "slap_sasl_getdn: dn:id converted to %s.\n", dn->bv_val ));
#else
- Debug( LDAP_DEBUG_TRACE, "getdn: dn:id converted to %s\n", dn,0,0 );
+ Debug( LDAP_DEBUG_TRACE, "getdn: dn:id converted to %s\n",
+ dn->bv_val, 0, 0 );
#endif
+ }
+ }
+ if( flags & FLAG_GETDN_FINAL ) {
+ /* omit "dn:" prefix */
+ is_dn = 0;
+ } else {
+ rc = dnNormalize2( NULL, dn, &dn2 );
+ free(dn->bv_val);
+ if ( rc != LDAP_SUCCESS ) {
+ *dn = slap_empty_bv;
+ return rc;
}
+ *dn = dn2;
}
- if( ( flags & FLAG_GETDN_FINAL ) == 0 ) {
- dn_normalize( dn );
+ /* Attach the "dn:" prefix if needed */
+ if ( is_dn == SET_DN ) {
+ c1 = ch_malloc( dn->bv_len + sizeof("dn:") );
+ strcpy( c1, "dn:" );
+ strcpy( c1 + 3, dn->bv_val );
+ free( dn->bv_val );
+ dn->bv_val = c1;
+ dn->bv_len += 3;
}
- *dnptr = dn;
return( LDAP_SUCCESS );
}
const char **user,
const char **errstr)
{
- char *authcDN, *authzDN;
+ struct berval authcDN, authzDN;
int rc;
Connection *conn = context;
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_authorize: conn %d Using authcDN=%s\n",
- conn ? conn->c_connid : -1, authcDN ));
+ conn ? conn->c_connid : -1, authcDN.bv_val ));
#else
Debug( LDAP_DEBUG_TRACE, "SASL Authorize [conn=%ld]: "
- "Using authcDN=%s\n", (long) (conn ? conn->c_connid : -1), authcDN,0 );
+ "Using authcDN=%s\n", (long) (conn ? conn->c_connid : -1), authcDN.bv_val,0 );
#endif
- *user = authcDN;
+ *user = authcDN.bv_val;
*errstr = NULL;
return SASL_OK;
}
rc = slap_sasl_getdn( conn, (char *)authzid, &authzDN, FLAG_GETDN_AUTHZID );
if( rc != LDAP_SUCCESS ) {
- ch_free( authcDN );
+ ch_free( authcDN.bv_val );
*errstr = ldap_err2string( rc );
return SASL_NOAUTHZ;
}
- rc = slap_sasl_authorized( authcDN, authzDN );
+ rc = slap_sasl_authorized( &authcDN, &authzDN );
if( rc ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_INFO,
#endif
*errstr = "not authorized";
- ch_free( authcDN );
- ch_free( authzDN );
+ ch_free( authcDN.bv_val );
+ ch_free( authzDN.bv_val );
return SASL_NOAUTHZ;
}
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_authorize: conn %d authorization allowed\n",
- (long)(conn ? conn->c_connid : -1 ) );
+ (long)(conn ? conn->c_connid : -1 ) ));
#else
Debug( LDAP_DEBUG_TRACE, "SASL Authorize [conn=%ld]: "
" authorization allowed\n",
#endif
- ch_free( authcDN );
- *user = authzDN;
+ ch_free( authcDN.bv_val );
+ *user = authzDN.bv_val;
*errstr = NULL;
return SASL_OK;
}
#ifdef HAVE_CYRUS_SASL
sasl_done();
#endif
+ free( global_host );
+ global_host = NULL;
+
return 0;
}
if( sc != SASL_OK ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
- "slap_sasl_mechs: sasl_listmech failed: %d\n", sc ));
+ "slap_sasl_mechs: sasl_listmech failed: %d\n", sc ));
#else
Debug( LDAP_DEBUG_ANY, "slap_sasl_listmech failed: %d\n",
sc, 0, 0 );
int slap_sasl_bind(
Connection *conn,
Operation *op,
- const char *dn,
- const char *ndn,
+ struct berval *dn,
+ struct berval *ndn,
struct berval *cred,
- char **edn,
- slap_ssf_t *ssfp )
+ struct berval *edn,
+ slap_ssf_t *ssfp )
{
int rc = 1;
#ifdef HAVE_CYRUS_SASL
sasl_conn_t *ctx = conn->c_sasl_context;
struct berval response;
- unsigned reslen;
+ unsigned reslen = 0;
const char *errstr;
int sc;
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
- "sasl_bind: conn %ld dn=\"%s\" mech=%s datalen=%d\n",
- conn->c_connid, dn,
- conn->c_sasl_bind_in_progress ? "<continuing>" : conn->c_sasl_bind_mech,
- cred ? cred->bv_len : 0 ));
+ "sasl_bind: conn %ld dn=\"%s\" mech=%s datalen=%ld\n",
+ conn->c_connid,
+ dn->bv_len ? dn->bv_val : "",
+ conn->c_sasl_bind_in_progress ? "<continuing>" : conn->c_sasl_bind_mech.bv_val,
+ cred ? cred->bv_len : 0 ));
#else
Debug(LDAP_DEBUG_ARGS,
- "==> sasl_bind: dn=\"%s\" mech=%s datalen=%d\n", dn,
- conn->c_sasl_bind_in_progress ? "<continuing>":conn->c_sasl_bind_mech,
- cred ? cred->bv_len : 0 );
+ "==> sasl_bind: dn=\"%s\" mech=%s datalen=%ld\n",
+ dn->bv_len ? dn->bv_val : "",
+ conn->c_sasl_bind_in_progress ? "<continuing>":conn->c_sasl_bind_mech.bv_val,
+ cred ? cred->bv_len : 0 );
#endif
if ( !conn->c_sasl_bind_in_progress ) {
sc = sasl_server_start( ctx,
- conn->c_sasl_bind_mech,
- cred->bv_val, cred->bv_len,
+ conn->c_sasl_bind_mech.bv_val,
+ cred->bv_len ? cred->bv_val : "",
+ cred->bv_len,
(char **)&response.bv_val, &reslen, &errstr );
} else {
if ( sc != SASL_OK ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
- "slap_sasl_bind: getprop(USERNAME) failed: %d\n", sc ));
+ "slap_sasl_bind: getprop(USERNAME) failed: %d\n", sc ));
#else
Debug(LDAP_DEBUG_TRACE,
"slap_sasl_bind: getprop(USERNAME) failed!\n",
rc = slap_sasl_getdn( conn, username, edn, FLAG_GETDN_FINAL );
if( rc == LDAP_SUCCESS ) {
- int i;
sasl_ssf_t *ssf = NULL;
(void) sasl_getprop( ctx, SASL_SSF, (void *)&ssf );
*ssfp = ssf ? *ssf : 0;
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
}
- /* Store the authorization DN as a subjectDN */
- if ( *edn ) {
- i = 2;
- do {
- i++;
- (*edn)[i-3] = (*edn)[i];
- } while( (*edn)[i] );
- }
-
send_ldap_sasl( conn, op, rc,
NULL, NULL, NULL, NULL,
response.bv_len ? &response : NULL );
NULL, errstr, NULL, NULL );
}
+ if( response.bv_len ) {
+ ch_free( response.bv_val );
+ }
+
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
- "slap_sasl_bind: rc=%d\n", rc ));
+ "slap_sasl_bind: rc=%d\n", rc ));
#else
Debug(LDAP_DEBUG_TRACE, "<== slap_sasl_bind: rc=%d\n", rc, 0, 0);
#endif