/* config.c - ldap backend configuration file routine */
/* $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
*/
/* This is an altered version */
/* dn massaging */
} else if ( strcasecmp( argv[0], "suffixmassage" ) == 0 ) {
- char *dn, *massaged_dn;
+#ifndef ENABLE_REWRITE
+ struct berval *bd2, *nd2;
+#endif /* ENABLE_REWRITE */
BackendDB *tmp_be;
+ struct berval bdn, ndn;
+ /*
+ * syntax:
+ *
+ * suffixmassage <suffix> <massaged suffix>
+ *
+ * the <suffix> field must be defined as a valid suffix
+ * (or suffixAlias?) for the current database;
+ * the <massaged suffix> shouldn't have already been
+ * defined as a valid suffix or suffixAlias for the
+ * current server
+ */
if ( argc != 3 ) {
- fprintf( stderr,
- "%s: line %d: syntax is \"suffixMassage <suffix> <massaged suffix>\"\n",
+ fprintf( stderr, "%s: line %d: syntax is"
+ " \"suffixMassage <suffix>"
+ " <massaged suffix>\"\n",
fname, lineno );
return( 1 );
}
- tmp_be = select_backend( argv[1], 0 );
+ bdn.bv_val = argv[1];
+ bdn.bv_len = strlen(bdn.bv_val);
+ if ( dnNormalize2( NULL, &bdn, &ndn ) != LDAP_SUCCESS ) {
+ fprintf( stderr, "%s: line %d: suffix DN %s is invalid\n",
+ fname, lineno, bdn.bv_val );
+ return( 1 );
+ }
+ tmp_be = select_backend( &ndn, 0, 0 );
+ free( ndn.bv_val );
if ( tmp_be != NULL && tmp_be != be ) {
- fprintf( stderr,
- "%s: line %d: suffix already in use by another backend in"
- " \"suffixMassage <suffix> <massaged suffix>\"\n",
+ fprintf( stderr, "%s: line %d: suffix already in use"
+ " by another backend in"
+ " \"suffixMassage <suffix>"
+ " <massaged suffix>\"\n",
fname, lineno );
return( 1 );
}
- tmp_be = select_backend( argv[2], 0 );
+ bdn.bv_val = argv[2];
+ bdn.bv_len = strlen(bdn.bv_val);
+ if ( dnNormalize2( NULL, &bdn, &ndn ) != LDAP_SUCCESS ) {
+ fprintf( stderr, "%s: line %d: suffix DN %s is invalid\n",
+ fname, lineno, bdn.bv_val );
+ return( 1 );
+ }
+ tmp_be = select_backend( &ndn, 0, 0 );
+ free( ndn.bv_val );
if ( tmp_be != NULL ) {
- fprintf( stderr,
- "%s: line %d: massaged suffix already in use by another backend in"
- " \"suffixMassage <suffix> <massaged suffix>\"\n",
+ fprintf( stderr, "%s: line %d: massaged suffix"
+ " already in use by another backend in"
+ " \"suffixMassage <suffix>"
+ " <massaged suffix>\"\n",
fname, lineno );
return( 1 );
}
+
+#ifdef ENABLE_REWRITE
+ /*
+ * The suffix massaging is emulated by means of the
+ * rewrite capabilities
+ * FIXME: no extra rewrite capabilities should be added
+ * to the database
+ */
+ return suffix_massage_config( li->rwinfo, argc, argv );
+#else /* !ENABLE_REWRITE */
+ bd2 = ber_bvstrdup( argv[1] );
+ ber_bvecadd( &li->suffix_massage, bd2 );
+ nd2 = NULL;
+ dnNormalize( NULL, bd2, &nd2 );
+ ber_bvecadd( &li->suffix_massage, nd2 );
- dn = ch_strdup( argv[1] );
- charray_add( &li->suffix_massage, dn );
- (void) dn_normalize( dn );
- charray_add( &li->suffix_massage, dn );
-
- massaged_dn = ch_strdup( argv[2] );
- charray_add( &li->suffix_massage, massaged_dn );
- (void) dn_normalize( massaged_dn );
- charray_add( &li->suffix_massage, massaged_dn );
+ bd2 = ber_bvstrdup( argv[2] );
+ ber_bvecadd( &li->suffix_massage, bd2 );
+ nd2 = NULL;
+ dnNormalize( NULL, bd2, &nd2 );
+ ber_bvecadd( &li->suffix_massage, nd2 );
+#endif /* !ENABLE_REWRITE */
+
+#ifdef ENABLE_REWRITE
+ /* rewrite stuff ... */
+ } else if ( strncasecmp( argv[0], "rewrite", 7 ) == 0 ) {
+ return rewrite_parse( li->rwinfo, fname, lineno, argc, argv );
+#endif /* ENABLE_REWRITE */
- free( dn );
- free( massaged_dn );
-
/* objectclass/attribute mapping */
} else if ( strcasecmp( argv[0], "map" ) == 0 ) {
struct ldapmap *map;
} else if ( strcasecmp( argv[1], "attribute" ) == 0 ) {
map = &li->at_map;
} else {
- fprintf( stderr,
- "%s: line %d: syntax is \"map {objectclass | attribute} {<source> | *} [<dest> | *]\"\n",
+ fprintf( stderr, "%s: line %d: syntax is "
+ "\"map {objectclass | attribute} {<source> | *} "
+ "[<dest> | *]\"\n",
fname, lineno );
return( 1 );
}
fname, lineno );
}
- mapping = (struct ldapmapping *)ch_calloc( 2, sizeof(struct ldapmapping) );
+ mapping = (struct ldapmapping *)ch_calloc( 2,
+ sizeof(struct ldapmapping) );
if ( mapping == NULL ) {
fprintf( stderr,
"%s: line %d: out of memory\n",
fname, lineno );
return( 1 );
}
- mapping->src = ch_strdup(src);
- mapping->dst = ch_strdup(dst);
+ ber_str2bv( src, 0, 1, &mapping->src );
+ ber_str2bv( dst, 0, 1, &mapping->dst );
if ( *dst != 0 ) {
mapping[1].src = mapping->dst;
mapping[1].dst = mapping->src;
mapping[1].dst = mapping->dst;
}
- if ( avl_find( map->map, (caddr_t)mapping, mapping_cmp ) != NULL
- || avl_find( map->remap, (caddr_t)&mapping[1], mapping_cmp ) != NULL)
+ if ( avl_find( map->map, (caddr_t)mapping, mapping_cmp ) != NULL ||
+ avl_find( map->remap, (caddr_t)&mapping[1], mapping_cmp ) != NULL)
{
fprintf( stderr,
"%s: line %d: duplicate mapping found (ignored)\n",
/* anything else */
} else {
- fprintf( stderr,
-"%s: line %d: unknown directive \"%s\" in ldap database definition (ignored)\n",
+ fprintf( stderr, "%s: line %d: unknown directive \"%s\" "
+ "in ldap database definition (ignored)\n",
fname, lineno, argv[0] );
}
return 0;
}
-int
-mapping_cmp ( const void *c1, const void *c2 )
+#ifdef ENABLE_REWRITE
+static char *
+suffix_massage_regexize( const char *s )
{
- struct ldapmapping *map1 = (struct ldapmapping *)c1;
- struct ldapmapping *map2 = (struct ldapmapping *)c2;
+ char *res, *p, *r;
+ int i;
- return ( strcasecmp(map1->src, map2->src) );
-}
+ for ( i = 0, p = ( char * )s;
+ ( r = strchr( p, ',' ) ) != NULL;
+ p = r + 1, i++ )
+ ;
-int
-mapping_dup ( void *c1, void *c2 )
-{
- struct ldapmapping *map1 = (struct ldapmapping *)c1;
- struct ldapmapping *map2 = (struct ldapmapping *)c2;
+ res = ch_calloc( sizeof( char ), strlen( s ) + 4 + 4*i + 1 );
- return( ( strcasecmp(map1->src, map2->src) == 0 ) ? -1 : 0 );
-}
+ strcpy( res, "(.*)" );
+ for ( i = 0, p = ( char * )s;
+ ( r = strchr( p, ',' ) ) != NULL;
+ p = r + 1 , i++ ) {
+ strncat( res, p, r - p + 1 );
+ strcat( res, "[ ]?" );
-char *
-ldap_back_map ( struct ldapmap *map, char *s, int remap )
-{
- Avlnode *tree;
- struct ldapmapping *mapping, fmapping;
-
- if (remap)
- tree = map->remap;
- else
- tree = map->map;
-
- fmapping.src = s;
- mapping = (struct ldapmapping *)avl_find( tree, (caddr_t)&fmapping, mapping_cmp );
- if (mapping != NULL) {
- if ( *mapping->dst == 0 )
- return(NULL);
- return(mapping->dst);
+ if ( r[ 1 ] == ' ' ) {
+ r++;
+ }
}
+ strcat( res, p );
- if (map->drop_missing)
- return(NULL);
-
- return(s);
+ return res;
}
-char *
-ldap_back_map_filter ( struct ldapinfo *li, char *f, int remap )
+static char *
+suffix_massage_patternize( const char *s, int normalize )
{
- char *nf, *m, *p, *q, *s, c;
- int len, extra, plen, in_quote;
+ char *res;
- if (f == NULL)
- return(NULL);
+ res = ch_calloc( sizeof( char ), strlen( s ) + sizeof("%1") );
- len = strlen(f);
- extra = len;
- len *= 2;
- nf = ch_malloc( len + 1 );
- if (nf == NULL)
- return(NULL);
+ sprintf( res, "%%1%s", s );
- /* this loop assumes the filter ends with one
- * of the delimiter chars -- probably ')'.
- */
-
- s = nf;
- q = NULL;
- in_quote = 0;
- for (p = f; c = *p; p++) {
- if (c == '"') {
- in_quote = !in_quote;
- if (q != NULL) {
- plen = p - q;
- memcpy(s, q, plen);
- s += plen;
- q = NULL;
- }
- *s++ = c;
- } else if (in_quote) {
- /* ignore everything in quotes --
- * what about attrs in DNs?
- */
- *s++ = c;
- } else if (c != '(' && c != ')'
- && c != '=' && c != '>' && c != '<'
- && c != '|' && c != '&')
- {
- if (q == NULL)
- q = p;
- } else {
- if (q != NULL) {
- *p = 0;
- m = ldap_back_map(&li->at_map, q, remap);
- if (m == NULL)
- m = ldap_back_map(&li->oc_map, q, remap);
- if (m == NULL) {
- m = q;
- }
- extra += p - q;
- plen = strlen(m);
- extra -= plen;
- if (extra < 0) {
- while (extra < 0) {
- extra += len;
- len *= 2;
- }
- s -= (long)nf;
- nf = ch_realloc(nf, len + 1);
- if (nf == NULL) {
- free(nf);
- return(NULL);
- }
- s += (long)nf;
- }
- memcpy(s, m, plen);
- s += plen;
- *p = c;
- q = NULL;
- }
- *s++ = c;
+ if ( normalize ) {
+ char *out = dn_normalize( res + (sizeof("%1")-1) );
+ if ( out != res + 2 ) {
+ strcpy( res + 2, out );
+ free( out );
}
}
- *s = 0;
- return(nf);
+
+ return res;
}
-char **
-ldap_back_map_attrs ( struct ldapinfo *li, char **a, int remap )
+int
+suffix_massage_config(
+ struct rewrite_info *info,
+ int argc,
+ char **argv
+)
{
- int i, j, count;
- char **na, *mapped;
-
- if (a == NULL)
- return(NULL);
-
- for (count = 0; a[count] != NULL; count++) {
- /* */
- }
+ char *rargv[ 5 ];
+
+ rargv[ 0 ] = "rewriteEngine";
+ rargv[ 1 ] = "on";
+ rargv[ 2 ] = NULL;
+ rewrite_parse( info, "<suffix massage>", 1, 2, rargv );
+
+ rargv[ 0 ] = "rewriteContext";
+ rargv[ 1 ] = "default";
+ rargv[ 2 ] = NULL;
+ rewrite_parse( info, "<suffix massage>", 2, 2, rargv );
+
+ rargv[ 0 ] = "rewriteRule";
+ rargv[ 1 ] = suffix_massage_regexize( argv[ 1 ] );
+ rargv[ 2 ] = suffix_massage_patternize( argv[ 2 ], 0 );
+ rargv[ 3 ] = ":";
+ rargv[ 4 ] = NULL;
+ rewrite_parse( info, "<suffix massage>", 3, 4, rargv );
+ ch_free( rargv[ 1 ] );
+ ch_free( rargv[ 2 ] );
+
+ rargv[ 0 ] = "rewriteContext";
+ rargv[ 1 ] = "searchResult";
+ rargv[ 2 ] = NULL;
+ rewrite_parse( info, "<suffix massage>", 4, 2, rargv );
+
+ rargv[ 0 ] = "rewriteRule";
+ rargv[ 1 ] = suffix_massage_regexize( argv[ 2 ] );
+ rargv[ 2 ] = suffix_massage_patternize( argv[ 1 ], 0 );
+ rargv[ 3 ] = ":";
+ rargv[ 4 ] = NULL;
+ rewrite_parse( info, "<suffix massage>", 5, 4, rargv );
+ ch_free( rargv[ 1 ] );
+ ch_free( rargv[ 2 ] );
+
+ /*
+ * the filter should be rewritten as
+ *
+ * rewriteRule
+ * "(.*)member=([^)]+),o=Foo Bar,[ ]?c=US(.*)"
+ * "%1member=%2,dc=example,dc=com%3"
+ *
+ * where "o=Foo Bar, c=US" is the virtual naming context,
+ * and "dc=example, dc=com" is the real naming context
+ */
+ rargv[ 0 ] = "rewriteContext";
+ rargv[ 1 ] = "searchFilter";
+ rargv[ 2 ] = NULL;
+ rewrite_parse( info, "<suffix massage>", 6, 2, rargv );
+
+#if 0 /* matched is not normalized */
+ rargv[ 0 ] = "rewriteContext";
+ rargv[ 1 ] = "matchedDn";
+ rargv[ 2 ] = "alias";
+ rargv[ 3 ] = "searchResult";
+ rargv[ 4 ] = NULL;
+ rewrite_parse( info, "<suffix massage>", 7, 4, rargv );
+#else /* normalize matched */
+ rargv[ 0 ] = "rewriteContext";
+ rargv[ 1 ] = "matchedDn";
+ rargv[ 2 ] = NULL;
+ rewrite_parse( info, "<suffix massage>", 7, 2, rargv );
+
+ rargv[ 0 ] = "rewriteRule";
+ rargv[ 1 ] = suffix_massage_regexize( argv[ 2 ] );
+ rargv[ 2 ] = suffix_massage_patternize( argv[ 1 ], 1 );
+ rargv[ 3 ] = ":";
+ rargv[ 4 ] = NULL;
+ rewrite_parse( info, "<suffix massage>", 8, 4, rargv );
+ ch_free( rargv[ 1 ] );
+ ch_free( rargv[ 2 ] );
+#endif /* normalize matched */
- na = (char **)ch_calloc( count + 1, sizeof(char *) );
- if (na == NULL)
- return(NULL);
-
- for (i = 0, j = 0; i < count; i++) {
- mapped = ldap_back_map(&li->at_map, a[i], remap);
- if (mapped != NULL) {
- mapped = ch_strdup(mapped);
- if (mapped == NULL) {
- charray_free(na);
- return(NULL);
- }
- na[j] = mapped;
- j++;
- }
- }
- return(na);
+ return 0;
}
-
+#endif /* ENABLE_REWRITE */
projects / openldap / blobdiff