X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fcontrols.c;h=0ac52e7884e52267789579e47d9c434e5ac55549;hb=f8fb4aca7668c722f41941be719203aa8c298e12;hp=b60af869aedefd72ff395a23eab36354503483c1;hpb=aad3c488da42b127cf9736570609e4ca06de5595;p=openldap diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c index b60af869ae..0ac52e7884 100644 --- a/servers/slapd/controls.c +++ b/servers/slapd/controls.c @@ -1,5 +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 @@ -18,11 +19,64 @@ #include "../../libraries/liblber/lber-int.h" -char *supportedControls[] = { - LDAP_CONTROL_MANAGEDSAIT, - NULL +#define SLAP_CTRL_ABANDON 0x0001 +#define SLAP_CTRL_ADD 0x2002 +#define SLAP_CTRL_BIND 0x0004 +#define SLAP_CTRL_COMPARE 0x1008 +#define SLAP_CTRL_DELETE 0x2010 +#define SLAP_CTRL_MODIFY 0x2020 +#define SLAP_CTRL_RENAME 0x2040 +#define SLAP_CTRL_SEARCH 0x1080 +#define SLAP_CTRL_UNBIND 0x0100 + +#define SLAP_CTRL_INTROGATE (SLAP_CTRL_COMPARE|SLAP_CTRL_SEARCH) +#define SLAP_CTRL_UPDATE \ + (SLAP_CTRL_ADD|SLAP_CTRL_DELETE|SLAP_CTRL_MODIFY|SLAP_CTRL_RENAME) +#define SLAP_CTRL_ACCESS (SLAP_CTRL_INTROGATE|SLAP_CTRL_UPDATE) + +typedef int (SLAP_CTRL_PARSE_FN) LDAP_P(( + Connection *conn, + Operation *op, + LDAPControl *ctrl, + const char **text )); + +static SLAP_CTRL_PARSE_FN parseManageDSAit; +static SLAP_CTRL_PARSE_FN parseSubentries; + +static struct slap_control { + char *sc_oid; + int sc_ops_mask; + char **sc_extendedops; + SLAP_CTRL_PARSE_FN *sc_parse; + +} supportedControls[] = { + { LDAP_CONTROL_MANAGEDSAIT, + SLAP_CTRL_ACCESS, NULL, + parseManageDSAit }, + { LDAP_CONTROL_SUBENTRIES, + SLAP_CTRL_SEARCH, NULL, + parseSubentries }, + { NULL } }; +char * +get_supported_ctrl(int index) +{ + return supportedControls[index].sc_oid; +} + +static struct slap_control * +find_ctrl( const char *oid ) +{ + int i; + for( i=0; supportedControls[i].sc_oid; i++ ) { + if( strcmp( oid, supportedControls[i].sc_oid ) == 0 ) { + return &supportedControls[i]; + } + } + return NULL; +} + int get_ctrls( Connection *conn, Operation *op, @@ -34,8 +88,9 @@ int get_ctrls( char *opaque; BerElement *ber = op->o_ber; LDAPControl ***ctrls = &op->o_ctrls; + struct slap_control *c; int rc = LDAP_SUCCESS; - char *errmsg = NULL; + const char *errmsg = NULL; len = ber_pvt_ber_remaining(ber); @@ -47,17 +102,21 @@ int get_ctrls( if(( tag = ber_peek_tag( ber, &len )) != LDAP_TAG_CONTROLS ) { if( tag == LBER_ERROR ) { - rc = -1; + rc = SLAPD_DISCONNECT; errmsg = "unexpected data in PDU"; } goto return_results; } +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, + "get_ctrls: conn %d\n", conn->c_connid )); +#else Debug( LDAP_DEBUG_TRACE, "=> get_ctrls\n", 0, 0, 0 ); - +#endif if( op->o_protocol < LDAP_VERSION3 ) { - rc = -1; + rc = SLAPD_DISCONNECT; errmsg = "controls require LDAPv3"; goto return_results; } @@ -73,7 +132,7 @@ int get_ctrls( } #endif - ctrls[nctrls] = NULL; + *ctrls[nctrls] = NULL; for( tag = ber_first_element( ber, &len, &opaque ); tag != LBER_ERROR; @@ -115,11 +174,17 @@ int get_ctrls( tag = ber_scanf( ber, "{a" /*}*/, &tctrl->ldctl_oid ); if( tag == LBER_ERROR ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_INFO, + "get_ctrls: conn %d get OID failed.\n", + conn->c_connid )); +#else Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: get oid failed.\n", 0, 0, 0 ); +#endif *ctrls = NULL; ldap_controls_free( tctrls ); - rc = -1; + rc = SLAPD_DISCONNECT; errmsg = "decoding controls error"; goto return_results; } @@ -131,11 +196,17 @@ int get_ctrls( tag = ber_scanf( ber, "b", &crit ); if( tag == LBER_ERROR ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_INFO, + "get_ctrls: conn %d get crit failed.\n", + conn->c_connid )); +#else Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: get crit failed.\n", 0, 0, 0 ); +#endif *ctrls = NULL; ldap_controls_free( tctrls ); - rc = -1; + rc = SLAPD_DISCONNECT; errmsg = "decoding controls error"; goto return_results; } @@ -144,30 +215,99 @@ int get_ctrls( tag = ber_peek_tag( ber, &len ); } +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_INFO, + "get_ctrls: conn %d oid=\"%s\" (%scritical)\n", + conn->c_connid, tctrl->ldctl_oid, + tctrl->ldctl_iscritical ? "" : "non" )); +#else Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: oid=\"%s\" (%scritical)\n", tctrl->ldctl_oid, tctrl->ldctl_iscritical ? "" : "non", 0 ); - +#endif if( tag == LBER_OCTETSTRING ) { tag = ber_scanf( ber, "o", &tctrl->ldctl_value ); if( tag == LBER_ERROR ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_INFO, + "get_ctrls: conn %d get value failed.\n", conn->c_connid )); +#else Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: get value failed.\n", 0, 0, 0 ); +#endif *ctrls = NULL; ldap_controls_free( tctrls ); - rc = -1; + rc = SLAPD_DISCONNECT; errmsg = "decoding controls error"; goto return_results; } } - if( tctrl->ldctl_iscritical && - !charray_inlist( supportedControls, tctrl->ldctl_oid ) ) - { + c = find_ctrl( tctrl->ldctl_oid ); + if( c != NULL ) { + /* recongized control */ + int tagmask = -1; + switch( op->o_tag ) { + case LDAP_REQ_ADD: + tagmask = SLAP_CTRL_ADD; + break; + case LDAP_REQ_BIND: + tagmask = SLAP_CTRL_BIND; + break; + case LDAP_REQ_COMPARE: + tagmask = SLAP_CTRL_COMPARE; + break; + case LDAP_REQ_DELETE: + tagmask = SLAP_CTRL_DELETE; + break; + case LDAP_REQ_MODIFY: + tagmask = SLAP_CTRL_MODIFY; + break; + case LDAP_REQ_RENAME: + tagmask = SLAP_CTRL_RENAME; + break; + case LDAP_REQ_SEARCH: + tagmask = SLAP_CTRL_SEARCH; + break; + case LDAP_REQ_UNBIND: + tagmask = SLAP_CTRL_UNBIND; + break; + case LDAP_REQ_EXTENDED: + /* FIXME: check list of extended operations */ + tagmask = -1; + break; + default: + rc = LDAP_OTHER; + errmsg = "controls internal error"; + goto return_results; + } + + if (( c->sc_ops_mask & tagmask ) == tagmask ) { + /* available extension */ + + if( !c->sc_parse ) { + rc = LDAP_OTHER; + errmsg = "not yet implemented"; + goto return_results; + } + + rc = c->sc_parse( conn, op, tctrl, &errmsg ); + + if( rc != LDAP_SUCCESS ) goto return_results; + + } else if( tctrl->ldctl_iscritical ) { + /* unavailable CRITICAL control */ + rc = LDAP_UNAVAILABLE_CRITICAL_EXTENSION; + errmsg = "critical extension is unavailable"; + goto return_results; + } + + } else if( tctrl->ldctl_iscritical ) { + /* unrecongized CRITICAL control */ rc = LDAP_UNAVAILABLE_CRITICAL_EXTENSION; - errmsg = "critical extension is unavailable "; + errmsg = "critical extension is not recongized"; goto return_results; } @@ -175,12 +315,18 @@ int get_ctrls( } return_results: +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_RESULTS, + "get_ctrls: conn %d %d %d %s\n", + conn->c_connid, nctrls, rc, errmsg ? errmsg : "" )); +#else Debug( LDAP_DEBUG_TRACE, "<= get_ctrls: %d %d %s\n", nctrls, rc, errmsg ? errmsg : ""); +#endif if( sendres && rc != LDAP_SUCCESS ) { - if( rc == -1 ) { - send_ldap_disconnect( conn, op, rc, errmsg ); + if( rc == SLAPD_DISCONNECT ) { + send_ldap_disconnect( conn, op, LDAP_PROTOCOL_ERROR, errmsg ); } else { send_ldap_result( conn, op, rc, NULL, errmsg, NULL, NULL ); @@ -190,21 +336,54 @@ return_results: return rc; } +static int parseManageDSAit ( + Connection *conn, + Operation *op, + LDAPControl *ctrl, + const char **text ) +{ + if ( op->o_managedsait != SLAP_NO_CONTROL ) { + *text = "manageDSAit control specified multiple times"; + return LDAP_PROTOCOL_ERROR; + } + + if ( ctrl->ldctl_value.bv_len ) { + *text = "manageDSAit control value not empty"; + return LDAP_PROTOCOL_ERROR; + } + + op->o_managedsait = ctrl->ldctl_iscritical + ? SLAP_CRITICAL_CONTROL + : SLAP_NONCRITICAL_CONTROL; + + return LDAP_SUCCESS; +} -int get_manageDSAit( Operation *op ) +static int parseSubentries ( + Connection *conn, + Operation *op, + LDAPControl *ctrl, + const char **text ) { - int i; - if( op == NULL || op->o_ctrls == NULL ) { - return 0; + if ( op->o_subentries != SLAP_NO_CONTROL ) { + *text = "subentries control specified multiple times"; + return LDAP_PROTOCOL_ERROR; } - for( i=0; op->o_ctrls[i] != NULL; i++ ) { - if( strcmp( LDAP_CONTROL_MANAGEDSAIT, op->o_ctrls[i]->ldctl_oid ) - == 0 ) - { - return 1; - } + /* FIXME: should use BER library */ + if( ( ctrl->ldctl_value.bv_len != 3 ) + && ( ctrl->ldctl_value.bv_val[0] != 0x01 ) + && ( ctrl->ldctl_value.bv_val[1] != 0x01 )) + { + *text = "subentries control value encoding is bogus"; + return LDAP_PROTOCOL_ERROR; } - return 0; + op->o_subentries = ctrl->ldctl_iscritical + ? SLAP_CRITICAL_CONTROL + : SLAP_NONCRITICAL_CONTROL; + + op->o_subentries_visibility = (ctrl->ldctl_value.bv_val[2] != 0x00); + + return LDAP_SUCCESS; }