static sasl_security_properties_t sasl_secprops;
-
static int
slap_sasl_log(
void *context,
return SASL_BADPARAM;
}
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
+ "SASL [conn=%d] %s: %s\n",
+ conn ? conn->c_connid : -1,
+ label, message ));
+#else
Debug( level, "SASL [conn=%d] %s: %s\n",
conn ? conn->c_connid: -1,
label, message );
+#endif
+
return SASL_OK;
}
+
+/* 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
+ by the calling process.
+ -Mark Adamson, Carnegie Mellon
+*/
+
+int slap_sasl_getdn( Connection *conn, char *id, char **dnptr, int flags )
+{
+ char *c, *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 : "<empty>") : "NULL" ));
+#else
+ Debug( LDAP_DEBUG_ARGS, "slap_sasl_getdn: id=%s\n",
+ id?(*id?id:"<empty>"):"NULL",0,0 );
+#endif
+
+
+ /* Blatantly anonymous ID */
+ len = strlen( "anonymous" );
+ if( id && !strncasecmp( id, "anonymous", len) &&
+ ( id[len] == '\0' || id[len] == '@' ) ) {
+ *dnptr = NULL;
+ return( LDAP_SUCCESS );
+ }
+ ctx = conn->c_sasl_context;
+ len = strlen( id );
+
+ /* 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] == '/' and dn[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[0] = 'd';
+ dn[1] = 'n';
+ dn[2] = ':';
+ memmove( &dn[3], tmpdn, len+1 );
+ len += 3;
+
+ } else {
+ /* convert to u:<username> form */
+ dn = ch_malloc( dn, len+3 );
+ dn[0] = 'u';
+ dn[1] = ':';
+ memmove( &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 ) )
+ {
+ ch_free( dn );
+ *dnptr = NULL;
+ return( LDAP_INAPPROPRIATE_AUTH );
+ }
+
+ /* Username strings */
+ if( !strncasecmp( dn, "u:", 2 ) ) {
+ int len1 = strlen( ",cn=auth" );
+ len += strlen( "dn:uid=" ) + len1;
+
+ /* Figure out how much data we have for the dn */
+ rc = sasl_getprop( ctx, SASL_REALM, (void **)&c );
+ if( rc != SASL_OK && rc != SASL_NOTDONE ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
+ "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;
+ return( LDAP_OPERATIONS_ERROR );
+ }
+
+ if( c && *c ) {
+ len += strlen( c ) + strlen(",cn=" );
+ }
+
+ if( conn->c_sasl_bind_mech ) {
+ len += strlen( conn->c_sasl_bind_mech ) + strlen( ",cn=" );
+ }
+
+ /* Build the new dn */
+ c1 = dn;
+ dn = ch_malloc( len );
+ len = sprintf( dn, "dn:uid=%s", c1+2 );
+ ch_free( c1 );
+
+ if( c ) {
+ len += sprintf( dn+len, ",cn=%s", c );
+ }
+ if( conn->c_sasl_bind_mech ) {
+ len += sprintf( dn+len, ",cn=%s", conn->c_sasl_bind_mech );
+ }
+ strcpy( dn+len, ",cn=auth" );
+ len += len1;
+
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
+ "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( 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 );
+ }
+
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
+ "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 );
+#endif
+ }
+ }
+
+ if( ( flags & FLAG_GETDN_FINAL ) == 0 ) {
+ dn_normalize( dn );
+ }
+
+ *dnptr = dn;
+ return( LDAP_SUCCESS );
+}
+
+
+
static int
slap_sasl_authorize(
void *context,
const char **user,
const char **errstr)
{
+ char *authcDN, *authzDN;
+ int rc;
Connection *conn = context;
*user = NULL;
- if ( authcid == NULL || *authcid == '\0' ) {
- *errstr = "empty authentication identity";
-
- Debug( LDAP_DEBUG_TRACE, "SASL Authorize [conn=%ld]: "
- "empty authentication identity\n",
- (long) (conn ? conn->c_connid : -1),
- 0, 0 );
- return SASL_BADAUTH;
- }
-
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
+ "slap_sas_authorize: conn %d authcid=\"%s\" authzid=\"%s\"\n",
+ conn ? conn->c_connid : -1,
+ authcid ? authcid : "<empty>",
+ authzid ? authzid : "<empty>" ));
+#else
Debug( LDAP_DEBUG_ARGS, "SASL Authorize [conn=%ld]: "
"authcid=\"%s\" authzid=\"%s\"\n",
(long) (conn ? conn->c_connid : -1),
authcid ? authcid : "<empty>",
authzid ? authzid : "<empty>" );
+#endif
- if ( authzid == NULL || *authzid == '\0' ||
- strcmp( authcid, authzid ) == 0 )
- {
- char* cuser;
- size_t len = sizeof("u:") + strlen( authcid );
- cuser = ch_malloc( len );
- strcpy( cuser, "u:" );
- strcpy( &cuser[sizeof("u:")-1], authcid );
+ /* 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, &authcDN, FLAG_GETDN_AUTHCID );
+ if( rc != LDAP_SUCCESS ) {
+ *errstr = ldap_err2string( rc );
+ return SASL_NOAUTHZ;
+ }
+ if( ( authzid == NULL ) || !strcmp( authcid,authzid ) ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
+ "slap_sasl_authorize: conn %d Using authcDN=%s\n",
+ conn ? conn->c_connid : -1, authcDN ));
+#else
+ Debug( LDAP_DEBUG_TRACE, "SASL Authorize [conn=%ld]: "
+ "Using authcDN=%s\n", (long) (conn ? conn->c_connid : -1), authcDN,0 );
+#endif
- *user = cuser;
+ *user = authcDN;
+ *errstr = NULL;
+ return SASL_OK;
+ }
+ rc = slap_sasl_getdn( conn, (char *)authzid, &authzDN, FLAG_GETDN_AUTHZID );
+ if( rc != LDAP_SUCCESS ) {
+ ch_free( authcDN );
+ *errstr = ldap_err2string( rc );
+ return SASL_NOAUTHZ;
+ }
+ rc = slap_sasl_authorized( authcDN, authzDN );
+ if( rc ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "sasl", LDAP_LEVEL_INFO,
+ "slap_sasl_authorize: conn %ld authorization disallowed (%d)\n",
+ (long)(conn ? conn->c_connid : -1), rc ));
+#else
Debug( LDAP_DEBUG_TRACE, "SASL Authorize [conn=%ld]: "
- "\"%s\" as \"%s\"\n",
- (long) (conn ? conn->c_connid : -1),
- authcid, cuser );
+ " authorization disallowed (%d)\n",
+ (long) (conn ? conn->c_connid : -1), rc, 0 );
+#endif
- return SASL_OK;
+ *errstr = "not authorized";
+ ch_free( authcDN );
+ ch_free( authzDN );
+ 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 ) );
+#else
Debug( LDAP_DEBUG_TRACE, "SASL Authorize [conn=%ld]: "
- "\"%s\" as \"%s\" disallowed. No policy.\n",
- (long) (conn ? conn->c_connid : -1),
- authcid, authzid );
+ " authorization allowed\n",
+ (long) (conn ? conn->c_connid : -1), 0, 0 );
+#endif
+
- *errstr = "no proxy policy";
- return SASL_NOAUTHZ;
+ ch_free( authcDN );
+ *user = authzDN;
+ *errstr = NULL;
+ return SASL_OK;
}
{
#ifdef HAVE_CYRUS_SASL
int rc;
- sasl_conn_t *server = NULL;
static sasl_callback_t server_callbacks[] = {
{ SASL_CB_LOG, &slap_sasl_log, NULL },
{ SASL_CB_LIST_END, NULL, NULL }
rc = sasl_server_init( server_callbacks, "slapd" );
if( rc != SASL_OK ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "sasl", LDAP_LEVEL_INFO,
+ "slap_sasl_init: init failed.\n" ));
+#else
Debug( LDAP_DEBUG_ANY, "sasl_server_init failed\n",
0, 0, 0 );
+#endif
+
return -1;
}
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "sasl", LDAP_LEVEL_INFO,
+ "slap_sasl_init: initialized!\n"));
+#else
Debug( LDAP_DEBUG_TRACE, "slap_sasl_init: initialized!\n",
0, 0, 0 );
+#endif
+
/* default security properties */
memset( &sasl_secprops, '\0', sizeof(sasl_secprops) );
sasl_secprops.max_ssf = INT_MAX;
sasl_secprops.maxbufsize = 65536;
sasl_secprops.security_flags = SASL_SEC_NOPLAINTEXT|SASL_SEC_NOANONYMOUS;
-
- sasl_dispose( &server );
-
#endif
+
return 0;
}
session_callbacks, SASL_SECURITY_LAYER, &ctx );
if( sc != SASL_OK ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
+ "slap_sasl_open: sasl_server_new failed: %d\n", sc ));
+#else
Debug( LDAP_DEBUG_ANY, "sasl_server_new failed: %d\n",
sc, 0, 0 );
+#endif
+
return -1;
}
SASL_SEC_PROPS, &sasl_secprops );
if( sc != SASL_OK ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
+ "slap_sasl_open: sasl_setprop failed: %d \n", sc ));
+#else
Debug( LDAP_DEBUG_ANY, "sasl_setprop failed: %d\n",
sc, 0, 0 );
+#endif
+
slap_sasl_close( conn );
return -1;
}
int slap_sasl_external(
Connection *conn,
slap_ssf_t ssf,
- char *auth_id )
+ const char *auth_id )
{
#ifdef HAVE_CYRUS_SASL
int sc;
memset( &extprops, '\0', sizeof(extprops) );
extprops.ssf = ssf;
- extprops.auth_id = auth_id;
+ extprops.auth_id = (char *) auth_id;
sc = sasl_setprop( ctx, SASL_SSF_EXTERNAL,
(void *) &extprops );
&mechstr, NULL, NULL );
if( sc != SASL_OK ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
+ "slap_sasl_mechs: sasl_listmech failed: %d\n", sc ));
+#else
Debug( LDAP_DEBUG_ANY, "slap_sasl_listmech failed: %d\n",
sc, 0, 0 );
+#endif
+
return NULL;
}
}
int slap_sasl_bind(
- Connection *conn,
- Operation *op,
- const char *dn,
- const char *ndn,
- const char *mech,
- struct berval *cred,
+ Connection *conn,
+ Operation *op,
+ const char *dn,
+ const char *ndn,
+ struct berval *cred,
char **edn,
slap_ssf_t *ssfp )
{
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 ));
+#else
Debug(LDAP_DEBUG_ARGS,
- "==> sasl_bind: dn=\"%s\" mech=%s datalen=%d\n",
- dn, mech ? mech : "<continuing>", cred ? cred->bv_len : 0 );
+ "==> 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 );
+#endif
+
if( ctx == NULL ) {
send_ldap_result( conn, op, LDAP_UNAVAILABLE,
return rc;
}
- if ( mech != NULL ) {
+ if ( !conn->c_sasl_bind_in_progress ) {
sc = sasl_server_start( ctx,
- mech,
+ conn->c_sasl_bind_mech,
cred->bv_val, cred->bv_len,
(char **)&response.bv_val, &reslen, &errstr );
SASL_USERNAME, (void **)&username );
if ( sc != SASL_OK ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
+ "slap_sasl_bind: getprop(USERNAME) failed: %d\n", sc ));
+#else
Debug(LDAP_DEBUG_TRACE,
"slap_sasl_bind: getprop(USERNAME) failed!\n",
0, 0, 0);
+#endif
- send_ldap_result( conn, op, rc = slap_sasl_err2ldap( sc ),
- NULL, "no SASL username", NULL, NULL );
- } else if ( username == NULL || *username == '\0' ) {
- Debug(LDAP_DEBUG_TRACE,
- "slap_sasl_bind: getprop(USERNAME) returned NULL!\n",
- 0, 0, 0);
-
- send_ldap_result( conn, op, rc = LDAP_INSUFFICIENT_ACCESS,
+ send_ldap_result( conn, op, rc = slap_sasl_err2ldap( sc ),
NULL, "no SASL username", NULL, NULL );
} else {
- char *realm = NULL;
- sasl_ssf_t *ssf = NULL;
-
- (void) sasl_getprop( ctx,
- SASL_REALM, (void **)&realm );
-
- (void) sasl_getprop( ctx,
- SASL_SSF, (void *)&ssf );
+ rc = slap_sasl_getdn( conn, username, edn, FLAG_GETDN_FINAL );
- Debug(LDAP_DEBUG_TRACE,
- "slap_sasl_bind: username=\"%s\" realm=\"%s\" ssf=%lu\n",
- username ? username : "",
- realm ? realm : "",
- (unsigned long) ( ssf ? *ssf : 0 ) );
-
- *ssfp = ssf ? *ssf : 0;
-
- rc = LDAP_SUCCESS;
-
- if( username == NULL || (
- !strncasecmp( username, "anonymous", sizeof("anonymous")-1 ) &&
- ( username[sizeof("anonymous")-1] == '\0' ||
- username[sizeof("anonymous")-1] == '@' ) ) )
- {
- Debug(LDAP_DEBUG_TRACE, "<== slap_sasl_bind: anonymous\n",
- 0, 0, 0);
-
- } else if ( username[0] == 'u' && username[1] == ':'
- && username[2] != '\0'
- && strpbrk( &username[2], "+=,;\"\\ \t") == NULL )
- {
- *edn = ch_malloc( sizeof( "uid= + realm=" )
- + strlen( &username[2] )
- + ( realm ? strlen( realm ) : 0 ) );
-
- strcpy( *edn, "uid=" );
- strcat( *edn, &username[2] );
-
- if( realm && *realm ) {
- strcat( *edn, " + realm=" );
- strcat( *edn, realm );
+ if( rc == LDAP_SUCCESS ) {
+ int i;
+ sasl_ssf_t *ssf = NULL;
+ (void) sasl_getprop( ctx, SASL_SSF, (void *)&ssf );
+ *ssfp = ssf ? *ssf : 0;
+
+ if( *ssfp ) {
+ ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+ conn->c_sasl_layers++;
+ ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
}
- Debug(LDAP_DEBUG_TRACE, "<== slap_sasl_bind: authzdn: \"%s\"\n",
- *edn, 0, 0);
-
- } else {
- rc = LDAP_INAPPROPRIATE_AUTH;
- errstr = "authorization disallowed";
- Debug(LDAP_DEBUG_TRACE, "<== slap_sasl_bind: %s\n",
- errstr, 0, 0);
- }
+ /* Store the authorization DN as a subjectDN */
+ if ( *edn ) {
+ i = 2;
+ do {
+ i++;
+ (*edn)[i-3] = (*edn)[i];
+ } while( (*edn)[i] );
+ }
- if( rc == LDAP_SUCCESS ) {
send_ldap_sasl( conn, op, rc,
NULL, NULL, NULL, NULL,
response.bv_len ? &response : NULL );
NULL, errstr, NULL, NULL );
}
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
+ "slap_sasl_bind: rc=%d\n", rc ));
+#else
Debug(LDAP_DEBUG_TRACE, "<== slap_sasl_bind: rc=%d\n", rc, 0, 0);
+#endif
+
#else
send_ldap_result( conn, op, rc = LDAP_UNAVAILABLE,
projects / openldap / blobdiff