X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=inline;f=servers%2Fslapd%2Fextended.c;h=7df5817ab901f4fb25f3c415429cd1884a33b4e6;hb=fd6259bfd1cc58b1f14a764178f86d9c40df8260;hp=f15fadeec40a0260a91ee8354f81edffd5feecfc;hpb=498f8a74543c4fdf9743a6704c89a31ecd47741b;p=openldap
diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c
index f15fadeec4..7df5817ab9 100644
--- a/servers/slapd/extended.c
+++ b/servers/slapd/extended.c
@@ -1,12 +1,16 @@
/* $OpenLDAP$ */
-/*
- * Copyright 1999-2003 The OpenLDAP Foundation.
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1999-2006 The OpenLDAP Foundation.
* All rights reserved.
*
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License. A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
/*
@@ -35,45 +39,37 @@
#include "slap.h"
#include "lber_pvt.h"
-#ifdef LDAP_SLAPI
-#include "slapi.h"
-#endif
+#define UNSUPPORTED_EXOP "unsupported extended operation"
-#define UNSUPPORTED_EXTENDEDOP "unsupported extended operation"
static struct extop_list {
struct extop_list *next;
struct berval oid;
+ slap_mask_t flags;
SLAP_EXTOP_MAIN_FN *ext_main;
} *supp_ext_list = NULL;
static SLAP_EXTOP_MAIN_FN whoami_extop;
-/* this list of built-in extops is for extops that are not part
- * of backends or in external modules. essentially, this is
+/* 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.
*/
-#ifdef LDAP_EXOP_X_CANCEL
const struct berval slap_EXOP_CANCEL = BER_BVC(LDAP_EXOP_X_CANCEL);
-#endif
const struct berval slap_EXOP_WHOAMI = BER_BVC(LDAP_EXOP_X_WHO_AM_I);
const struct berval slap_EXOP_MODIFY_PASSWD = BER_BVC(LDAP_EXOP_MODIFY_PASSWD);
const struct berval slap_EXOP_START_TLS = BER_BVC(LDAP_EXOP_START_TLS);
static struct {
const struct berval *oid;
+ slap_mask_t flags;
SLAP_EXTOP_MAIN_FN *ext_main;
} builtin_extops[] = {
-#ifdef LDAP_EXOP_X_CANCEL
- { &slap_EXOP_CANCEL, cancel_extop },
-#endif
- { &slap_EXOP_WHOAMI, whoami_extop },
- { &slap_EXOP_MODIFY_PASSWD, passwd_extop },
-#ifdef HAVE_TLS
- { &slap_EXOP_START_TLS, starttls_extop },
-#endif
- { NULL, NULL }
+ { &slap_EXOP_CANCEL, SLAP_EXOP_HIDE, cancel_extop },
+ { &slap_EXOP_WHOAMI, 0, whoami_extop },
+ { &slap_EXOP_MODIFY_PASSWD, SLAP_EXOP_WRITES, passwd_extop },
+ { NULL, 0, NULL }
};
@@ -94,249 +90,168 @@ get_supported_extop (int index)
if (ext == NULL) return NULL;
- return &ext->oid ;
+ return &ext->oid;
+}
+
+
+int exop_root_dse_info( Entry *e )
+{
+ AttributeDescription *ad_supportedExtension
+ = slap_schema.si_ad_supportedExtension;
+ struct berval vals[2];
+ struct extop_list *ext;
+
+ vals[1].bv_val = NULL;
+ vals[1].bv_len = 0;
+
+ for (ext = supp_ext_list; ext != NULL; ext = ext->next) {
+ if( ext->flags & SLAP_EXOP_HIDE ) continue;
+
+ vals[0] = ext->oid;
+
+ if( attr_merge( e, ad_supportedExtension, vals, NULL ) ) {
+ return LDAP_OTHER;
+ }
+ }
+
+ return LDAP_SUCCESS;
}
int
do_extended(
- Connection *conn,
- Operation *op
+ Operation *op,
+ SlapReply *rs
)
{
- int rc = LDAP_SUCCESS;
- struct berval reqoid = {0, NULL};
struct berval reqdata = {0, NULL};
ber_tag_t tag;
ber_len_t len;
- struct extop_list *ext = NULL;
- const char *text;
- BerVarray refs;
- char *rspoid;
- struct berval *rspdata;
- LDAPControl **rspctrls;
-
-#if defined(LDAP_SLAPI)
- Slapi_PBlock *pb = op->o_pb;
- SLAPI_FUNC funcAddr = NULL;
- int extop_rc;
- int msg_sent = FALSE;
- char *result_msg = "";
-#endif /* defined(LDAP_SLAPI) */
-
-#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 );
-#endif
if( op->o_protocol < LDAP_VERSION3 ) {
-#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;
+ send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "requires LDAPv3" );
+ rs->sr_err = SLAPD_DISCONNECT;
goto done;
}
- 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
+ if ( ber_scanf( op->o_ber, "{m" /*}*/, &op->ore_reqoid ) == LBER_ERROR ) {
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;
+ send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
+ rs->sr_err = SLAPD_DISCONNECT;
goto done;
}
-#ifdef LDAP_SLAPI
- getPluginFunc( &reqoid, &funcAddr ); /* NS-SLAPI extended operation */
- if( !funcAddr && !(ext = find_extop(supp_ext_list, &reqoid )))
-#else
- if( !(ext = find_extop(supp_ext_list, &reqoid )))
-#endif
- {
-#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.bv_val, 0 ,0 );
-#endif
- send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
- NULL, "unsupported extended operation", NULL, NULL );
- goto done;
- }
-
- op->o_extendedop = reqoid.bv_val;
-
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, "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;
+ send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
+ rs->sr_err = SLAPD_DISCONNECT;
goto done;
}
}
- 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
+ if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY, "do_extended: get_ctrls failed\n", 0, 0 ,0 );
-#endif
- return rc;
+ return rs->sr_err;
}
/* 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 );
+ if( get_manageDSAit( op ) == SLAP_CONTROL_CRITICAL ) {
+ Statslog( LDAP_DEBUG_STATS, "%s EXT oid=%s\n",
+ op->o_log_prefix, op->ore_reqoid.bv_val, 0, 0, 0 );
+ send_ldap_error( op, rs,
+ LDAP_UNAVAILABLE_CRITICAL_EXTENSION,
+ "manageDSAit control inappropriate" );
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;
- rspctrls = NULL;
- text = NULL;
- refs = NULL;
-
-#if defined(LDAP_SLAPI)
- if (ext != NULL) { /* OpenLDAP extended operation */
-#endif /* defined(LDAP_SLAPI) */
-
- rc = (ext->ext_main)( conn, op,
- &reqoid, reqdata.bv_val ? &reqdata : NULL,
- &rspoid, &rspdata, &rspctrls, &text, &refs );
-
- if( rc != SLAPD_ABANDON ) {
- 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 );
- }
+ /* FIXME: temporary? */
+ if ( reqdata.bv_val ) {
+ op->ore_reqdata = &reqdata;
+ }
- if ( rspdata != NULL ) {
- ber_bvfree( rspdata );
- }
+ op->o_bd = frontendDB;
+ rs->sr_err = frontendDB->be_extended( op, rs );
-#if defined( LDAP_SLAPI )
- goto done; /* end of OpenLDAP extended operation */
+done:
+ return rs->sr_err;
+}
- } else { /* start of Netscape extended operation */
- rc = slapi_pblock_set( pb, SLAPI_EXT_OP_REQ_OID,
- (void *)reqoid.bv_val);
- if ( rc != LDAP_SUCCESS ) {
- rc = LDAP_OTHER;
- goto done;
- }
+int
+fe_extended( Operation *op, SlapReply *rs )
+{
+ struct extop_list *ext = NULL;
+ struct berval reqdata = BER_BVNULL;
- rc = slapi_pblock_set( pb, SLAPI_EXT_OP_REQ_VALUE,
- (void *)&reqdata);
- if ( rc != LDAP_SUCCESS ) {
- rc = LDAP_OTHER;
- goto done;
- }
+ if (op->ore_reqdata) {
+ reqdata = *op->ore_reqdata;
+ }
- rc = slapi_x_connection_set_pb( pb, conn );
- if ( rc != LDAP_SUCCESS ) {
- rc = LDAP_OTHER;
- goto done;
- }
+ ext = find_extop(supp_ext_list, &op->ore_reqoid );
+ if ( ext == NULL ) {
+ Statslog( LDAP_DEBUG_STATS, "%s EXT oid=%s\n",
+ op->o_log_prefix, op->ore_reqoid.bv_val, 0, 0, 0 );
+ Debug( LDAP_DEBUG_ANY, "do_extended: unsupported operation \"%s\"\n",
+ op->ore_reqoid.bv_val, 0 ,0 );
+ send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR,
+ "unsupported extended operation" );
+ goto done;
+ }
- rc = slapi_x_operation_set_pb( pb, op );
- if ( rc != LDAP_SUCCESS ) {
- rc = LDAP_OTHER;
- goto done;
- }
+ op->ore_flags = ext->flags;
- extop_rc = (*funcAddr)( pb );
- if ( extop_rc == SLAPI_PLUGIN_EXTENDED_SENT_RESULT ) {
- msg_sent = TRUE;
+ Debug( LDAP_DEBUG_ARGS, "do_extended: oid=%s\n",
+ op->ore_reqoid.bv_val, 0 ,0 );
- } else if ( extop_rc == SLAPI_PLUGIN_EXTENDED_NOT_HANDLED ) {
- rc = LDAP_PROTOCOL_ERROR;
- result_msg = UNSUPPORTED_EXTENDEDOP;
+ { /* start of OpenLDAP extended operation */
+ BackendDB *bd = op->o_bd;
- } else {
- rc = slapi_pblock_get( pb, SLAPI_EXT_OP_RET_OID,
- &rspoid);
- if ( rc != LDAP_SUCCESS ) {
- goto done2;
- }
+ rs->sr_err = (ext->ext_main)( op, rs );
- rc = slapi_pblock_get( pb, SLAPI_EXT_OP_RET_VALUE,
- &rspdata);
- if ( rc != LDAP_SUCCESS ) {
- goto done2;
+ if( rs->sr_err != SLAPD_ABANDON ) {
+ if ( rs->sr_err == LDAP_REFERRAL && rs->sr_ref == NULL ) {
+ rs->sr_ref = referral_rewrite( default_referral,
+ NULL, NULL, LDAP_SCOPE_DEFAULT );
+ if ( !rs->sr_ref ) rs->sr_ref = default_referral;
+ if ( !rs->sr_ref ) {
+ rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
+ rs->sr_text = "referral missing";
+ }
}
- send_ldap_extended( conn, op, extop_rc, NULL, text,
- refs, rspoid, rspdata, rspctrls );
- msg_sent = TRUE;
- }
+ if ( op->o_bd == NULL )
+ op->o_bd = bd;
+ send_ldap_extended( op, rs );
-done2:;
- if ( rc != LDAP_SUCCESS && msg_sent == FALSE ) {
- send_ldap_result( conn, op, rc, NULL, result_msg,
- NULL, NULL );
+ if ( rs->sr_ref != default_referral ) {
+ ber_bvarray_free( rs->sr_ref );
+ rs->sr_ref = NULL;
+ }
}
- if ( rspoid != NULL ) {
- free( rspoid );
+ if ( rs->sr_rspoid != NULL ) {
+ free( (char *)rs->sr_rspoid );
}
- if ( rspdata != NULL ) {
- ber_bvfree( rspdata );
+ if ( rs->sr_rspdata != NULL ) {
+ ber_bvfree( rs->sr_rspdata );
}
+ } /* end of OpenLDAP extended operation */
- } /* end of Netscape extended operation */
-#endif /* defined( LDAP_SLAPI ) */
-
-done:
- return rc;
+done:;
+ return rs->sr_err;
}
int
load_extop(
- struct berval *ext_oid,
+ const struct berval *ext_oid,
+ slap_mask_t ext_flags,
SLAP_EXTOP_MAIN_FN *ext_main )
{
struct extop_list *ext;
@@ -349,6 +264,8 @@ load_extop(
if (ext == NULL)
return(-1);
+ ext->flags = ext_flags;
+
ext->oid.bv_val = (char *)(ext + 1);
AC_MEMCPY( ext->oid.bv_val, ext_oid->bv_val, ext_oid->bv_len );
ext->oid.bv_len = ext_oid->bv_len;
@@ -368,7 +285,9 @@ extops_init (void)
int i;
for (i = 0; builtin_extops[i].oid != NULL; i++) {
- load_extop((struct berval *)builtin_extops[i].oid, builtin_extops[i].ext_main);
+ load_extop((struct berval *)builtin_extops[i].oid,
+ builtin_extops[i].flags,
+ builtin_extops[i].ext_main);
}
return(0);
}
@@ -401,37 +320,32 @@ find_extop( struct extop_list *list, struct berval *oid )
static int
whoami_extop (
- Connection *conn,
Operation *op,
- struct berval * reqoid,
- struct berval * reqdata,
- char ** rspoid,
- struct berval ** rspdata,
- LDAPControl ***rspctrls,
- const char ** text,
- BerVarray * refs )
+ SlapReply *rs )
{
struct berval *bv;
- if ( reqdata != NULL ) {
+ if ( op->ore_reqdata != NULL ) {
/* no request data should be provided */
- *text = "no request data expected";
+ rs->sr_text = "no request data expected";
return LDAP_PROTOCOL_ERROR;
}
- {
- int rc = backend_check_restrictions( conn->c_authz_backend,
- conn, op, (struct berval *)&slap_EXOP_WHOAMI, text );
+ Statslog( LDAP_DEBUG_STATS, "%s WHOAMI\n",
+ op->o_log_prefix, 0, 0, 0, 0 );
- if( rc != LDAP_SUCCESS ) return rc;
+ op->o_bd = op->o_conn->c_authz_backend;
+ if( backend_check_restrictions( op, rs,
+ (struct berval *)&slap_EXOP_WHOAMI ) != LDAP_SUCCESS ) {
+ return rs->sr_err;
}
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_len = op->o_dn.bv_len + STRLENOF( "dn:" );
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,
+ AC_MEMCPY( bv->bv_val, "dn:", STRLENOF( "dn:" ) );
+ AC_MEMCPY( &bv->bv_val[STRLENOF( "dn:" )], op->o_dn.bv_val,
op->o_dn.bv_len );
bv->bv_val[bv->bv_len] = '\0';
@@ -440,6 +354,6 @@ whoami_extop (
bv->bv_val = NULL;
}
- *rspdata = bv;
+ rs->sr_rspdata = bv;
return LDAP_SUCCESS;
}