/* $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;
static int
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
- "SASL [conn=%d] %s: %s\n",
+ "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
int slap_sasl_getdn( Connection *conn, char *id, char **dnptr, int flags )
{
- char *c, *c1, *dn=NULL;
+ char *c=NULL, *c1, *dn=NULL;
int rc, len;
sasl_conn_t *ctx;
/* Blatantly anonymous ID */
- len = strlen( "anonymous" );
- if( id && !strncasecmp( id, "anonymous", len) &&
- ( id[len] == '\0' || id[len] == '@' ) ) {
+ if( id &&
+ ( id[sizeof( "anonymous" )-1] == '\0'
+ || id[sizeof( "anonymous" )-1] == '@' ) &&
+ !strncasecmp( id, "anonymous", sizeof( "anonymous" )-1) ) {
*dnptr = NULL;
return( LDAP_SUCCESS );
}
/* An authcID needs to be converted to authzID form */
if( flags & FLAG_GETDN_AUTHCID ) {
if( sasl_external_x509dn_convert && conn->c_sasl_bind_mech
- && ( strcasecmp( LDAP_SASL_EXTERNAL, conn->c_sasl_bind_mech ) == 0 )
- && len && dn[0] == '/' && dn[len-1]== '/' )
+ && ( strcasecmp( "EXTERNAL", conn->c_sasl_bind_mech ) == 0 )
+ && len && id[0] == '/' /* && id[len-1]== '/' */)
{
/* check SASL external for X.509 style DN and */
/* convert to dn:<dn> form */
char *tmpdn = ldap_dcedn2dn( id );
len = strlen( tmpdn );
- dn = ch_malloc( dn, len+4 );
+ dn = ch_malloc( len+4 );
dn[0] = 'd';
dn[1] = 'n';
dn[2] = ':';
- memmove( &dn[3], tmpdn, len+1 );
+ AC_MEMCPY( &dn[3], tmpdn, len+1 );
len += 3;
} else {
/* convert to u:<username> form */
- dn = ch_malloc( dn, len+3 );
+ dn = ch_malloc( len+3 );
dn[0] = 'u';
dn[1] = ':';
- memmove( &dn[2], id, len+1 );
+ AC_MEMCPY( &dn[2], id, len+1 );
len += 2;
}
} else {
/* An authzID must be properly prefixed */
if( flags & FLAG_GETDN_AUTHZID
- && strncasecmp( dn, "u:", 2 )
- && strncasecmp( dn, "dn:", 3 ) )
+ && strncasecmp( dn, "u:", sizeof("u:")-1 )
+ && strncasecmp( dn, "dn:", sizeof("dn:")-1 ) )
{
ch_free( dn );
*dnptr = NULL;
}
/* Username strings */
- if( !strncasecmp( dn, "u:", 2 ) ) {
- int len1 = strlen( ",cn=auth" );
- len += strlen( "dn:uid=" ) + len1;
+ if( !strncasecmp( dn, "u:", sizeof("u:")-1 ) ) {
+ len += (sizeof("dn: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( c && *c ) {
- len += strlen( c ) + strlen(",cn=" );
+ len += strlen( c ) + (sizeof(",cn=")-1);
}
if( conn->c_sasl_bind_mech ) {
- len += strlen( conn->c_sasl_bind_mech ) + strlen( ",cn=" );
+ len += strlen( conn->c_sasl_bind_mech ) + (sizeof(",cn=")-1);
}
/* Build the new dn */
len += sprintf( dn+len, ",cn=%s", conn->c_sasl_bind_mech );
}
strcpy( dn+len, ",cn=auth" );
- len += len1;
+ len += (sizeof(",cn=auth")-1);
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
}
/* DN strings that are a cn=auth identity to run through regexp */
- if( !strncasecmp( dn, "dn:", 3) && ( ( flags & FLAG_GETDN_FINAL ) == 0 ) ) {
- c1 = slap_sasl2dn( dn + 3 );
+ if( !strncasecmp( dn, "dn:", sizeof("dn:")-1) &&
+ ( ( flags & FLAG_GETDN_FINAL ) == 0 ) )
+ {
+ c1 = slap_sasl2dn( dn + (sizeof("dn:")-1) );
if( c1 ) {
ch_free( dn );
dn = c1;
/* Reaffix the dn: prefix if it was removed */
- if( strncasecmp( dn, "dn:", 3) ) {
+ if( strncasecmp( dn, "dn:", sizeof("dn:")-1) ) {
c1 = dn;
- dn = ch_malloc( strlen( c1 ) + 4 );
+ dn = ch_malloc( strlen( c1 ) + sizeof("dn:") );
sprintf( dn, "dn:%s", c1 );
ch_free( c1 );
}
#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 ));
#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, 0, 0 );
#endif
}
}
if( ( flags & FLAG_GETDN_FINAL ) == 0 ) {
- dn_normalize( dn );
+ dn_normalize( dn+(sizeof("dn:")-1) );
}
*dnptr = dn;
#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",
#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 )
+ char **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,
+ 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,
+ 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,
+ 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",
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
projects / openldap / blobdiff