/* dn.c - routines for dealing with distinguished names */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include "slap.h"
-#define B4LEADTYPE 0
-#define B4TYPE 1
-#define INOIDTYPE 2
-#define INKEYTYPE 3
-#define B4EQUAL 4
-#define B4VALUE 5
-#define INVALUE 6
-#define INQUOTEDVALUE 7
-#define B4SEPARATOR 8
+const struct berval slap_empty_bv = { 0, "" };
-#define UTF8DN 1
+#define SLAP_LDAPDN_PRETTY 0x1
+
+#define SLAP_LDAPDN_MAXLEN 8192
/*
- * dn_validate - validate and compress dn. the dn is
- * compressed in place are returned if valid.
+ * The DN syntax-related functions take advantage of the dn representation
+ * handling functions ldap_str2dn/ldap_dn2str. The latter are not schema-
+ * aware, so the attributes and their values need be validated (and possibly
+ * normalized). In the current implementation the required validation/nor-
+ * malization/"pretty"ing are done on newly created DN structural represen-
+ * tations; however the idea is to move towards DN handling in structural
+ * representation instead of the current string representation. To this
+ * purpose, we need to do only the required operations and keep track of
+ * what has been done to minimize their impact on performances.
+ *
+ * Developers are strongly encouraged to use this feature, to speed-up
+ * its stabilization.
*/
-char *
-dn_validate( char *dn_in )
+#define AVA_PRIVATE( ava ) ( ( AttributeDescription * )(ava)->la_private )
+
+/*
+ * In-place, schema-aware validation of the
+ * structural representation of a distinguished name.
+ */
+static int
+LDAPDN_validate( LDAPDN *dn )
{
- char *d, *s;
- int state, gotesc;
- char *dn = dn_in;
-
- gotesc = 0;
- state = B4LEADTYPE;
- for ( d = s = dn; *s; s++ ) {
- switch ( state ) {
- case B4LEADTYPE:
- case B4TYPE:
- if ( OID_LEADCHAR(*s) ) {
- state = INOIDTYPE;
- *d++ = *s;
- } else if ( ATTR_LEADCHAR(*s) ) {
- state = INKEYTYPE;
- *d++ = *s;
- } else if ( ! ASCII_SPACE( *s ) ) {
- dn = NULL;
- state = INKEYTYPE;
- *d++ = *s;
- }
- break;
+ int iRDN;
+ int rc;
- case INOIDTYPE:
- if ( OID_CHAR(*s) ) {
- *d++ = *s;
- } else if ( *s == '=' ) {
- state = B4VALUE;
- *d++ = *s;
- } else if ( ASCII_SPACE( *s ) ) {
- state = B4EQUAL;
- } else {
- dn = NULL;
- *d++ = *s;
- }
- break;
+ assert( dn );
- case INKEYTYPE:
- if ( ATTR_CHAR(*s) ) {
- *d++ = *s;
- } else if ( *s == '=' ) {
- state = B4VALUE;
- *d++ = *s;
- } else if ( ASCII_SPACE( *s ) ) {
- state = B4EQUAL;
- } else {
- dn = NULL;
- *d++ = *s;
- }
- break;
+ for ( iRDN = 0; dn[ 0 ][ iRDN ]; iRDN++ ) {
+ LDAPRDN *rdn = dn[ 0 ][ iRDN ];
+ int iAVA;
- case B4EQUAL:
- if ( *s == '=' ) {
- state = B4VALUE;
- *d++ = *s;
- } else if ( ! ASCII_SPACE( *s ) ) {
- /* not a valid dn - but what can we do here? */
- *d++ = *s;
- dn = NULL;
- }
- break;
+ assert( rdn );
- case B4VALUE:
- if ( *s == '"' ) {
- state = INQUOTEDVALUE;
- *d++ = *s;
- } else if ( ! ASCII_SPACE( *s ) ) {
- state = INVALUE;
- *d++ = *s;
- }
- break;
+ for ( iAVA = 0; rdn[ 0 ][ iAVA ]; iAVA++ ) {
+ LDAPAVA *ava = rdn[ 0 ][ iAVA ];
+ AttributeDescription *ad;
+ slap_syntax_validate_func *validate = NULL;
+
+ assert( ava );
+
+ if ( ( ad = AVA_PRIVATE( ava ) ) == NULL ) {
+ const char *text = NULL;
- case INVALUE:
- if ( !gotesc && RDN_SEPARATOR( *s ) ) {
- while ( ASCII_SPACE( *(d - 1) ) )
- d--;
- state = B4TYPE;
- if ( *s == '+' ) {
- *d++ = *s;
- } else {
- *d++ = ',';
+ rc = slap_bv2ad( &ava->la_attr, &ad, &text );
+ if ( rc != LDAP_SUCCESS ) {
+ return LDAP_INVALID_SYNTAX;
}
- } else if ( gotesc && !RDN_NEEDSESCAPE( *s ) &&
- !RDN_SEPARATOR( *s ) ) {
- *--d = *s;
- d++;
- } else if( !ASCII_SPACE( *s ) || !ASCII_SPACE( *(d - 1) ) ) {
- *d++ = *s;
- }
- break;
- case INQUOTEDVALUE:
- if ( !gotesc && *s == '"' ) {
- state = B4SEPARATOR;
- *d++ = *s;
- } else if ( gotesc && !RDN_NEEDSESCAPE( *s ) ) {
- *--d = *s;
- d++;
- } else if( !ASCII_SPACE( *s ) || !ASCII_SPACE( *(d - 1) ) ) {
- *d++ = *s;
+ ava->la_private = ( void * )ad;
}
- break;
- case B4SEPARATOR:
- if ( RDN_SEPARATOR( *s ) ) {
- state = B4TYPE;
- *d++ = *s;
- } else if ( !ASCII_SPACE( *s ) ) {
- dn = NULL;
+ /*
+ * Replace attr oid/name with the canonical name
+ */
+ ava->la_attr = ad->ad_cname;
+
+ validate = ad->ad_type->sat_syntax->ssyn_validate;
+
+ if ( validate ) {
+ /*
+ * validate value by validate function
+ */
+ rc = ( *validate )( ad->ad_type->sat_syntax,
+ &ava->la_value );
+
+ if ( rc != LDAP_SUCCESS ) {
+ return LDAP_INVALID_SYNTAX;
+ }
}
- break;
-
- default:
- dn = NULL;
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "dn_validate: unknown state %d for dn \"%s\".\n",
- state, dn_in ));
-#else
- Debug( LDAP_DEBUG_ANY,
- "dn_validate - unknown state %d\n", state, 0, 0 );
-#endif
- break;
- }
-
- if ( *s == '\\' ) {
- gotesc = 1;
- } else {
- gotesc = 0;
}
}
- /* trim trailing spaces */
- while( d > dn_in && ASCII_SPACE( *(d-1) ) ) {
- --d;
+ return LDAP_SUCCESS;
+}
+
+/*
+ * dn validate routine
+ */
+int
+dnValidate(
+ Syntax *syntax,
+ struct berval *in )
+{
+ int rc;
+ LDAPDN *dn = NULL;
+
+ assert( in );
+
+ if ( in->bv_len == 0 ) {
+ return LDAP_SUCCESS;
+
+ } else if ( in->bv_len > SLAP_LDAPDN_MAXLEN ) {
+ return LDAP_INVALID_SYNTAX;
}
- *d = '\0';
- if( gotesc ) {
- /* shouldn't be left in escape */
- dn = NULL;
+ rc = ldap_bv2dn( in, &dn, LDAP_DN_FORMAT_LDAP );
+ if ( rc != LDAP_SUCCESS ) {
+ return LDAP_INVALID_SYNTAX;
}
- /* check end state */
- switch( state ) {
- case B4LEADTYPE: /* looking for first type */
- case B4SEPARATOR: /* looking for separator */
- case INVALUE: /* inside value */
- break;
- default:
- dn = NULL;
+ assert( strlen( in->bv_val ) == in->bv_len );
+
+ /*
+ * Schema-aware validate
+ */
+ rc = LDAPDN_validate( dn );
+ ldap_dnfree( dn );
+
+ if ( rc != LDAP_SUCCESS ) {
+ return LDAP_INVALID_SYNTAX;
}
- return( dn );
+ return LDAP_SUCCESS;
}
/*
- * dn_normalize - put dn into a canonical form suitable for storing
- * in a hash database. this involves normalizing the case as well as
- * the format. the dn is normalized in place as well as returned if valid.
+ * AVA sorting inside a RDN
+ *
+ * rule: sort attributeTypes in alphabetical order; in case of multiple
+ * occurrences of the same attributeType, sort values in byte order
+ * (use memcmp, which implies alphabetical order in case of IA5 value;
+ * this should guarantee the repeatability of the operation).
+ *
+ * Note: the sorting can be slightly improved by sorting first
+ * by attribute type length, then by alphabetical order.
+ *
+ * uses a linear search; should be fine since the number of AVAs in
+ * a RDN should be limited.
*/
-
-char *
-dn_normalize( char *dn )
+static void
+AVA_Sort( LDAPRDN *rdn, int iAVA )
{
- char *out;
- /* upper case it */
-#ifndef UTF8DN
- ldap_pvt_str2upper( dn );
- /* validate and compress dn */
- out = dn_validate( dn );
-#else
- /* enabling this might require reindexing */
- struct berval *bvdn, *nbvdn;
+ int i;
+ LDAPAVA *ava_in = rdn[ 0 ][ iAVA ];
- out = NULL;
- bvdn = ber_bvstr( dn );
+ assert( rdn );
+ assert( ava_in );
- if ( dnNormalize( NULL, bvdn, &nbvdn ) == LDAP_SUCCESS ) {
- if ( nbvdn->bv_len <= bvdn->bv_len ) {
- out = dn;
- strcpy( out, nbvdn->bv_val );
- }
- ber_bvfree( nbvdn );
- }
- bvdn->bv_val = NULL; /* prevent bvfree from freeing dn */
- ber_bvfree( bvdn );
-#endif
+ for ( i = 0; i < iAVA; i++ ) {
+ LDAPAVA *ava = rdn[ 0 ][ i ];
+ int a, j;
- return( out );
-}
+ assert( ava );
-/*
- * dn_parent - return a copy of the dn of dn's parent
- */
+ a = strcmp( ava_in->la_attr.bv_val, ava->la_attr.bv_val );
-char *
-dn_parent(
- Backend *be,
- const char *dn
-)
-{
- const char *s;
- int inquote;
+ if ( a > 0 ) {
+ break;
+ }
- if( dn == NULL ) {
- return NULL;
- }
+ while ( a == 0 ) {
+ int v, d;
- while(*dn != '\0' && ASCII_SPACE(*dn)) {
- dn++;
- }
+ d = ava_in->la_value.bv_len - ava->la_value.bv_len;
- if( *dn == '\0' ) {
- return NULL;
- }
+ v = memcmp( ava_in->la_value.bv_val,
+ ava->la_value.bv_val,
+ d <= 0 ? ava_in->la_value.bv_len
+ : ava->la_value.bv_len );
- if ( be != NULL && be_issuffix( be, dn ) ) {
- return NULL;
- }
+ if ( v == 0 && d != 0 ) {
+ v = d;
+ }
- /*
- * assume it is an X.500-style name, which looks like
- * foo=bar,sha=baz,...
- */
+ if ( v <= 0 ) {
+ /*
+ * got it!
+ */
+ break;
+ }
- inquote = 0;
- for ( s = dn; *s; s++ ) {
- if ( *s == '\\' ) {
- if ( *(s + 1) ) {
- s++;
+ if ( ++i == iAVA ) {
+ /*
+ * already sorted
+ */
+ return;
}
- continue;
+
+ ava = rdn[ 0 ][ i ];
+ a = strcmp( ava_in->la_attr.bv_val,
+ ava->la_attr.bv_val );
}
- if ( inquote ) {
- if ( *s == '"' ) {
- inquote = 0;
- }
- } else {
- if ( *s == '"' ) {
- inquote = 1;
- } else if ( DN_SEPARATOR( *s ) ) {
- return ch_strdup( &s[1] );
- }
+
+ /*
+ * move ahead
+ */
+ for ( j = iAVA; j > i; j-- ) {
+ rdn[ 0 ][ j ] = rdn[ 0 ][ j - 1 ];
}
- }
+ rdn[ 0 ][ i ] = ava_in;
- return ch_strdup( "" );
+ return;
+ }
}
-char * dn_rdn(
- Backend *be,
- const char *dn_in )
+/*
+ * In-place, schema-aware normalization / "pretty"ing of the
+ * structural representation of a distinguished name.
+ */
+static int
+LDAPDN_rewrite( LDAPDN *dn, unsigned flags )
{
- char *dn, *s;
- int inquote;
+ int iRDN;
+ int rc;
- if( dn_in == NULL ) {
- return NULL;
- }
+ assert( dn );
- while(*dn_in && ASCII_SPACE(*dn_in)) {
- dn_in++;
- }
+ for ( iRDN = 0; dn[ 0 ][ iRDN ]; iRDN++ ) {
+ LDAPRDN *rdn = dn[ 0 ][ iRDN ];
+ int iAVA;
- if( *dn_in == '\0' ) {
- return( NULL );
- }
+ assert( rdn );
- if ( be != NULL && be_issuffix( be, dn_in ) ) {
- return( NULL );
- }
+ for ( iAVA = 0; rdn[ 0 ][ iAVA ]; iAVA++ ) {
+ LDAPAVA *ava = rdn[ 0 ][ iAVA ];
+ AttributeDescription *ad;
+ slap_syntax_validate_func *validf = NULL;
+ slap_syntax_transform_func *transf = NULL;
+ MatchingRule *mr;
+ struct berval bv = { 0, NULL };
+ int do_sort = 0;
- dn = ch_strdup( dn_in );
+ assert( ava );
- inquote = 0;
+ if ( ( ad = AVA_PRIVATE( ava ) ) == NULL ) {
+ const char *text = NULL;
- for ( s = dn; *s; s++ ) {
- if ( *s == '\\' ) {
- if ( *(s + 1) ) {
- s++;
+ rc = slap_bv2ad( &ava->la_attr, &ad, &text );
+ if ( rc != LDAP_SUCCESS ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ ava->la_private = ( void * )ad;
+ do_sort = 1;
}
- continue;
- }
- if ( inquote ) {
- if ( *s == '"' ) {
- inquote = 0;
+
+ /*
+ * Replace attr oid/name with the canonical name
+ */
+ ava->la_attr = ad->ad_cname;
+
+ if( ava->la_flags & LDAP_AVA_BINARY ) {
+ /* AVA is binary encoded, don't muck with it */
+ validf = NULL;
+ transf = NULL;
+ mr = NULL;
+ } else if( flags & SLAP_LDAPDN_PRETTY ) {
+ validf = NULL;
+ transf = ad->ad_type->sat_syntax->ssyn_pretty;
+ mr = NULL;
+ } else {
+ validf = ad->ad_type->sat_syntax->ssyn_validate;
+ transf = ad->ad_type->sat_syntax->ssyn_normalize;
+ mr = ad->ad_type->sat_equality;
}
- } else {
- if ( *s == '"' ) {
- inquote = 1;
- } else if ( DN_SEPARATOR( *s ) ) {
- *s = '\0';
- return( dn );
+
+ if ( validf ) {
+ /* validate value before normalization */
+ rc = ( *validf )( ad->ad_type->sat_syntax,
+ ava->la_value.bv_len
+ ? &ava->la_value
+ : (struct berval *) &slap_empty_bv );
+
+ if ( rc != LDAP_SUCCESS ) {
+ return LDAP_INVALID_SYNTAX;
+ }
}
+
+ if ( transf ) {
+ /*
+ * transform value by normalize/pretty function
+ * if value is empty, use empty_bv
+ */
+ rc = ( *transf )( ad->ad_type->sat_syntax,
+ ava->la_value.bv_len
+ ? &ava->la_value
+ : (struct berval *) &slap_empty_bv,
+ &bv );
+
+ if ( rc != LDAP_SUCCESS ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+ }
+
+ if( mr && ( mr->smr_usage & SLAP_MR_DN_FOLD ) ) {
+ char *s = bv.bv_val;
+
+ if ( UTF8bvnormalize( &bv, &bv,
+ LDAP_UTF8_CASEFOLD ) == NULL ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+ free( s );
+ }
+
+ if( bv.bv_val ) {
+ free( ava->la_value.bv_val );
+ ava->la_value = bv;
+ }
+
+ if( do_sort ) AVA_Sort( rdn, iAVA );
}
}
- return( dn );
+ return LDAP_SUCCESS;
}
-
/*
- * return a charray of all subtrees to which the DN resides in
+ * dn normalize routine
*/
-char **dn_subtree(
- Backend *be,
- const char *dn )
+int
+dnNormalize(
+ Syntax *syntax,
+ struct berval *val,
+ struct berval **normalized )
{
- char *child, *parent;
- char **subtree = NULL;
-
- child = ch_strdup( dn );
+ struct berval *out;
+ int rc;
+
+ assert( normalized && *normalized == NULL );
+
+ out = ch_malloc( sizeof( struct berval ) );
+ rc = dnNormalize2( syntax, val, out );
+ if ( rc != LDAP_SUCCESS )
+ free( out );
+ else
+ *normalized = out;
+ return rc;
+}
- do {
- charray_add( &subtree, child );
+int
+dnNormalize2(
+ Syntax *syntax,
+ struct berval *val,
+ struct berval *out )
+{
+ assert( val );
+ assert( out );
- parent = dn_parent( be, child );
+ Debug( LDAP_DEBUG_TRACE, ">>> dnNormalize: <%s>\n", val->bv_val, 0, 0 );
- free( child );
+ if ( val->bv_len != 0 ) {
+ LDAPDN *dn = NULL;
+ int rc;
- child = parent;
- } while ( child != NULL );
+ /*
+ * Go to structural representation
+ */
+ rc = ldap_bv2dn( val, &dn, LDAP_DN_FORMAT_LDAP );
+ if ( rc != LDAP_SUCCESS ) {
+ return LDAP_INVALID_SYNTAX;
+ }
- return subtree;
-}
+ assert( strlen( val->bv_val ) == val->bv_len );
+ /*
+ * Schema-aware rewrite
+ */
+ if ( LDAPDN_rewrite( dn, 0 ) != LDAP_SUCCESS ) {
+ ldap_dnfree( dn );
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ /*
+ * Back to string representation
+ */
+ rc = ldap_dn2bv( dn, out, LDAP_DN_FORMAT_LDAPV3 );
+
+ ldap_dnfree( dn );
+
+ if ( rc != LDAP_SUCCESS ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+ } else {
+ ber_dupbv( out, val );
+ }
+
+ Debug( LDAP_DEBUG_TRACE, "<<< dnNormalize: <%s>\n", out->bv_val, 0, 0 );
+
+ return LDAP_SUCCESS;
+}
/*
- * dn_issuffix - tells whether suffix is a suffix of dn. both dn
- * and suffix must be normalized.
+ * dn "pretty"ing routine
*/
+int
+dnPretty(
+ Syntax *syntax,
+ struct berval *val,
+ struct berval **pretty)
+{
+ struct berval *out;
+ int rc;
+
+ assert( pretty && *pretty == NULL );
+
+ out = ch_malloc( sizeof( struct berval ) );
+ rc = dnPretty2( syntax, val, out );
+ if ( rc != LDAP_SUCCESS )
+ free( out );
+ else
+ *pretty = out;
+ return rc;
+}
int
-dn_issuffix(
- const char *dn,
- const char *suffix
-)
+dnPretty2(
+ Syntax *syntax,
+ struct berval *val,
+ struct berval *out)
{
- int dnlen, suffixlen;
+ assert( val );
+ assert( out );
- if ( dn == NULL ) {
- return( 0 );
- }
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, ARGS, ">>> dnPretty: <%s>\n", val->bv_val, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE, ">>> dnPretty: <%s>\n", val->bv_val, 0, 0 );
+#endif
+
+ if ( val->bv_len == 0 ) {
+ ber_dupbv( out, val );
+
+ } else if ( val->bv_len > SLAP_LDAPDN_MAXLEN ) {
+ return LDAP_INVALID_SYNTAX;
- suffixlen = strlen( suffix );
- dnlen = strlen( dn );
+ } else {
+ LDAPDN *dn = NULL;
+ int rc;
- if ( suffixlen > dnlen ) {
- return( 0 );
+ /* FIXME: should be liberal in what we accept */
+ rc = ldap_bv2dn( val, &dn, LDAP_DN_FORMAT_LDAP );
+ if ( rc != LDAP_SUCCESS ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ assert( strlen( val->bv_val ) == val->bv_len );
+
+ /*
+ * Schema-aware rewrite
+ */
+ if ( LDAPDN_rewrite( dn, SLAP_LDAPDN_PRETTY ) != LDAP_SUCCESS ) {
+ ldap_dnfree( dn );
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ /* FIXME: not sure why the default isn't pretty */
+ /* RE: the default is the form that is used as
+ * an internal representation; the pretty form
+ * is a variant */
+ rc = ldap_dn2bv( dn, out,
+ LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY );
+
+ ldap_dnfree( dn );
+
+ if ( rc != LDAP_SUCCESS ) {
+ return LDAP_INVALID_SYNTAX;
+ }
}
- return( strcmp( dn + dnlen - suffixlen, suffix ) == 0 );
+ Debug( LDAP_DEBUG_TRACE, "<<< dnPretty: <%s>\n", out->bv_val, 0, 0 );
+
+ return LDAP_SUCCESS;
}
/*
- * get_next_substring(), rdn_attr_type(), rdn_attr_value(), and
- * build_new_dn().
- *
- * Copyright 1999, Juan C. Gomez, All rights reserved.
- * This software is not subject to any license of Silicon Graphics
- * Inc. or Purdue University.
- *
- * Redistribution and use in source and binary forms are permitted
- * without restriction or fee of any kind as long as this notice
- * is preserved.
- *
+ * Combination of both dnPretty and dnNormalize
*/
+int
+dnPrettyNormal(
+ Syntax *syntax,
+ struct berval *val,
+ struct berval *pretty,
+ struct berval *normal)
+{
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ENTRY, ">>> dnPrettyNormal: <%s>\n", val->bv_val, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE, ">>> dnPrettyNormal: <%s>\n", val->bv_val, 0, 0 );
+#endif
-/* get_next_substring:
- *
- * Gets next substring in s, using d (or the end of the string '\0') as a
- * string delimiter, and places it in a duplicated memory space. Leading
- * spaces are ignored. String s **must** be null-terminated.
- */
+ assert( val );
+ assert( pretty );
+ assert( normal );
-static char *
-get_next_substring( const char * s, char d )
-{
+ if ( val->bv_len == 0 ) {
+ ber_dupbv( pretty, val );
+ ber_dupbv( normal, val );
- char *str, *r;
+ } else if ( val->bv_len > SLAP_LDAPDN_MAXLEN ) {
+ /* too big */
+ return LDAP_INVALID_SYNTAX;
- r = str = ch_malloc( strlen(s) + 1 );
+ } else {
+ LDAPDN *dn = NULL;
+ int rc;
- /* Skip leading spaces */
-
- while ( *s && ASCII_SPACE(*s) ) {
- s++;
- }
-
- /* Copy word */
+ pretty->bv_val = NULL;
+ normal->bv_val = NULL;
+ pretty->bv_len = 0;
+ normal->bv_len = 0;
+
+ /* FIXME: should be liberal in what we accept */
+ rc = ldap_bv2dn( val, &dn, LDAP_DN_FORMAT_LDAP );
+ if ( rc != LDAP_SUCCESS ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ assert( strlen( val->bv_val ) == val->bv_len );
+
+ /*
+ * Schema-aware rewrite
+ */
+ if ( LDAPDN_rewrite( dn, SLAP_LDAPDN_PRETTY ) != LDAP_SUCCESS ) {
+ ldap_dnfree( dn );
+ return LDAP_INVALID_SYNTAX;
+ }
- while ( *s && (*s != d) ) {
+ rc = ldap_dn2bv( dn, pretty,
+ LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY );
- /* Don't stop when you see trailing spaces may be a multi-word
- * string, i.e. name=John Doe!
- */
+ if ( rc != LDAP_SUCCESS ) {
+ ldap_dnfree( dn );
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ if ( LDAPDN_rewrite( dn, 0 ) != LDAP_SUCCESS ) {
+ ldap_dnfree( dn );
+ free( pretty->bv_val );
+ pretty->bv_val = NULL;
+ pretty->bv_len = 0;
+ return LDAP_INVALID_SYNTAX;
+ }
- *str++ = *s++;
-
+ rc = ldap_dn2bv( dn, normal, LDAP_DN_FORMAT_LDAPV3 );
+
+ ldap_dnfree( dn );
+ if ( rc != LDAP_SUCCESS ) {
+ free( pretty->bv_val );
+ pretty->bv_val = NULL;
+ pretty->bv_len = 0;
+ return LDAP_INVALID_SYNTAX;
+ }
}
-
- *str = '\0';
-
- return r;
-
-}
+#ifdef NEW_LOGGING
+ LDAP_LOG (OPERATION, RESULTS, "<<< dnPrettyNormal: <%s>, <%s>\n",
+ pretty->bv_val, normal->bv_val, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE, "<<< dnPrettyNormal: <%s>, <%s>\n",
+ pretty->bv_val, normal->bv_val, 0 );
+#endif
-/* rdn_attr_type:
- *
- * Given a string (i.e. an rdn) of the form:
- * "attribute_type = attribute_value"
- * this function returns the type of an attribute, that is the
- * string "attribute_type" which is placed in newly allocated
- * memory. The returned string will be null-terminated.
- */
+ return LDAP_SUCCESS;
+}
-char * rdn_attr_type( const char * s )
+/*
+ * dnMatch routine
+ */
+int
+dnMatch(
+ int *matchp,
+ slap_mask_t flags,
+ Syntax *syntax,
+ MatchingRule *mr,
+ struct berval *value,
+ void *assertedValue )
{
- return get_next_substring( s, '=' );
-}
+ int match;
+ struct berval *asserted = (struct berval *) assertedValue;
+
+ assert( matchp );
+ assert( value );
+ assert( assertedValue );
+
+ match = value->bv_len - asserted->bv_len;
+
+ if ( match == 0 ) {
+ match = memcmp( value->bv_val, asserted->bv_val,
+ value->bv_len );
+ }
+#ifdef NEW_LOGGING
+ LDAP_LOG( CONFIG, ENTRY, "dnMatch: %d\n %s\n %s\n",
+ match, value->bv_val, asserted->bv_val );
+#else
+ Debug( LDAP_DEBUG_ARGS, "dnMatch %d\n\t\"%s\"\n\t\"%s\"\n",
+ match, value->bv_val, asserted->bv_val );
+#endif
-/* rdn_attr_value:
+ *matchp = match;
+ return( LDAP_SUCCESS );
+}
+
+/*
+ * dnParent - dn's parent, in-place
*
- * Given a string (i.e. an rdn) of the form:
- * "attribute_type = attribute_value"
- * this function returns "attribute_type" which is placed in newly allocated
- * memory. The returned string will be null-terminated and may contain
- * spaces (i.e. "John Doe\0").
+ * note: the incoming dn is assumed to be normalized/prettyfied,
+ * so that escaped rdn/ava separators are in '\'+hexpair form
*/
-
-char *
-rdn_attr_value( const char * rdn )
+void
+dnParent(
+ struct berval *dn,
+ struct berval *pdn )
{
+ char *p;
- const char *str;
+ p = strchr( dn->bv_val, ',' );
- if ( (str = strchr( rdn, '=' )) != NULL ) {
- return get_next_substring(++str, '\0');
+ /* one-level dn */
+ if ( p == NULL ) {
+ pdn->bv_len = 0;
+ pdn->bv_val = dn->bv_val + dn->bv_len;
+ return;
}
- return NULL;
+ assert( DN_SEPARATOR( p[ 0 ] ) );
+ p++;
-}
+ assert( ATTR_LEADCHAR( p[ 0 ] ) );
+ pdn->bv_val = p;
+ pdn->bv_len = dn->bv_len - (p - dn->bv_val);
+ return;
+}
-/* rdn_attrs:
- *
- * Given a string (i.e. an rdn) of the form:
- * "attribute_type=attribute_value[+attribute_type=attribute_value[...]]"
- * this function stores the types of the attributes in ptypes, that is the
- * array of strings "attribute_type" which is placed in newly allocated
- * memory, and the values of the attributes in pvalues, that is the
- * array of strings "attribute_value" which is placed in newly allocated
- * memory. Returns 1 on success, 0 on failure.
- *
- * note: got part of the code from dn_validate
- */
int
-rdn_attrs( const char * rdn_in, char ***ptypes, char ***pvalues)
+dnExtractRdn(
+ struct berval *dn,
+ struct berval *rdn )
{
- char *start, *end, *s;
- int state, gotesc, t = 0, v = 0;
- char *dn = ch_strdup( rdn_in );
-
- *ptypes = NULL;
- *pvalues = NULL;
-
- gotesc = 0;
- state = B4LEADTYPE;
- for ( start = end = s = dn; *s; s++ ) {
- switch ( state ) {
- case B4LEADTYPE:
- case B4TYPE:
- if ( OID_LEADCHAR(*s) ) {
- state = INOIDTYPE;
- start = end;
- *end++ = *s;
- } else if ( ATTR_LEADCHAR(*s) ) {
- state = INKEYTYPE;
- start = end;
- *end++ = *s;
- } else if ( ! ASCII_SPACE( *s ) ) {
- goto failure;
- state = INKEYTYPE;
- *end++ = *s;
- }
- break;
-
- case INOIDTYPE:
- if ( OID_CHAR(*s) ) {
- *end++ = *s;
- } else if ( *s == '=' ) {
- state = B4VALUE;
- charray_add_n( ptypes, start, ( end - start ) );
- t++;
- *end++ = *s;
- } else if ( ASCII_SPACE( *s ) ) {
- state = B4EQUAL;
- charray_add_n( ptypes, start, ( end - start ) );
- t++;
- } else {
- *end++ = *s;
- goto failure;
- }
- break;
+ LDAPRDN *tmpRDN;
+ const char *p;
+ int rc;
- case INKEYTYPE:
- if ( ATTR_CHAR(*s) ) {
- *end++ = *s;
- } else if ( *s == '=' ) {
- state = B4VALUE;
- charray_add_n( ptypes, start, ( end - start ) );
- t++;
- *end++ = *s;
- } else if ( ASCII_SPACE( *s ) ) {
- state = B4EQUAL;
- charray_add_n( ptypes, start, ( end - start ) );
- t++;
- } else {
- *end++ = *s;
- goto failure;
- }
- break;
+ assert( dn );
+ assert( rdn );
- case B4EQUAL:
- if ( *s == '=' ) {
- state = B4VALUE;
- *end++ = *s;
- } else if ( ! ASCII_SPACE( *s ) ) {
- /* not a valid dn - but what can we do here? */
- *end++ = *s;
- goto failure;
- }
- break;
+ if( dn->bv_len == 0 ) {
+ return LDAP_OTHER;
+ }
- case B4VALUE:
- if ( *s == '"' ) {
- state = INQUOTEDVALUE;
- start = end;
- *end++ = *s;
- } else if ( ! ASCII_SPACE( *s ) ) {
- state = INVALUE;
- start = end;
- *end++ = *s;
- }
- break;
+ rc = ldap_bv2rdn( dn, &tmpRDN, (char **)&p, LDAP_DN_FORMAT_LDAP );
+ if ( rc != LDAP_SUCCESS ) {
+ return rc;
+ }
- case INVALUE:
- if ( !gotesc && RDN_SEPARATOR( *s ) ) {
- while ( ASCII_SPACE( *(end - 1) ) )
- end--;
- state = B4TYPE;
- if ( RDN_ATTRTYPEANDVALUE_SEPARATOR( *s ) ) {
- if ( ++v != t ) {
- goto failure;
- }
- charray_add_n( pvalues, start, ( end - start ) );
- *end++ = *s;
- } else {
- /* not a rdn! */
- goto failure;
- }
- } else if ( gotesc && !RDN_NEEDSESCAPE( *s ) &&
- !RDN_SEPARATOR( *s ) ) {
- *--end = *s;
- end++;
- } else if( !ASCII_SPACE( *s ) || !ASCII_SPACE( *(end - 1) ) ) {
- *end++ = *s;
- }
- break;
+ rc = ldap_rdn2bv( tmpRDN, rdn, LDAP_DN_FORMAT_LDAPV3 );
+ ldap_rdnfree( tmpRDN );
+ if ( rc != LDAP_SUCCESS ) {
+ return rc;
+ }
- case INQUOTEDVALUE:
- if ( !gotesc && *s == '"' ) {
- state = B4SEPARATOR;
- *end++ = *s;
- } else if ( gotesc && !RDN_NEEDSESCAPE( *s ) ) {
- *--end = *s;
- end++;
- } else if( !ASCII_SPACE( *s ) || !ASCII_SPACE( *(end - 1) ) ) {
- *end++ = *s;
- }
- break;
+ return LDAP_SUCCESS;
+}
- case B4SEPARATOR:
- if ( RDN_SEPARATOR( *s ) ) {
- state = B4TYPE;
- if ( RDN_ATTRTYPEANDVALUE_SEPARATOR( *s ) ) {
- if ( ++v != t ) {
- goto failure;
- }
- charray_add_n( pvalues, start, ( end - start ) );
- *end++ = *s;
- } else {
- /* not a rdn! */
- goto failure;
- }
- } else if ( !ASCII_SPACE( *s ) ) {
- goto failure;
- }
- break;
+/*
+ * We can assume the input is a prettied or normalized DN
+ */
+int
+dn_rdnlen(
+ Backend *be,
+ struct berval *dn_in )
+{
+ const char *p;
- default:
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "rdn_attrs: unknown state %d for rdn \"%s\".\n",
- state, dn_in ));
-#else
- Debug( LDAP_DEBUG_ANY,
- "rdn_attrs - unknown state %d\n", state, 0, 0 );
-#endif
- goto failure;
- }
+ assert( dn_in );
- if ( *s == '\\' ) {
- gotesc = 1;
- } else {
- gotesc = 0;
- }
+ if ( dn_in == NULL ) {
+ return 0;
}
- if( gotesc ) {
- /* shouldn't be left in escape */
- goto failure;
+ if ( !dn_in->bv_len ) {
+ return 0;
}
- /* check end state */
- switch( state ) {
- case B4LEADTYPE: /* looking for first type */
- case B4SEPARATOR: /* looking for separator */
- case INVALUE: /* inside value */
- if ( ++v != t ) {
- goto failure;
- }
- charray_add_n( pvalues, start, ( end - start ) );
- break;
- default:
- goto failure;
+ if ( be != NULL && be_issuffix( be, dn_in ) ) {
+ return 0;
}
- ch_free( dn );
-
- return( 1 );
-failure:
- ch_free( dn );
- charray_free( *ptypes );
- *ptypes = NULL;
- charray_free( *pvalues );
- *pvalues = NULL;
+ p = strchr( dn_in->bv_val, ',' );
- return( 0 );
+ return p ? p - dn_in->bv_val : dn_in->bv_len;
}
-/* rdn_validate:
- *
- * 1 if rdn is a legal rdn;
- * 0 otherwise (including a sequence of rdns)
+/* rdnValidate:
*
- * note: got it from dn_rdn; it should be rewritten
- * according to dn_validate
+ * LDAP_SUCCESS if rdn is a legal rdn;
+ * LDAP_INVALID_SYNTAX otherwise (including a sequence of rdns)
*/
int
-rdn_validate( const char * rdn )
+rdnValidate( struct berval *rdn )
{
- int inquote;
-
- if ( rdn == NULL ) {
- return( 0 );
+#if 1
+ /* Major cheat!
+ * input is a pretty or normalized DN
+ * hence, we can just search for ','
+ */
+ if( rdn == NULL || rdn->bv_len == 0 ||
+ rdn->bv_len > SLAP_LDAPDN_MAXLEN )
+ {
+ return LDAP_INVALID_SYNTAX;
}
- if ( strchr( rdn, '=' ) == NULL ) {
- return( 0 );
- }
+ return strchr( rdn->bv_val, ',' ) == NULL
+ ? LDAP_SUCCESS : LDAP_INVALID_SYNTAX;
+
+#else
+ LDAPRDN *RDN, **DN[ 2 ] = { &RDN, NULL };
+ const char *p;
+ int rc;
- while ( *rdn && ASCII_SPACE( *rdn ) ) {
- rdn++;
+ /*
+ * must be non-empty
+ */
+ if ( rdn == NULL || rdn == '\0' ) {
+ return 0;
}
- if( *rdn == '\0' ) {
- return( 0 );
+ /*
+ * must be parsable
+ */
+ rc = ldap_bv2rdn( rdn, &RDN, (char **)&p, LDAP_DN_FORMAT_LDAP );
+ if ( rc != LDAP_SUCCESS ) {
+ return 0;
}
- inquote = 0;
+ /*
+ * Must be one-level
+ */
+ if ( p[ 0 ] != '\0' ) {
+ return 0;
+ }
- for ( ; *rdn; rdn++ ) {
- if ( *rdn == '\\' ) {
- if ( *(rdn + 1) ) {
- rdn++;
- }
- continue;
- }
- if ( inquote ) {
- if ( *rdn == '"' ) {
- inquote = 0;
- }
- } else {
- if ( *rdn == '"' ) {
- inquote = 1;
- } else if ( DN_SEPARATOR( *rdn ) ) {
- return( 0 );
- }
- }
+ /*
+ * Schema-aware validate
+ */
+ if ( rc == LDAP_SUCCESS ) {
+ rc = LDAPDN_validate( DN );
}
+ ldap_rdnfree( RDN );
- return( 1 );
+ /*
+ * Must validate (there's a repeated parsing ...)
+ */
+ return ( rc == LDAP_SUCCESS );
+#endif
}
/* build_new_dn:
*
- * Used by ldbm/bdb2_back_modrdn to create the new dn of entries being
+ * Used by ldbm/bdb2 back_modrdn to create the new dn of entries being
* renamed.
*
- * new_dn = parent (p_dn) + separator(s) + rdn (newrdn) + null.
+ * new_dn = parent (p_dn) + separator + rdn (newrdn) + null.
*/
void
-build_new_dn( char ** new_dn,
- const char *e_dn,
- const char * p_dn,
- const char * newrdn )
+build_new_dn( struct berval * new_dn,
+ struct berval * parent_dn,
+ struct berval * newrdn )
{
+ char *ptr;
- if ( p_dn == NULL ) {
- *new_dn = ch_strdup( newrdn );
- return;
- }
-
- *new_dn = (char *) ch_malloc( strlen( p_dn ) + strlen( newrdn ) + 3 );
+ if ( parent_dn == NULL ) {
+ ber_dupbv( new_dn, newrdn );
+ return;
+ }
+
+ new_dn->bv_len = parent_dn->bv_len + newrdn->bv_len + 1;
+ new_dn->bv_val = (char *) ch_malloc( new_dn->bv_len + 1 );
+
+ ptr = lutil_strcopy( new_dn->bv_val, newrdn->bv_val );
+ *ptr++ = ',';
+ strcpy( ptr, parent_dn->bv_val );
+}
+
+
+/*
+ * dnIsSuffix - tells whether suffix is a suffix of dn.
+ * Both dn and suffix must be normalized.
+ */
+int
+dnIsSuffix(
+ const struct berval *dn,
+ const struct berval *suffix )
+{
+ int d = dn->bv_len - suffix->bv_len;
+
+ assert( dn );
+ assert( suffix );
+
+ /* empty suffix matches any dn */
+ if ( suffix->bv_len == 0 ) {
+ return 1;
+ }
+
+ /* suffix longer than dn */
+ if ( d < 0 ) {
+ return 0;
+ }
+
+ /* no rdn separator or escaped rdn separator */
+ if ( d > 1 && !DN_SEPARATOR( dn->bv_val[ d - 1 ] ) ) {
+ return 0;
+ }
+
+ /* no possible match or malformed dn */
+ if ( d == 1 ) {
+ return 0;
+ }
+
+ /* compare */
+ return( strcmp( dn->bv_val + d, suffix->bv_val ) == 0 );
+}
- strcpy( *new_dn, newrdn );
- strcat( *new_dn, "," );
- strcat( *new_dn, p_dn );
+#ifdef HAVE_TLS
+/*
+ * Convert an X.509 DN into a normalized LDAP DN
+ */
+int
+dnX509normalize( void *x509_name, struct berval *out )
+{
+ /* Invoke the LDAP library's converter with our schema-rewriter */
+ return ldap_X509dn2bv( x509_name, out, LDAPDN_rewrite, 0 );
}
+
+/*
+ * Get the TLS session's peer's DN into a normalized LDAP DN
+ */
+int
+dnX509peerNormalize( void *ssl, struct berval *dn )
+{
+
+ return ldap_pvt_tls_get_peer_dn( ssl, dn, (LDAPDN_rewrite_dummy *)LDAPDN_rewrite, 0 );
+}
+#endif
projects / openldap / blobdiff