mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

don't search if the filter is invalid; search also if an attribute is undefined for that objectclass, the filter may succeed anyway

Browse Source
This commit is contained in:
Pierangelo Masarati 2004-01-11 22:50:25 +00:00
parent 4dbc0b842a
commit db395f2cd7
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
servers/slapd/back-sql/search.c
View File

@ -339,8 +339,10 @@ backsql_process_filter( backsql_srch_info *bsi, Filter *f )
int rc = 0; int rc = 0;
Debug( LDAP_DEBUG_TRACE, "==>backsql_process_filter()\n", 0, 0, 0 ); Debug( LDAP_DEBUG_TRACE, "==>backsql_process_filter()\n", 0, 0, 0 );
if ( f == NULL || f->f_choice == SLAPD_FILTER_COMPUTED ) { if ( f->f_choice == SLAPD_FILTER_COMPUTED ) {
return 0; Debug( LDAP_DEBUG_TRACE, "backsql_process_filter(): "
"invalid filter\n", 0, 0, 0 );
goto impossible;
} }
switch( f->f_choice ) { switch( f->f_choice ) {
@ -402,6 +404,11 @@ backsql_process_filter( backsql_srch_info *bsi, Filter *f )
ObjectClass *oc = oc_bvfind( &f->f_av_value ); ObjectClass *oc = oc_bvfind( &f->f_av_value );
if ( oc == NULL ) { if ( oc == NULL ) {
Debug( LDAP_DEBUG_TRACE,
"backsql_process_filter(): "
"unknown objectClass \"%s\" "
"in filter\n",
f->f_av_value.bv_val, 0, 0 );
bsi->bsi_status = LDAP_OTHER; bsi->bsi_status = LDAP_OTHER;
goto impossible; goto impossible;
} }
@ -426,6 +433,11 @@ filter_oc_success:;
goto done; goto done;
default: default:
Debug( LDAP_DEBUG_TRACE,
"backsql_process_filter(): "
"illegal/unhandled filter "
"on objectClass attribute",
0, 0, 0 );
bsi->bsi_status = LDAP_OTHER; bsi->bsi_status = LDAP_OTHER;
goto impossible; goto impossible;
} }
@ -472,10 +484,19 @@ filter_oc_success:;
Debug( LDAP_DEBUG_TRACE, "backsql_process_filter(): " Debug( LDAP_DEBUG_TRACE, "backsql_process_filter(): "
"attribute '%s' is not defined for objectclass '%s'\n", "attribute '%s' is not defined for objectclass '%s'\n",
ad->ad_cname.bv_val, BACKSQL_OC_NAME( bsi->bsi_oc ), 0 ); ad->ad_cname.bv_val, BACKSQL_OC_NAME( bsi->bsi_oc ), 0 );
#if 0
backsql_strfcat( &bsi->bsi_flt_where, "l", backsql_strfcat( &bsi->bsi_flt_where, "l",
(ber_len_t)sizeof( "1=0" ) - 1, "1=0" ); (ber_len_t)sizeof( "1=0" ) - 1, "1=0" );
bsi->bsi_status = LDAP_UNDEFINED_TYPE; bsi->bsi_status = LDAP_UNDEFINED_TYPE;
goto impossible; goto impossible;
#else
/* search anyway; other parts of the filter may succeeed */
backsql_strfcat( &bsi->bsi_flt_where, "l",
(ber_len_t)sizeof( "1=1" ) - 1, "1=1" );
bsi->bsi_status = LDAP_SUCCESS;
goto done;
#endif
} }
backsql_strfcat( &bsi->bsi_flt_where, "c", '(' ); backsql_strfcat( &bsi->bsi_flt_where, "c", '(' );