/* dn.c - routines for dealing with distinguished names */
+/* $OpenLDAP$ */
/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include <ac/string.h>
#include <ac/time.h>
+#include "ldap_pvt.h"
+
#include "slap.h"
#define B4LEADTYPE 0
#define B4SEPARATOR 8
/*
- * dn_normalize - put dn into a canonical format. the dn is
- * normalized in place, as well as returned if valid.
+ * dn_validate - validate and compress dn. the dn is
+ * compressed in place are returned if valid.
*/
char *
-dn_normalize( char *dn )
+dn_validate( char *dn_in )
{
char *d, *s;
int state, gotesc;
+ char *dn = dn_in;
gotesc = 0;
state = B4LEADTYPE;
switch ( state ) {
case B4LEADTYPE:
case B4TYPE:
- if ( LEADOIDCHAR(*s) ) {
+ if ( OID_LEADCHAR(*s) ) {
state = INOIDTYPE;
*d++ = *s;
- } else if ( LEADKEYCHAR(*s) ) {
+ } else if ( ATTR_LEADCHAR(*s) ) {
state = INKEYTYPE;
*d++ = *s;
- } else if ( ! SPACE( *s ) ) {
+ } else if ( ! ASCII_SPACE( *s ) ) {
dn = NULL;
state = INKEYTYPE;
*d++ = *s;
break;
case INOIDTYPE:
- if ( OIDCHAR(*s) ) {
+ if ( OID_CHAR(*s) ) {
*d++ = *s;
} else if ( *s == '=' ) {
state = B4VALUE;
*d++ = *s;
- } else if ( SPACE( *s ) ) {
+ } else if ( ASCII_SPACE( *s ) ) {
state = B4EQUAL;
} else {
dn = NULL;
break;
case INKEYTYPE:
- if ( KEYCHAR(*s) ) {
+ if ( ATTR_CHAR(*s) ) {
*d++ = *s;
} else if ( *s == '=' ) {
state = B4VALUE;
*d++ = *s;
- } else if ( SPACE( *s ) ) {
+ } else if ( ASCII_SPACE( *s ) ) {
state = B4EQUAL;
} else {
dn = NULL;
if ( *s == '=' ) {
state = B4VALUE;
*d++ = *s;
- } else if ( ! SPACE( *s ) ) {
+ } else if ( ! ASCII_SPACE( *s ) ) {
/* not a valid dn - but what can we do here? */
*d++ = *s;
dn = NULL;
if ( *s == '"' ) {
state = INQUOTEDVALUE;
*d++ = *s;
- } else if ( ! SPACE( *s ) ) {
+ } else if ( ! ASCII_SPACE( *s ) ) {
state = INVALUE;
*d++ = *s;
}
break;
case INVALUE:
- if ( !gotesc && SEPARATOR( *s ) ) {
- while ( SPACE( *(d - 1) ) )
+ if ( !gotesc && RDN_SEPARATOR( *s ) ) {
+ while ( ASCII_SPACE( *(d - 1) ) )
d--;
state = B4TYPE;
if ( *s == '+' ) {
} else {
*d++ = ',';
}
- } else if ( gotesc && !NEEDSESCAPE( *s ) &&
- !SEPARATOR( *s ) ) {
+ } else if ( gotesc && !RDN_NEEDSESCAPE( *s ) &&
+ !RDN_SEPARATOR( *s ) )
+ {
*--d = *s;
d++;
- } else {
+ } else if( !ASCII_SPACE( *s ) || !ASCII_SPACE( *(d - 1) ) ) {
*d++ = *s;
}
break;
if ( !gotesc && *s == '"' ) {
state = B4SEPARATOR;
*d++ = *s;
- } else if ( gotesc && !NEEDSESCAPE( *s ) ) {
+ } else if ( gotesc && !RDN_NEEDSESCAPE( *s ) ) {
*--d = *s;
d++;
- } else {
+ } else if( !ASCII_SPACE( *s ) || !ASCII_SPACE( *(d - 1) ) ) {
*d++ = *s;
}
break;
+
case B4SEPARATOR:
- if ( SEPARATOR( *s ) ) {
+ if ( RDN_SEPARATOR( *s ) ) {
state = B4TYPE;
*d++ = *s;
+ } else if ( !ASCII_SPACE( *s ) ) {
+ dn = NULL;
}
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_normalize - unknown state %d\n", state, 0, 0 );
+ "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;
+ }
*d = '\0';
if( gotesc ) {
}
/*
- * dn_normalize_case - 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.
+ * 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.
*/
char *
-dn_normalize_case( char *dn )
+dn_normalize( char *dn )
{
- str2upper( dn );
+ char *out;
+ struct berval *bvdn, *nbvdn;
- /* normalize format */
- dn = dn_normalize( dn );
+ out = NULL;
+ bvdn = ber_bvstr( dn );
+
+ 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 );
- /* and upper case it */
- return( dn );
+ return( out );
}
/*
char *
dn_parent(
- Backend *be,
- const char *dn
+ Backend *be,
+ const char *dn
)
{
const char *s;
return NULL;
}
- while(*dn && SPACE(*dn)) {
+ while(*dn != '\0' && ASCII_SPACE(*dn)) {
dn++;
}
if( *dn == '\0' ) {
- return( NULL );
+ return NULL;
}
if ( be != NULL && be_issuffix( be, dn ) ) {
- return( NULL );
- }
-
- /*
- * no =, assume it is a dns name, like blah@some.domain.name
- * if the blah@ part is there, return some.domain.name. if
- * it's just some.domain.name, return domain.name.
- */
- if ( strchr( dn, '=' ) == NULL ) {
- if ( (s = strchr( dn, '@' )) == NULL ) {
- if ( (s = strchr( dn, '.' )) == NULL ) {
- return( NULL );
- }
- }
- if ( *(s + 1) == '\0' ) {
- return( NULL );
- } else {
- return( ch_strdup( &s[1] ) );
- }
+ return NULL;
}
/*
- * else assume it is an X.500-style name, which looks like
+ * assume it is an X.500-style name, which looks like
* foo=bar,sha=baz,...
*/
} else {
if ( *s == '"' ) {
inquote = 1;
- } else if ( DNSEPARATOR( *s ) ) {
- return( ch_strdup( &s[1] ) );
+ } else if ( DN_SEPARATOR( *s ) ) {
+ return ch_strdup( &s[1] );
}
}
}
- return( ch_strdup( "" ) );
+ return ch_strdup( "" );
}
-char * dn_rdn(
- Backend *be,
- char *dn )
+char * dn_rdn(
+ Backend *be,
+ const char *dn_in )
{
- char *s;
+ char *dn, *s;
int inquote;
- if( dn == NULL ) {
+ if( dn_in == NULL ) {
return NULL;
}
- while(*dn && SPACE(*dn)) {
- dn++;
+ while(*dn_in && ASCII_SPACE(*dn_in)) {
+ dn_in++;
}
- if( *dn == '\0' ) {
+ if( *dn_in == '\0' ) {
return( NULL );
}
- if ( be != NULL && be_issuffix( be, dn ) ) {
+ if ( be != NULL && be_issuffix( be, dn_in ) ) {
return( NULL );
}
- dn = ch_strdup( dn );
-
-#ifdef DNS_DN
- /*
- * no =, assume it is a dns name, like blah@some.domain.name
- * if the blah@ part is there, return some.domain.name. if
- * it's just some.domain.name, return domain.name.
- */
- if ( strchr( dn, '=' ) == NULL ) {
- if ( (s = strchr( dn, '@' )) == NULL ) {
- if ( (s = strchr( dn, '.' )) == NULL ) {
- return( dn );
- }
- }
- *s = '\0';
- return( dn );
- }
-#endif
-
- /*
- * else assume it is an X.500-style name, which looks like
- * foo=bar,sha=baz,...
- */
+ dn = ch_strdup( dn_in );
inquote = 0;
} else {
if ( *s == '"' ) {
inquote = 1;
- } else if ( DNSEPARATOR( *s ) ) {
+ } else if ( DN_SEPARATOR( *s ) ) {
*s = '\0';
return( dn );
}
*/
char **dn_subtree(
Backend *be,
- const char *dn )
+ const char *dn )
{
char *child, *parent;
char **subtree = NULL;
/*
- * dn_issuffix - tells whether suffix is a suffix of dn. both dn
+ * dn_issuffix - tells whether suffix is a suffix of dn. Both dn
* and suffix must be normalized.
*/
int
dn_issuffix(
- char *dn,
- char *suffix
+ const char *dn,
+ const char *suffix
)
{
int dnlen, suffixlen;
return( strcmp( dn + dnlen - suffixlen, suffix ) == 0 );
}
-#ifdef DNS_DN
-/*
- * dn_type - tells whether the given dn is an X.500 thing or DNS thing
- * returns (defined in slap.h): DN_DNS dns-style thing
- * DN_X500 x500-style thing
- */
-
-int
-dn_type( char *dn )
-{
- return( strchr( dn, '=' ) == NULL ? DN_DNS : DN_X500 );
-}
-#endif
-
-char *
-str2upper( char *str )
-{
- char *s;
-
- /* normalize case */
- for ( s = str; *s; s++ ) {
- *s = TOUPPER( (unsigned char) *s );
- }
-
- return( str );
-}
-
-char *
-str2lower( char *str )
-{
- char *s;
-
- /* normalize case */
- for ( s = str; *s; s++ ) {
- *s = TOLOWER( (unsigned char) *s );
- }
-
- return( str );
-}
-
-
/*
* 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
+ * 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
/* 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
+ * 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.
- */
+ */
-static char *
-get_next_substring( char * s, char d )
+static char *
+get_next_substring( const char * s, char d )
{
char *str, *r;
/* Skip leading spaces */
- while ( *s && SPACE(*s) ) {
-
+ while ( *s && ASCII_SPACE(*s) ) {
s++;
-
}
/* Copy word */
*/
*str++ = *s++;
-
}
*str = '\0';
*
* 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
+ * 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.
*/
-char * rdn_attr_type( char * s )
+char * rdn_attr_type( const char * s )
{
-
return get_next_substring( s, '=' );
-
}
*
* 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
+ * 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").
*/
-char *
-rdn_attr_value( char * rdn )
+char *
+rdn_attr_value( const char * rdn )
{
- char *str;
+ const char *str;
if ( (str = strchr( rdn, '=' )) != NULL ) {
-
return get_next_substring(++str, '\0');
-
}
return NULL;
}
-int rdn_validate( const char * rdn )
+/* 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 0 on success, -1 on failure.
+ *
+ * note: got part of the code from dn_validate
+ */
+
+int
+rdn_attrs( const char * rdn_in, char ***ptypes, char ***pvalues)
{
- /* just a simple check for now */
- return strchr( rdn, '=' ) != NULL;
+ char **parts, **p;
+
+ *ptypes = NULL;
+ *pvalues = NULL;
+
+ /*
+ * explode the rdn in parts
+ */
+ parts = ldap_explode_rdn( rdn_in, 0 );
+
+ if ( parts == NULL ) {
+ return( -1 );
+ }
+
+ for ( p = parts; p[0]; p++ ) {
+ char *s, *e, *d;
+
+ /* split each rdn part in type value */
+ s = strchr( p[0], '=' );
+ if ( s == NULL ) {
+ charray_free( *ptypes );
+ charray_free( *pvalues );
+ charray_free( parts );
+ return( -1 );
+ }
+
+ /* type should be fine */
+ charray_add_n( ptypes, p[0], ( s-p[0] ) );
+
+ /* value needs to be unescaped
+ * (maybe this should be moved to ldap_explode_rdn?) */
+ for ( e = d = s + 1; e[0]; e++ ) {
+ if ( *e != '\\' ) {
+ *d++ = *e;
+ }
+ }
+ d[0] = '\0';
+ charray_add( pvalues, s + 1 );
+ }
+
+ /* free array */
+ charray_free( parts );
+
+ return( 0 );
}
-/* build_new_dn:
+/* rdn_validate:
*
- * Used by ldbm/bdb2_back_modrdn to create the new dn of entries being
- * renamed.
+ * 1 if rdn is a legal rdn;
+ * 0 otherwise (including a sequence of rdns)
*
- * new_dn = parent (p_dn) + separator(s) + rdn (newrdn) + null.
+ * note: got it from dn_rdn; it should be rewritten
+ * according to dn_validate
*/
-
-void
-build_new_dn( char ** new_dn,
- const char *e_dn,
- const char * p_dn,
- const char * newrdn )
+int
+rdn_validate( const char * rdn )
{
+ int inquote;
- if ( p_dn == NULL ) {
-
- *new_dn = ch_strdup( newrdn );
- return;
-
- }
-
- *new_dn = (char *) ch_malloc( strlen( p_dn ) + strlen( newrdn ) + 3 );
+ if ( rdn == NULL ) {
+ return( 0 );
+ }
-#ifdef DNS_DN
- if ( dn_type( e_dn ) == DN_X500 ) {
-#endif
+ if ( strchr( rdn, '=' ) == NULL ) {
+ return( 0 );
+ }
- strcpy( *new_dn, newrdn );
- strcat( *new_dn, "," );
- strcat( *new_dn, p_dn );
+ while ( *rdn && ASCII_SPACE( *rdn ) ) {
+ rdn++;
+ }
-#ifdef DNS_DN
- } else {
+ if( *rdn == '\0' ) {
+ return( 0 );
+ }
- char *s;
- char sep[2];
+ inquote = 0;
- strcpy( *new_dn, newrdn );
- s = strchr( newrdn, '\0' );
- s--;
+ 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 );
+ }
+ }
+ }
- if ( (*s != '.') && (*s != '@') ) {
+ return( 1 );
+}
- if ( (s = strpbrk( e_dn, ".@" )) != NULL ) {
- sep[0] = *s;
- sep[1] = '\0';
- strcat( *new_dn, sep );
+/* build_new_dn:
+ *
+ * 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.
+ */
- }
+void
+build_new_dn( char ** new_dn,
+ const char *e_dn,
+ const char * p_dn,
+ const char * newrdn )
+{
+ if ( p_dn == NULL ) {
+ *new_dn = ch_strdup( newrdn );
+ return;
}
- strcat( *new_dn, p_dn );
+ *new_dn = (char *) ch_malloc( strlen( p_dn ) + strlen( newrdn ) + 3 );
- }
-#endif
-
+ strcpy( *new_dn, newrdn );
+ strcat( *new_dn, "," );
+ strcat( *new_dn, p_dn );
}
projects / openldap / blobdiff