X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fextended.c;h=0da22bdfbbfdc46db73a3fb9282832524ba66a81;hb=69343add5ac17c2300e256c85acf3279298a0fbe;hp=52eb15a7a7ac6cf3dd78faf2b7603b4e7dd1fca5;hpb=951b275ed6e967b80f72da71c5fb4c8c825851e6;p=openldap diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c index 52eb15a7a7..0da22bdfbb 100644 --- a/servers/slapd/extended.c +++ b/servers/slapd/extended.c @@ -1,6 +1,6 @@ /* $OpenLDAP$ */ /* - * Copyright 1999 The OpenLDAP Foundation. + * Copyright 1999-2002 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms are permitted only @@ -12,15 +12,15 @@ /* * LDAPv3 Extended Operation Request * ExtendedRequest ::= [APPLICATION 23] SEQUENCE { - * requestName [0] LDAPOID, - * requestValue [1] OCTET STRING OPTIONAL + * requestName [0] LDAPOID, + * requestValue [1] OCTET STRING OPTIONAL * } * * LDAPv3 Extended Operation Response * ExtendedResponse ::= [APPLICATION 24] SEQUENCE { * COMPONENTS OF LDAPResult, - * responseName [10] LDAPOID OPTIONAL, - * response [11] OCTET STRING OPTIONAL + * responseName [10] LDAPOID OPTIONAL, + * response [11] OCTET STRING OPTIONAL * } * */ @@ -29,39 +29,60 @@ #include #include +#include #include "slap.h" +#include "lber_pvt.h" -#ifdef SLAPD_EXTERNAL_EXTENSIONS +static struct extop_list { + struct extop_list *next; + struct berval oid; + SLAP_EXTOP_MAIN_FN *ext_main; +} *supp_ext_list = NULL; -typedef struct extensions_cookie_t { - Connection *conn; - Operation *op; -} extensions_cookie_t; +static SLAP_EXTOP_MAIN_FN whoami_extop; -#define MAX_OID_LENGTH 128 +/* BerVal Constant initializer */ -typedef struct extensions_list_t { - struct extensions_list_t *next; - char *oid; - int (*ext_main)(int (*)(), void *, char *reqoid, struct berval *reqdata, char **rspoid, struct berval *rspdata, char **text); -} extensions_list_t; +#define BVC(x) {sizeof(x)-1, x} -extensions_list_t *supp_ext_list = NULL; +/* this list of built-in extops is for extops that are not part + * of backends or in external modules. essentially, this is + * just a way to get built-in extops onto the extop list without + * having a separate init routine for each built-in extop. + */ +static struct { + struct berval oid; + SLAP_EXTOP_MAIN_FN *ext_main; +} builtin_extops[] = { +#ifdef HAVE_TLS + { BVC(LDAP_EXOP_START_TLS), starttls_extop }, +#endif + { BVC(LDAP_EXOP_MODIFY_PASSWD), passwd_extop }, + { BVC(LDAP_EXOP_X_WHO_AM_I), whoami_extop }, + { {0,NULL}, NULL } +}; -#define MAX_SUPP_EXT_TRACKED 64 -int supp_ext_count = 0; -char *supportedExtensions[MAX_SUPP_EXT_TRACKED] = { NULL }; -extensions_list_t *find_extension (extensions_list_t *list, char *oid); -int extensions_callback (extensions_cookie_t *cookie, int msg, int arg, void *argp); -#else +static struct extop_list *find_extop( + struct extop_list *list, struct berval *oid ); -char *supportedExtensions[] = { - NULL -}; -#endif +struct berval * +get_supported_extop (int index) +{ + struct extop_list *ext; + + /* linear scan is slow, but this way doesn't force a + * big change on root_dse.c, where this routine is used. + */ + for (ext = supp_ext_list; ext != NULL && --index >= 0; ext = ext->next) { + ; /* empty */ + } + + if (ext == NULL) return NULL; + return &ext->oid ; +} int do_extended( @@ -70,57 +91,76 @@ do_extended( ) { int rc = LDAP_SUCCESS; - char* reqoid ; - struct berval reqdata; + struct berval reqoid = {0, NULL}; + struct berval reqdata = {0, NULL}; ber_tag_t tag; ber_len_t len; -#ifdef SLAPD_EXTERNAL_EXTENSIONS - extensions_list_t *ext; - char *rspoid, *text; - struct berval rspdata; - extensions_cookie_t cookie; -#endif - + struct extop_list *ext; + const char *text; + BerVarray refs; + char *rspoid; + struct berval *rspdata; + LDAPControl **rspctrls; + +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ENTRY, "do_extended: conn %d\n", conn->c_connid, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "do_extended\n", 0, 0, 0 ); - - reqoid = NULL; - reqdata.bv_val = NULL; +#endif if( op->o_protocol < LDAP_VERSION3 ) { - Debug( LDAP_DEBUG_ANY, "do_extended: protocol version (%d) too low\n", +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, + "do_extended: protocol version (%d) too low.\n", op->o_protocol, 0, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "do_extended: protocol version (%d) too low\n", op->o_protocol, 0 ,0 ); +#endif send_ldap_disconnect( conn, op, LDAP_PROTOCOL_ERROR, "requires LDAPv3" ); rc = -1; goto done; } - if ( ber_scanf( op->o_ber, "{a" /*}*/, &reqoid ) == LBER_ERROR ) { + if ( ber_scanf( op->o_ber, "{m" /*}*/, &reqoid ) == LBER_ERROR ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, "do_extended: conn %d ber_scanf failed\n", + conn->c_connid, 0, 0 ); +#else Debug( LDAP_DEBUG_ANY, "do_extended: ber_scanf failed\n", 0, 0 ,0 ); +#endif send_ldap_disconnect( conn, op, LDAP_PROTOCOL_ERROR, "decoding error" ); rc = -1; goto done; } -#ifdef SLAPD_EXTERNAL_EXTENSIONS - if( !(ext = find_extension(supp_ext_list, reqoid)) ) + if( !(ext = find_extop(supp_ext_list, &reqoid)) ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, + "do_extended: conn %d unsupported operation \"%s\"\n", + conn->c_connid, reqoid.bv_val, 0 ); #else - if( !charray_inlist( supportedExtensions, reqoid ) ) -#endif - { Debug( LDAP_DEBUG_ANY, "do_extended: unsupported operation \"%s\"\n", - reqoid, 0 ,0 ); + reqoid.bv_val, 0 ,0 ); +#endif send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR, - NULL, "unsuppored extended operation", NULL, NULL ); + NULL, "unsupported extended operation", NULL, NULL ); goto done; } tag = ber_peek_tag( op->o_ber, &len ); if( ber_peek_tag( op->o_ber, &len ) == LDAP_TAG_EXOP_REQ_VALUE ) { - if( ber_scanf( op->o_ber, "o", &reqdata ) == LBER_ERROR ) { + if( ber_scanf( op->o_ber, "m", &reqdata ) == LBER_ERROR ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, + "do_extended: conn %d ber_scanf failed\n", + conn->c_connid, 0, 0 ); +#else Debug( LDAP_DEBUG_ANY, "do_extended: ber_scanf failed\n", 0, 0 ,0 ); +#endif send_ldap_disconnect( conn, op, LDAP_PROTOCOL_ERROR, "decoding error" ); rc = -1; @@ -129,167 +169,176 @@ do_extended( } if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, + "do_extended: conn %d get_ctrls failed\n", conn->c_connid, 0, 0 ); +#else Debug( LDAP_DEBUG_ANY, "do_extended: get_ctrls failed\n", 0, 0 ,0 ); +#endif return rc; } - Debug( LDAP_DEBUG_ARGS, "do_extended: oid \"%s\"\n", reqoid, 0 ,0 ); + /* check for controls inappropriate for all extended operations */ + if( get_manageDSAit( op ) == SLAP_CRITICAL_CONTROL ) { + send_ldap_result( conn, op, + rc = LDAP_UNAVAILABLE_CRITICAL_EXTENSION, + NULL, "manageDSAit control inappropriate", + NULL, NULL ); + goto done; + } + +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, DETAIL1, + "do_extended: conn %d oid=%d\n.", conn->c_connid, reqoid.bv_val, 0 ); +#else + Debug( LDAP_DEBUG_ARGS, "do_extended: oid=%s\n", reqoid.bv_val, 0 ,0 ); +#endif -#ifdef SLAPD_EXTERNAL_EXTENSIONS - cookie.conn = conn; - cookie.op = op; rspoid = NULL; - rspdata.bv_len = 0; - rspdata.bv_val = NULL; + rspdata = NULL; + rspctrls = NULL; text = NULL; - rc = (ext->ext_main)(extensions_callback, &cookie, reqoid, &reqdata, &rspoid, &rspdata, &text); + refs = NULL; - send_ldap_extended(conn, op, rc, NULL, text, rspoid, rspdata.bv_val ? &rspdata : NULL); + rc = (ext->ext_main)( conn, op, + reqoid.bv_val, reqdata.bv_val ? &reqdata : NULL, + &rspoid, &rspdata, &rspctrls, &text, &refs ); - if (rspoid != NULL) - free(rspoid); - if ( rspdata.bv_val != NULL ) - free(rspdata.bv_val); - if ( text != NULL ) - free(text); + if( rc != SLAPD_ABANDON ) { + if ( rc == LDAP_REFERRAL && refs == NULL ) { + refs = referral_rewrite( default_referral, + NULL, NULL, LDAP_SCOPE_DEFAULT ); + } -#else - send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR, - NULL, "unsupported extended operation", NULL, NULL ); + send_ldap_extended( conn, op, rc, NULL, text, refs, + rspoid, rspdata, rspctrls ); -#endif + ber_bvarray_free( refs ); + } -done: - if ( reqoid != NULL ) { - free( reqoid ); + if ( rspoid != NULL ) { + free( rspoid ); } - if ( reqdata.bv_val != NULL ) { - free( reqdata.bv_val ); + + if ( rspdata != NULL ) { + ber_bvfree( rspdata ); } +done: return rc; } -#ifdef SLAPD_EXTERNAL_EXTENSIONS - int -load_extension ( - const void *module, - const char *file_name -) +load_extop( + const char *ext_oid, + SLAP_EXTOP_MAIN_FN *ext_main ) { - extensions_list_t *ext; - int (*ext_getoid)(int index, char *oid, int blen); - int rc; + struct extop_list *ext; - ext = ch_calloc(1, sizeof(extensions_list_t)); + if( ext_oid == NULL || *ext_oid == '\0' ) return -1; + if(!ext_main) return -1; + + ext = ch_calloc(1, sizeof(struct extop_list)); if (ext == NULL) return(-1); - ext->oid = ch_malloc(MAX_OID_LENGTH); - if (ext->oid == NULL) { + ber_str2bv( ext_oid, 0, 1, &ext->oid ); + if (ext->oid.bv_val == NULL) { free(ext); return(-1); } - ext->ext_main = module_resolve(module, "ext_main"); - if (ext->ext_main == NULL) { - free(ext->oid); - free(ext); - return(-1); - } + ext->ext_main = ext_main; + ext->next = supp_ext_list; - ext_getoid = module_resolve(module, "ext_getoid"); - if (ext_getoid == NULL) { - free(ext->oid); - free(ext); - return(-1); - } - rc = (ext_getoid)(0, ext->oid, MAX_OID_LENGTH); - if (rc != 0) { - free(ext->oid); - free(ext); - return(rc); - } - if (*ext->oid == 0) { - free(ext->oid); - free(ext); - return(-1); - } + supp_ext_list = ext; - /* supportedExtensions must be maintained for the root DSE. - * Unfortunately, this global var is declared extern char *[], - * which means it cannot grow dynamically. So, for now it is - * a char *[n], and only (n-1) oids are tracked. In the off - * chance that this is too few, the extensions will still be - * loaded, but not reported in root DSE info. To increase - * the maximum, change MAX_SUPP_EXT_TRACKED and recompile or - * fix root_dse.c to use something other than a static array. - */ - if (supp_ext_count < (MAX_SUPP_EXT_TRACKED - 1)) { - supportedExtensions[supp_ext_count++] = ch_strdup(ext->oid); - supportedExtensions[supp_ext_count] = NULL; + return(0); +} + +int +extops_init (void) +{ + int i; + + for (i = 0; builtin_extops[i].oid.bv_val != NULL; i++) { + load_extop(builtin_extops[i].oid.bv_val, builtin_extops[i].ext_main); } + return(0); +} - ext->next = supp_ext_list; - supp_ext_list = ext; +int +extops_kill (void) +{ + struct extop_list *ext; + + /* we allocated the memory, so we have to free it, too. */ + while ((ext = supp_ext_list) != NULL) { + supp_ext_list = ext->next; + if (ext->oid.bv_val != NULL) + ch_free(ext->oid.bv_val); + ch_free(ext); + } return(0); } -extensions_list_t * -find_extension (extensions_list_t *list, char *oid) +static struct extop_list * +find_extop( struct extop_list *list, struct berval *oid ) { - extensions_list_t *ext; + struct extop_list *ext; for (ext = list; ext; ext = ext->next) { - if (strcmp(ext->oid, oid) == 0) + if (bvmatch(&ext->oid, oid)) return(ext); } return(NULL); } -int -extensions_callback (extensions_cookie_t *cookie, int msg, int arg, void *argp) + +static int +whoami_extop ( + Connection *conn, + Operation *op, + const char * reqoid, + struct berval * reqdata, + char ** rspoid, + struct berval ** rspdata, + LDAPControl ***rspctrls, + const char ** text, + BerVarray * refs ) { - if (cookie == NULL) - return(-1); + struct berval *bv; - if (argp == NULL) - return(-1); + if ( reqdata != NULL ) { + /* no request data should be provided */ + *text = "no request data expected"; + return LDAP_PROTOCOL_ERROR; + } - switch (msg) { - case 0: /* SLAPD_EXT_GETVERSION */ - *(int *)argp = 1; - return(0); + { + int rc; + struct berval whoami = BER_BVC( LDAP_EXOP_X_WHO_AM_I ); - case 1: /* SLAPD_EXT_GETPROTO */ - *(int *)argp = cookie->op->o_protocol; - return(0); - - case 2: /* SLAPD_EXT_GETAUTH */ - *(int *)argp = cookie->op->o_authtype; - return(0); - - case 3: /* SLAPD_EXT_GETDN */ - *(char **)argp = cookie->op->o_dn; - return(0); - - case 4: /* SLAPD_EXT_GETCLIENT */ - if (cookie->conn->c_peer_domain != NULL && *cookie->conn->c_peer_domain != 0) { - *(char **)argp = cookie->conn->c_peer_domain; - return(0); - } - if (cookie->conn->c_peer_name != NULL && *cookie->conn->c_peer_name != 0) { - *(char **)argp = cookie->conn->c_peer_name; - return(0); - } - break; - - default: - break; + rc = backend_check_restrictions( conn->c_authz_backend, + conn, op, &whoami, text ); + + if( rc != LDAP_SUCCESS ) return rc; } - return(-1); -} -#endif + bv = (struct berval *) ch_malloc( sizeof(struct berval) ); + if( op->o_dn.bv_len ) { + bv->bv_len = op->o_dn.bv_len + sizeof("dn:")-1; + bv->bv_val = ch_malloc( bv->bv_len + 1 ); + AC_MEMCPY( bv->bv_val, "dn:", sizeof("dn:")-1 ); + AC_MEMCPY( &bv->bv_val[sizeof("dn:")-1], op->o_dn.bv_val, + op->o_dn.bv_len ); + bv->bv_val[bv->bv_len] = '\0'; + + } else { + bv->bv_len = 0; + bv->bv_val = NULL; + } + *rspdata = bv; + return LDAP_SUCCESS; +}