X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fdn.c;h=148d8155e9756adda8cd41f9053395a96af96769;hb=1fbbc1181152a32c1b9b82342ad6d63034ec7fbb;hp=19960cebf4339ed1336d750f60dadd5d3af655fb;hpb=1092fcfed876a6c47cd0a277c49a7621b11f08ee;p=openldap

diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index 19960cebf4..148d8155e9 100644
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -1,7 +1,7 @@
 /* dn.c - routines for dealing with distinguished names */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -18,7 +18,9 @@
 
 #include "slap.h"
 
-#define SLAP_LDAPDN_PRETTY 0x1
+#include "lutil.h"
+
+const struct berval slap_empty_bv = { 0, "" };
 
 /*
  * The DN syntax-related functions take advantage of the dn representation
@@ -111,24 +113,30 @@ dnValidate(
 	assert( in );
 
 	if ( in->bv_len == 0 ) {
-		return( LDAP_SUCCESS );
+		return LDAP_SUCCESS;
+
+	} else if ( in->bv_len > SLAP_LDAPDN_MAXLEN ) {
+		return LDAP_INVALID_SYNTAX;
 	}
 
-	rc = ldap_str2dn( in->bv_val, &dn, LDAP_DN_FORMAT_LDAP );
+	rc = ldap_bv2dn( in, &dn, LDAP_DN_FORMAT_LDAP );
+	if ( rc != LDAP_SUCCESS ) {
+		return LDAP_INVALID_SYNTAX;
+	}
+
+	assert( strlen( in->bv_val ) == in->bv_len );
 
 	/*
 	 * Schema-aware validate
 	 */
-	if ( rc == LDAP_SUCCESS ) {
-		rc = LDAPDN_validate( dn );
-		ldap_dnfree( dn );
-	}
-	
+	rc = LDAPDN_validate( dn );
+	ldap_dnfree( dn );
+
 	if ( rc != LDAP_SUCCESS ) {
-		return( LDAP_INVALID_SYNTAX );
+		return LDAP_INVALID_SYNTAX;
 	}
 
-	return( LDAP_SUCCESS );
+	return LDAP_SUCCESS;
 }
 
 /*
@@ -232,6 +240,7 @@ LDAPDN_rewrite( LDAPDN *dn, unsigned flags )
 		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 };
@@ -256,20 +265,43 @@ LDAPDN_rewrite( LDAPDN *dn, unsigned flags )
 			 */
 			ava->la_attr = ad->ad_cname;
 
-			if( flags & SLAP_LDAPDN_PRETTY ) {
+			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;
 			}
 
