X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fgetdn.c;h=4dd2279ee5fd0ab31748b52fb4eca7e39aa5c5cf;hb=70092b38fb23b9141a2b8414fb5a9c5200f3c12d;hp=7a143bd58999c3aa0b52689c9dc7a1d98c7cb64a;hpb=4d7e9044048a046e43296d9e8d22b4f5b60b38ff;p=openldap diff --git a/libraries/libldap/getdn.c b/libraries/libldap/getdn.c index 7a143bd589..4dd2279ee5 100644 --- a/libraries/libldap/getdn.c +++ b/libraries/libldap/getdn.c @@ -1,6 +1,6 @@ /* $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 */ /* Portions @@ -20,27 +20,23 @@ #include #include "ldap-int.h" +#include "ldap_schema.h" /* extension to UFN that turns trailing "dc=value" rdns in DNS style, * e.g. "ou=People,dc=openldap,dc=org" => "People, openldap.org" */ #define DC_IN_UFN -/* #define PRETTY_ESCAPE */ - -static int dn2dn( const char *dnin, unsigned fin, char **dnout, unsigned fout ); - -/* from libraries/libldap/schema.c */ -extern char * parse_numericoid(const char **sp, int *code, const int flags); +#define PRETTY_ESCAPE /* parsing/printing routines */ -static int str2strval( const char *str, struct berval **val, +static int str2strval( const char *str, ber_len_t stoplen, struct berval *val, const char **next, unsigned flags, unsigned *retFlags ); -static int DCE2strval( const char *str, struct berval **val, +static int DCE2strval( const char *str, struct berval *val, const char **next, unsigned flags ); -static int IA52strval( const char *str, struct berval **val, +static int IA52strval( const char *str, struct berval *val, const char **next, unsigned flags ); -static int quotedIA52strval( const char *str, struct berval **val, +static int quotedIA52strval( const char *str, struct berval *val, const char **next, unsigned flags ); -static int hexstr2binval( const char *str, struct berval **val, +static int hexstr2binval( const char *str, struct berval *val, const char **next, unsigned flags ); static int hexstr2bin( const char *str, char *c ); static int byte2hexpair( const char *val, char *pair ); @@ -66,12 +62,6 @@ static int dn2domain( LDAPDN *dn, struct berval *bv, int pos, int *iRDN ); /* AVA helpers */ static LDAPAVA * ldapava_new( const struct berval *attr, const struct berval *val, unsigned flags ); -static LDAPRDN * ldapava_append_to_rdn( LDAPRDN *rdn, LDAPAVA *ava ); -static LDAPRDN * ldapava_insert_into_rdn( - LDAPRDN *rdn, LDAPAVA *ava, unsigned where ); -static LDAPDN * ldapava_append_to_dn( LDAPDN *dn, LDAPRDN *rdn ); -static LDAPDN * ldapava_insert_into_dn( - LDAPDN *dn, LDAPRDN *rdn, unsigned where ); /* Higher level helpers */ static int rdn2strlen( LDAPRDN *rdn, unsigned flags, ber_len_t *len, @@ -94,12 +84,15 @@ ldap_get_dn( LDAP *ld, LDAPMessage *entry ) char *dn; BerElement tmp; +#ifdef NEW_LOGGING + LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_get_dn\n" )); +#else Debug( LDAP_DEBUG_TRACE, "ldap_get_dn\n", 0, 0, 0 ); +#endif - if ( entry == NULL ) { - ld->ld_errno = LDAP_PARAM_ERROR; - return( NULL ); - } + assert( ld != NULL ); + assert( LDAP_VALID(ld) ); + assert( entry != NULL ); tmp = *entry->lm_ber; /* struct copy */ if ( ber_scanf( &tmp, "{a" /*}*/, &dn ) == LBER_ERROR ) { @@ -118,9 +111,14 @@ ldap_dn2ufn( LDAP_CONST char *dn ) { char *out = NULL; +#ifdef NEW_LOGGING + LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_dn2ufn\n" )); +#else Debug( LDAP_DEBUG_TRACE, "ldap_dn2ufn\n", 0, 0, 0 ); +#endif - ( void )dn2dn( dn, LDAP_DN_FORMAT_LDAP, &out, LDAP_DN_FORMAT_UFN ); + ( void )ldap_dn_normalize( dn, LDAP_DN_FORMAT_LDAP, + &out, LDAP_DN_FORMAT_UFN ); return( out ); } @@ -136,7 +134,11 @@ ldap_explode_dn( LDAP_CONST char *dn, int notypes ) int iRDN; unsigned flag = notypes ? LDAP_DN_FORMAT_UFN : LDAP_DN_FORMAT_LDAPV3; +#ifdef NEW_LOGGING + LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_explode_dn\n" )); +#else Debug( LDAP_DEBUG_TRACE, "ldap_explode_dn\n", 0, 0, 0 ); +#endif if ( ldap_str2dn( dn, &tmpDN, LDAP_DN_FORMAT_LDAP ) != LDAP_SUCCESS ) { @@ -151,22 +153,20 @@ ldap_explode_dn( LDAP_CONST char *dn, int notypes ) return values; } - for ( iRDN = 0; tmpDN[ iRDN ]; iRDN++ ) { - char *str, **v = NULL; - - ldap_rdn2str( tmpDN[ iRDN ][ 0 ], &str, flag ); + for ( iRDN = 0; tmpDN[ 0 ][ iRDN ]; iRDN++ ); - v = LDAP_REALLOC( values, sizeof( char * ) * ( 2 + iRDN ) ); - if ( v == NULL ) { - LBER_VFREE( values ); - ldap_dnfree( tmpDN ); - return NULL; - } - values = v; - values[ iRDN ] = str; + values = LDAP_MALLOC( sizeof( char * ) * ( 1 + iRDN ) ); + if ( values == NULL ) { + ldap_dnfree( tmpDN ); + return NULL; } + for ( iRDN = 0; tmpDN[ 0 ][ iRDN ]; iRDN++ ) { + ldap_rdn2str( tmpDN[ 0 ][ iRDN ], &values[ iRDN ], flag ); + } + ldap_dnfree( tmpDN ); values[ iRDN ] = NULL; + return values; } @@ -178,46 +178,51 @@ ldap_explode_rdn( LDAP_CONST char *rdn, int notypes ) const char *p; int iAVA; +#ifdef NEW_LOGGING + LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_explode_rdn\n" )); +#else Debug( LDAP_DEBUG_TRACE, "ldap_explode_rdn\n", 0, 0, 0 ); +#endif /* * we only parse the first rdn * FIXME: we prefer efficiency over checking if the _ENTIRE_ * dn can be parsed */ - if ( ldap_str2rdn( rdn, &tmpRDN, &p, LDAP_DN_FORMAT_LDAP ) + if ( ldap_str2rdn( rdn, &tmpRDN, (char **) &p, LDAP_DN_FORMAT_LDAP ) != LDAP_SUCCESS ) { return( NULL ); } - for ( iAVA = 0; tmpRDN[ iAVA ]; iAVA++ ) { + for ( iAVA = 0; tmpRDN[ 0 ][ iAVA ]; iAVA++ ) ; + values = LDAP_MALLOC( sizeof( char * ) * ( 1 + iAVA ) ); + if ( values == NULL ) { + ldap_rdnfree( tmpRDN ); + return( NULL ); + } + + for ( iAVA = 0; tmpRDN[ 0 ][ iAVA ]; iAVA++ ) { ber_len_t l = 0, vl, al = 0; - char *str, **v = NULL; - LDAPAVA *ava = tmpRDN[ iAVA ][ 0 ]; - - v = LDAP_REALLOC( values, sizeof( char * ) * ( 2 + iAVA ) ); - if ( v == NULL ) { - goto error_return; - } - values = v; + char *str; + LDAPAVA *ava = tmpRDN[ 0 ][ iAVA ]; if ( ava->la_flags == LDAP_AVA_BINARY ) { - vl = 1 + 2 * ava->la_value->bv_len; + vl = 1 + 2 * ava->la_value.bv_len; } else { - if ( strval2strlen( ava->la_value, + if ( strval2strlen( &ava->la_value, ava->la_flags, &vl ) ) { goto error_return; } } if ( !notypes ) { - al = ava->la_attr->bv_len; - l = vl + ava->la_attr->bv_len + 1; + al = ava->la_attr.bv_len; + l = vl + ava->la_attr.bv_len + 1; str = LDAP_MALLOC( l + 1 ); - AC_MEMCPY( str, ava->la_attr->bv_val, - ava->la_attr->bv_len ); + AC_MEMCPY( str, ava->la_attr.bv_val, + ava->la_attr.bv_len ); str[ al++ ] = '='; } else { @@ -227,12 +232,12 @@ ldap_explode_rdn( LDAP_CONST char *rdn, int notypes ) if ( ava->la_flags == LDAP_AVA_BINARY ) { str[ al++ ] = '#'; - if ( binval2hexstr( ava->la_value, &str[ al ] ) ) { + if ( binval2hexstr( &ava->la_value, &str[ al ] ) ) { goto error_return; } } else { - if ( strval2str( ava->la_value, &str[ al ], + if ( strval2str( &ava->la_value, &str[ al ], ava->la_flags, &vl ) ) { goto error_return; } @@ -258,9 +263,14 @@ ldap_dn2dcedn( LDAP_CONST char *dn ) { char *out = NULL; +#ifdef NEW_LOGGING + LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_dn2dcedn\n" )); +#else Debug( LDAP_DEBUG_TRACE, "ldap_dn2dcedn\n", 0, 0, 0 ); +#endif - ( void )dn2dn( dn, LDAP_DN_FORMAT_LDAP, &out, LDAP_DN_FORMAT_DCE ); + ( void )ldap_dn_normalize( dn, LDAP_DN_FORMAT_LDAP, + &out, LDAP_DN_FORMAT_DCE ); return( out ); } @@ -270,9 +280,13 @@ ldap_dcedn2dn( LDAP_CONST char *dce ) { char *out = NULL; +#ifdef NEW_LOGGING + LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_dcedn2dn\n" )); +#else Debug( LDAP_DEBUG_TRACE, "ldap_dcedn2dn\n", 0, 0, 0 ); +#endif - ( void )dn2dn( dce, LDAP_DN_FORMAT_DCE, &out, LDAP_DN_FORMAT_LDAPV3 ); + ( void )ldap_dn_normalize( dce, LDAP_DN_FORMAT_DCE, &out, LDAP_DN_FORMAT_LDAPV3 ); return( out ); } @@ -282,26 +296,20 @@ ldap_dn2ad_canonical( LDAP_CONST char *dn ) { char *out = NULL; +#ifdef NEW_LOGGING + LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_dn2ad_canonical\n" )); +#else Debug( LDAP_DEBUG_TRACE, "ldap_dn2ad_canonical\n", 0, 0, 0 ); +#endif - ( void )dn2dn( dn, LDAP_DN_FORMAT_LDAP, + ( void )ldap_dn_normalize( dn, LDAP_DN_FORMAT_LDAP, &out, LDAP_DN_FORMAT_AD_CANONICAL ); return( out ); } -int -ldap_dn_normalize( const char *in, unsigned iflags, char **out, unsigned oflags ) -{ - assert( out ); - - Debug( LDAP_DEBUG_TRACE, "ldap_dn_normalize\n", 0, 0, 0 ); - - return dn2dn( in, iflags, out, oflags); -} - /* - * helper that changes the string representation of dnin + * function that changes the string representation of dnin * from ( fin & LDAP_DN_FORMAT_MASK ) to ( fout & LDAP_DN_FORMAT_MASK ) * * fin can be one of: @@ -317,12 +325,19 @@ ldap_dn_normalize( const char *in, unsigned iflags, char **out, unsigned oflags * LDAP_DN_FORMAT_UFN (rfc 1781, partial and with extensions) * LDAP_DN_FORMAT_AD_CANONICAL (?) */ -static int -dn2dn( const char *dnin, unsigned fin, char **dnout, unsigned fout ) +int +ldap_dn_normalize( LDAP_CONST char *dnin, + unsigned fin, char **dnout, unsigned fout ) { int rc; LDAPDN *tmpDN = NULL; +#ifdef NEW_LOGGING + LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_dn_normalize\n" )); +#else + Debug( LDAP_DEBUG_TRACE, "ldap_dn_normalize\n", 0, 0, 0 ); +#endif + assert( dnout ); *dnout = NULL; @@ -368,25 +383,21 @@ dn2dn( const char *dnin, unsigned fin, char **dnout, unsigned fout ) */ #define LDAP_DN_ASCII_SPACE(c) \ ( (c) == ' ' || (c) == '\t' || (c) == '\n' || (c) == '\r' ) -#define LDAP_DN_ASCII_LOWER(c) ( (c) >= 'a' && (c) <= 'z' ) -#define LDAP_DN_ASCII_UPPER(c) ( (c) >= 'A' && (c) <= 'Z' ) -#define LDAP_DN_ASCII_ALPHA(c) \ - ( LDAP_DN_ASCII_LOWER(c) || LDAP_DN_ASCII_UPPER(c) ) -#define LDAP_DN_ASCII_DIGIT(c) ( (c) >= '0' && (c) <= '9' ) -#define LDAP_DN_ASCII_LCASE_HEXALPHA(c) ( (c) >= 'a' && (c) <= 'f' ) -#define LDAP_DN_ASCII_UCASE_HEXALPHA(c) ( (c) >= 'A' && (c) <= 'F' ) -#define LDAP_DN_ASCII_HEXDIGIT(c) \ - ( LDAP_DN_ASCII_DIGIT(c) \ - || LDAP_DN_ASCII_LCASE_HEXALPHA(c) \ - || LDAP_DN_ASCII_UCASE_HEXALPHA(c) ) -#define LDAP_DN_ASCII_ALNUM(c) \ - ( LDAP_DN_ASCII_ALPHA(c) || LDAP_DN_ASCII_DIGIT(c) ) +#define LDAP_DN_ASCII_LOWER(c) LDAP_LOWER(c) +#define LDAP_DN_ASCII_UPPER(c) LDAP_UPPER(c) +#define LDAP_DN_ASCII_ALPHA(c) LDAP_ALPHA(c) + +#define LDAP_DN_ASCII_DIGIT(c) LDAP_DIGIT(c) +#define LDAP_DN_ASCII_LCASE_HEXALPHA(c) LDAP_HEXLOWER(c) +#define LDAP_DN_ASCII_UCASE_HEXALPHA(c) LDAP_HEXUPPER(c) +#define LDAP_DN_ASCII_HEXDIGIT(c) LDAP_HEX(c) +#define LDAP_DN_ASCII_ALNUM(c) LDAP_ALNUM(c) #define LDAP_DN_ASCII_PRINTABLE(c) ( (c) >= ' ' && (c) <= '~' ) /* attribute type */ -#define LDAP_DN_OID_LEADCHAR(c) ( LDAP_DN_ASCII_DIGIT(c) ) -#define LDAP_DN_DESC_LEADCHAR(c) ( LDAP_DN_ASCII_ALPHA(c) ) -#define LDAP_DN_DESC_CHAR(c) ( LDAP_DN_ASCII_ALNUM(c) || (c) == '-' ) +#define LDAP_DN_OID_LEADCHAR(c) LDAP_DIGIT(c) +#define LDAP_DN_DESC_LEADCHAR(c) LDAP_ALPHA(c) +#define LDAP_DN_DESC_CHAR(c) LDAP_LDH(c) #define LDAP_DN_LANG_SEP(c) ( (c) == ';' ) #define LDAP_DN_ATTRDESC_CHAR(c) \ ( LDAP_DN_DESC_CHAR(c) || LDAP_DN_LANG_SEP(c) ) @@ -404,10 +415,12 @@ dn2dn( const char *dnin, unsigned fin, char **dnout, unsigned fout ) #define LDAP_DN_NE(c) \ ( LDAP_DN_RDN_SEP_V2(c) || LDAP_DN_AVA_SEP(c) \ || LDAP_DN_QUOTES(c) || (c) == '<' || (c) == '>' ) +#define LDAP_DN_MAYESCAPE(c) \ + ( LDAP_DN_ESCAPE(c) || LDAP_DN_NE(c) \ + || LDAP_DN_ASCII_SPACE(c) || LDAP_DN_OCTOTHORPE(c) ) #define LDAP_DN_NEEDESCAPE(c) \ ( LDAP_DN_ESCAPE(c) || LDAP_DN_NE(c) ) -#define LDAP_DN_NEEDESCAPE_LEAD(c) \ - ( LDAP_DN_ASCII_SPACE(c) || LDAP_DN_OCTOTHORPE(c) || LDAP_DN_NE(c) ) +#define LDAP_DN_NEEDESCAPE_LEAD(c) LDAP_DN_MAYESCAPE(c) #define LDAP_DN_NEEDESCAPE_TRAIL(c) \ ( LDAP_DN_ASCII_SPACE(c) || LDAP_DN_NEEDESCAPE(c) ) #define LDAP_DN_WILLESCAPE_CHAR(c) \ @@ -478,13 +491,13 @@ dn2dn( const char *dnin, unsigned fin, char **dnout, unsigned fout ) #define LDAP_DC_ATTR "dc" #define LDAP_DC_ATTRU "DC" #define LDAP_DN_IS_RDN_DC( r ) \ - ( (r) && (r)[0][0] && !(r)[1] \ + ( (r) && (r)[0][0] && !(r)[0][1] \ && ((r)[0][0]->la_flags == LDAP_AVA_STRING) \ - && ((r)[0][0]->la_attr->bv_len == 2) \ - && (((r)[0][0]->la_attr->bv_val[0] == LDAP_DC_ATTR[0]) \ - || ((r)[0][0]->la_attr->bv_val[0] == LDAP_DC_ATTRU[0])) \ - && (((r)[0][0]->la_attr->bv_val[1] == LDAP_DC_ATTR[1]) \ - || ((r)[0][0]->la_attr->bv_val[1] == LDAP_DC_ATTRU[1]))) + && ((r)[0][0]->la_attr.bv_len == 2) \ + && (((r)[0][0]->la_attr.bv_val[0] == LDAP_DC_ATTR[0]) \ + || ((r)[0][0]->la_attr.bv_val[0] == LDAP_DC_ATTRU[0])) \ + && (((r)[0][0]->la_attr.bv_val[1] == LDAP_DC_ATTR[1]) \ + || ((r)[0][0]->la_attr.bv_val[1] == LDAP_DC_ATTRU[1]))) /* Composite rules */ #define LDAP_DN_ALLOW_ONE_SPACE(f) \ @@ -520,15 +533,19 @@ ldapava_new( const struct berval *attr, const struct berval *val, assert( attr ); assert( val ); - ava = LDAP_MALLOC( sizeof( LDAPAVA ) ); + ava = LDAP_MALLOC( sizeof( LDAPAVA ) + attr->bv_len + 1 ); /* should we test it? */ if ( ava == NULL ) { return( NULL ); } - ava->la_attr = ( struct berval * )attr; - ava->la_value = ( struct berval * )val; + ava->la_attr.bv_len = attr->bv_len; + ava->la_attr.bv_val = (char *)(ava+1); + AC_MEMCPY( ava->la_attr.bv_val, attr->bv_val, attr->bv_len ); + ava->la_attr.bv_val[attr->bv_len] = '\0'; + + ava->la_value = *val; ava->la_flags = flags; ava->la_private = NULL; @@ -548,65 +565,15 @@ ldap_avafree( LDAPAVA *ava ) assert( ava->la_private == NULL ); #endif - ber_bvfree( ava->la_attr ); - ber_bvfree( ava->la_value ); +#if 0 + /* la_attr is now contiguous with ava, not freed separately */ + LDAP_FREE( ava->la_attr.bv_val ); +#endif + LDAP_FREE( ava->la_value.bv_val ); LDAP_FREE( ava ); } -LDAPRDN * -ldapava_append_to_rdn( LDAPRDN *rdn, LDAPAVA *ava ) -{ - LDAPRDN *newRDN; - unsigned i = 0U; - - assert( ava ); - - if ( rdn != NULL ) { - for ( i = 0U; rdn[ i ]; i++ ) { - /* no op */ - } - } - newRDN = LDAP_REALLOC( rdn, ( i + 2 ) * sizeof( LDAPAVA ** ) ); - newRDN[ i ] = LDAP_MALLOC( sizeof( LDAPAVA * ) ); - newRDN[ i ][ 0 ] = ava; - newRDN[ i + 1 ] = NULL; - - return( newRDN ); -} - -LDAPRDN * -ldapava_insert_into_rdn( LDAPRDN *rdn, LDAPAVA *ava, unsigned where ) -{ - LDAPRDN *newRDN; - unsigned i = 0U; - - assert( ava ); - - if ( rdn != NULL ) { - for ( i = 0U; rdn[ i ]; i++ ) { - /* no op */ - } - } - if ( where > i ) { - where = i; - /* assume "at end", which corresponds to - * ldapava_append_to_rdn */ - } - - newRDN = LDAP_REALLOC( rdn, ( i + 2 ) * sizeof( LDAPAVA ** ) ); - - /* data after insert point */ - AC_MEMCPY( &newRDN[ where + 1 ], &newRDN[ where ], - ( i - where ) * sizeof( LDAPRDN * ) ); - - newRDN[ where ] = LDAP_MALLOC( sizeof( LDAPAVA * ) ); - newRDN[ where ][ 0 ] = ava; - newRDN[ i + 1 ] = NULL; - - return( newRDN ); -} - void ldap_rdnfree( LDAPRDN *rdn ) { @@ -616,66 +583,11 @@ ldap_rdnfree( LDAPRDN *rdn ) return; } - for ( iAVA = 0; rdn[ iAVA ]; iAVA++ ) { - assert( rdn[ iAVA ][ 0 ] ); - - ldap_avafree( rdn[ iAVA ][ 0 ] ); - } - - LDAP_VFREE( rdn ); -} - -LDAPDN * -ldapava_append_to_dn( LDAPDN *dn, LDAPRDN *rdn ) -{ - LDAPDN *newDN; - unsigned i = 0U; - - assert( rdn ); - - if ( dn != NULL ) { - for ( i = 0U; dn[ i ]; i++ ) { - /* no op */ - } + for ( iAVA = 0; rdn[ 0 ][ iAVA ]; iAVA++ ) { + ldap_avafree( rdn[ 0 ][ iAVA ] ); } - newDN = LDAP_REALLOC( dn, ( i + 2 ) * sizeof( LDAPRDN ** ) ); - newDN[ i ] = LDAP_MALLOC( sizeof( LDAPRDN * ) ); - newDN[ i ][ 0 ] = rdn; - newDN[ i + 1 ] = NULL; - - return( newDN ); -} - -LDAPDN * -ldapava_insert_into_dn( LDAPDN *dn, LDAPRDN *rdn, unsigned where ) -{ - LDAPDN *newDN; - unsigned i = 0U; - - assert( rdn ); - - if ( dn != NULL ) { - for ( i = 0U; dn[ i ]; i++ ) { - /* no op */ - } - } - if ( where > i ) { - where = i; - /* assume "at end", which corresponds to - * ldapava_append_to_dn */ - } - - newDN = LDAP_REALLOC( dn, ( i + 2 ) * sizeof( LDAPRDN ** ) ); - - /* data after insert point */ - AC_MEMCPY( &newDN[ where + 1 ], &newDN[ where ], - ( i - where ) * sizeof( LDAPDN * ) ); - newDN[ where ] = LDAP_MALLOC( sizeof( LDAPRDN * ) ); - newDN[ where ][ 0 ] = rdn; - newDN[ i + 1 ] = NULL; - - return( newDN ); + LDAP_FREE( rdn ); } void @@ -687,13 +599,11 @@ ldap_dnfree( LDAPDN *dn ) return; } - for ( iRDN = 0; dn[ iRDN ]; iRDN++ ) { - assert( dn[ iRDN ][ 0 ] ); - - ldap_rdnfree( dn[ iRDN ][ 0 ] ); + for ( iRDN = 0; dn[ 0 ][ iRDN ]; iRDN++ ) { + ldap_rdnfree( dn[ 0 ][ iRDN ] ); } - LDAP_VFREE( dn ); + LDAP_FREE( dn ); } /* @@ -710,19 +620,51 @@ ldap_dnfree( LDAPDN *dn ) * and readable as soon as it works as expected. */ +/* + * Default sizes of AVA and RDN static working arrays; if required + * the are dynamically resized. The values can be tuned in case + * of special requirements (e.g. very deep DN trees or high number + * of AVAs per RDN). + */ +#define TMP_AVA_SLOTS 8 +#define TMP_RDN_SLOTS 32 + +int +ldap_str2dn( LDAP_CONST char *str, LDAPDN **dn, unsigned flags ) +{ + struct berval bv; + + assert( str ); + + bv.bv_len = strlen( str ); + bv.bv_val = (char *) str; + + return ldap_bv2dn( &bv, dn, flags ); +} + int -ldap_str2dn( const char *str, LDAPDN **dn, unsigned flags ) +ldap_bv2dn( struct berval *bv, LDAPDN **dn, unsigned flags ) { const char *p; - int rc = LDAP_INVALID_DN_SYNTAX; + int rc = LDAP_DECODING_ERROR; + int nrdns = 0; LDAPDN *newDN = NULL; - LDAPRDN *newRDN = NULL; + LDAPRDN *newRDN = NULL, *tmpDN_[TMP_RDN_SLOTS], **tmpDN = tmpDN_; + int num_slots = TMP_RDN_SLOTS; + char *str = bv->bv_val; + char *end = str + bv->bv_len; - assert( str ); + assert( bv ); + assert( bv->bv_val ); assert( dn ); - Debug( LDAP_DEBUG_TRACE, "=> ldap_str2dn(%s,%u)\n%s", str, flags, "" ); +#ifdef NEW_LOGGING + LDAP_LOG (( "getdn", LDAP_LEVEL_ARGS, "ldap_bv2dn(%s,%u)\n%s", + str, flags, "" )); +#else + Debug( LDAP_DEBUG_TRACE, "=> ldap_bv2dn(%s,%u)\n%s", str, flags, "" ); +#endif *dn = NULL; @@ -736,14 +678,20 @@ ldap_str2dn( const char *str, LDAPDN **dn, unsigned flags ) /* unsupported in str2dn */ case LDAP_DN_FORMAT_UFN: case LDAP_DN_FORMAT_AD_CANONICAL: - return( LDAP_INVALID_DN_SYNTAX ); + return LDAP_PARAM_ERROR; + case LDAP_DN_FORMAT_LBER: default: - return( LDAP_OTHER ); + return LDAP_PARAM_ERROR; } - if ( str[ 0 ] == '\0' ) { - return( LDAP_SUCCESS ); + if ( bv->bv_len == 0 ) { + return LDAP_SUCCESS; + } + + if( memchr( bv->bv_val, '\0', bv->bv_len ) != NULL ) { + /* value must have embedded NULs */ + return LDAP_DECODING_ERROR; } p = str; @@ -757,7 +705,12 @@ ldap_str2dn( const char *str, LDAPDN **dn, unsigned flags ) goto parsing_error; } p++; - + + /* + * actually we do not want to accept by default the DCE form, + * we do not want to auto-detect it + */ +#if 0 } else if ( LDAP_DN_LDAP( flags ) ) { /* * if dn starts with '/' let's make it a DCE dn @@ -766,13 +719,16 @@ ldap_str2dn( const char *str, LDAPDN **dn, unsigned flags ) flags |= LDAP_DN_FORMAT_DCE; p++; } +#endif } - for ( ; p[ 0 ]; p++ ) { - LDAPDN *dn; + for ( ; p < end; p++ ) { int err; + struct berval tmpbv; + tmpbv.bv_len = bv->bv_len - ( p - str ); + tmpbv.bv_val = (char *)p; - err = ldap_str2rdn( p, &newRDN, &p, flags ); + err = ldap_bv2rdn( &tmpbv, &newRDN, (char **) &p, flags ); if ( err != LDAP_SUCCESS ) { goto parsing_error; } @@ -780,11 +736,11 @@ ldap_str2dn( const char *str, LDAPDN **dn, unsigned flags ) /* * We expect a rdn separator */ - if ( p[ 0 ] ) { + if ( p < end && p[ 0 ] ) { switch ( LDAP_DN_FORMAT( flags ) ) { case LDAP_DN_FORMAT_LDAPV3: if ( !LDAP_DN_RDN_SEP( p[ 0 ] ) ) { - rc = LDAP_OTHER; + rc = LDAP_DECODING_ERROR; goto parsing_error; } break; @@ -792,14 +748,14 @@ ldap_str2dn( const char *str, LDAPDN **dn, unsigned flags ) case LDAP_DN_FORMAT_LDAP: case LDAP_DN_FORMAT_LDAPV2: if ( !LDAP_DN_RDN_SEP_V2( p[ 0 ] ) ) { - rc = LDAP_OTHER; + rc = LDAP_DECODING_ERROR; goto parsing_error; } break; case LDAP_DN_FORMAT_DCE: if ( !LDAP_DN_RDN_SEP_DCE( p[ 0 ] ) ) { - rc = LDAP_OTHER; + rc = LDAP_DECODING_ERROR; goto parsing_error; } break; @@ -807,27 +763,60 @@ ldap_str2dn( const char *str, LDAPDN **dn, unsigned flags ) } - if ( LDAP_DN_DCE( flags ) ) { - /* add in reversed order */ - dn = ldapava_insert_into_dn( newDN, newRDN, 0 ); - } else { - dn = ldapava_append_to_dn( newDN, newRDN ); - } + tmpDN[nrdns++] = newRDN; + newRDN = NULL; - if ( dn == NULL ) { - rc = LDAP_NO_MEMORY; - goto parsing_error; - } + /* + * make the static RDN array dynamically rescalable + */ + if ( nrdns == num_slots ) { + LDAPRDN **tmp; - newDN = dn; - newRDN = NULL; + if ( tmpDN == tmpDN_ ) { + tmp = LDAP_MALLOC( num_slots * 2 * sizeof( LDAPRDN * ) ); + if ( tmp == NULL ) { + rc = LDAP_NO_MEMORY; + goto parsing_error; + } + AC_MEMCPY( tmp, tmpDN, num_slots * sizeof( LDAPRDN * ) ); + + } else { + tmp = LDAP_REALLOC( tmpDN, num_slots * 2 * sizeof( LDAPRDN * ) ); + if ( tmp == NULL ) { + rc = LDAP_NO_MEMORY; + goto parsing_error; + } + } + + tmpDN = tmp; + num_slots *= 2; + } - if ( p[ 0 ] == '\0' ) { - + if ( p >= end || p[ 0 ] == '\0' ) { /* * the DN is over, phew */ - rc = LDAP_SUCCESS; + newDN = (LDAPDN *)LDAP_MALLOC( sizeof(LDAPDN) + + sizeof(LDAPRDN *) * (nrdns+1)); + if ( newDN == NULL ) { + rc = LDAP_NO_MEMORY; + goto parsing_error; + } else { + int i; + + newDN[0] = (LDAPRDN **)(newDN+1); + + if ( LDAP_DN_DCE( flags ) ) { + /* add in reversed order */ + for ( i=0; i= 0; nrdns-- ) { + ldap_rdnfree( tmpDN[nrdns] ); } return_result:; - Debug( LDAP_DEBUG_TRACE, "<= ldap_str2dn(%s,%u)=%d\n", str, flags, rc ); + if ( tmpDN != tmpDN_ ) { + LDAP_FREE( tmpDN ); + } + +#ifdef NEW_LOGGING + LDAP_LOG (( "getdn", LDAP_LEVEL_RESULTS, "<= ldap_bv2dn(%s,%u)=%d\n", + str, flags, rc )); +#else + Debug( LDAP_DEBUG_TRACE, "<= ldap_bv2dn(%s,%u)=%d\n", str, flags, rc ); +#endif *dn = newDN; return( rc ); @@ -859,26 +856,54 @@ return_result:; * corresponds to the rdn separator or to '\0' in case the string is over. */ int -ldap_str2rdn( const char *str, LDAPRDN **rdn, const char **n, unsigned flags ) +ldap_str2rdn( LDAP_CONST char *str, LDAPRDN **rdn, + char **n_in, unsigned flags ) +{ + struct berval bv; + + assert( str ); + assert( str[ 0 ] != '\0' ); /* FIXME: is this required? */ + + bv.bv_len = strlen( str ); + bv.bv_val = (char *) str; + + return ldap_bv2rdn( &bv, rdn, n_in, flags ); +} + +int +ldap_bv2rdn( struct berval *bv, LDAPRDN **rdn, + char **n_in, unsigned flags ) { + const char **n = (const char **) n_in; const char *p; + int navas = 0; int state = B4AVA; - int rc = LDAP_INVALID_DN_SYNTAX; + int rc = LDAP_DECODING_ERROR; int attrTypeEncoding = LDAP_AVA_STRING, attrValueEncoding = LDAP_AVA_STRING; - struct berval *attrType = NULL; - struct berval *attrValue = NULL; + struct berval attrType = { 0, NULL }; + struct berval attrValue = { 0, NULL }; LDAPRDN *newRDN = NULL; + LDAPAVA *tmpRDN_[TMP_AVA_SLOTS], **tmpRDN = tmpRDN_; + int num_slots = TMP_AVA_SLOTS; + + char *str; + ber_len_t stoplen; - assert( str ); - assert( rdn ); + assert( bv ); + assert( bv->bv_len ); + assert( bv->bv_val ); + assert( rdn || flags & LDAP_DN_SKIP ); assert( n ); - Debug( LDAP_DEBUG_TRACE, "=> ldap_str2rdn(%s,%u)\n%s", str, flags, "" ); + str = bv->bv_val; + stoplen = bv->bv_len; - *rdn = NULL; + if ( rdn ) { + *rdn = NULL; + } *n = NULL; switch ( LDAP_DN_FORMAT( flags ) ) { @@ -891,14 +916,21 @@ ldap_str2rdn( const char *str, LDAPRDN **rdn, const char **n, unsigned flags ) /* unsupported in str2dn */ case LDAP_DN_FORMAT_UFN: case LDAP_DN_FORMAT_AD_CANONICAL: - return( LDAP_INVALID_DN_SYNTAX ); + return LDAP_PARAM_ERROR; + case LDAP_DN_FORMAT_LBER: default: - return( LDAP_OTHER ); + return LDAP_PARAM_ERROR; } - if ( str[ 0 ] == '\0' ) { - return( LDAP_SUCCESS ); + if ( bv->bv_len == 0 ) { + return LDAP_SUCCESS; + + } + + if( memchr( bv->bv_val, '\0', bv->bv_len ) != NULL ) { + /* value must have embedded NULs */ + return LDAP_DECODING_ERROR; } p = str; @@ -989,19 +1021,15 @@ ldap_str2rdn( const char *str, LDAPRDN **rdn, const char **n, unsigned flags ) case B4OIDATTRTYPE: { int err = LDAP_SUCCESS; - char *type; - type = parse_numericoid( &p, &err, 0 ); - if ( type == NULL ) { - goto parsing_error; - } - attrType = LDAP_MALLOC( sizeof( struct berval ) ); - if ( attrType== NULL ) { - rc = LDAP_NO_MEMORY; + attrType.bv_val = ldap_int_parse_numericoid( &p, &err, + LDAP_SCHEMA_SKIP); + + if ( err != LDAP_SUCCESS ) { goto parsing_error; } - attrType->bv_val = type; - attrType->bv_len = strlen( type ); + attrType.bv_len = p - attrType.bv_val; + attrTypeEncoding = LDAP_AVA_BINARY; state = B4AVAEQUALS; @@ -1053,18 +1081,6 @@ ldap_str2rdn( const char *str, LDAPRDN **rdn, const char **n, unsigned flags ) goto parsing_error; } - assert( attrType == NULL ); - attrType = LDAP_MALLOC( sizeof( struct berval ) ); - if ( attrType == NULL ) { - rc = LDAP_NO_MEMORY; - goto parsing_error; - } - attrType->bv_val = LDAP_STRNDUP( startPos, len ); - if ( attrType->bv_val == NULL ) { - rc = LDAP_NO_MEMORY; - goto parsing_error; - } - attrType->bv_len = len; attrTypeEncoding = LDAP_AVA_STRING; /* @@ -1074,6 +1090,14 @@ ldap_str2rdn( const char *str, LDAPRDN **rdn, const char **n, unsigned flags ) */ state = B4AVAEQUALS; + + if ( flags & LDAP_DN_SKIP ) { + break; + } + + attrType.bv_val = (char *)startPos; + attrType.bv_len = len; + break; } @@ -1155,7 +1179,12 @@ ldap_str2rdn( const char *str, LDAPRDN **rdn, const char **n, unsigned flags ) * here STRING means RFC 2253 string * FIXME: what about DCE strings? */ - state = B4STRINGVALUE; + if ( !p[ 0 ] ) { + /* empty value */ + state = GOTAVA; + } else { + state = B4STRINGVALUE; + } break; case B4BINARYVALUE: @@ -1170,7 +1199,8 @@ ldap_str2rdn( const char *str, LDAPRDN **rdn, const char **n, unsigned flags ) switch ( LDAP_DN_FORMAT( flags ) ) { case LDAP_DN_FORMAT_LDAP: case LDAP_DN_FORMAT_LDAPV3: - if ( str2strval( p, &attrValue, &p, flags, + if ( str2strval( p, stoplen - ( p - str ), + &attrValue, &p, flags, &attrValueEncoding ) ) { goto parsing_error; } @@ -1209,26 +1239,52 @@ ldap_str2rdn( const char *str, LDAPRDN **rdn, const char **n, unsigned flags ) break; case GOTAVA: { - LDAPAVA *ava; - LDAPRDN *rdn; int rdnsep = 0; - /* - * we accept empty values - */ - ava = ldapava_new( attrType, attrValue, - attrValueEncoding ); - if ( ava == NULL ) { - rc = LDAP_NO_MEMORY; - goto parsing_error; - } + if ( !( flags & LDAP_DN_SKIP ) ) { + LDAPAVA *ava; - rdn = ldapava_append_to_rdn( newRDN, ava ); - if ( rdn == NULL ) { - rc = LDAP_NO_MEMORY; - goto parsing_error; + /* + * we accept empty values + */ + ava = ldapava_new( &attrType, &attrValue, + attrValueEncoding ); + + if ( ava == NULL ) { + rc = LDAP_NO_MEMORY; + goto parsing_error; + } + tmpRDN[navas++] = ava; + + attrValue.bv_val = NULL; + attrValue.bv_len = 0; + + /* + * prepare room for new AVAs if needed + */ + if (navas == num_slots) { + LDAPAVA **tmp; + + if ( tmpRDN == tmpRDN_ ) { + tmp = LDAP_MALLOC( num_slots * 2 * sizeof( LDAPAVA * ) ); + if ( tmp == NULL ) { + rc = LDAP_NO_MEMORY; + goto parsing_error; + } + AC_MEMCPY( tmp, tmpRDN, num_slots * sizeof( LDAPAVA * ) ); + + } else { + tmp = LDAP_REALLOC( tmpRDN, num_slots * 2 * sizeof( LDAPAVA * ) ); + if ( tmp == NULL ) { + rc = LDAP_NO_MEMORY; + goto parsing_error; + } + } + + tmpRDN = tmp; + num_slots *= 2; + } } - newRDN = rdn; /* * if we got an AVA separator ('+', or ',' for DCE ) @@ -1256,13 +1312,30 @@ ldap_str2rdn( const char *str, LDAPRDN **rdn, const char **n, unsigned flags ) * the RDN is over, phew */ *n = p; + if ( !( flags & LDAP_DN_SKIP ) ) { + newRDN = (LDAPRDN *)LDAP_MALLOC( sizeof(LDAPRDN) + + sizeof(LDAPAVA *) * (navas+1) ); + if ( newRDN == NULL ) { + rc = LDAP_NO_MEMORY; + goto parsing_error; + } else { + int i; + + newRDN[0] = (LDAPAVA**)(newRDN+1); + + for (i=0; i= 0; navas-- ) { + ldap_avafree( tmpRDN[navas] ); } return_result:; - Debug( LDAP_DEBUG_TRACE, "<= ldap_str2rdn(%*s)=%d\n", - *n - p, str, rc ); - *rdn = newRDN; + if ( tmpRDN != tmpRDN_ ) { + LDAP_FREE( tmpRDN ); + } + + if ( rdn ) { + *rdn = newRDN; + } return( rc ); } @@ -1305,27 +1379,24 @@ return_result:; * '\' + HEXPAIR(p) -> unhex(p) */ static int -str2strval( const char *str, struct berval **val, const char **next, unsigned flags, unsigned *retFlags ) +str2strval( const char *str, ber_len_t stoplen, struct berval *val, const char **next, unsigned flags, unsigned *retFlags ) { - const char *p, *startPos, *endPos = NULL; - ber_len_t len, escapes, unescapes; + const char *p, *end, *startPos, *endPos = NULL; + ber_len_t len, escapes; assert( str ); assert( val ); assert( next ); - *val = NULL; *next = NULL; - - for ( startPos = p = str, escapes = 0, unescapes = 0; p[ 0 ]; p++ ) { + end = str + stoplen; + for ( startPos = p = str, escapes = 0; p < end; p++ ) { if ( LDAP_DN_ESCAPE( p[ 0 ] ) ) { p++; if ( p[ 0 ] == '\0' ) { return( 1 ); } - if ( ( p == startPos + 1 && LDAP_DN_NEEDESCAPE_LEAD( p[ 0 ] ) ) - || ( LDAP_DN_VALUE_END( p[ 1 ] ) && LDAP_DN_NEEDESCAPE_TRAIL( p[ 0 ] ) ) - || LDAP_DN_NEEDESCAPE( p[ 0 ] ) ) { + if ( LDAP_DN_MAYESCAPE( p[ 0 ] ) ) { escapes++; continue; } @@ -1352,14 +1423,18 @@ str2strval( const char *str, struct berval **val, const char **next, unsigned fl return( 1 ); } /* - * FIXME: we allow escaping + * we do not allow escaping * of chars that don't need * to and do not belong to - * HEXDIGITS (we also allow - * single hexdigit; maybe we - * shouldn't). + * HEXDIGITS */ - unescapes++; + return( 1 ); + + } else if (!LDAP_DN_ASCII_PRINTABLE( p[ 0 ] ) ) { + if ( p[ 0 ] == '\0' ) { + return( 1 ); + } + *retFlags = LDAP_AVA_NONPRINTABLE; } else if ( ( LDAP_DN_LDAP( flags ) && LDAP_DN_VALUE_END_V2( p[ 0 ] ) ) || ( LDAP_DN_LDAPV3( flags ) && LDAP_DN_VALUE_END( p[ 0 ] ) ) ) { @@ -1394,62 +1469,63 @@ str2strval( const char *str, struct berval **val, const char **next, unsigned fl } } + *next = p; + if ( flags & LDAP_DN_SKIP ) { + return( 0 ); + } + /* * FIXME: test memory? */ - len = ( endPos ? endPos : p ) - startPos - escapes - unescapes; - *val = LDAP_MALLOC( sizeof( struct berval ) ); - ( *val )->bv_len = len; + len = ( endPos ? endPos : p ) - startPos - escapes; + val->bv_len = len; - if ( escapes == 0 && unescapes == 0 ) { - ( *val )->bv_val = LDAP_STRNDUP( startPos, len ); + if ( escapes == 0 ) { + if ( *retFlags == LDAP_AVA_NONPRINTABLE ) { + val->bv_val = LDAP_MALLOC( len + 1 ); + AC_MEMCPY( val->bv_val, startPos, len ); + val->bv_val[ len ] = '\0'; + } else { + val->bv_val = LDAP_STRNDUP( startPos, len ); + } } else { ber_len_t s, d; - ( *val )->bv_val = LDAP_MALLOC( len + 1 ); + val->bv_val = LDAP_MALLOC( len + 1 ); for ( s = 0, d = 0; d < len; ) { if ( LDAP_DN_ESCAPE( startPos[ s ] ) ) { s++; - if ( ( s == 0 && LDAP_DN_NEEDESCAPE_LEAD( startPos[ s ] ) ) - || ( s == len - 1 && LDAP_DN_NEEDESCAPE_TRAIL( startPos[ s ] ) ) - || LDAP_DN_NEEDESCAPE( startPos[ s ] ) ) { - ( *val )->bv_val[ d++ ] = + if ( LDAP_DN_MAYESCAPE( startPos[ s ] ) ) { + val->bv_val[ d++ ] = startPos[ s++ ]; } else if ( LDAP_DN_HEXPAIR( &startPos[ s ] ) ) { char c; hexstr2bin( &startPos[ s ], &c ); - ( *val )->bv_val[ d++ ] = c; + val->bv_val[ d++ ] = c; s += 2; } else { - /* - * we allow escaping of chars - * that do not need to - */ - ( *val )->bv_val[ d++ ] = - startPos[ s++ ]; + /* we should never get here */ + assert( 0 ); } } else { - ( *val )->bv_val[ d++ ] = startPos[ s++ ]; + val->bv_val[ d++ ] = startPos[ s++ ]; } } - ( *val )->bv_val[ d ] = '\0'; - assert( strlen( ( *val )->bv_val ) == len ); + val->bv_val[ d ] = '\0'; + assert( d == len ); } - - *next = p; - return( 0 ); } static int -DCE2strval( const char *str, struct berval **val, const char **next, unsigned flags ) +DCE2strval( const char *str, struct berval *val, const char **next, unsigned flags ) { const char *p, *startPos, *endPos = NULL; ber_len_t len, escapes; @@ -1458,7 +1534,6 @@ DCE2strval( const char *str, struct berval **val, const char **next, unsigned fl assert( val ); assert( next ); - *val = NULL; *next = NULL; for ( startPos = p = str, escapes = 0; p[ 0 ]; p++ ) { @@ -1501,17 +1576,20 @@ DCE2strval( const char *str, struct berval **val, const char **next, unsigned fl } } - + *next = p; + if ( flags & LDAP_DN_SKIP ) { + return( 0 ); + } + len = ( endPos ? endPos : p ) - startPos - escapes; - *val = LDAP_MALLOC( sizeof( struct berval ) ); - ( *val )->bv_len = len; + val->bv_len = len; if ( escapes == 0 ){ - ( *val )->bv_val = LDAP_STRNDUP( startPos, len ); + val->bv_val = LDAP_STRNDUP( startPos, len ); } else { ber_len_t s, d; - ( *val )->bv_val = LDAP_MALLOC( len + 1 ); + val->bv_val = LDAP_MALLOC( len + 1 ); for ( s = 0, d = 0; d < len; ) { /* * This point is reached only if escapes @@ -1522,19 +1600,17 @@ DCE2strval( const char *str, struct berval **val, const char **next, unsigned fl s++; } - ( *val )->bv_val[ d++ ] = startPos[ s++ ]; + val->bv_val[ d++ ] = startPos[ s++ ]; } - ( *val )->bv_val[ d ] = '\0'; - assert( strlen( ( *val )->bv_val ) == len ); + val->bv_val[ d ] = '\0'; + assert( strlen( val->bv_val ) == len ); } - *next = p; - return( 0 ); } static int -IA52strval( const char *str, struct berval **val, const char **next, unsigned flags ) +IA52strval( const char *str, struct berval *val, const char **next, unsigned flags ) { const char *p, *startPos, *endPos = NULL; ber_len_t len, escapes; @@ -1543,7 +1619,6 @@ IA52strval( const char *str, struct berval **val, const char **next, unsigned fl assert( val ); assert( next ); - *val = NULL; *next = NULL; /* @@ -1582,32 +1657,35 @@ IA52strval( const char *str, struct berval **val, const char **next, unsigned fl /* no op */ } - *val = LDAP_MALLOC( sizeof( struct berval ) ); + *next = p; + if ( flags & LDAP_DN_SKIP ) { + return( 0 ); + } + len = ( endPos ? endPos : p ) - startPos - escapes; - ( *val )->bv_len = len; + val->bv_len = len; if ( escapes == 0 ) { - ( *val )->bv_val = LDAP_STRNDUP( startPos, len ); + val->bv_val = LDAP_STRNDUP( startPos, len ); } else { ber_len_t s, d; - ( *val )->bv_val = LDAP_MALLOC( len + 1 ); + val->bv_val = LDAP_MALLOC( len + 1 ); for ( s = 0, d = 0; d < len; ) { if ( LDAP_DN_ESCAPE( startPos[ s ] ) ) { s++; } - ( *val )->bv_val[ d++ ] = startPos[ s++ ]; + val->bv_val[ d++ ] = startPos[ s++ ]; } - ( *val )->bv_val[ d ] = '\0'; - assert( strlen( ( *val )->bv_val ) == len ); + val->bv_val[ d ] = '\0'; + assert( strlen( val->bv_val ) == len ); } - *next = p; return( 0 ); } static int -quotedIA52strval( const char *str, struct berval **val, const char **next, unsigned flags ) +quotedIA52strval( const char *str, struct berval *val, const char **next, unsigned flags ) { const char *p, *startPos, *endPos = NULL; ber_len_t len; @@ -1617,7 +1695,6 @@ quotedIA52strval( const char *str, struct berval **val, const char **next, unsig assert( val ); assert( next ); - *val = NULL; *next = NULL; /* initial quote already eaten */ @@ -1669,31 +1746,33 @@ quotedIA52strval( const char *str, struct berval **val, const char **next, unsig /* no op */ } + *next = p; + if ( flags & LDAP_DN_SKIP ) { + return( 0 ); + } + len = endPos - startPos - escapes; - assert( len >= 0 ); - *val = LDAP_MALLOC( sizeof( struct berval ) ); - ( *val )->bv_len = len; + assert( endPos >= startPos + escapes ); + val->bv_len = len; if ( escapes == 0 ) { - ( *val )->bv_val = LDAP_STRNDUP( startPos, len ); + val->bv_val = LDAP_STRNDUP( startPos, len ); } else { ber_len_t s, d; - ( *val )->bv_val = LDAP_MALLOC( len + 1 ); - ( *val )->bv_len = len; + val->bv_val = LDAP_MALLOC( len + 1 ); + val->bv_len = len; for ( s = d = 0; d < len; ) { if ( LDAP_DN_ESCAPE( str[ s ] ) ) { s++; } - ( *val )->bv_val[ d++ ] = str[ s++ ]; + val->bv_val[ d++ ] = str[ s++ ]; } - ( *val )->bv_val[ d ] = '\0'; - assert( strlen( ( *val )->bv_val ) == len ); + val->bv_val[ d ] = '\0'; + assert( strlen( val->bv_val ) == len ); } - *next = p; - return( 0 ); } @@ -1738,7 +1817,7 @@ hexstr2bin( const char *str, char *c ) } static int -hexstr2binval( const char *str, struct berval **val, const char **next, unsigned flags ) +hexstr2binval( const char *str, struct berval *val, const char **next, unsigned flags ) { const char *p, *startPos, *endPos = NULL; ber_len_t len; @@ -1748,7 +1827,6 @@ hexstr2binval( const char *str, struct berval **val, const char **next, unsigned assert( val ); assert( next ); - *val = NULL; *next = NULL; for ( startPos = p = str; p[ 0 ]; p += 2 ) { @@ -1811,19 +1889,18 @@ hexstr2binval( const char *str, struct berval **val, const char **next, unsigned end_of_value:; + *next = p; + if ( flags & LDAP_DN_SKIP ) { + return( 0 ); + } + len = ( ( endPos ? endPos : p ) - startPos ) / 2; /* must be even! */ assert( 2 * len == (ber_len_t) (( endPos ? endPos : p ) - startPos )); - *val = LDAP_MALLOC( sizeof( struct berval ) ); - if ( *val == NULL ) { - return( LDAP_NO_MEMORY ); - } - - ( *val )->bv_len = len; - ( *val )->bv_val = LDAP_MALLOC( len + 1 ); - if ( ( *val )->bv_val == NULL ) { - LDAP_FREE( *val ); + val->bv_len = len; + val->bv_val = LDAP_MALLOC( len + 1 ); + if ( val->bv_val == NULL ) { return( LDAP_NO_MEMORY ); } @@ -1832,11 +1909,10 @@ end_of_value:; hexstr2bin( &startPos[ s ], &c ); - ( *val )->bv_val[ d ] = c; + val->bv_val[ d ] = c; } - ( *val )->bv_val[ d ] = '\0'; - *next = p; + val->bv_val[ d ] = '\0'; return( 0 ); } @@ -1912,8 +1988,18 @@ strval2strlen( struct berval *val, unsigned flags, ber_len_t *len ) return( 0 ); } - for ( l = 0, p = val->bv_val; p[ 0 ]; p += cl ) { - cl = ldap_utf8_charlen( p ); + for ( l = 0, p = val->bv_val; p < val->bv_val + val->bv_len; p += cl ) { + + /* + * escape '%x00' + */ + if ( p[ 0 ] == '\0' ) { + cl = 1; + l += 3; + continue; + } + + cl = LDAP_UTF8_CHARLEN2( p, cl ); if ( cl == 0 ) { /* illegal utf-8 char! */ return( -1 ); @@ -1922,7 +2008,7 @@ strval2strlen( struct berval *val, unsigned flags, ber_len_t *len ) ber_len_t cnt; for ( cnt = 1; cnt < cl; cnt++ ) { - if ( ( p[ cnt ] & 0x80 ) == 0x00 ) { + if ( ( p[ cnt ] & 0xc0 ) != 0x80 ) { return( -1 ); } } @@ -1932,7 +2018,11 @@ strval2strlen( struct berval *val, unsigned flags, ber_len_t *len ) || ( p == val->bv_val && LDAP_DN_NEEDESCAPE_LEAD( p[ 0 ] ) ) || ( !p[ 1 ] && LDAP_DN_NEEDESCAPE_TRAIL( p[ 0 ] ) ) ) { #ifdef PRETTY_ESCAPE +#if 0 if ( LDAP_DN_WILLESCAPE_HEX( flags, p[ 0 ] ) ) { +#else + if ( LDAP_DN_WILLESCAPE_CHAR( p[ 0 ] ) ) { +#endif /* * there might be some chars we want @@ -1981,7 +2071,26 @@ strval2str( struct berval *val, char *str, unsigned flags, ber_len_t *len ) * of the value */ for ( s = 0, d = 0, end = val->bv_len - 1; s < val->bv_len; ) { - ber_len_t cl = ldap_utf8_charlen( &val->bv_val[ s ] ); + ber_len_t cl; + + /* + * escape '%x00' + */ + if ( val->bv_val[ s ] == '\0' ) { + cl = 1; + str[ d++ ] = '\\'; + str[ d++ ] = '0'; + str[ d++ ] = '0'; + s++; + continue; + } + + /* + * The length was checked in strval2strlen(); + * LDAP_UTF8_CHARLEN() should suffice + */ + cl = LDAP_UTF8_CHARLEN2( &val->bv_val[ s ], cl ); + assert( cl > 0 ); /* * there might be some chars we want to escape in form @@ -1989,7 +2098,11 @@ strval2str( struct berval *val, char *str, unsigned flags, ber_len_t *len ) */ if ( ( cl > 1 && !LDAP_DN_IS_PRETTY( flags ) ) #ifdef PRETTY_ESCAPE +#if 0 || LDAP_DN_WILLESCAPE_HEX( flags, val->bv_val[ s ] ) +#else + || LDAP_DN_WILLESCAPE_CHAR( val->bv_val[ s ] ) +#endif #else /* ! PRETTY_ESCAPE */ || LDAP_DN_NEEDESCAPE( val->bv_val[ s ] ) || ( d == 0 && LDAP_DN_NEEDESCAPE_LEAD( val->bv_val[ s ] ) ) @@ -2319,8 +2432,8 @@ dn2domain( LDAPDN *dn, struct berval *bv, int pos, int *iRDN ) LDAPRDN *rdn; LDAPAVA *ava; - assert( dn[ i ][ 0 ] ); - rdn = dn[ i ][ 0 ]; + assert( dn[ 0 ][ i ] ); + rdn = dn[ 0 ][ i ]; assert( rdn[ 0 ][ 0 ] ); ava = rdn[ 0 ][ 0 ]; @@ -2333,16 +2446,16 @@ dn2domain( LDAPDN *dn, struct berval *bv, int pos, int *iRDN ) if ( first ) { first = 0; - AC_MEMCPY( str, ava->la_value->bv_val, - ava->la_value->bv_len + 1); - l += ava->la_value->bv_len; + AC_MEMCPY( str, ava->la_value.bv_val, + ava->la_value.bv_len + 1); + l += ava->la_value.bv_len; } else { - AC_MEMCPY( str + ava->la_value->bv_len + 1, bv->bv_val, l); - AC_MEMCPY( str, ava->la_value->bv_val, - ava->la_value->bv_len ); - str[ ava->la_value->bv_len ] = '.'; - l += ava->la_value->bv_len + 1; + AC_MEMCPY( str + ava->la_value.bv_len + 1, bv->bv_val + pos, l); + AC_MEMCPY( str, ava->la_value.bv_val, + ava->la_value.bv_len ); + str[ ava->la_value.bv_len ] = '.'; + l += ava->la_value.bv_len + 1; } } @@ -2361,21 +2474,21 @@ rdn2strlen( LDAPRDN *rdn, unsigned flags, ber_len_t *len, *len = 0; - for ( iAVA = 0; rdn[ iAVA ]; iAVA++ ) { - LDAPAVA *ava = rdn[ iAVA ][ 0 ]; + for ( iAVA = 0; rdn[ 0 ][ iAVA ]; iAVA++ ) { + LDAPAVA *ava = rdn[ 0 ][ iAVA ]; /* len(type) + '=' + '+' | ',' */ - l += ava->la_attr->bv_len + 2; + l += ava->la_attr.bv_len + 2; if ( ava->la_flags & LDAP_AVA_BINARY ) { /* octothorpe + twice the length */ - l += 1 + 2 * ava->la_value->bv_len; + l += 1 + 2 * ava->la_value.bv_len; } else { ber_len_t vl; unsigned f = flags | ava->la_flags; - if ( ( *s2l )( ava->la_value, f, &vl ) ) { + if ( ( *s2l )( &ava->la_value, f, &vl ) ) { return( -1 ); } l += vl; @@ -2394,32 +2507,32 @@ rdn2str( LDAPRDN *rdn, char *str, unsigned flags, ber_len_t *len, int iAVA; ber_len_t l = 0; - for ( iAVA = 0; rdn[ iAVA ]; iAVA++ ) { - LDAPAVA *ava = rdn[ iAVA ][ 0 ]; + for ( iAVA = 0; rdn[ 0 ][ iAVA ]; iAVA++ ) { + LDAPAVA *ava = rdn[ 0 ][ iAVA ]; - AC_MEMCPY( &str[ l ], ava->la_attr->bv_val, - ava->la_attr->bv_len ); - l += ava->la_attr->bv_len; + AC_MEMCPY( &str[ l ], ava->la_attr.bv_val, + ava->la_attr.bv_len ); + l += ava->la_attr.bv_len; str[ l++ ] = '='; if ( ava->la_flags & LDAP_AVA_BINARY ) { str[ l++ ] = '#'; - if ( binval2hexstr( ava->la_value, &str[ l ] ) ) { + if ( binval2hexstr( &ava->la_value, &str[ l ] ) ) { return( -1 ); } - l += 2 * ava->la_value->bv_len; + l += 2 * ava->la_value.bv_len; } else { ber_len_t vl; unsigned f = flags | ava->la_flags; - if ( ( *s2s )( ava->la_value, &str[ l ], f, &vl ) ) { + if ( ( *s2s )( &ava->la_value, &str[ l ], f, &vl ) ) { return( -1 ); } l += vl; } - str[ l++ ] = ( rdn[ iAVA + 1 ] ? '+' : ',' ); + str[ l++ ] = ( rdn[ 0 ][ iAVA + 1 ] ? '+' : ',' ); } *len = l; @@ -2435,23 +2548,23 @@ rdn2DCEstrlen( LDAPRDN *rdn, unsigned flags, ber_len_t *len ) *len = 0; - for ( iAVA = 0; rdn[ iAVA ]; iAVA++ ) { - LDAPAVA *ava = rdn[ iAVA ][ 0 ]; + for ( iAVA = 0; rdn[ 0 ][ iAVA ]; iAVA++ ) { + LDAPAVA *ava = rdn[ 0 ][ iAVA ]; /* len(type) + '=' + ',' | '/' */ - l += ava->la_attr->bv_len + 2; + l += ava->la_attr.bv_len + 2; switch ( ava->la_flags ) { case LDAP_AVA_BINARY: /* octothorpe + twice the length */ - l += 1 + 2 * ava->la_value->bv_len; + l += 1 + 2 * ava->la_value.bv_len; break; case LDAP_AVA_STRING: { ber_len_t vl; unsigned f = flags | ava->la_flags; - if ( strval2DCEstrlen( ava->la_value, f, &vl ) ) { + if ( strval2DCEstrlen( &ava->la_value, f, &vl ) ) { return( -1 ); } l += vl; @@ -2474,8 +2587,8 @@ rdn2DCEstr( LDAPRDN *rdn, char *str, unsigned flags, ber_len_t *len, int first ) int iAVA; ber_len_t l = 0; - for ( iAVA = 0; rdn[ iAVA ]; iAVA++ ) { - LDAPAVA *ava = rdn[ iAVA ][ 0 ]; + for ( iAVA = 0; rdn[ 0 ][ iAVA ]; iAVA++ ) { + LDAPAVA *ava = rdn[ 0 ][ iAVA ]; if ( first ) { first = 0; @@ -2483,26 +2596,26 @@ rdn2DCEstr( LDAPRDN *rdn, char *str, unsigned flags, ber_len_t *len, int first ) str[ l++ ] = ( iAVA ? ',' : '/' ); } - AC_MEMCPY( &str[ l ], ava->la_attr->bv_val, - ava->la_attr->bv_len ); - l += ava->la_attr->bv_len; + AC_MEMCPY( &str[ l ], ava->la_attr.bv_val, + ava->la_attr.bv_len ); + l += ava->la_attr.bv_len; str[ l++ ] = '='; switch ( ava->la_flags ) { case LDAP_AVA_BINARY: str[ l++ ] = '#'; - if ( binval2hexstr( ava->la_value, &str[ l ] ) ) { + if ( binval2hexstr( &ava->la_value, &str[ l ] ) ) { return( -1 ); } - l += 2 * ava->la_value->bv_len; + l += 2 * ava->la_value.bv_len; break; case LDAP_AVA_STRING: { ber_len_t vl; unsigned f = flags | ava->la_flags; - if ( strval2DCEstr( ava->la_value, &str[ l ], f, &vl ) ) { + if ( strval2DCEstr( &ava->la_value, &str[ l ], f, &vl ) ) { return( -1 ); } l += vl; @@ -2530,22 +2643,22 @@ rdn2UFNstrlen( LDAPRDN *rdn, unsigned flags, ber_len_t *len ) *len = 0; - for ( iAVA = 0; rdn[ iAVA ]; iAVA++ ) { - LDAPAVA *ava = rdn[ iAVA ][ 0 ]; + for ( iAVA = 0; rdn[ 0 ][ iAVA ]; iAVA++ ) { + LDAPAVA *ava = rdn[ 0 ][ iAVA ]; /* ' + ' | ', ' */ - l += ( rdn[ iAVA + 1 ] ? 3 : 2 ); + l += ( rdn[ 0 ][ iAVA + 1 ] ? 3 : 2 ); /* FIXME: are binary values allowed in UFN? */ if ( ava->la_flags & LDAP_AVA_BINARY ) { /* octothorpe + twice the value */ - l += 1 + 2 * ava->la_value->bv_len; + l += 1 + 2 * ava->la_value.bv_len; } else { ber_len_t vl; unsigned f = flags | ava->la_flags; - if ( strval2strlen( ava->la_value, f, &vl ) ) { + if ( strval2strlen( &ava->la_value, f, &vl ) ) { return( -1 ); } l += vl; @@ -2563,27 +2676,27 @@ rdn2UFNstr( LDAPRDN *rdn, char *str, unsigned flags, ber_len_t *len ) int iAVA; ber_len_t l = 0; - for ( iAVA = 0; rdn[ iAVA ]; iAVA++ ) { - LDAPAVA *ava = rdn[ iAVA ][ 0 ]; + for ( iAVA = 0; rdn[ 0 ][ iAVA ]; iAVA++ ) { + LDAPAVA *ava = rdn[ 0 ][ iAVA ]; if ( ava->la_flags & LDAP_AVA_BINARY ) { str[ l++ ] = '#'; - if ( binval2hexstr( ava->la_value, &str[ l ] ) ) { + if ( binval2hexstr( &ava->la_value, &str[ l ] ) ) { return( -1 ); } - l += 2 * ava->la_value->bv_len; + l += 2 * ava->la_value.bv_len; } else { ber_len_t vl; unsigned f = flags | ava->la_flags; - if ( strval2str( ava->la_value, &str[ l ], f, &vl ) ) { + if ( strval2str( &ava->la_value, &str[ l ], f, &vl ) ) { return( -1 ); } l += vl; } - if ( rdn[ iAVA + 1 ]) { + if ( rdn[ 0 ][ iAVA + 1 ]) { AC_MEMCPY( &str[ l ], " + ", 3 ); l += 3; @@ -2609,8 +2722,8 @@ rdn2ADstrlen( LDAPRDN *rdn, unsigned flags, ber_len_t *len ) *len = 0; - for ( iAVA = 0; rdn[ iAVA ]; iAVA++ ) { - LDAPAVA *ava = rdn[ iAVA ][ 0 ]; + for ( iAVA = 0; rdn[ 0 ][ iAVA ]; iAVA++ ) { + LDAPAVA *ava = rdn[ 0 ][ iAVA ]; /* ',' | '/' */ l++; @@ -2619,14 +2732,14 @@ rdn2ADstrlen( LDAPRDN *rdn, unsigned flags, ber_len_t *len ) switch ( ava->la_flags ) { case LDAP_AVA_BINARY: /* octothorpe + twice the value */ - l += 1 + 2 * ava->la_value->bv_len; + l += 1 + 2 * ava->la_value.bv_len; break; case LDAP_AVA_STRING: { ber_len_t vl; unsigned f = flags | ava->la_flags; - if ( strval2ADstrlen( ava->la_value, f, &vl ) ) { + if ( strval2ADstrlen( &ava->la_value, f, &vl ) ) { return( -1 ); } l += vl; @@ -2649,8 +2762,8 @@ rdn2ADstr( LDAPRDN *rdn, char *str, unsigned flags, ber_len_t *len, int first ) int iAVA; ber_len_t l = 0; - for ( iAVA = 0; rdn[ iAVA ]; iAVA++ ) { - LDAPAVA *ava = rdn[ iAVA ][ 0 ]; + for ( iAVA = 0; rdn[ 0 ][ iAVA ]; iAVA++ ) { + LDAPAVA *ava = rdn[ 0 ][ iAVA ]; if ( first ) { first = 0; @@ -2661,17 +2774,17 @@ rdn2ADstr( LDAPRDN *rdn, char *str, unsigned flags, ber_len_t *len, int first ) switch ( ava->la_flags ) { case LDAP_AVA_BINARY: str[ l++ ] = '#'; - if ( binval2hexstr( ava->la_value, &str[ l ] ) ) { + if ( binval2hexstr( &ava->la_value, &str[ l ] ) ) { return( -1 ); } - l += 2 * ava->la_value->bv_len; + l += 2 * ava->la_value.bv_len; break; case LDAP_AVA_STRING: { ber_len_t vl; unsigned f = flags | ava->la_flags; - if ( strval2ADstr( ava->la_value, &str[ l ], f, &vl ) ) { + if ( strval2ADstr( &ava->la_value, &str[ l ], f, &vl ) ) { return( -1 ); } l += vl; @@ -2703,6 +2816,10 @@ ldap_rdn2str( LDAPRDN *rdn, char **str, unsigned flags ) assert( str ); + if((flags & LDAP_DN_FORMAT_MASK) == LDAP_DN_FORMAT_LBER) { + return LDAP_PARAM_ERROR; + } + rc = ldap_rdn2bv( rdn, &bv, flags ); *str = bv.bv_val; return rc; @@ -2731,36 +2848,36 @@ ldap_rdn2bv( LDAPRDN *rdn, struct berval *bv, unsigned flags ) switch ( LDAP_DN_FORMAT( flags ) ) { case LDAP_DN_FORMAT_LDAPV3: if ( rdn2strlen( rdn, flags, &l, strval2strlen ) ) { - return( LDAP_OTHER ); + return LDAP_DECODING_ERROR; } break; case LDAP_DN_FORMAT_LDAPV2: if ( rdn2strlen( rdn, flags, &l, strval2IA5strlen ) ) { - return( LDAP_OTHER ); + return LDAP_DECODING_ERROR; } break; case LDAP_DN_FORMAT_UFN: if ( rdn2UFNstrlen( rdn, flags, &l ) ) { - return( LDAP_OTHER ); + return LDAP_DECODING_ERROR; } break; case LDAP_DN_FORMAT_DCE: if ( rdn2DCEstrlen( rdn, flags, &l ) ) { - return( LDAP_OTHER ); + return LDAP_DECODING_ERROR; } break; case LDAP_DN_FORMAT_AD_CANONICAL: if ( rdn2ADstrlen( rdn, flags, &l ) ) { - return( LDAP_OTHER ); + return LDAP_DECODING_ERROR; } break; default: - return( LDAP_INVALID_DN_SYNTAX ); + return LDAP_PARAM_ERROR; } bv->bv_val = LDAP_MALLOC( l + 1 ); @@ -2793,18 +2910,18 @@ ldap_rdn2bv( LDAPRDN *rdn, struct berval *bv, unsigned flags ) default: /* need at least one of the previous */ - return( LDAP_OTHER ); + return LDAP_PARAM_ERROR; } if ( rc ) { ldap_memfree( bv->bv_val ); - return( LDAP_OTHER ); + return rc; } bv->bv_len = l - back; bv->bv_val[ bv->bv_len ] = '\0'; - return( LDAP_SUCCESS ); + return LDAP_SUCCESS; } /* @@ -2826,6 +2943,10 @@ int ldap_dn2str( LDAPDN *dn, char **str, unsigned flags ) assert( str ); + if((flags & LDAP_DN_FORMAT_MASK) == LDAP_DN_FORMAT_LBER) { + return LDAP_PARAM_ERROR; + } + rc = ldap_dn2bv( dn, &bv, flags ); *str = bv.bv_val; return rc; @@ -2834,7 +2955,7 @@ int ldap_dn2str( LDAPDN *dn, char **str, unsigned flags ) int ldap_dn2bv( LDAPDN *dn, struct berval *bv, unsigned flags ) { int iRDN; - int rc = LDAP_OTHER; + int rc = LDAP_ENCODING_ERROR; ber_len_t len, l; /* stringifying helpers for LDAPv3/LDAPv2 */ @@ -2842,11 +2963,15 @@ int ldap_dn2bv( LDAPDN *dn, struct berval *bv, unsigned flags ) int ( *sv2s ) ( struct berval *v, char *s, unsigned f, ber_len_t *l ); assert( bv ); - bv->bv_len = 0; bv->bv_val = NULL; +#ifdef NEW_LOGGING + LDAP_LOG (( "getdn", LDAP_LEVEL_ARGS, "=> ldap_dn2bv(%u)\n%s%s", + flags, "", "" )); +#else Debug( LDAP_DEBUG_TRACE, "=> ldap_dn2bv(%u)\n%s%s", flags, "", "" ); +#endif /* * a null dn means an empty dn string @@ -2861,16 +2986,16 @@ int ldap_dn2bv( LDAPDN *dn, struct berval *bv, unsigned flags ) case LDAP_DN_FORMAT_LDAPV3: sv2l = strval2strlen; sv2s = strval2str; - goto got_funcs; + if( 0 ) { case LDAP_DN_FORMAT_LDAPV2: - sv2l = strval2IA5strlen; - sv2s = strval2IA5str; -got_funcs: - - for ( iRDN = 0, len = 0; dn[ iRDN ]; iRDN++ ) { + sv2l = strval2IA5strlen; + sv2s = strval2IA5str; + } + + for ( iRDN = 0, len = 0; dn[ 0 ][ iRDN ]; iRDN++ ) { ber_len_t rdnl; - LDAPRDN *rdn = dn[ iRDN ][ 0 ]; + LDAPRDN *rdn = dn[ 0 ][ iRDN ]; if ( rdn2strlen( rdn, flags, &rdnl, sv2l ) ) { goto return_results; @@ -2884,9 +3009,9 @@ got_funcs: break; } - for ( l = 0, iRDN = 0; dn[ iRDN ]; iRDN++ ) { + for ( l = 0, iRDN = 0; dn[ 0 ][ iRDN ]; iRDN++ ) { ber_len_t rdnl; - LDAPRDN *rdn = dn[ iRDN ][ 0 ]; + LDAPRDN *rdn = dn[ 0 ][ iRDN ]; if ( rdn2str( rdn, &bv->bv_val[ l ], flags, &rdnl, sv2s ) ) { @@ -2910,7 +3035,6 @@ got_funcs: break; case LDAP_DN_FORMAT_UFN: { - /* * FIXME: quoting from RFC 1781: * @@ -2950,9 +3074,9 @@ got_funcs: int last_iRDN = -1; #endif /* DC_IN_UFN */ - for ( iRDN = 0, len = 0; dn[ iRDN ]; iRDN++ ) { + for ( iRDN = 0, len = 0; dn[ 0 ][ iRDN ]; iRDN++ ) { ber_len_t rdnl; - LDAPRDN *rdn = dn[ iRDN ][ 0 ]; + LDAPRDN *rdn = dn[ 0 ][ iRDN ]; if ( rdn2UFNstrlen( rdn, flags, &rdnl ) ) { goto return_results; @@ -2978,9 +3102,9 @@ got_funcs: #ifdef DC_IN_UFN if ( leftmost_dc == -1 ) { #endif /* DC_IN_UFN */ - for ( l = 0, iRDN = 0; dn[ iRDN ]; iRDN++ ) { + for ( l = 0, iRDN = 0; dn[ 0 ][ iRDN ]; iRDN++ ) { ber_len_t vl; - LDAPRDN *rdn = dn[ iRDN ][ 0 ]; + LDAPRDN *rdn = dn[ 0 ][ iRDN ]; if ( rdn2UFNstr( rdn, &bv->bv_val[ l ], flags, &vl ) ) { @@ -3003,7 +3127,7 @@ got_funcs: for ( l = 0, iRDN = 0; iRDN < leftmost_dc; iRDN++ ) { ber_len_t vl; - LDAPRDN *rdn = dn[ iRDN ][ 0 ]; + LDAPRDN *rdn = dn[ 0 ][ iRDN ]; if ( rdn2UFNstr( rdn, &bv->bv_val[ l ], flags, &vl ) ) { @@ -3025,14 +3149,13 @@ got_funcs: #endif /* DC_IN_UFN */ rc = LDAP_SUCCESS; - break; - } - case LDAP_DN_FORMAT_DCE: + } break; - for ( iRDN = 0, len = 0; dn[ iRDN ]; iRDN++ ) { + case LDAP_DN_FORMAT_DCE: + for ( iRDN = 0, len = 0; dn[ 0 ][ iRDN ]; iRDN++ ) { ber_len_t rdnl; - LDAPRDN *rdn = dn[ iRDN ][ 0 ]; + LDAPRDN *rdn = dn[ 0 ][ iRDN ]; if ( rdn2DCEstrlen( rdn, flags, &rdnl ) ) { goto return_results; @@ -3048,7 +3171,7 @@ got_funcs: for ( l = 0; iRDN--; ) { ber_len_t rdnl; - LDAPRDN *rdn = dn[ iRDN ][ 0 ]; + LDAPRDN *rdn = dn[ 0 ][ iRDN ]; if ( rdn2DCEstr( rdn, &bv->bv_val[ l ], flags, &rdnl, 0 ) ) { @@ -3068,7 +3191,6 @@ got_funcs: break; case LDAP_DN_FORMAT_AD_CANONICAL: { - /* * Sort of UFN for DCE DNs: a slash ('/') separated * global->local DN with no types; strictly speaking, @@ -3083,9 +3205,9 @@ got_funcs: * * "microsoft.com/People/Bill,Gates" */ - for ( iRDN = 0, len = -1; dn[ iRDN ]; iRDN++ ) { + for ( iRDN = 0, len = -1; dn[ 0 ][ iRDN ]; iRDN++ ) { ber_len_t rdnl; - LDAPRDN *rdn = dn[ iRDN ][ 0 ]; + LDAPRDN *rdn = dn[ 0 ][ iRDN ]; if ( rdn2ADstrlen( rdn, flags, &rdnl ) ) { goto return_results; @@ -3103,7 +3225,7 @@ got_funcs: if ( iRDN && dn2domain( dn, bv, 0, &iRDN ) ) { for ( l = bv->bv_len; iRDN >= 0 ; iRDN-- ) { ber_len_t rdnl; - LDAPRDN *rdn = dn[ iRDN ][ 0 ]; + LDAPRDN *rdn = dn[ 0 ][ iRDN ]; if ( rdn2ADstr( rdn, &bv->bv_val[ l ], flags, &rdnl, 0 ) ) { @@ -3125,13 +3247,13 @@ got_funcs: if ( flags & LDAP_DN_PEDANTIC ) { LDAP_FREE( bv->bv_val ); bv->bv_val = NULL; - rc = LDAP_INVALID_DN_SYNTAX; + rc = LDAP_ENCODING_ERROR; break; } for ( l = 0; iRDN >= 0 ; iRDN-- ) { ber_len_t rdnl; - LDAPRDN *rdn = dn[ iRDN ][ 0 ]; + LDAPRDN *rdn = dn[ 0 ][ iRDN ]; if ( rdn2ADstr( rdn, &bv->bv_val[ l ], flags, &rdnl, first ) ) { @@ -3150,16 +3272,210 @@ got_funcs: bv->bv_val[ bv->bv_len ] = '\0'; rc = LDAP_SUCCESS; - break; - } + } break; default: - return( LDAP_INVALID_DN_SYNTAX ); - + return LDAP_PARAM_ERROR; } - Debug( LDAP_DEBUG_TRACE, "<= ldap_dn2bv(%s,%u)=%d\n", bv->bv_val, flags, rc ); +#ifdef NEW_LOGGING + LDAP_LOG (( "getdn", LDAP_LEVEL_RESULTS, "<= ldap_dn2bv(%s,%u)=%d\n", + bv->bv_val, flags, rc )); +#else + Debug( LDAP_DEBUG_TRACE, "<= ldap_dn2bv(%s,%u)=%d\n", + bv->bv_val, flags, rc ); +#endif + return_results:; return( rc ); } +#ifdef HAVE_TLS +#include +#include + +/* Convert a structured DN from an X.509 certificate into an LDAPV3 DN. + * x509_name must be an (X509_NAME *). If func is non-NULL, the + * constructed DN will use numeric OIDs to identify attributeTypes, + * and the func() will be invoked to rewrite the DN with the given + * flags. + * + * Otherwise the DN will use shortNames as defined in the OpenSSL + * library. + * + * It's preferable to let slapd do the OID to attributeType mapping, + * because the OpenSSL tables are known to have many typos in versions + * up to (at least) 0.9.6c. However, the LDAP client has no schema tables, + * so we're forced to use OpenSSL's mapping there. + * -- Howard Chu 2002-04-18 + */ + +int +ldap_X509dn2bv( void *x509_name, struct berval *bv, LDAPDN_rewrite_func *func, + unsigned flags ) +{ + LDAPDN *newDN; + LDAPRDN *newRDN; + LDAPAVA *newAVA, *baseAVA; + X509_NAME_ENTRY *ne; + ASN1_OBJECT *obj; + ASN1_STRING *str; + char oids[8192], *oidptr = oids, *oidbuf = NULL; + void *ptrs[2048]; + int i, j, k = 0, navas, nrdns, rc = LDAP_SUCCESS; + int set = -1; + size_t dnsize, oidrem = sizeof(oids), oidsize = 0; + int csize; + + struct berval Val; + + assert( bv ); + bv->bv_len = 0; + bv->bv_val = NULL; + + /* Get the number of AVAs. This is not necessarily the same as + * the number of RDNs. + */ + navas = X509_NAME_entry_count( x509_name ); + + /* Get the last element, to see how many RDNs there are */ + ne = X509_NAME_get_entry( x509_name, navas - 1 ); + nrdns = ne->set + 1; + + /* Allocate the DN/RDN/AVA stuff as a single block */ + dnsize = sizeof(LDAPDN) + sizeof(LDAPRDN *) * (nrdns+1); + dnsize += sizeof(LDAPRDN) * nrdns + sizeof(LDAPAVA *) * (navas+nrdns); + dnsize += sizeof(LDAPAVA) * navas; + if (dnsize > sizeof(ptrs)) { + newDN = (LDAPDN *)LDAP_MALLOC( dnsize ); + if ( newDN == NULL ) + return LDAP_NO_MEMORY; + } else { + newDN = (LDAPDN *)ptrs; + } + + newDN[0] = (LDAPRDN**)(newDN+1); + newDN[0][nrdns] = NULL; + newRDN = (LDAPRDN*)(newDN[0] + nrdns+1); + newAVA = (LDAPAVA*)(newRDN + navas + nrdns*2); + baseAVA = newAVA; + + /* Retrieve RDNs in reverse order; LDAP is backwards from X.500. */ + for ( i = nrdns - 1, j = 0; i >= 0; i-- ) { + ne = X509_NAME_get_entry( x509_name, i ); + obj = X509_NAME_ENTRY_get_object( ne ); + str = X509_NAME_ENTRY_get_data( ne ); + + /* If set changed, move to next RDN */ + if ( set != ne->set ) { + /* If this is not the first time, end the + * previous RDN and advance. + */ + if ( j > 0 ) { + newRDN[0][k] = NULL; + newRDN = (LDAPRDN*)(newRDN[0]+k+1); + } + newDN[0][j++] = newRDN; + + newRDN[0] = (LDAPAVA**)(newRDN+1); + k = 0; + set = ne->set; + } + newAVA->la_private = NULL; + newAVA->la_flags = LDAP_AVA_STRING; + + if ( !func ) { + int n = OBJ_obj2nid( obj ); + + if (n == NID_undef) + goto get_oid; + newAVA->la_attr.bv_val = (char *)OBJ_nid2sn( n ); + newAVA->la_attr.bv_len = strlen( newAVA->la_attr.bv_val ); + } else { +get_oid: newAVA->la_attr.bv_val = oidptr; + newAVA->la_attr.bv_len = OBJ_obj2txt( oidptr, oidrem, obj, 1 ); + oidptr += newAVA->la_attr.bv_len + 1; + oidrem -= newAVA->la_attr.bv_len + 1; + + /* Running out of OID buffer space? */ + if (oidrem < 128) { + if ( oidsize == 0 ) { + oidsize = sizeof(oids) * 2; + oidrem = oidsize; + oidbuf = LDAP_MALLOC( oidsize ); + if ( oidbuf == NULL ) goto nomem; + oidptr = oidbuf; + } else { + char *old = oidbuf; + oidbuf = LDAP_REALLOC( oidbuf, oidsize*2 ); + if ( oidbuf == NULL ) goto nomem; + /* Buffer moved! Fix AVA pointers */ + if ( old != oidbuf ) { + LDAPAVA *a; + long dif = oidbuf - old; + + for (a=baseAVA; a<=newAVA; a++){ + if (a->la_attr.bv_val >= old && + a->la_attr.bv_val <= (old + oidsize)) + a->la_attr.bv_val += dif; + } + } + oidptr = oidbuf + oidsize - oidrem; + oidrem += oidsize; + oidsize *= 2; + } + } + } + Val.bv_val = str->data; + Val.bv_len = str->length; + switch( str->type ) { + case V_ASN1_UNIVERSALSTRING: + /* This uses 32-bit ISO 10646-1 */ + csize = 4; goto to_utf8; + case V_ASN1_BMPSTRING: + /* This uses 16-bit ISO 10646-1 */ + csize = 2; goto to_utf8; + case V_ASN1_T61STRING: + /* This uses 8-bit, assume ISO 8859-1 */ + csize = 1; +to_utf8: rc = ldap_ucs_to_utf8s( &Val, csize, &newAVA->la_value ); + if (rc != LDAP_SUCCESS) goto nomem; + newAVA->la_flags = LDAP_AVA_NONPRINTABLE; + break; + case V_ASN1_UTF8STRING: + newAVA->la_flags = LDAP_AVA_NONPRINTABLE; + /* This is already in UTF-8 encoding */ + case V_ASN1_IA5STRING: + case V_ASN1_PRINTABLESTRING: + /* These are always 7-bit strings */ + ber_dupbv( &newAVA->la_value, &Val ); + default: + ; + } + newRDN[0][k] = newAVA; + newAVA++; + k++; + } + newRDN[0][k] = NULL; + + if ( func ) { + rc = func( newDN, flags ); + if ( rc != LDAP_SUCCESS ) + goto nomem; + } + + rc = ldap_dn2bv( newDN, bv, LDAP_DN_FORMAT_LDAPV3 ); + +nomem: + for (;baseAVA < newAVA; baseAVA++) { + LDAP_FREE( baseAVA->la_value.bv_val ); + } + + if ( oidsize != 0 ) + LDAP_FREE( oidbuf ); + if ( newDN != (LDAPDN*) ptrs ) + LDAP_FREE( newDN ); + return rc; +} +#endif /* HAVE_TLS */ +