X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=inline;f=servers%2Fslapd%2Fextended.c;h=7ec130854f7e1785dd464670629262599888d0ff;hb=d0f025bd468b6c4958b1c0bdde9cfe82d716aa8d;hp=ec49fe5c58c99a21c130593c8cd16557378b6cc0;hpb=81c3c311a8ba260da7edc6db89760d6fefb381a3;p=openldap

diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c
index ec49fe5c58..7ec130854f 100644
--- a/servers/slapd/extended.c
+++ b/servers/slapd/extended.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /* 
- * Copyright 1999-2002 The OpenLDAP Foundation.
+ * Copyright 1999-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -28,10 +28,18 @@
 #include "portable.h"
 
 #include <stdio.h>
+
 #include <ac/socket.h>
 #include <ac/string.h>
 
 #include "slap.h"
+#include "lber_pvt.h"
+
+#ifdef LDAP_SLAPI
+#include "slapi.h"
+#endif
+
+#define UNSUPPORTED_EXTENDEDOP "unsupported extended operation"
 
 static struct extop_list {
 	struct extop_list *next;
@@ -41,25 +49,31 @@ static struct extop_list {
 
 static SLAP_EXTOP_MAIN_FN whoami_extop;
 
-/* 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
  * 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 {
-	struct berval oid;
+	const struct berval *oid;
 	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
-	{ BVC(LDAP_EXOP_START_TLS), starttls_extop },
+	{ &slap_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 }
+	{ NULL, NULL }
 };
 
 
@@ -85,68 +99,71 @@ get_supported_extop (int index)
 
 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;
-	const char *text;
-	BerVarray refs;
-	char *rspoid;
-	struct berval *rspdata;
-	LDAPControl **rspctrls;
+	struct extop_list *ext = NULL;
+
+#if defined(LDAP_SLAPI) 
+ 	Slapi_PBlock    *pb = op->o_pb;
+ 	SLAPI_FUNC      funcAddr = NULL;
+ 	int             extop_rc;
+ 	int             msg_sent = FALSE;
+#endif /* defined(LDAP_SLAPI) */
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-		"do_extended: conn %d\n", conn->c_connid ));
+	LDAP_LOG( OPERATION, ENTRY, "do_extended: conn %d\n", op->o_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", LDAP_LEVEL_ERR,
-			"do_extended: protocol version (%d) too low.\n",
-			op->o_protocol ));
+		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 = -1;
 		goto done;
 	}
 
-	if ( ber_scanf( op->o_ber, "{m" /*}*/, &reqoid ) == LBER_ERROR ) {
+	if ( ber_scanf( op->o_ber, "{m" /*}*/, &op->ore_reqoid ) == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-			"do_extended: conn %d  ber_scanf failed\n", conn->c_connid ));
+		LDAP_LOG( OPERATION, ERR, "do_extended: conn %d  ber_scanf failed\n", 
+			op->o_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 = -1;
 		goto done;
 	}
 
-	if( !(ext = find_extop(supp_ext_list, &reqoid)) ) {
+#ifdef LDAP_SLAPI
+	getPluginFunc( &op->ore_reqoid, &funcAddr ); /* NS-SLAPI extended operation */
+	if( !funcAddr && !(ext = find_extop(supp_ext_list, &op->ore_reqoid )))
+#else
+	if( !(ext = find_extop(supp_ext_list, &op->ore_reqoid )))
+#endif
+	{
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+		LDAP_LOG( OPERATION, ERR, 
 			"do_extended: conn %d  unsupported operation \"%s\"\n",
-			conn->c_connid, reqoid.bv_val ));
+			op->o_connid, op->ore_reqoid.bv_val, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY, "do_extended: unsupported operation \"%s\"\n",
-			reqoid.bv_val, 0 ,0 );
+			op->ore_reqoid.bv_val, 0 ,0 );
 #endif
