X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsasl.c;h=9e99441bfdc5ddd1c3d65563ea36ce28bae7933d;hb=f89308915aabff352eb390a1e58a71127b7ebd26;hp=95faa8f29afda7b045b68dd9e0f86b8e81fe8152;hpb=6b4ec38178d87e3d70f00f4396264be99d3a3e6d;p=openldap diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c index 95faa8f29a..9e99441bfd 100644 --- a/servers/slapd/sasl.c +++ b/servers/slapd/sasl.c @@ -1,20 +1,20 @@ /* $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 #include - -#include "slap.h" -#include "proto-slap.h" +#include +#include #include #include +#include "slap.h" + #ifdef HAVE_CYRUS_SASL #include #include @@ -25,8 +25,8 @@ #include #endif -static sasl_security_properties_t sasl_secprops; +static sasl_security_properties_t sasl_secprops; static int slap_sasl_log( @@ -61,11 +61,11 @@ 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 @@ -83,16 +83,16 @@ slap_sasl_log( int slap_sasl_getdn( Connection *conn, char *id, char **dnptr, int flags ) { - char *c, *c1, *dn=NULL; - int rc, len, len1; + char *c=NULL, *c1, *dn=NULL; + int rc, len; sasl_conn_t *ctx; #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 : "") : "NULL" )); + "slap_sasl_getdn: conn %d id=%s\n", + conn ? conn->c_connid : -1, + id ? (*id ? id : "") : "NULL" )); #else Debug( LDAP_DEBUG_ARGS, "slap_sasl_getdn: id=%s\n", id?(*id?id:""):"NULL",0,0 ); @@ -100,44 +100,66 @@ int slap_sasl_getdn( Connection *conn, char *id, char **dnptr, int flags ) /* 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 ); } 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 + && ( 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: form */ + char *tmpdn = ldap_dcedn2dn( id ); + len = strlen( tmpdn ); + + dn = ch_malloc( len+4 ); + dn[0] = 'd'; + dn[1] = 'n'; + dn[2] = ':'; + AC_MEMCPY( &dn[3], tmpdn, len+1 ); + len += 3; + + } else { + /* convert to u: form */ + dn = ch_malloc( len+3 ); + dn[0] = 'u'; + dn[1] = ':'; + AC_MEMCPY( &dn[2], id, len+1 ); + len += 2; + } + } else { + dn = ch_strdup( id ); } /* An authzID must be properly prefixed */ - if( flags & FLAG_GETDN_AUTHZID && strncasecmp( dn, "u:", 2 ) && - strncasecmp( dn, "dn:", 3 ) ) { + if( flags & FLAG_GETDN_AUTHZID + && strncasecmp( dn, "u:", sizeof("u:")-1 ) + && strncasecmp( dn, "dn:", sizeof("dn:")-1 ) ) + { ch_free( dn ); *dnptr = NULL; return( LDAP_INAPPROPRIATE_AUTH ); } /* Username strings */ - len1 = strlen( ",cn=auth" ); - if( !strncasecmp( dn, "u:", 2 ) ) { - 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( 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); @@ -147,11 +169,13 @@ int slap_sasl_getdn( Connection *conn, char *id, char **dnptr, int flags ) *dnptr = NULL; 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" ); + len += strlen( conn->c_sasl_bind_mech ) + (sizeof(",cn=")-1); } /* Build the new dn */ @@ -167,41 +191,44 @@ int slap_sasl_getdn( Connection *conn, char *id, char **dnptr, int flags ) 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, - "getdn: u:id converted to %s.\n", dn )); + "slap_sasl_getdn: u:id converted to %s.\n", dn )); #else Debug( LDAP_DEBUG_TRACE, "getdn: u:id converted to %s\n", dn,0,0 ); #endif - } /* 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; @@ -288,7 +315,7 @@ slap_sasl_authorize( #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", @@ -402,6 +429,9 @@ int slap_sasl_destroy( void ) #ifdef HAVE_CYRUS_SASL sasl_done(); #endif + free( global_host ); + global_host = NULL; + return 0; } @@ -538,7 +568,7 @@ char ** slap_sasl_mechs( Connection *conn ) 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 ); @@ -577,32 +607,34 @@ int slap_sasl_close( Connection *conn ) 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 ? "" : 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 ? "" : 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 ? "":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 ? "":conn->c_sasl_bind_mech, + cred ? cred->bv_len : 0 ); #endif @@ -615,7 +647,8 @@ int slap_sasl_bind( 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 { @@ -635,7 +668,7 @@ int slap_sasl_bind( 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", @@ -689,9 +722,13 @@ int slap_sasl_bind( 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