Merge the 'normalise' ldb module with extended_dn_out

[abartlet/samba.git/.git] / source4 / dsdb / samdb / ldb_modules / extended_dn_out.c

diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
index f284c719daf96095adff3cbdb5a9ef8d7d3fd592..d91d9460e2a06d2a6ad48e473c0700b89567afab 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
@@ -24,7 +24,7 @@
  *  Component: ldb extended dn control module
  *
  *  Description: this module builds a special dn for returned search
- *  results 
+ *  results, and fixes some other aspects of the result (returned case issues)
  *  values.
  *
  *  Authors: Simo Sorce
@@ -41,6 +41,7 @@
 
 struct extended_dn_out_private {
        bool dereference;
+       bool normalise;
        struct dsdb_openldap_dereference_control *dereference_control;
 };
 
@@ -98,6 +99,39 @@ static bool add_attrs(void *mem_ctx, char ***attrs, const char *attr)
        return true;
 }
 
+/* Fix the DN so that the relative attribute names are in upper case so that the DN:
+   cn=Adminstrator,cn=users,dc=samba,dc=example,dc=com becomes
+   CN=Adminstrator,CN=users,DC=samba,DC=example,DC=com
+*/
+
+
+static int fix_dn(struct ldb_dn *dn) 
+{
+       int i, ret;
+       char *upper_rdn_attr;
+
+       for (i=0; i < ldb_dn_get_comp_num(dn); i++) {
+               /* We need the attribute name in upper case */
+               upper_rdn_attr = strupper_talloc(dn,
+                                                ldb_dn_get_component_name(dn, i));
+               if (!upper_rdn_attr) {
+                       return LDB_ERR_OPERATIONS_ERROR;
+               }
+               
+               /* And replace it with CN=foo (we need the attribute in upper case */
+               ret = ldb_dn_set_component(dn, i, upper_rdn_attr,
+                                          *ldb_dn_get_component_val(dn, i));
+               talloc_free(upper_rdn_attr);
+               if (ret != LDB_SUCCESS) {
+                       return ret;
+               }
+       }
+       return LDB_SUCCESS;
+}
+
+/* Inject the extended DN components, so the DN cn=Adminstrator,cn=users,dc=samba,dc=example,dc=com becomes
+   <GUID=541203ae-f7d6-47ef-8390-bfcf019f9583>;<SID=S-1-5-21-4177067393-1453636373-93818737-500>;cn=Adminstrator,cn=users,dc=samba,dc=example,dc=com */
+
 static int inject_extended_dn_out(struct ldb_reply *ares,
                                  struct ldb_context *ldb,
                                  int type,
@@ -161,10 +195,9 @@ static int handle_dereference(struct ldb_dn *dn,
                        
        /* Look for this attribute in the returned control */
        for (j = 0; dereference_attrs && dereference_attrs[j]; j++) {
-               DATA_BLOB source_dn = data_blob_string_const(dereference_attrs[j]->dereferenced_dn);
-               if (ldb_attr_cmp(dereference_attrs[j]->source_attribute, attr)
+               struct ldb_val source_dn = data_blob_string_const(dereference_attrs[j]->dereferenced_dn);
+               if (ldb_attr_cmp(dereference_attrs[j]->source_attribute, attr) == 0
                    && data_blob_cmp(&source_dn, val) == 0) {
-                       
                        fake_msg.num_elements = dereference_attrs[j]->num_attributes;
                        fake_msg.elements = dereference_attrs[j]->attributes;
                        break;
@@ -279,6 +312,18 @@ static int extended_callback(struct ldb_request *req, struct ldb_reply *ares)
                if (!attribute) {
                        continue;
                }
+
+               if (private->normalise) {
+                       /* If we are also in 'normalise' mode, then
+                        * fix the attribute names to be in the
+                        * correct case */
+                       msg->elements[i].name = talloc_strdup(msg->elements, attribute->lDAPDisplayName);
+                       if (!msg->elements[i].name) {
+                               ldb_oom(ac->module->ldb);
+                               return ldb_module_done(ac->req, NULL, NULL, LDB_ERR_OPERATIONS_ERROR);
+                       }
+               }
+
                /* Look to see if this attributeSyntax is a DN */
                if (strcmp(attribute->attributeSyntax_oid, "2.5.5.1") != 0) {
                        continue;
@@ -291,6 +336,13 @@ static int extended_callback(struct ldb_request *req, struct ldb_reply *ares)
                                return ldb_module_done(ac->req, NULL, NULL, LDB_ERR_INVALID_DN_SYNTAX);
                        }
 
+                       if (private->normalise) {
+                               ret = fix_dn(dn);
+                               if (ret != LDB_SUCCESS) {
+                                       return ldb_module_done(ac->req, NULL, NULL, ret);
+                               }
+                       }
+                       
                        /* If we are running in dereference mode (such
                         * as against OpenLDAP) then the DN in the msg
                         * above does not contain the extended values,
@@ -305,11 +357,10 @@ static int extended_callback(struct ldb_request *req, struct ldb_reply *ares)
                                                         msg->elements[i].name,
                                                         &msg->elements[i].values[j]);
                                if (ret != LDB_SUCCESS) {
-                                       
                                        return ldb_module_done(ac->req, NULL, NULL, ret);
                                }
                        }
-
+                       
                        if (!ac->inject) {
                                dn_str = talloc_steal(msg->elements[i].values, 
                                                      ldb_dn_get_linearized(dn));
@@ -318,6 +369,10 @@ static int extended_callback(struct ldb_request *req, struct ldb_reply *ares)
                                                      ldb_dn_get_extended_linearized(msg->elements[i].values, 
                                                                                     dn, ac->extended_type));
                        }
+                       if (!dn_str) {
+                               ldb_oom(ac->module->ldb);
+                               return ldb_module_done(ac->req, NULL, NULL, LDB_ERR_OPERATIONS_ERROR);
+                       }
                        msg->elements[i].values[j] = data_blob_string_const(dn_str);
                        talloc_free(dn);
                }
@@ -508,6 +563,10 @@ static int extended_dn_out_dereference_init(struct ldb_module *module)
 
        private->dereference = true;
 
+       /* At the moment, servers that need dereference also need the
+        * DN and attribute names to be normalised */
+       private->normalise = true;
+
        ret = ldb_mod_register_control(module, LDB_CONTROL_EXTENDED_DN_OID);
        if (ret != LDB_SUCCESS) {
                ldb_debug(module->ldb, LDB_DEBUG_ERROR,