X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fentry.c;h=a150097dae6754c7d7dcdd55723427bc4b6188be;hb=0f30fb0d8f0adbbb7b41fd455c57aa56d64c9853;hp=d355bd6b4a86a57f0edcc78eac897f10b007f6b1;hpb=662909357195a9983be15fd037e98465f7c18fc3;p=openldap diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c index d355bd6b4a..a150097dae 100644 --- a/servers/slapd/entry.c +++ b/servers/slapd/entry.c @@ -15,10 +15,16 @@ #include #include "slap.h" +#include "ldif.h" -static unsigned char *ebuf; /* buf returned by entry2str */ +static unsigned char *ebuf; /* buf returned by entry2str */ static unsigned char *ecur; /* pointer to end of currently used ebuf */ -static int emaxsize;/* max size of ebuf */ +static int emaxsize;/* max size of ebuf */ + +/* + * Empty root entry + */ +const Entry slap_entry_root = { NOID, "", "", NULL, NULL }; int entry_destroy(void) { @@ -58,16 +64,26 @@ str2entry( char *s ) * or newline. */ +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1, + "str2entry: \"%s\"\n", s ? s : "NULL" )); +#else Debug( LDAP_DEBUG_TRACE, "=> str2entry\n", s ? s : "NULL", 0, 0 ); +#endif /* initialize reader/writer lock */ e = (Entry *) ch_malloc( sizeof(Entry) ); if( e == NULL ) { - Debug( LDAP_DEBUG_TRACE, +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_ERR, + "str2entry: entry allocation failed.\n" )); +#else + Debug( LDAP_DEBUG_ANY, "<= str2entry NULL (entry allocation failed)\n", 0, 0, 0 ); +#endif return( NULL ); } @@ -89,8 +105,13 @@ str2entry( char *s ) } if ( ldif_parse_line( s, &type, &value.bv_val, &value.bv_len ) != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1, + "str2entry: NULL (parse_line)\n" )); +#else Debug( LDAP_DEBUG_TRACE, "<= str2entry NULL (parse_line)\n", 0, 0, 0 ); +#endif continue; } @@ -98,10 +119,18 @@ str2entry( char *s ) free( type ); if ( e->e_dn != NULL ) { - Debug( LDAP_DEBUG_ANY, - "str2entry: entry %ld has multiple dns \"%s\" and \"%s\" (second ignored)\n", - e->e_id, e->e_dn, +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1, "str2entry: " + "entry %ld has multiple dns \"%s\" and \"%s\" " + "(second ignored)\n", + (long) e->e_id, e->e_dn, value.bv_val != NULL ? value.bv_val : "" )); +#else + Debug( LDAP_DEBUG_ANY, "str2entry: " + "entry %ld has multiple dns \"%s\" and \"%s\" " + "(second ignored)\n", + (long) e->e_id, e->e_dn, value.bv_val != NULL ? value.bv_val : "" ); +#endif if( value.bv_val != NULL ) free( value.bv_val ); continue; } @@ -114,29 +143,91 @@ str2entry( char *s ) rc = slap_str2ad( type, &ad, &text ); if( rc != LDAP_SUCCESS ) { - Debug( LDAP_DEBUG_TRACE, +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1, + "str2entry: str2ad(%s): %s\n", type, text )); +#else + Debug( slapMode & SLAP_TOOL_MODE + ? LDAP_DEBUG_ANY : LDAP_DEBUG_TRACE, "<= str2entry: str2ad(%s): %s\n", type, text, 0 ); +#endif + if( slapMode & SLAP_TOOL_MODE ) { + entry_free( e ); + free( value.bv_val ); + free( type ); + return NULL; + } rc = slap_str2undef_ad( type, &ad, &text ); if( rc != LDAP_SUCCESS ) { - Debug( LDAP_DEBUG_TRACE, +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1, + "str2entry: str2undef_ad(%s): %s\n", type, text )); +#else + Debug( LDAP_DEBUG_ANY, "<= str2entry: str2undef_ad(%s): %s\n", type, text, 0 ); +#endif entry_free( e ); free( value.bv_val ); free( type ); - return( NULL ); + return NULL; } } - rc = attr_merge( e, ad, vals ); + if( slapMode & SLAP_TOOL_MODE ) { + slap_syntax_validate_func *validate = + ad->ad_type->sat_syntax->ssyn_validate; + + if( !validate ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_INFO, + "str2entry: no validator for syntax %s\n", + ad->ad_type->sat_syntax->ssyn_oid )); +#else + Debug( LDAP_DEBUG_ANY, + "str2entry: no validator for syntax %s\n", + ad->ad_type->sat_syntax->ssyn_oid, 0, 0 ); +#endif + entry_free( e ); + free( value.bv_val ); + free( type ); + return NULL; + } + + /* + * validate value per syntax + */ + rc = validate( ad->ad_type->sat_syntax, &value ); + + if( rc != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_ERR, + "str2entry: invalid value for syntax %s\n", + ad->ad_type->sat_syntax->ssyn_oid )); +#else + Debug( LDAP_DEBUG_ANY, + "str2entry: invalid value for syntax %s\n", + ad->ad_type->sat_syntax->ssyn_oid, 0, 0 ); +#endif + entry_free( e ); + free( value.bv_val ); + free( type ); + return NULL; + } + } - ad_free( ad, 1 ); + rc = attr_merge( e, ad, vals ); if( rc != 0 ) { - Debug( LDAP_DEBUG_TRACE, +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1, + "str2entry: NULL (attr_merge)\n" )); +#else + Debug( LDAP_DEBUG_ANY, "<= str2entry NULL (attr_merge)\n", 0, 0, 0 ); +#endif entry_free( e ); free( value.bv_val ); free( type ); @@ -149,8 +240,14 @@ str2entry( char *s ) /* check to make sure there was a dn: line */ if ( e->e_dn == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_INFO, + "str2entry: entry %ld has no dn.\n", + (long) e->e_id )); +#else Debug( LDAP_DEBUG_ANY, "str2entry: entry %ld has no dn\n", - e->e_id, 0, 0 ); + (long) e->e_id, 0, 0 ); +#endif entry_free( e ); return( NULL ); } @@ -159,9 +256,13 @@ str2entry( char *s ) e->e_ndn = ch_strdup( e->e_dn ); (void) dn_normalize( e->e_ndn ); +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL2, + "str2entry(%s) -> 0x%lx\n", e->e_dn, (unsigned long)e )); +#else Debug(LDAP_DEBUG_TRACE, "<= str2entry(%s) -> 0x%lx\n", e->e_dn, (unsigned long) e, 0 ); - +#endif return( e ); } @@ -209,10 +310,10 @@ entry2str( /* put ":[:] " line for each value */ for ( i = 0; a->a_vals[i] != NULL; i++ ) { bv = a->a_vals[i]; - tmplen = a->a_desc->ad_cname->bv_len; + tmplen = a->a_desc->ad_cname.bv_len; MAKE_SPACE( LDIF_SIZE_NEEDED( tmplen, bv->bv_len )); ldif_sput( (char **) &ecur, LDIF_PUT_VALUE, - a->a_desc->ad_cname->bv_val, + a->a_desc->ad_cname.bv_val, bv->bv_val, bv->bv_len ); } } @@ -226,8 +327,14 @@ entry2str( void entry_free( Entry *e ) { - Attribute *a, *next; + /* free an entry structure */ + assert( e != NULL ); + + /* e_private must be freed by the caller */ + assert( e->e_private == NULL ); + e->e_private = NULL; + /* free DNs */ if ( e->e_dn != NULL ) { free( e->e_dn ); e->e_dn = NULL; @@ -236,12 +343,11 @@ entry_free( Entry *e ) free( e->e_ndn ); e->e_ndn = NULL; } - for ( a = e->e_attrs; a != NULL; a = next ) { - next = a->a_next; - attr_free( a ); - } + + /* free attributes */ + attrs_free( e->e_attrs ); e->e_attrs = NULL; - e->e_private = NULL; + free( e ); } @@ -250,7 +356,7 @@ entry_free( Entry *e ) * * the Entry has three entry points (ways to find things): * - * by entry e.g., if you already have an entry from the cache + * by entry e.g., if you already have an entry from the cache * and want to delete it. (really by entry ptr) * by dn e.g., when looking for the base object of a search * by id e.g., for search candidates @@ -277,180 +383,191 @@ entry_id_cmp( Entry *e1, Entry *e2 ) return( e1->e_id < e2->e_id ? -1 : (e1->e_id > e2->e_id ? 1 : 0) ); } -#define SLAPD_SLEEPY 1 -#ifdef SLAPD_SLEEPY +#ifdef SLAPD_BDB -/* a DER encoded entry looks like: - * - * entry :== SEQUENCE { - * dn DistinguishedName, - * ndn NormalizedDistinguishedName, - * attrs SEQUENCE OF SEQUENCE { - * type AttributeType, - * values SET OF AttributeValue - * } - * } - * - * Encoding/Decoding of DER should be much faster than LDIF +/* Flatten an Entry into a buffer. The buffer contents become a direct + * copy of the entry, with all pointers converted to offsets from the + * beginning of the buffer. We do this by first walking through all + * the fields of the Entry, adding up their sizes. Then a single chunk + * of memory is malloc'd and the entry is copied. We differentiate between + * fixed size fields and variable-length content when tallying up the + * entry size, so that we can stick all of the variable-length stuff + * into the back half of the buffer. */ - -int entry_decode( struct berval *bv, Entry **entry ) +int entry_encode(Entry *e, struct berval **bv) { - int rc; - BerElement *ber; - Entry *e; - ber_tag_t tag; - ber_len_t len; - char *last; - - Debug( LDAP_DEBUG_TRACE, "=> entry_decode", - 0, 0, 0 ); - - ber = ber_init( bv ); - if( ber == NULL ) { - Debug( LDAP_DEBUG_TRACE, - "<= entry_encode: ber_init failed\n", - 0, 0, 0 ); - return LDAP_LOCAL_ERROR; - } - - /* initialize reader/writer lock */ - e = (Entry *) ch_malloc( sizeof(Entry) ); - - if( e == NULL ) { - Debug( LDAP_DEBUG_TRACE, - "<= entry_encode: entry allocation failed\n", - 0, 0, 0 ); - return LDAP_LOCAL_ERROR; + int siz = sizeof(Entry); + int len, dnlen, ndnlen; + int i, j; + Entry *f; + Attribute *a, *b; + struct berval **bvl, *bz; + char *ptr, *base, *data; + + *bv = ch_malloc(sizeof(struct berval)); +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1, + "entry_encode: id: 0x%08lx \"%s\"\n", + (long) e->e_id, e->e_dn )); +#else + Debug( LDAP_DEBUG_TRACE, "=> entry_encode(0x%08lx): %s\n", + (long) e->e_id, e->e_dn, 0 ); +#endif + dnlen = strlen(e->e_dn); + ndnlen = strlen(e->e_ndn); + len = dnlen + ndnlen + 2; /* two trailing NUL bytes */ + for (a=e->e_attrs; a; a=a->a_next) { + /* For AttributeDesc, we only store the attr name */ + siz += sizeof(Attribute); + len += a->a_desc->ad_cname.bv_len+1; + for (i=0; a->a_vals[i]; i++) { + siz += sizeof(struct berval *); + siz += sizeof(struct berval); + len += a->a_vals[i]->bv_len + 1; + } + siz += sizeof(struct berval *); /* NULL pointer at end */ } + (*bv)->bv_len = siz + len; + (*bv)->bv_val = ch_malloc(siz+len); + base = (*bv)->bv_val; + ptr = base + siz; + f = (Entry *)base; + data = (char *)(f+1); + f->e_id = e->e_id; + f->e_dn = (char *)(ptr-base); + memcpy(ptr, e->e_dn, dnlen); + ptr += dnlen; + *ptr++ = '\0'; + f->e_ndn = (char *)(ptr-base); + memcpy(ptr, e->e_ndn, ndnlen); + ptr += ndnlen; + *ptr++ = '\0'; + f->e_attrs = e->e_attrs ? (Attribute *)sizeof(Entry) : NULL; + f->e_private = NULL; + for (a=e->e_attrs; a; a=a->a_next) { + b = (Attribute *)data; + data = (char *)(b+1); + b->a_desc = (AttributeDescription *)(ptr-base); + memcpy(ptr, a->a_desc->ad_cname.bv_val, + a->a_desc->ad_cname.bv_len); + ptr += a->a_desc->ad_cname.bv_len; + *ptr++ = '\0'; + if (a->a_vals) { + bvl = (struct berval **)data; + b->a_vals = (struct berval **)(data-base); + for (i=0; a->a_vals[i]; i++); + data = (char *)(bvl+i+1); + bz = (struct berval *)data; + for (j=0; jbv_len = a->a_vals[j]->bv_len; + if (a->a_vals[j]->bv_val) { + bz->bv_val = (char *)(ptr-base); + memcpy(ptr, a->a_vals[j]->bv_val, bz->bv_len); + } else { + bz->bv_val = NULL; + } + ptr += bz->bv_len; + *ptr++ = '\0'; + bvl[j] = (struct berval *)(data-base); + bz++; + data = (char *)bz; + } + bvl[j] = NULL; + } else { + b->a_vals = NULL; + } - /* initialize entry */ - e->e_id = NOID; - e->e_dn = NULL; - e->e_ndn = NULL; - e->e_attrs = NULL; - e->e_private = NULL; - - rc = ber_scanf( ber, "{ss" /*"}"*/, &e->e_dn, &e->e_ndn ); - if( rc < 0 ) { - free( e ); - return LDAP_PROTOCOL_ERROR; + if (a->a_next) + b->a_next = (Attribute *)(data-base); + else + b->a_next = NULL; } + return 0; +} - /* get the attrs */ - for ( tag = ber_first_element( ber, &len, &last ); - tag != LBER_DEFAULT; - tag = ber_next_element( ber, &len, last ) ) - { - struct berval *type; - struct berval **vals; - AttributeDescription *ad; - const char *text; - - rc = ber_scanf( ber, "{O{V}}", &type, &vals ); - - if ( rc == LBER_ERROR ) { - Debug( LDAP_DEBUG_ANY, "entry_decode: decoding error\n", 0, 0, 0 ); - entry_free( e ); - return LDAP_PROTOCOL_ERROR; - } - - if ( vals == NULL ) { - Debug( LDAP_DEBUG_ANY, "entry_decode: no values for type %s\n", - type, 0, 0 ); - ber_bvfree( type ); - entry_free( e ); - return LDAP_PROTOCOL_ERROR; - } +/* Retrieve an Entry that was stored using entry_encode above. + * All we have to do is add the buffer address to all of the + * stored offsets. We also must lookup the stored attribute names + * to get AttributeDescriptions. To detect if the attributes of + * an Entry are later modified, we also store the address of the + * end of this block in e_private. + * + * Note: everything is stored in a single contiguous block, so + * you can not free individual attributes or names from this + * structure. Attempting to do so will likely corrupt memory. + */ +int entry_decode(struct berval *bv, Entry **e) +{ + int i; + long base; + Attribute *a; + Entry *x = (Entry *)bv->bv_val; + char *type; + const char *text; + AttributeDescription *ad; + base = (long)bv->bv_val; + x->e_dn += base; + x->e_ndn += base; +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL2, + "entry_decode: \"%s\"\n", x->e_dn )); +#else + Debug( LDAP_DEBUG_TRACE, + "entry_decode: \"%s\"\n", + x->e_dn, 0, 0 ); +#endif + x->e_private = bv->bv_val + bv->bv_len; + if (x->e_attrs) + x->e_attrs = (Attribute *)((long)x->e_attrs+base); + for (a=x->e_attrs; a; a=a->a_next) { + if (a->a_next) + a->a_next = (Attribute *)((long)a->a_next+base); ad = NULL; - rc = slap_bv2ad( type, &ad, &text ); - - if( rc != LDAP_SUCCESS ) { + type = (char *)a->a_desc+base; + i = slap_str2ad( type, &ad, &text ); + + if( i != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_INFO, + "entry_decode: str2ad(%s): %s\n", type, text )); +#else Debug( LDAP_DEBUG_TRACE, "<= entry_decode: str2ad(%s): %s\n", type, text, 0 ); - - rc = slap_bv2undef_ad( type, &ad, &text ); - - if( rc != LDAP_SUCCESS ) { - Debug( LDAP_DEBUG_TRACE, - "<= str2entry: str2undef_ad(%s): %s\n", +#endif + i = slap_str2undef_ad( type, &ad, &text ); + + if( i != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_INFO, + "entry_decode: str2undef_ad(%s): %s\n", type, text)); +#else + Debug( LDAP_DEBUG_ANY, + "<= entry_decode: str2undef_ad(%s): %s\n", type, text, 0 ); - ber_bvfree( type ); - ber_bvecfree( vals ); - entry_free( e ); - return rc; +#endif + return i; } } - - rc = attr_merge( e, ad, vals ); - ad_free( ad, 1 ); - - if( rc != 0 ) { - Debug( LDAP_DEBUG_TRACE, - "<= entry_decode: attr_merge failed\n", 0, 0, 0 ); - ber_bvfree( type ); - ber_bvecfree( vals ); - entry_free( e ); - return LDAP_LOCAL_ERROR; - } - - free( type ); - ber_bvecfree( vals ); - } - - rc = ber_scanf( ber, /*"{"*/ "}" ); - if( rc < 0 ) { - entry_free( e ); - return LDAP_PROTOCOL_ERROR; - } - - Debug(LDAP_DEBUG_TRACE, "<= entry_decode(%s) -> 0x%lx\n", - e->e_dn, (unsigned long) e, 0 ); - - *entry = e; - return LDAP_SUCCESS; -} - -int entry_encode( - Entry *e, - struct berval **bv ) -{ - int rc = -1; - Attribute *a; - BerElement *ber; - - Debug( LDAP_DEBUG_TRACE, "=> entry_encode", - 0, 0, 0 ); - - ber = ber_alloc_t( LBER_USE_DER ); - if( ber == NULL ) { - goto done; - } - - rc = ber_printf( ber, "{ss{" /*"}}"*/, e->e_dn, e->e_ndn ); - if( rc < 0 ) { - goto done; - } - - for ( a = e->e_attrs; a != NULL; a = a->a_next ) { - rc = ber_printf( ber, "{O{V}}", - a->a_desc->ad_cname, - a->a_vals ); - if( rc < 0 ) { - goto done; + a->a_desc = ad; + if (a->a_vals) { + a->a_vals = (struct berval **)((long)a->a_vals+base); + for (i=0; a->a_vals[i]; i++) { + a->a_vals[i] = (struct berval *) + ((long)a->a_vals[i]+base); + if (a->a_vals[i]->bv_val) + a->a_vals[i]->bv_val += base; + } } } - - rc = ber_printf( ber, /*"{{"*/ "}}" ); - if( rc < 0 ) { - goto done; - } - - rc = ber_flatten( ber, bv ); - -done: - ber_free( ber, 1 ); - return rc; +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1, + "entry_decode: %s\n", x->e_dn )); +#else + Debug(LDAP_DEBUG_TRACE, "<= entry_decode(%s)\n", + x->e_dn, 0, 0 ); +#endif + *e = x; + return 0; } -#endif \ No newline at end of file +#endif