]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/extended.c
Remove extraneous ber_peek_tag() call
[openldap] / servers / slapd / extended.c
index 9a011b818e4eb587586cb0a9b2424bd334d93ade..a105ddfaa775b036b59cb3822ce927336acaa15d 100644 (file)
@@ -1,12 +1,16 @@
 /* $OpenLDAP$ */
-/* 
- * Copyright 1999-2000 The OpenLDAP Foundation.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1999-2010 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
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 /*
 #include "portable.h"
 
 #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_mask_t flags;
+       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;
-
-/* 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.
  */
-struct {
-       char *oid;
-       SLAP_EXTOP_MAIN_FN ext_main;
+static struct {
+       const struct berval *oid;
+       slap_mask_t flags;
+       SLAP_EXTOP_MAIN_FN *ext_main;
 } builtin_extops[] = {
-#ifdef HAVE_TLS
-               { LDAP_EXOP_START_TLS, starttls_extop },
+#ifdef LDAP_X_TXN
+       { &slap_EXOP_TXN_START, 0, txn_start_extop },
+       { &slap_EXOP_TXN_END, 0, txn_end_extop },
 #endif
-               { LDAP_EXOP_X_MODIFY_PASSWD, passwd_extop },
-               { NULL, NULL }
-       };
+       { &slap_EXOP_CANCEL, 0, cancel_extop },
+       { &slap_EXOP_WHOAMI, 0, whoami_extop },
+       { &slap_EXOP_MODIFY_PASSWD, SLAP_EXOP_WRITES, passwd_extop },
+       { NULL, 0, NULL }
+};
 
 
-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 );
 
-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 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;
-       char* reqoid;
-       struct berval *reqdata;
-       ber_tag_t tag;
+       struct berval reqdata = {0, NULL};
        ber_len_t len;
-       extop_list_t *ext;
-       const char *text;
-       struct berval **refs;
-       char *rspoid;
-       struct berval *rspdata;
-       LDAPControl **rspctrls;
-
-#ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-                  "do_extended: conn %d\n", conn->c_connid ));
-#else
-       Debug( LDAP_DEBUG_TRACE, "do_extended\n", 0, 0, 0 );
-#endif
-       reqoid = NULL;
-       reqdata = NULL;
 
-       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 ));
-#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;
-       }
+       Debug( LDAP_DEBUG_TRACE, "%s do_extended\n",
+               op->o_log_prefix, 0, 0 );
 
-       if ( ber_scanf( op->o_ber, "{a" /*}*/, &reqoid ) == LBER_ERROR ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                          "do_extended: conn %d  ber_scanf failed\n", conn->c_connid ));
-#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( op->o_protocol < LDAP_VERSION3 ) {
+               Debug( LDAP_DEBUG_ANY, "%s do_extended: protocol version (%d) too low\n",
+                       op->o_log_prefix, op->o_protocol, 0 );
+               send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "requires LDAPv3" );
+               rs->sr_err = SLAPD_DISCONNECT;
                goto done;
        }
 
-       if( !(ext = find_extop(supp_ext_list, reqoid)) ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                          "do_extended: conn %d  unsupported operation \"%s\"\n",
-                          conn->c_connid, reqoid ));
-#else
-               Debug( LDAP_DEBUG_ANY, "do_extended: unsupported operation \"%s\"\n",
-                       reqoid, 0 ,0 );
-#endif
-               send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
-                       NULL, "unsupported extended operation", NULL, NULL );
+       if ( ber_scanf( op->o_ber, "{m" /*}*/, &op->ore_reqoid ) == LBER_ERROR ) {
+               Debug( LDAP_DEBUG_ANY, "%s do_extended: ber_scanf failed\n",
+                       op->o_log_prefix, 0, 0 );
+               send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
+               rs->sr_err = SLAPD_DISCONNECT;
                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 ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                                  "do_extended: conn %d  ber_scanf failed\n", conn->c_connid ));
-#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( ber_scanf( op->o_ber, "m", &reqdata ) == LBER_ERROR ) {
+                       Debug( LDAP_DEBUG_ANY, "%s do_extended: ber_scanf failed\n",
+                               op->o_log_prefix, 0, 0 );
+                       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", LDAP_LEVEL_ERR,
-                          "do_extended: conn %d  get_ctrls failed\n", conn->c_connid ));
-#else
-               Debug( LDAP_DEBUG_ANY, "do_extended: get_ctrls failed\n", 0, 0 ,0 );
-#endif
-               return rc;
+       if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) {
+               Debug( LDAP_DEBUG_ANY, "%s do_extended: get_ctrls failed\n",
+                       op->o_log_prefix, 0, 0 );
+               return rs->sr_err;
        } 
 
