X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foverlays%2Frwmdn.c;h=8e18a66c4df6faf5488f33d3cdbaf58c8a08f3e3;hb=8bdfd2edbb7a09f5bfe96b2bca043680f731237a;hp=85c929b2c31ba9a8953aebf2cd77b33848001d1e;hpb=22bd2667ce0b627bf6c07d88c82d66ae82a4de13;p=openldap
diff --git a/servers/slapd/overlays/rwmdn.c b/servers/slapd/overlays/rwmdn.c
index 85c929b2c3..8e18a66c4d 100644
--- a/servers/slapd/overlays/rwmdn.c
+++ b/servers/slapd/overlays/rwmdn.c
@@ -2,7 +2,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Copyright 1999-2009 The OpenLDAP Foundation.
* Portions Copyright 1999-2003 Howard Chu.
* Portions Copyright 2000-2003 Pierangelo Masarati.
* All rights reserved.
@@ -16,7 +16,7 @@
* .
*/
/* ACKNOWLEDGEMENTS:
- * This work was initially developed by the Howard Chu for inclusion
+ * This work was initially developed by Howard Chu for inclusion
* in OpenLDAP Software and subsequently enhanced by Pierangelo
* Masarati.
*/
@@ -36,60 +36,152 @@
/* FIXME: after rewriting, we should also remap attributes ... */
-#ifdef ENABLE_REWRITE
+/*
+ * massages "in" and normalizes it into "ndn"
+ *
+ * "ndn" may be untouched if no massaging occurred and its value was not null
+ */
+int
+rwm_dn_massage_normalize(
+ dncookie *dc,
+ struct berval *in,
+ struct berval *ndn )
+{
+ int rc;
+ struct berval mdn = BER_BVNULL;
+
+ /* massage and normalize a DN */
+ rc = rwm_dn_massage( dc, in, &mdn );
+ if ( rc != LDAP_SUCCESS ) {
+ return rc;
+ }
+
+ if ( mdn.bv_val == in->bv_val && !BER_BVISNULL( ndn ) ) {
+ return rc;
+ }
+
+ rc = dnNormalize( 0, NULL, NULL, &mdn, ndn, NULL );
+
+ if ( mdn.bv_val != in->bv_val ) {
+ ch_free( mdn.bv_val );
+ }
+
+ return rc;
+}
+
+/*
+ * massages "in" and prettifies it into "pdn"
+ *
+ * "pdn" may be untouched if no massaging occurred and its value was not null
+ */
+int
+rwm_dn_massage_pretty(
+ dncookie *dc,
+ struct berval *in,
+ struct berval *pdn )
+{
+ int rc;
+ struct berval mdn = BER_BVNULL;
+
+ /* massage and pretty a DN */
+ rc = rwm_dn_massage( dc, in, &mdn );
+ if ( rc != LDAP_SUCCESS ) {
+ return rc;
+ }
+
+ if ( mdn.bv_val == in->bv_val && !BER_BVISNULL( pdn ) ) {
+ return rc;
+ }
+
+ rc = dnPretty( NULL, &mdn, pdn, NULL );
+
+ if ( mdn.bv_val != in->bv_val ) {
+ ch_free( mdn.bv_val );
+ }
+
+ return rc;
+}
+
+/*
+ * massages "in" and prettifies and normalizes it into "pdn" and "ndn"
+ *
+ * "pdn" may be untouched if no massaging occurred and its value was not null;
+ * "ndn" may be untouched if no massaging occurred and its value was not null;
+ * if no massage occurred and "ndn" value was not null, it is filled
+ * with the normaized value of "pdn", much like ndn = dnNormalize( pdn )
+ */
+int
+rwm_dn_massage_pretty_normalize(
+ dncookie *dc,
+ struct berval *in,
+ struct berval *pdn,
+ struct berval *ndn )
+{
+ int rc;
+ struct berval mdn = BER_BVNULL;
+
+ /* massage, pretty and normalize a DN */
+ rc = rwm_dn_massage( dc, in, &mdn );
+ if ( rc != LDAP_SUCCESS ) {
+ return rc;
+ }
+
+ if ( mdn.bv_val == in->bv_val && !BER_BVISNULL( pdn ) ) {
+ if ( BER_BVISNULL( ndn ) ) {
+ rc = dnNormalize( 0, NULL, NULL, &mdn, ndn, NULL );
+ }
+ return rc;
+ }
+
+ rc = dnPrettyNormal( NULL, &mdn, pdn, ndn, NULL );
+
+ if ( mdn.bv_val != in->bv_val ) {
+ ch_free( mdn.bv_val );
+ }
+
+ return rc;
+}
+
+/*
+ * massages "in" into "dn"
+ *
+ * "dn" may contain the value of "in" if no massage occurred
+ */
int
rwm_dn_massage(
dncookie *dc,
struct berval *in,
- struct berval *dn,
- struct berval *ndn
+ struct berval *dn
)
{
int rc = 0;
struct berval mdn;
+ static char *dmy = "";
+ char *in_val;
+
+ assert( dc != NULL );
+ assert( in != NULL );
+ assert( dn != NULL );
+
+ /* protect from NULL berval */
+ in_val = in->bv_val ? in->bv_val : dmy;
rc = rewrite_session( dc->rwmap->rwm_rw, dc->ctx,
- ( in->bv_len ? in->bv_val : "" ),
- dc->conn, &mdn.bv_val );
+ in_val, dc->conn, &mdn.bv_val );
switch ( rc ) {
case REWRITE_REGEXEC_OK:
- if ( !BER_BVISNULL( &mdn ) ) {
-
+ if ( !BER_BVISNULL( &mdn ) && mdn.bv_val != in_val ) {
mdn.bv_len = strlen( mdn.bv_val );
-
- if ( dn != NULL && ndn != NULL ) {
- rc = dnPrettyNormal( NULL, &mdn, dn, ndn, NULL );
-
- } else if ( dn != NULL ) {
- rc = dnPretty( NULL, &mdn, dn, NULL );
-
- } else if ( ndn != NULL) {
- rc = dnNormalize( 0, NULL, NULL, &mdn, ndn, NULL );
- }
-
- if ( mdn.bv_val != in->bv_val ) {
- ch_free( mdn.bv_val );
- }
-
+ *dn = mdn;
} else {
- /* we assume the input string is already in pretty form,
- * and that the normalized version is already available */
- *dn = *in;
- if ( ndn != NULL ) {
- BER_BVZERO( ndn );
- }
- rc = LDAP_SUCCESS;
+ dn->bv_len = in->bv_len;
+ dn->bv_val = in_val;
}
+ rc = LDAP_SUCCESS;
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDAP, DETAIL1,
- "[rw] %s: \"%s\" -> \"%s\"\n",
- dc->ctx, in->bv_val, dn->bv_val );
-#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS,
"[rw] %s: \"%s\" -> \"%s\"\n",
- dc->ctx, in->bv_val, dn->bv_val );
-#endif /* !NEW_LOGGING */
+ dc->ctx, in_val, dn->bv_val );
break;
case REWRITE_REGEXEC_UNWILLING:
@@ -109,132 +201,15 @@ rwm_dn_massage(
break;
}
- return rc;
-}
-
-#else
-/*
- * rwm_dn_massage
- *
- * Aliases the suffix; based on suffix_alias (servers/slapd/suffixalias.c).
- */
-int
-rwm_dn_massage(
- dncookie *dc,
- struct berval *tmpin,
- struct berval *dn,
- struct berval *ndn
-)
-{
- int i, src, dst;
- struct berval pretty = BER_BVNULL,
- normal = BER_BVNULL,
- *in = tmpin;
-
- assert( dn );
-
- if ( in == NULL || BER_BVISNULL( in ) ) {
- dn->bv_val = NULL;
- dn->bv_len = 0;
- return LDAP_SUCCESS;
- }
- if ( dc->rwmap == NULL || dc->rwmap->rwm_suffix_massage == NULL ) {
- *dn = *in;
- return LDAP_SUCCESS;
+ if ( mdn.bv_val == dmy ) {
+ BER_BVZERO( &mdn );
}
- if ( dc->tofrom ) {
- src = 0 + dc->normalized;
- dst = 2 + dc->normalized;
-
- } else {
- int rc;
-
- src = 2 + dc->normalized;
- dst = 0 + dc->normalized;
-
- /* DN from remote server may be in arbitrary form.
- * Pretty it so we can parse reliably.
- */
- if ( dc->normalized && dn == NULL ) {
- rc = dnNormalize( 0, NULL, NULL, in, &normal, NULL );
-
- } else if ( !dc->normalized && ndn == NULL ) {
- rc = dnPretty( NULL, in, &pretty, NULL );
-
- } else {
- rc = dnPrettyNormal( NULL, in, &pretty, &normal, NULL );
- }
-
- if ( rc != LDAP_SUCCESS ) {
- return rc;
- }
-
- if ( dc->normalized && !BER_BVISNULL( &normal) ) {
- in = &normal;
-
- } else if ( !dc->normalized && !BER_BVISNULL( &pretty ) ) {
- in = &pretty;
- }
+ if ( dn->bv_val == dmy ) {
+ BER_BVZERO( dn );
}
- for ( i = 0;
- dc->rwmap->rwm_suffix_massage[i].bv_val != NULL;
- i += 4 ) {
- int aliasLength = dc->rwmap->rwm_suffix_massage[i+src].bv_len;
- int diff = in->bv_len - aliasLength;
-
- if ( diff < 0 ) {
- /* alias is longer than dn */
- continue;
-
- } else if ( diff > 0 && ( !DN_SEPARATOR(in->bv_val[diff-1]))) {
- /* FIXME: DN_SEPARATOR() is intended to work
- * on a normalized/pretty DN, so that ';'
- * is never used as a DN separator */
- continue;
- /* At a DN Separator */
- }
-
- if ( !strcmp( dc->rwmap->rwm_suffix_massage[i+src].bv_val, &in->bv_val[diff] ) ) {
- dn->bv_len = diff + dc->rwmap->rwm_suffix_massage[i+dst].bv_len;
- dn->bv_val = ch_malloc( dn->bv_len + 1 );
- strncpy( dn->bv_val, in->bv_val, diff );
- strcpy( &dn->bv_val[diff], dc->rwmap->rwm_suffix_massage[i+dst].bv_val );
-#ifdef NEW_LOGGING
- LDAP_LOG ( BACK_LDAP, ARGS,
- "rwm_dn_massage: converted \"%s\" to \"%s\"\n",
- in->bv_val, dn->bv_val, 0 );
-#else
- Debug( LDAP_DEBUG_ARGS,
- "rwm_dn_massage:"
- " converted \"%s\" to \"%s\"\n",
- in->bv_val, dn->bv_val, 0 );
-#endif
- break;
- }
- }
-
- if ( !BER_BVISNULL( &pretty ) ) {
- ch_free( pretty.bv_val );
- }
-
- if ( !BER_BVISNULL( &normal ) ) {
- ch_free( normal.bv_val );
- }
-
- in = tmpin;
-
- /* Nothing matched, just return the original DN */
- if ( dc->normalized && BER_BVISNULL( ndn ) ) {
- *ndn = *in;
-
- } else if ( !dc->normalized && BER_BVISNULL( dn ) ) {
- *dn = *in;
- }
-
- return LDAP_SUCCESS;
+ return rc;
}
-#endif /* !ENABLE_REWRITE */
#endif /* SLAPD_OVER_RWM */