+			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 );
+					ava->la_value.bv_len
+						? &ava->la_value
+						: (struct berval *) &slap_empty_bv,
+					&bv );
 			
 				if ( rc != LDAP_SUCCESS ) {
 					return LDAP_INVALID_SYNTAX;
@@ -279,9 +311,10 @@ LDAPDN_rewrite( LDAPDN *dn, unsigned flags )
 			if( mr && ( mr->smr_usage & SLAP_MR_DN_FOLD ) ) {
 				char *s = bv.bv_val;
 
-				ber_str2bv( UTF8normalize( bv.bv_val ? &bv
-					: &ava->la_value, LDAP_UTF8_CASEFOLD ),
-					0, 0, &bv );
+				if ( UTF8bvnormalize( &bv, &bv, 
+						LDAP_UTF8_CASEFOLD ) == NULL ) {
+					return LDAP_INVALID_SYNTAX;
+				}
 				free( s );
 			}
 
@@ -338,11 +371,13 @@ dnNormalize2(
 		/*
 		 * Go to structural representation
 		 */
-		rc = ldap_str2dn( val->bv_val, &dn, LDAP_DN_FORMAT_LDAP );
+		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
 		 */
@@ -354,7 +389,8 @@ dnNormalize2(
 		/*
 		 * Back to string representation
 		 */
-		rc = ldap_dn2bv( dn, out, LDAP_DN_FORMAT_LDAPV3 );
+		rc = ldap_dn2bv( dn, out,
+			LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY );
 
 		ldap_dnfree( dn );
 
@@ -402,18 +438,30 @@ dnPretty2(
 	assert( val );
 	assert( out );
 
+#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 ) {
+	if ( val->bv_len == 0 ) {
+		ber_dupbv( out, val );
+
+	} else if ( val->bv_len > SLAP_LDAPDN_MAXLEN ) {
+		return LDAP_INVALID_SYNTAX;
+
+	} else {
 		LDAPDN		*dn = NULL;
 		int		rc;
 
 		/* FIXME: should be liberal in what we accept */
-		rc = ldap_str2dn( val->bv_val, &dn, LDAP_DN_FORMAT_LDAP );
+		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
 		 */
@@ -434,8 +482,6 @@ dnPretty2(
 		if ( rc != LDAP_SUCCESS ) {
 			return LDAP_INVALID_SYNTAX;
 		}
-	} else {
-		ber_dupbv( out, val );
 	}
 
 	Debug( LDAP_DEBUG_TRACE, "<<< dnPretty: <%s>\n", out->bv_val, 0, 0 );
@@ -443,6 +489,60 @@ dnPretty2(
 	return LDAP_SUCCESS;
 }
 
+int
+dnPrettyNormalDN(
+	Syntax *syntax,
+	struct berval *val,
+	LDAPDN **dn,
+	int flags )
+{
+	assert( val );
+	assert( dn );
+
+#ifdef NEW_LOGGING
+	LDAP_LOG( OPERATION, ARGS, ">>> dn%sDN: <%s>\n", 
+			flags == SLAP_LDAPDN_PRETTY ? "Pretty" : "Normal", 
+			val->bv_val, 0 );
+#else
+	Debug( LDAP_DEBUG_TRACE, ">>> dn%sDN: <%s>\n", 
+			flags == SLAP_LDAPDN_PRETTY ? "Pretty" : "Normal", 
+			val->bv_val, 0 );
+#endif
+
+	if ( val->bv_len == 0 ) {
+		return LDAP_SUCCESS;
+
+	} else if ( val->bv_len > SLAP_LDAPDN_MAXLEN ) {
+		return LDAP_INVALID_SYNTAX;
+
+	} else {
+		int		rc;
+
+		/* 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, flags ) != LDAP_SUCCESS ) {
+			ldap_dnfree( *dn );
+			*dn = NULL;
+			return LDAP_INVALID_SYNTAX;
+		}
+	}
+
+	Debug( LDAP_DEBUG_TRACE, "<<< dn%sDN\n", 
+			flags == SLAP_LDAPDN_PRETTY ? "Pretty" : "Normal",
+			0, 0 );
+
+	return LDAP_SUCCESS;
+}
+
 /*
  * Combination of both dnPretty and dnNormalize
  */
@@ -453,13 +553,25 @@ dnPrettyNormal(
 	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
 
 	assert( val );
 	assert( pretty );
 	assert( normal );
 
-	if ( val->bv_len != 0 ) {
+	if ( val->bv_len == 0 ) {
+		ber_dupbv( pretty, val );
+		ber_dupbv( normal, val );
+
+	} else if ( val->bv_len > SLAP_LDAPDN_MAXLEN ) {
+		/* too big */
+		return LDAP_INVALID_SYNTAX;
+
+	} else {
 		LDAPDN		*dn = NULL;
 		int		rc;
 
@@ -469,11 +581,13 @@ dnPrettyNormal(
 		normal->bv_len = 0;
 
 		/* FIXME: should be liberal in what we accept */
-		rc = ldap_str2dn( val->bv_val, &dn, LDAP_DN_FORMAT_LDAP );
+		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
 		 */
@@ -498,7 +612,8 @@ dnPrettyNormal(
 			return LDAP_INVALID_SYNTAX;
 		}
 
-		rc = ldap_dn2bv( dn, normal, LDAP_DN_FORMAT_LDAPV3 );
+		rc = ldap_dn2bv( dn, normal,
+			LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY );
 
 		ldap_dnfree( dn );
 		if ( rc != LDAP_SUCCESS ) {
@@ -507,13 +622,15 @@ dnPrettyNormal(
 			pretty->bv_len = 0;
 			return LDAP_INVALID_SYNTAX;
 		}
-	} else {
-		ber_dupbv( pretty, val );
-		ber_dupbv( normal, val );
 	}
 
+#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
 
 	return LDAP_SUCCESS;
 }
@@ -540,13 +657,13 @@ dnMatch(
 	match = value->bv_len - asserted->bv_len;
 
 	if ( match == 0 ) {
-		match = strcmp( value->bv_val, asserted->bv_val );
+		match = memcmp( value->bv_val, asserted->bv_val, 
+				value->bv_len );
 	}
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
-		"dnMatch: %d\n    %s\n    %s\n", match,
-		value->bv_val, asserted->bv_val ));
+	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 );
@@ -556,122 +673,37 @@ dnMatch(
 	return( LDAP_SUCCESS );
 }
 
-#ifdef SLAP_DN_MIGRATION
-/*
- * these routines are provided for migration purposes only!
- *	dn_normalize is deprecated in favor of dnNormalize
- *	strcmp/strcasecmp for DNs is deprecated in favor of dnMatch
- *
- * other routines are likewise deprecated but may not yet have
- * replacement functions.
- */
-
-/*
- * 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.
- * Deprecated in favor of dnNormalize()
- */
-char *
-dn_normalize( char *dn )
-{
-	struct berval val;
-	struct berval *normalized = NULL;
-	int		rc;
-
-	if ( dn == NULL || dn[0] == '\0' ) {
-		return dn;
-	}
-
-	val.bv_val = dn;
-	val.bv_len = strlen( dn );
-
-	rc = dnNormalize( NULL, &val, &normalized );
-	if ( rc != LDAP_SUCCESS ) {
-		return NULL;
-	}
-
-	if ( val.bv_len < normalized->bv_len ) {
-		ber_bvfree( normalized );
-		return NULL;
-	}
-
-	AC_MEMCPY( dn, normalized->bv_val, normalized->bv_len + 1 );
-	ber_bvfree( normalized );
-
-	return dn;
-}
-
 /*
  * dnParent - dn's parent, in-place
+ *
+ * note: the incoming dn is assumed to be normalized/prettyfied,
+ * so that escaped rdn/ava separators are in '\'+hexpair form
  */
-int
+void
 dnParent( 
-	const char	*dn, 
-	const char	**pdn )
+	struct berval	*dn, 
+	struct berval	*pdn )
 {
-	const char	*p;
-	int		rc;
+	char	*p;
 
-	rc = ldap_str2rdn( dn, NULL, (char **)&p,
-		LDAP_DN_FORMAT_LDAP | LDAP_DN_SKIP );
-	if ( rc != LDAP_SUCCESS ) {
-		return rc;
-	}
+	p = strchr( dn->bv_val, ',' );
 
-	/* Parent is root */
-	if (*p == '\0') {
-		*pdn = "";
-		return LDAP_SUCCESS;
+	/* one-level dn */
+	if ( p == NULL ) {
+		pdn->bv_len = 0;
+		pdn->bv_val = dn->bv_val + dn->bv_len;
+		return;
 	}
 
 	assert( DN_SEPARATOR( p[ 0 ] ) );
 	p++;
 
-	while ( ASCII_SPACE( p[ 0 ] ) ) {
-		p++;
-	}
-
-	*pdn = p;
-
-	return LDAP_SUCCESS;
-}
-
-/*
- * dn_parent - return the dn's parent, in-place
- * FIXME: should be replaced by dnParent()
- */
-char *
-dn_parent(
-	Backend		*be,
-	const char	*dn )
-{
-	const char	*pdn;
+	assert( ATTR_LEADCHAR( p[ 0 ] ) );
+	pdn->bv_val = p;
+	pdn->bv_len = dn->bv_len - (p - dn->bv_val);
 
-	if ( dn == NULL ) {
-		return NULL;
-	}
-
-	while ( dn[ 0 ] != '\0' && ASCII_SPACE( dn[ 0 ] ) ) {
-		dn++;
-	}
-
-	if ( dn[ 0 ] == '\0' ) {
-		return NULL;
-	}
-
-	if ( be != NULL && be_issuffix( be, dn ) ) {
-		return NULL;
-	}
-
-	if ( dnParent( dn, &pdn ) != LDAP_SUCCESS ) {
-		return NULL;
-	}
-	
-	return ( char * )pdn;
+	return;
 }
-#endif /* SLAP_DN_MIGRATION */
-
 
 int
 dnExtractRdn( 
@@ -689,12 +721,13 @@ dnExtractRdn(
 		return LDAP_OTHER;
 	}
 
-	rc = ldap_str2rdn( dn->bv_val, &tmpRDN, (char **)&p, LDAP_DN_FORMAT_LDAP );
+	rc = ldap_bv2rdn( dn, &tmpRDN, (char **)&p, LDAP_DN_FORMAT_LDAP );
 	if ( rc != LDAP_SUCCESS ) {
 		return rc;
 	}
 
-	rc = ldap_rdn2bv( tmpRDN, rdn, LDAP_DN_FORMAT_LDAPV3 );
+	rc = ldap_rdn2bv( tmpRDN, rdn, LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY );
+
 	ldap_rdnfree( tmpRDN );
 	if ( rc != LDAP_SUCCESS ) {
 		return rc;
@@ -704,14 +737,13 @@ dnExtractRdn(
 }
 
 /*
- * FIXME: should be replaced by dnExtractRdn()
+ * We can assume the input is a prettied or normalized DN
  */
 int 
 dn_rdnlen(
 	Backend		*be,
 	struct berval	*dn_in )
 {
-	int		rc;
 	const char	*p;
 
 	assert( dn_in );
@@ -724,17 +756,13 @@ dn_rdnlen(
 		return 0;
 	}
 
-	if ( be != NULL && be_issuffix( be, dn_in->bv_val ) ) {
+	if ( be != NULL && be_issuffix( be, dn_in ) ) {
 		return 0;
 	}
 
-	rc = ldap_str2rdn( dn_in->bv_val, NULL, (char **)&p, 
-			LDAP_DN_FORMAT_LDAP | LDAP_DN_SKIP );
-	if ( rc != LDAP_SUCCESS ) {
-		return 0;
-	}
+	p = strchr( dn_in->bv_val, ',' );
 
-	return p - dn_in->bv_val;
+	return p ? p - dn_in->bv_val : dn_in->bv_len;
 }
 
 
@@ -751,7 +779,9 @@ rdnValidate( struct berval *rdn )
 	 * input is a pretty or normalized DN
 	 * hence, we can just search for ','
 	 */
-	if( rdn == NULL || rdn->bv_len == 0 ) {
+	if( rdn == NULL || rdn->bv_len == 0 ||
+		rdn->bv_len > SLAP_LDAPDN_MAXLEN )
+	{
 		return LDAP_INVALID_SYNTAX;
 	}
 
@@ -773,7 +803,7 @@ rdnValidate( struct berval *rdn )
 	/*
 	 * must be parsable
 	 */
-	rc = ldap_str2rdn( rdn, &RDN, (char **)&p, LDAP_DN_FORMAT_LDAP );
+	rc = ldap_bv2rdn( rdn, &RDN, (char **)&p, LDAP_DN_FORMAT_LDAP );
 	if ( rc != LDAP_SUCCESS ) {
 		return 0;
 	}
@@ -824,7 +854,7 @@ build_new_dn( struct berval * new_dn,
 	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 = slap_strcopy( new_dn->bv_val, newrdn->bv_val );
+	ptr = lutil_strcopy( new_dn->bv_val, newrdn->bv_val );
 	*ptr++ = ',';
 	strcpy( ptr, parent_dn->bv_val );
 }
@@ -855,8 +885,7 @@ dnIsSuffix(
 	}
 
 	/* no rdn separator or escaped rdn separator */
-	if ( d > 1 && ( !DN_SEPARATOR( dn->bv_val[ d - 1 ] ) 
-				|| DN_ESCAPE( dn->bv_val[ d - 2 ] ) ) ) {
+	if ( d > 1 && !DN_SEPARATOR( dn->bv_val[ d - 1 ] ) ) {
 		return 0;
 	}
 
@@ -868,3 +897,25 @@ dnIsSuffix(
 	/* compare */
 	return( strcmp( dn->bv_val + d, suffix->bv_val ) == 0 );
 }
+
+#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