-#ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-                  "do_extended: conn %d  oid=%d\n.", conn->c_connid, reqoid ));
-#else
-       Debug( LDAP_DEBUG_ARGS, "do_extended: oid=%s\n", reqoid, 0 ,0 );
-#endif
-       rspoid = NULL;
-       rspdata = NULL;
-       rspctrls = NULL;
-       text = NULL;
-       refs = NULL;
-
-       rc = (ext->ext_main)( conn, op,
-               reqoid, reqdata,
-               &rspoid, &rspdata, &rspctrls, &text, &refs );
-
-       if( rc != SLAPD_ABANDON ) {
-               if (rc == LDAP_REFERRAL) {
-                       refs = default_referral;
-               }
+       Statslog( LDAP_DEBUG_STATS, "%s EXT oid=%s\n",
+           op->o_log_prefix, op->ore_reqoid.bv_val, 0, 0, 0 );
 
-               send_ldap_extended( conn, op, rc, NULL, text, refs,
-                       rspoid, rspdata, rspctrls );
+       /* check for controls inappropriate for all extended operations */
+       if( get_manageDSAit( op ) == SLAP_CONTROL_CRITICAL ) {
+               send_ldap_error( op, rs,
+                       LDAP_UNAVAILABLE_CRITICAL_EXTENSION,
+                       "manageDSAit control inappropriate" );
+               goto done;
        }
 
-       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 );
+
+       /* clean up in case some overlay set them? */
+       if ( !BER_BVISNULL( &op->o_req_ndn ) ) {
+               if ( !BER_BVISNULL( &op->o_req_dn )
+                       && op->o_req_ndn.bv_val != op->o_req_dn.bv_val )
+               {
+                       op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx );
+               }
+               op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx );
+               BER_BVZERO( &op->o_req_dn );
+               BER_BVZERO( &op->o_req_ndn );
+       }
 
 done:
-       if ( reqdata != NULL ) {
-               ber_bvfree( reqdata );
+       return rs->sr_err;
+}
+
+int
+fe_extended( Operation *op, SlapReply *rs )
+{
+       struct extop_list       *ext = NULL;
+       struct berval           reqdata = BER_BVNULL;
+
+       if (op->ore_reqdata) {
+               reqdata = *op->ore_reqdata;
        }
-       if ( reqoid != NULL ) {
-               free( reqoid );
+
+       ext = find_extop(supp_ext_list, &op->ore_reqoid );
+       if ( ext == NULL ) {
+               Debug( LDAP_DEBUG_ANY, "%s do_extended: unsupported operation \"%s\"\n",
+                       op->o_log_prefix, op->ore_reqoid.bv_val, 0 );
+               send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR,
+                       "unsupported extended operation" );
+               goto done;
        }
 
-       return rc;
+       op->ore_flags = ext->flags;
+
+       Debug( LDAP_DEBUG_ARGS, "do_extended: oid=%s\n",
+               op->ore_reqoid.bv_val, 0 ,0 );
+
+       { /* start of OpenLDAP extended operation */
+               BackendDB       *bd = op->o_bd;
+
+               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 );
+                               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";
+                               }
+                       }
+
+                       if ( op->o_bd == NULL )
+                               op->o_bd = bd;
+                       send_ldap_extended( op, rs );
+
+                       if ( rs->sr_ref != default_referral ) {
+                               ber_bvarray_free( rs->sr_ref );
+                               rs->sr_ref = NULL;
+                       }
+               }
+
+               if ( rs->sr_rspoid != NULL ) {
+                       free( (char *)rs->sr_rspoid );
+               }
+
+               if ( rs->sr_rspdata != NULL ) {
+                       ber_bvfree( rs->sr_rspdata );
+               }
+       } /* end of OpenLDAP extended operation */
+
+done:;
+       return rs->sr_err;
 }
 
 int
