/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2000-2006 The OpenLDAP Foundation.
+ * Copyright 2000-2011 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include "rewrite-int.h"
#include "rewrite-map.h"
+typedef enum {
+ MAP_LDAP_UNKNOWN,
+ MAP_LDAP_EVERYTIME,
+ MAP_LDAP_NOW,
+ MAP_LDAP_LATER
+} bindwhen_t;
+
/*
* LDAP map data structure
*/
struct ldap_map_data {
char *lm_url;
LDAPURLDesc *lm_lud;
- int lm_attrsonly;
+ int lm_version;
char *lm_binddn;
- char *lm_bindpw;
+ struct berval lm_cred;
-#define MAP_LDAP_EVERYTIME 0x00
-#define MAP_LDAP_NOW 0x01
-#define MAP_LDAP_LATER 0x02
- int lm_when;
+ bindwhen_t lm_when;
LDAP *lm_ld;
+ int lm_wantdn;
+ char *lm_attrs[ 2 ];
+
#ifdef USE_REWRITE_LDAP_PVT_THREADS
ldap_pvt_thread_mutex_t lm_mutex;
#endif /* USE_REWRITE_LDAP_PVT_THREADS */
free( data->lm_binddn );
}
- if ( data->lm_bindpw != NULL ) {
- free( data->lm_bindpw );
+ if ( data->lm_cred.bv_val != NULL ) {
+ memset( data->lm_cred.bv_val, 0, data->lm_cred.bv_len );
+ free( data->lm_cred.bv_val );
+ data->lm_cred.bv_val = NULL;
+ data->lm_cred.bv_len = 0;
}
if ( data->lm_when != MAP_LDAP_EVERYTIME && data->lm_ld != NULL ) {
- ldap_unbind_s( data->lm_ld );
+ ldap_unbind_ext( data->lm_ld, NULL, NULL );
}
free( data );
}
-void *
+static void *
map_ldap_parse(
- struct rewrite_info *info,
const char *fname,
int lineno,
int argc,
)
{
struct ldap_map_data *data;
- char *p;
+ char *p, *uri;
- assert( info != NULL );
assert( fname != NULL );
assert( argv != NULL );
return NULL;
}
- data->lm_url = strdup( argv[ 0 ] );
+ uri = argv[ 0 ];
+ if ( strncasecmp( uri, "uri=", STRLENOF( "uri=" ) ) == 0 ) {
+ uri += STRLENOF( "uri=" );
+ }
+
+ data->lm_url = strdup( uri );
if ( data->lm_url == NULL ) {
map_ldap_free( data );
return NULL;
}
- if ( ldap_url_parse( argv[ 0 ], &data->lm_lud ) != REWRITE_SUCCESS ) {
+ if ( ldap_url_parse( uri, &data->lm_lud ) != REWRITE_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
"[%s:%d] illegal URI '%s'\n",
fname, lineno, argv[ 0 ] );
return NULL;
}
+ /* trim everything after [host][:port] */
p = strchr( data->lm_url, '/' );
assert( p[ 1 ] == '/' );
if ( ( p = strchr( p + 2, '/' ) ) != NULL ) {
p[ 0 ] = '\0';
}
- if ( strcasecmp( data->lm_lud->lud_attrs[ 0 ], "dn" ) == 0 ) {
- data->lm_attrsonly = 1;
+ if ( data->lm_lud->lud_attrs == NULL ) {
+ data->lm_attrs[ 0 ] = LDAP_NO_ATTRS;
+ data->lm_wantdn = 1;
+
+ } else {
+ if ( data->lm_lud->lud_attrs[ 1 ] != NULL ) {
+ Debug( LDAP_DEBUG_ANY,
+ "[%s:%d] only one attribute allowed in URI\n",
+ fname, lineno, 0 );
+ map_ldap_free( data );
+ return NULL;
+ }
+
+ if ( strcasecmp( data->lm_lud->lud_attrs[ 0 ], "dn" ) == 0
+ || strcasecmp( data->lm_lud->lud_attrs[ 0 ], "entryDN" ) == 0 )
+ {
+ ldap_memfree( data->lm_lud->lud_attrs[ 0 ] );
+ ldap_memfree( data->lm_lud->lud_attrs );
+ data->lm_lud->lud_attrs = NULL;
+ data->lm_attrs[ 0 ] = LDAP_NO_ATTRS;
+ data->lm_wantdn = 1;
+
+ } else {
+ data->lm_attrs[ 0 ] = data->lm_lud->lud_attrs[ 0 ];
+ }
}
-
+
+ data->lm_attrs[ 1 ] = NULL;
+
+ /* safe defaults */
+ data->lm_version = LDAP_VERSION3;
+
for ( argc--, argv++; argc > 0; argc--, argv++ ) {
- if ( strncasecmp( argv[ 0 ], "binddn=", 7 ) == 0 ) {
- char *p = argv[ 0 ] + 7;
+ if ( strncasecmp( argv[ 0 ], "binddn=", STRLENOF( "binddn=" ) ) == 0 ) {
+ char *p = argv[ 0 ] + STRLENOF( "binddn=" );
int l;
if ( p[ 0 ] == '\"' || p [ 0 ] == '\'' ) {
|| data->lm_binddn[ l ] == '\'' ) {
data->lm_binddn[ l ] = '\0';
}
- } else if ( strncasecmp( argv[ 0 ], "bindpw=", 7 ) == 0 ) {
- data->lm_bindpw = strdup( argv[ 0 ] + 7 );
- if ( data->lm_bindpw == NULL ) {
+
+ /* deprecated */
+ } else if ( strncasecmp( argv[ 0 ], "bindpw=", STRLENOF( "bindpw=" ) ) == 0 ) {
+ ber_str2bv( argv[ 0 ] + STRLENOF( "bindpw=" ), 0, 1, &data->lm_cred );
+ if ( data->lm_cred.bv_val == NULL ) {
+ map_ldap_free( data );
+ return NULL;
+ }
+
+ } else if ( strncasecmp( argv[ 0 ], "credentials=", STRLENOF( "credentials=" ) ) == 0 ) {
+ ber_str2bv( argv[ 0 ] + STRLENOF( "credentials=" ), 0, 1, &data->lm_cred );
+ if ( data->lm_cred.bv_val == NULL ) {
map_ldap_free( data );
return NULL;
}
- } else if ( strncasecmp( argv[ 0 ], "bindwhen=", 9 ) == 0 ) {
- char *p = argv[ 0 ] + 9;
+
+ } else if ( strncasecmp( argv[ 0 ], "bindwhen=", STRLENOF( "bindwhen=" ) ) == 0 ) {
+ char *p = argv[ 0 ] + STRLENOF( "bindwhen=" );
if ( strcasecmp( p, "now" ) == 0 ) {
int rc;
return NULL;
}
+ ldap_set_option( data->lm_ld,
+ LDAP_OPT_PROTOCOL_VERSION,
+ (void *)&data->lm_version );
+
#ifdef USE_REWRITE_LDAP_PVT_THREADS
ldap_pvt_thread_mutex_init( &data->lm_mutex );
#endif /* USE_REWRITE_LDAP_PVT_THREADS */
} else {
/* ignore ... */
}
+
+ } else if ( strncasecmp( argv[ 0 ], "version=", STRLENOF( "version=" ) ) == 0 ) {
+ if ( lutil_atoi( &data->lm_version, argv[ 0 ] + STRLENOF( "version=" ) ) ) {
+ map_ldap_free( data );
+ return NULL;
+ }
+
+ switch ( data->lm_version ) {
+ case LDAP_VERSION2:
+ case LDAP_VERSION3:
+ break;
+
+ default:
+ Debug( LDAP_DEBUG_ANY,
+ "[%s:%d] unknown version %s\n",
+ fname, lineno, p );
+ map_ldap_free( data );
+ return NULL;
+ }
+
+ } else {
+ Debug( LDAP_DEBUG_ANY,
+ "[%s:%d] unknown option %s (ignored)\n",
+ fname, lineno, argv[0] );
}
}
+ if ( data->lm_when == MAP_LDAP_UNKNOWN ) {
+ data->lm_when = MAP_LDAP_EVERYTIME;
+ }
+
return ( void * )data;
}
-int
+static int
map_ldap_apply(
- struct rewrite_builtin_map *map,
+ void *private,
const char *filter,
struct berval *val
{
LDAP *ld;
LDAPMessage *res = NULL, *entry;
- char **values;
int rc;
- struct ldap_map_data *data = ( struct ldap_map_data * )map->lb_private;
+ struct ldap_map_data *data = private;
LDAPURLDesc *lud = data->lm_lud;
- int first_try = 1;
+ int first_try = 1, set_version = 0;
- assert( map != NULL );
- assert( map->lb_type == REWRITE_BUILTIN_MAP_LDAP );
- assert( map->lb_private != NULL );
+ assert( private != NULL );
assert( filter != NULL );
assert( val != NULL );
if ( data->lm_when == MAP_LDAP_EVERYTIME ) {
rc = ldap_initialize( &ld, data->lm_url );
+ set_version = 1;
} else {
#ifdef USE_REWRITE_LDAP_PVT_THREADS
if ( data->lm_when == MAP_LDAP_LATER && data->lm_ld == NULL ) {
rc = ldap_initialize( &data->lm_ld, data->lm_url );
+ set_version = 1;
}
ld = data->lm_ld;
}
do_bind:;
+ if ( set_version ) {
+ ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION,
+ (void *)&data->lm_version );
+ set_version = 0;
+ }
+
if ( data->lm_binddn != NULL ) {
- rc = ldap_simple_bind_s( ld, data->lm_binddn, data->lm_bindpw );
+ rc = ldap_sasl_bind_s( ld, data->lm_binddn,
+ LDAP_SASL_SIMPLE, &data->lm_cred,
+ NULL, NULL, NULL );
if ( rc == LDAP_SERVER_DOWN && first_try ) {
first_try = 0;
if ( ldap_initialize( &ld, data->lm_url ) != LDAP_SUCCESS ) {
rc = REWRITE_ERR;
goto rc_return;
}
+ set_version = 1;
goto do_bind;
} else if ( rc != REWRITE_SUCCESS ) {
}
}
- rc = ldap_search_s( ld, lud->lud_dn, lud->lud_scope, ( char * )filter,
- lud->lud_attrs, data->lm_attrsonly, &res );
+ rc = ldap_search_ext_s( ld, lud->lud_dn, lud->lud_scope, ( char * )filter,
+ data->lm_attrs, 0, NULL, NULL, NULL, 1, &res );
if ( rc == LDAP_SERVER_DOWN && first_try ) {
first_try = 0;
if ( ldap_initialize( &ld, data->lm_url ) != LDAP_SUCCESS ) {
rc = REWRITE_ERR;
goto rc_return;
}
+ set_version = 1;
goto do_bind;
- } else if ( rc != REWRITE_SUCCESS ) {
+ } else if ( rc != LDAP_SUCCESS ) {
rc = REWRITE_ERR;
goto rc_return;
}
entry = ldap_first_entry( ld, res );
assert( entry != NULL );
- if ( data->lm_attrsonly == 1 ) {
+ if ( data->lm_wantdn == 1 ) {
/*
* dn is newly allocated, so there's no need to strdup it
*/
val->bv_val = ldap_get_dn( ld, entry );
+ val->bv_len = strlen( val->bv_val );
} else {
- values = ldap_get_values( ld, entry, lud->lud_attrs[ 0 ] );
- if ( values == NULL || values[ 0 ] == NULL ) {
- if ( values != NULL ) {
- ldap_value_free( values );
+ struct berval **values;
+
+ values = ldap_get_values_len( ld, entry, data->lm_attrs[ 0 ] );
+ if ( values != NULL ) {
+ if ( values[ 0 ] != NULL && values[ 0 ]->bv_val != NULL ) {
+#if 0
+ /* NOTE: in principle, multiple values
+ * should not be acceptable according
+ * to the current API; ignore by now */
+ if ( values[ 1 ] != NULL ) {
+ /* error */
+ }
+#endif
+ ber_dupbv( val, values[ 0 ] );
}
- ldap_msgfree( res );
- rc = REWRITE_ERR;
- goto rc_return;
+ ldap_value_free_len( values );
}
- val->bv_val = strdup( values[ 0 ] );
- ldap_value_free( values );
}
ldap_msgfree( res );
rc = REWRITE_ERR;
goto rc_return;
}
- val->bv_len = strlen( val->bv_val );
rc_return:;
if ( data->lm_when == MAP_LDAP_EVERYTIME ) {
if ( ld != NULL ) {
- ldap_unbind_s( ld );
+ ldap_unbind_ext( ld, NULL, NULL );
}
} else {
return rc;
}
-int
+static int
map_ldap_destroy(
- struct rewrite_builtin_map **pmap
+ void *private
)
{
- struct ldap_map_data *data;
+ struct ldap_map_data *data = private;
- assert( pmap != NULL );
- assert( *pmap != NULL );
+ assert( private != NULL );
- data = ( struct ldap_map_data * )(*pmap)->lb_private;
-
- if ( data->lm_when != MAP_LDAP_EVERYTIME && data->lm_ld != NULL ) {
- ldap_unbind_s( data->lm_ld );
- data->lm_ld = NULL;
- }
-
- if ( data->lm_lud ) {
- ldap_free_urldesc( data->lm_lud );
- data->lm_lud = NULL;
- }
-
- if ( data->lm_url ) {
- free( data->lm_url );
- data->lm_url = NULL;
- }
-
- if ( data->lm_binddn ) {
- free( data->lm_binddn );
- data->lm_binddn = NULL;
- }
-
- if (data->lm_bindpw ) {
- memset( data->lm_bindpw, 0, strlen( data->lm_bindpw ) );
- free( data->lm_bindpw );
- data->lm_bindpw = NULL;
- }
-
- free( data );
- (*pmap)->lb_private = NULL;
+ map_ldap_free( data );
return 0;
}
+const rewrite_mapper rewrite_ldap_mapper = {
+ "ldap",
+ map_ldap_parse,
+ map_ldap_apply,
+ map_ldap_destroy
+};
+
projects / openldap / blobdiff