X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Froot_dse.c;h=c3b30ac63b0a726a20ef6582da3923bd45a0a1ab;hb=21be582df7e13ae2c8d44e1f7f02478eb9ec0762;hp=78c70e6d12428b30f063c3960a8ae93ff744be38;hpb=18d18d25dc3b9487d80f8400b44f7eb59e20fcd1;p=openldap diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c index 78c70e6d12..c3b30ac63b 100644 --- a/servers/slapd/root_dse.c +++ b/servers/slapd/root_dse.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1999-2005 The OpenLDAP Foundation. + * Copyright 1999-2006 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,23 +28,153 @@ #include "slapi/slapi.h" #endif -static struct berval supportedFeatures[] = { - BER_BVC(LDAP_FEATURE_ALL_OP_ATTRS), /* All Op Attrs (+) */ +static struct berval builtin_supportedFeatures[] = { + BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT), /* Modify/increment */ + BER_BVC(LDAP_FEATURE_ALL_OP_ATTRS), /* All Op Attrs (+) */ BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS), /* OCs in Attrs List (@class) */ BER_BVC(LDAP_FEATURE_ABSOLUTE_FILTERS), /* (&) and (|) search filters */ - BER_BVC(LDAP_FEATURE_LANGUAGE_TAG_OPTIONS), /* Language Tag Options */ - BER_BVC(LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS),/* Language Range Options */ + BER_BVC(LDAP_FEATURE_LANGUAGE_TAG_OPTIONS), /* Language Tag Options */ + BER_BVC(LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS), /* Language Range Options */ #ifdef LDAP_FEATURE_SUBORDINATE_SCOPE BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE), /* "children" search scope */ #endif -#ifdef LDAP_FEATURE_MODIFY_INCREMENT - BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT), /* Modify/increment */ -#endif - {0,NULL} + BER_BVNULL }; +static struct berval *supportedFeatures; static Entry *usr_attr = NULL; +/* + * allow modules to register functions that muck with the root DSE entry + */ + +typedef struct entry_info_t { + SLAP_ENTRY_INFO_FN func; + void *arg; + struct entry_info_t *next; +} entry_info_t; + +static entry_info_t *extra_info; + +int +entry_info_register( SLAP_ENTRY_INFO_FN func, void *arg ) +{ + entry_info_t *ei = ch_calloc( 1, sizeof( entry_info_t ) ); + + ei->func = func; + ei->arg = arg; + + ei->next = extra_info; + extra_info = ei; + + return 0; +} + +int +entry_info_unregister( SLAP_ENTRY_INFO_FN func, void *arg ) +{ + entry_info_t **eip; + + for ( eip = &extra_info; *eip != NULL; eip = &(*eip)->next ) { + if ( (*eip)->func == func && (*eip)->arg == arg ) { + entry_info_t *ei = *eip; + + *eip = ei->next; + + ch_free( ei ); + + return 0; + } + } + + return -1; +} + +void +entry_info_destroy( void ) +{ + entry_info_t **eip; + + for ( eip = &extra_info; *eip != NULL; ) { + entry_info_t *ei = *eip; + + eip = &(*eip)->next; + + ch_free( ei ); + } +} + +/* + * Allow modules to register supported features + */ + +static int +supported_feature_init( void ) +{ + int i; + + if ( supportedFeatures != NULL ) { + return 0; + } + + for ( i = 0; !BER_BVISNULL( &builtin_supportedFeatures[ i ] ); i++ ) + ; + + supportedFeatures = ch_calloc( sizeof( struct berval ), i + 1 ); + if ( supportedFeatures == NULL ) { + return -1; + } + + for ( i = 0; !BER_BVISNULL( &builtin_supportedFeatures[ i ] ); i++ ) { + ber_dupbv( &supportedFeatures[ i ], &builtin_supportedFeatures[ i ] ); + } + BER_BVZERO( &supportedFeatures[ i ] ); + + return 0; +} + +int +supported_feature_destroy( void ) +{ + int i; + + if ( supportedFeatures == NULL ) { + return 0; + } + + for ( i = 0; !BER_BVISNULL( &supportedFeatures[ i ] ); i++ ) { + ch_free( supportedFeatures[ i ].bv_val ); + } + + ch_free( supportedFeatures ); + supportedFeatures = NULL; + + return 0; +} + +int +supported_feature_load( struct berval *f ) +{ + struct berval *tmp; + int i; + + supported_feature_init(); + + for ( i = 0; !BER_BVISNULL( &supportedFeatures[ i ] ); i++ ) + ; + + tmp = ch_realloc( supportedFeatures, sizeof( struct berval ) * ( i + 2 ) ); + if ( tmp == NULL ) { + return -1; + } + supportedFeatures = tmp; + + ber_dupbv( &supportedFeatures[ i ], f ); + BER_BVZERO( &supportedFeatures[ i + 1 ] ); + + return 0; +} + int root_dse_info( Connection *conn, @@ -52,8 +182,10 @@ root_dse_info( const char **text ) { Entry *e; - struct berval val, *bv; - struct berval nval; + struct berval val; +#ifdef LDAP_SLAPI + struct berval *bv; +#endif int i, j; char ** supportedSASLMechanisms; BackendDB *be; @@ -64,8 +196,10 @@ root_dse_info( = slap_schema.si_ad_objectClass; AttributeDescription *ad_namingContexts = slap_schema.si_ad_namingContexts; +#ifdef LDAP_SLAPI AttributeDescription *ad_supportedExtension = slap_schema.si_ad_supportedExtension; +#endif AttributeDescription *ad_supportedLDAPVersion = slap_schema.si_ad_supportedLDAPVersion; AttributeDescription *ad_supportedSASLMechanisms @@ -99,6 +233,7 @@ root_dse_info( e->e_private = NULL; + /* FIXME: is this really needed? */ BER_BVSTR( &val, "top" ); if( attr_merge_one( e, ad_objectClass, &val, NULL ) ) { return LDAP_OTHER; @@ -171,23 +306,26 @@ root_dse_info( #endif /* LDAP_SLAPI */ /* supportedFeatures */ + if ( supportedFeatures == NULL ) { + supported_feature_init(); + } + if( attr_merge( e, ad_supportedFeatures, supportedFeatures, NULL ) ) { return LDAP_OTHER; } /* supportedLDAPVersion */ - for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) { + /* don't publish version 2 as we don't really support it + * (even when configured to accept version 2 Bind requests) + * and the value would never be used by true LDAPv2 (or LDAPv3) + * clients. + */ + for ( i=LDAP_VERSION3; i<=LDAP_VERSION_MAX; i++ ) { char buf[BUFSIZ]; - if (!( global_allows & SLAP_ALLOW_BIND_V2 ) && - ( i < LDAP_VERSION3 ) ) - { - /* version 2 and lower are disallowed */ - continue; - } snprintf(buf, sizeof buf, "%d", i); val.bv_val = buf; val.bv_len = strlen( val.bv_val ); - if( attr_merge( e, ad_supportedLDAPVersion, &val, NULL ) ) { + if( attr_merge_one( e, ad_supportedLDAPVersion, &val, NULL ) ) { return LDAP_OTHER; } } @@ -199,7 +337,7 @@ root_dse_info( for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) { val.bv_val = supportedSASLMechanisms[i]; val.bv_len = strlen( val.bv_val ); - if( attr_merge( e, ad_supportedSASLMechanisms, &val, NULL ) ) { + if( attr_merge_one( e, ad_supportedSASLMechanisms, &val, NULL ) ) { return LDAP_OTHER; } } @@ -223,6 +361,14 @@ root_dse_info( } } + if ( extra_info ) { + entry_info_t *ei = extra_info; + + for ( ; ei; ei = ei->next ) { + ei->func( ei->arg, e ); + } + } + *entry = e; return LDAP_SUCCESS; } @@ -235,11 +381,11 @@ root_dse_info( */ int read_root_dse_file( const char *fname ) { - FILE *fp; + struct LDIFFP *fp; int rc = 0, lineno = 0, lmax = 0; char *buf = NULL; - if ( (fp = fopen( fname, "r" )) == NULL ) { + if ( (fp = ldif_open( fname, "r" )) == NULL ) { Debug( LDAP_DEBUG_ANY, "could not open rootdse attr file \"%s\" - absolute path?\n", fname, 0, 0 ); @@ -251,7 +397,7 @@ int read_root_dse_file( const char *fname ) if( usr_attr == NULL ) { Debug( LDAP_DEBUG_ANY, "read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 ); - fclose( fp ); + ldif_close( fp ); return LDAP_OTHER; } usr_attr->e_attrs = NULL; @@ -303,8 +449,83 @@ int read_root_dse_file( const char *fname ) ch_free( buf ); - fclose( fp ); + ldif_close( fp ); Debug(LDAP_DEBUG_CONFIG, "rootDSE file %s read.\n", fname, 0, 0); return rc; } + +int +slap_discover_feature( + const char *uri, + int version, + const char *attr, + const char *val ) +{ + LDAP *ld; + LDAPMessage *res = NULL, *entry; + int rc, i; + struct berval cred = BER_BVC( "" ), + bv_val, + **values = NULL; + char *attrs[ 2 ] = { NULL, NULL }; + + ber_str2bv( val, 0, 0, &bv_val ); + attrs[ 0 ] = (char *) attr; + + rc = ldap_initialize( &ld, uri ); + if ( rc != LDAP_SUCCESS ) { + return rc; + } + + rc = ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version ); + if ( rc != LDAP_SUCCESS ) { + goto done; + } + + rc = ldap_sasl_bind_s( ld, "", LDAP_SASL_SIMPLE, + &cred, NULL, NULL, NULL ); + if ( rc != LDAP_SUCCESS ) { + goto done; + } + + rc = ldap_search_ext_s( ld, "", LDAP_SCOPE_BASE, "(objectClass=*)", + attrs, 0, NULL, NULL, NULL, 0, &res ); + if ( rc != LDAP_SUCCESS ) { + goto done; + } + + entry = ldap_first_entry( ld, res ); + if ( entry == NULL ) { + goto done; + } + + values = ldap_get_values_len( ld, entry, attrs[ 0 ] ); + if ( values == NULL ) { + rc = LDAP_NO_SUCH_ATTRIBUTE; + goto done; + } + + for ( i = 0; values[ i ] != NULL; i++ ) { + if ( bvmatch( &bv_val, values[ i ] ) ) { + rc = LDAP_COMPARE_TRUE; + goto done; + } + } + + rc = LDAP_COMPARE_FALSE; + +done:; + if ( values != NULL ) { + ldap_value_free_len( values ); + } + + if ( res != NULL ) { + ldap_msgfree( res ); + } + + ldap_unbind_ext( ld, NULL, NULL ); + + return rc; +} +