-		send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
-			NULL, "unsupported extended operation", NULL, NULL );
+		send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR,
+			"unsupported extended operation" );
 		goto done;
 	}
 
@@ -155,97 +172,158 @@ do_extended(
 	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", LDAP_LEVEL_ERR,
-				"do_extended: conn %d  ber_scanf failed\n", conn->c_connid ));
+			LDAP_LOG( OPERATION, ERR, 
+				"do_extended: conn %d  ber_scanf failed\n", 
+				op->o_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 = -1;
 			goto done;
 		}
 	}
 
-	if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
+	if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-			"do_extended: conn %d  get_ctrls failed\n", conn->c_connid ));
+		LDAP_LOG( OPERATION, ERR, 
+			"do_extended: conn %d  get_ctrls failed\n", op->o_connid, 0, 0 );
 #else
 		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 );
+		send_ldap_error( op, rs,
+			LDAP_UNAVAILABLE_CRITICAL_EXTENSION,
+			"manageDSAit control inappropriate" );
 		goto done;
 	}
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-		"do_extended: conn %d  oid=%d\n.", conn->c_connid, reqoid.bv_val ));
+	LDAP_LOG( OPERATION, DETAIL1, 
+		"do_extended: conn %d  oid=%s\n.", op->o_connid, op->ore_reqoid.bv_val, 0 );
 #else
-	Debug( LDAP_DEBUG_ARGS, "do_extended: oid=%s\n", reqoid.bv_val, 0 ,0 );
+	Debug( LDAP_DEBUG_ARGS, "do_extended: oid=%s\n", op->ore_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) */
+
+		if (reqdata.bv_val) op->ore_reqdata = &reqdata;
+		rs->sr_err = (ext->ext_main)( op, rs );
+
+		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 );
+			}
 
-	rc = (ext->ext_main)( conn, op,
-		reqoid.bv_val, &reqdata,
-		&rspoid, &rspdata, &rspctrls, &text, &refs );
+			send_ldap_extended( op, rs );
 
-	if( rc != SLAPD_ABANDON ) {
-		if ( rc == LDAP_REFERRAL && refs == NULL ) {
-			refs = referral_rewrite( default_referral,
-				NULL, NULL, LDAP_SCOPE_DEFAULT );
+			ber_bvarray_free( rs->sr_ref );
 		}
 
-		send_ldap_extended( conn, op, rc, NULL, text, refs,
-			rspoid, rspdata, rspctrls );
+		if ( rs->sr_rspoid != NULL ) {
+			free( (char *)rs->sr_rspoid );
+		}
 
-		ber_bvarray_free( refs );
-	}
+		if ( rs->sr_rspdata != NULL ) {
+			ber_bvfree( rs->sr_rspdata );
+		}
 
-	if ( rspoid != NULL ) {
-		free( rspoid );
-	}
+#if defined( LDAP_SLAPI )
+		goto done;  /* end of OpenLDAP extended operation */
 
