/* $OpenLDAP$ */
/*
- * Copyright 1999-2000 The OpenLDAP Foundation.
+ * Copyright 1999-2002 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted only
/*
* 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
* }
*
*/
#include <stdio.h>
#include <ac/socket.h>
+#include <ac/string.h>
#include "slap.h"
+#include "lber_pvt.h"
-#define MAX_OID_LENGTH 128
+static struct extop_list {
+ struct extop_list *next;
+ struct berval oid;
+ SLAP_EXTOP_MAIN_FN *ext_main;
+} *supp_ext_list = NULL;
-typedef struct extop_list_t {
- struct extop_list_t *next;
- char *oid;
- SLAP_EXTOP_MAIN_FN ext_main;
-} extop_list_t;
+static SLAP_EXTOP_MAIN_FN whoami_extop;
-extop_list_t *supp_ext_list = NULL;
+/* BerVal Constant initializer */
+
+#define BVC(x) {sizeof(x)-1, x}
/* this list of built-in extops is for extops that are not part
- * of backends or in external modules. essentially, this is
+ * 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.
*/
-struct {
- char *oid;
- SLAP_EXTOP_MAIN_FN ext_main;
+static struct {
+ struct berval oid;
+ SLAP_EXTOP_MAIN_FN *ext_main;
} builtin_extops[] = {
#ifdef HAVE_TLS
- { LDAP_EXOP_START_TLS, starttls_extop },
+ { BVC(LDAP_EXOP_START_TLS), starttls_extop },
#endif
- { LDAP_EXOP_X_MODIFY_PASSWD, passwd_extop },
- { NULL, NULL }
- };
-
+ { BVC(LDAP_EXOP_MODIFY_PASSWD), passwd_extop },
+ { BVC(LDAP_EXOP_X_WHO_AM_I), whoami_extop },
+ { {0,NULL}, NULL }
+};
-static extop_list_t *find_extop( extop_list_t *list, char *oid );
-static int extop_callback(
- Connection *conn, Operation *op,
- int msg, int arg, void *argp);
+static struct extop_list *find_extop(
+ struct extop_list *list, struct berval *oid );
-char *
+struct berval *
get_supported_extop (int index)
{
- extop_list_t *ext;
+ 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) ;
- if (ext == NULL)
- return(NULL);
- return(ext->oid);
+ for (ext = supp_ext_list; ext != NULL && --index >= 0; ext = ext->next) {
+ ; /* empty */
+ }
+
+ if (ext == NULL) return NULL;
+
+ return &ext->oid ;
}
int
)
{
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;
- extop_list_t *ext;
+ struct extop_list *ext;
const char *text;
- struct berval **refs;
+ 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 = 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;
}
- if( !(ext = find_extop(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
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, "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;
}
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
rspoid = NULL;
rspdata = NULL;
text = NULL;
refs = NULL;
- rc = (ext->ext_main)( extop_callback, conn, op,
- reqoid, reqdata,
+ rc = (ext->ext_main)( conn, op,
+ reqoid.bv_val, reqdata.bv_val ? &reqdata : NULL,
&rspoid, &rspdata, &rspctrls, &text, &refs );
if( rc != SLAPD_ABANDON ) {
- if (rc == LDAP_REFERRAL) {
- refs = default_referral;
+ if ( rc == LDAP_REFERRAL && refs == NULL ) {
+ refs = referral_rewrite( default_referral,
+ NULL, NULL, LDAP_SCOPE_DEFAULT );
}
send_ldap_extended( conn, op, rc, NULL, text, refs,
rspoid, rspdata, rspctrls );
+
+ ber_bvarray_free( refs );
}
if ( rspoid != NULL ) {
free( rspoid );
}
- if ( rspdata != NULL )
+ if ( rspdata != NULL ) {
ber_bvfree( rspdata );
-
-done:
- if ( reqdata != NULL ) {
- ber_bvfree( reqdata );
- }
- if ( reqoid != NULL ) {
- free( reqoid );
}
+done:
return rc;
}
int
load_extop(
const char *ext_oid,
- SLAP_EXTOP_MAIN_FN ext_main )
+ SLAP_EXTOP_MAIN_FN *ext_main )
{
- extop_list_t *ext;
+ struct extop_list *ext;
if( ext_oid == NULL || *ext_oid == '\0' ) return -1;
if(!ext_main) return -1;
- ext = ch_calloc(1, sizeof(extop_list_t));
+ ext = ch_calloc(1, sizeof(struct extop_list));
if (ext == NULL)
return(-1);
- ext->oid = ch_strdup( ext_oid );
- if (ext->oid == NULL) {
+ ber_str2bv( ext_oid, 0, 1, &ext->oid );
+ if (ext->oid.bv_val == NULL) {
free(ext);
return(-1);
}
{
int i;
- for (i = 0; builtin_extops[i].oid != NULL; i++) {
- load_extop(builtin_extops[i].oid, builtin_extops[i].ext_main);
+ 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);
}
int
extops_kill (void)
{
- extop_list_t *ext;
+ 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 != NULL)
- ch_free(ext->oid);
+ if (ext->oid.bv_val != NULL)
+ ch_free(ext->oid.bv_val);
ch_free(ext);
}
return(0);
}
-static extop_list_t *
-find_extop( extop_list_t *list, char *oid )
+static struct extop_list *
+find_extop( struct extop_list *list, struct berval *oid )
{
- extop_list_t *ext;
+ struct extop_list *ext;
for (ext = list; ext; ext = ext->next) {
- if (strcmp(ext->oid, oid) == 0)
+ if (ber_bvcmp(&ext->oid, oid) == 0)
return(ext);
}
return(NULL);
}
-int
-extop_callback(
- Connection *conn, Operation *op,
- 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 (argp == NULL)
- return(-1);
+ struct berval *bv;
- switch (msg) {
- case SLAPD_EXTOP_GETVERSION:
- *(int *)argp = 1;
- return(0);
+ if ( reqdata != NULL ) {
+ /* no request data should be provided */
+ *text = "no request data expected";
+ return LDAP_PROTOCOL_ERROR;
+ }
- case SLAPD_EXTOP_GETPROTO:
- *(int *)argp = op->o_protocol;
- return(0);
-
- case SLAPD_EXTOP_GETAUTH:
- *(int *)argp = op->o_authtype;
- return(0);
-
- case SLAPD_EXTOP_GETDN:
- *(char **)argp = op->o_dn;
- return(0);
-
- case SLAPD_EXTOP_GETCLIENT:
- if (conn->c_peer_domain != NULL && *conn->c_peer_domain != 0) {
- *(char **)argp = conn->c_peer_domain;
- return(0);
- }
- if (conn->c_peer_name != NULL && *conn->c_peer_name != 0) {
- *(char **)argp = conn->c_peer_name;
- return(0);
- }
- break;
-
- default:
- break;
+ {
+ int rc;
+ struct berval whoami = BER_BVC( LDAP_EXOP_X_WHO_AM_I );
+
+ rc = backend_check_restrictions( conn->c_authz_backend,
+ conn, op, &whoami, text );
+
+ if( rc != LDAP_SUCCESS ) return rc;
+ }
+
+ 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;
}
- return(-1);
+
+ *rspdata = bv;
+ return LDAP_SUCCESS;
}
projects / openldap / blobdiff