-load_extop(
-       const char *ext_oid,
-       SLAP_EXTOP_MAIN_FN ext_main )
+load_extop2(
+       const struct berval *ext_oid,
+       slap_mask_t ext_flags,
+       SLAP_EXTOP_MAIN_FN *ext_main,
+       unsigned flags )
 {
-       extop_list_t *ext;
+       struct berval           oidm = BER_BVNULL;
+       struct extop_list       *ext;
+       int                     insertme = 0;
+
+       if ( !ext_main ) {
+               return -1; 
+       }
+
+       if ( ext_oid == NULL || BER_BVISNULL( ext_oid ) ||
+               BER_BVISEMPTY( ext_oid ) )
+       {
+               return -1; 
+       }
+
+       if ( numericoidValidate( NULL, (struct berval *)ext_oid ) !=
+               LDAP_SUCCESS )
+       {
+               oidm.bv_val = oidm_find( ext_oid->bv_val );
+               if ( oidm.bv_val == NULL ) {
+                       return -1;
+               }
+               oidm.bv_len = strlen( oidm.bv_val );
+               ext_oid = &oidm;
+       }
 
-       if( ext_oid == NULL || *ext_oid == '\0' ) return -1; 
-       if(!ext_main) return -1; 
+       for ( ext = supp_ext_list; ext; ext = ext->next ) {
+               if ( bvmatch( ext_oid, &ext->oid ) ) {
+                       if ( flags == 1 ) {
+                               break;
+                       }
+                       return -1;
+               }
+       }
+
+       if ( flags == 0 || ext == NULL ) {
+               ext = ch_calloc( 1, sizeof(struct extop_list) + ext_oid->bv_len + 1 );
+               if ( ext == NULL ) {
+                       return(-1);
+               }
 
-       ext = ch_calloc(1, sizeof(extop_list_t));
-       if (ext == NULL)
-               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->oid = ch_strdup( ext_oid );
-       if (ext->oid == NULL) {
-               free(ext);
-               return(-1);
+               insertme = 1;
        }
 
+       ext->flags = ext_flags;
        ext->ext_main = ext_main;
-       ext->next = supp_ext_list;
 
-       supp_ext_list = ext;
+       if ( insertme ) {
+               ext->next = supp_ext_list;
+               supp_ext_list = ext;
+       }
 
        return(0);
 }
 
+int
+unload_extop(
+       const struct berval *ext_oid,
+       SLAP_EXTOP_MAIN_FN *ext_main,
+       unsigned flags )
+{
+       struct berval           oidm = BER_BVNULL;
+       struct extop_list       *ext, **extp;
+
+       /* oid must be given */
+       if ( ext_oid == NULL || BER_BVISNULL( ext_oid ) ||
+               BER_BVISEMPTY( ext_oid ) )
+       {
+               return -1; 
+       }
+
+       /* if it's not an oid, check if it's a macto */
+       if ( numericoidValidate( NULL, (struct berval *)ext_oid ) !=
+               LDAP_SUCCESS )
+       {
+               oidm.bv_val = oidm_find( ext_oid->bv_val );
+               if ( oidm.bv_val == NULL ) {
+                       return -1;
+               }
+               oidm.bv_len = strlen( oidm.bv_val );
+               ext_oid = &oidm;
+       }
+
+       /* lookup the oid */
+       for ( extp = &supp_ext_list; *extp; extp = &(*extp)->next ) {
+               if ( bvmatch( ext_oid, &(*extp)->oid ) ) {
+                       /* if ext_main is given, only remove if it matches */
+                       if ( ext_main != NULL && (*extp)->ext_main != ext_main ) {
+                               return -1;
+                       }
+                       break;
+               }
+       }
+
+       if ( *extp == NULL ) {
+               return -1;
+       }
+
+       ext = *extp;
+       *extp = (*extp)->next;
+
+       ch_free( ext );
+
+       return 0;
+}
+
 int
 extops_init (void)
 {
        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 != NULL; i++ ) {
+               load_extop( (struct berval *)builtin_extops[i].oid,
+                       builtin_extops[i].flags,
+                       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);
                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 (bvmatch(&ext->oid, oid))
                        return(ext);
        }
        return(NULL);
 }
+
+
+const struct berval slap_EXOP_WHOAMI = BER_BVC(LDAP_EXOP_WHO_AM_I);
+
+static int
+whoami_extop (
+       Operation *op,
+       SlapReply *rs )
+{
+       struct berval *bv;
+
+       if ( op->ore_reqdata != NULL ) {
+               /* no request data should be provided */
+               rs->sr_text = "no request data expected";
+               return LDAP_PROTOCOL_ERROR;
+       }
+
+       Statslog( LDAP_DEBUG_STATS, "%s WHOAMI\n",
+           op->o_log_prefix, 0, 0, 0, 0 );
+
+       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 + STRLENOF( "dn:" );
+               bv->bv_val = ch_malloc( bv->bv_len + 1 );
+               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';
+
+       } else {
+               bv->bv_len = 0;
+               bv->bv_val = NULL;
+       }
+
+       rs->sr_rspdata = bv;
+       return LDAP_SUCCESS;
+}