-	if ( rspdata != NULL ) {
-		ber_bvfree( rspdata );
-	}
+	} else { /* start of Netscape extended operation */
+		rs->sr_err = slapi_pblock_set( pb, SLAPI_EXT_OP_REQ_OID,
+				(void *)op->ore_reqoid.bv_val);
+		if ( rs->sr_err != LDAP_SUCCESS ) {
+			rs->sr_err = LDAP_OTHER;
+			goto done;
+		}
+
+		rs->sr_err = slapi_pblock_set( pb, SLAPI_EXT_OP_REQ_VALUE,
+				(void *)&reqdata);
+		if ( rs->sr_err != LDAP_SUCCESS ) {
+			rs->sr_err = LDAP_OTHER;
+			goto done;
+		}
+
+		rs->sr_err = slapi_x_pblock_set_operation( pb, op );
+		if ( rs->sr_err != LDAP_SUCCESS ) {
+			rs->sr_err = LDAP_OTHER;
+			goto done;
+		}
+
+		extop_rc = (*funcAddr)( pb );
+		if ( extop_rc == SLAPI_PLUGIN_EXTENDED_SENT_RESULT ) {
+			msg_sent = TRUE;
+
+		} else if ( extop_rc == SLAPI_PLUGIN_EXTENDED_NOT_HANDLED ) {
+			rs->sr_err = LDAP_PROTOCOL_ERROR;
+			rs->sr_text = UNSUPPORTED_EXTENDEDOP;
+
+		} else {
+			rs->sr_err = slapi_pblock_get( pb, SLAPI_EXT_OP_RET_OID,
+					&rs->sr_rspoid);
+			if ( rs->sr_err != LDAP_SUCCESS ) {
+				goto done2;
+			}
+
+			rs->sr_err = slapi_pblock_get( pb, SLAPI_EXT_OP_RET_VALUE,
+					&rs->sr_rspdata);
+			if ( rs->sr_err != LDAP_SUCCESS ) {
+				goto done2;
+			}
+
+			rs->sr_err = extop_rc;
+			send_ldap_extended( op, rs );
+			msg_sent = TRUE;
+		}
+
+done2:;
+		if ( rs->sr_err != LDAP_SUCCESS && msg_sent == FALSE ) {
+			send_ldap_result( op, rs );
+		}
+
+		if ( rs->sr_rspoid != NULL ) {
+			ch_free( (char *)rs->sr_rspoid );
+		}
+
+		if ( rs->sr_rspdata != NULL ) {
+			ber_bvfree( rs->sr_rspdata );
+		}
+
+	} /* end of Netscape extended operation */
+#endif /* defined( LDAP_SLAPI ) */
 
 done:
-	return rc;
+	return rs->sr_err;
 }
 
 int
 load_extop(
-	const char *ext_oid,
+	struct berval *ext_oid,
 	SLAP_EXTOP_MAIN_FN *ext_main )
 {
 	struct extop_list *ext;
 
-	if( ext_oid == NULL || *ext_oid == '\0' ) return -1; 
+	if( ext_oid == NULL || ext_oid->bv_val == NULL ||
+		ext_oid->bv_val[0] == '\0' || ext_oid->bv_len == 0 ) return -1; 
 	if(!ext_main) return -1; 
 
-	ext = ch_calloc(1, sizeof(struct extop_list));
+	ext = ch_calloc(1, sizeof(struct extop_list) + ext_oid->bv_len + 1);
 	if (ext == NULL)
 		return(-1);
 
-	ber_str2bv( ext_oid, 0, 1, &ext->oid );
-	if (ext->oid.bv_val == NULL) {
-		free(ext);
-		return(-1);
-	}
+	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;
+	ext->oid.bv_val[ext->oid.bv_len] = '\0';
 
 	ext->ext_main = ext_main;
 	ext->next = supp_ext_list;
@@ -260,8 +338,8 @@ 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);
+	for (i = 0; builtin_extops[i].oid != NULL; i++) {
+		load_extop((struct berval *)builtin_extops[i].oid, builtin_extops[i].ext_main);
 	}
 	return(0);
 }
@@ -274,8 +352,6 @@ extops_kill (void)
 	/* 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);
@@ -287,33 +363,32 @@ find_extop( struct extop_list *list, struct berval *oid )
 	struct extop_list *ext;
 
 	for (ext = list; ext; ext = ext->next) {
-		if (ber_bvcmp(&ext->oid, oid) == 0)
+		if (bvmatch(&ext->oid, oid))
 			return(ext);
 	}
 	return(NULL);
 }
 
 
-int
+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 )
+	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;
 	}
 
+	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;
@@ -328,6 +403,6 @@ whoami_extop (
 		bv->bv_val = NULL;
 	}
 
-	*rspdata = bv;
+	rs->sr_rspdata = bv;
 	return LDAP_SUCCESS;
 }