Changeset 1705 for trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Timestamp:

02/03/16 05:29:32 (8 years ago)

Author:

nanardon

Message:

Properly handle rename when key_attr != dn_attr

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ldap

Files:

• User.pm (modified) (1 diff)
• objects.pm (modified) (1 diff)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ldap/User.pm

@@ -43 +43 @@
 
 sub _key_attr { 'cn' } 
+
+sub _key_attribute {
+    my ($self, $base) = @_;
+    $base ||= $self->base;
+
+    $base->config($self->type . '_key_attribute') || 'uid';
+}
 
 sub _my_ldap_classes { qw(

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ldap/objects.pm

@@ -146 +146 @@
 
     my $mesg;
-    if ($class->_key_attribute($base) eq
+
+    if ($class->_key_attribute($base) ne
                 $class->_dn_attribute($base)) {
-        $mesg = $base->ldap->moddn( $obj->{entry},
-            newrdn => $class->_dn_attribute($base) . '=' .  escape_filter_value($newuid),
-            deleteoldrdn => 1,)
-    } else {
-        $obj->{entry}->replace($class->_key_attribute($base), $newuid);
-        $mesg = $obj->{entry}->update($base->ldap);
-    }
+
+        my $entry = $obj->{entry}->clone;
+        $entry->add(
+            $class->_key_attribute($base),
+            $newuid
+        );
+        $mesg = $entry->update($base->ldap);
+        if ($mesg->code && $mesg->code ne 20) {
+            $base->log(LA_ERR, "Cannot update key_attribute for object %s: %s", $uid, $mesg->error);
+            return;
+        }
+    }
+
+
+    $mesg = $base->ldap->moddn(
+        $obj->{entry},
+        newrdn => $class->_dn_attribute($base) . '=' .  escape_filter_value($newuid),
+        deleteoldrdn => 1,
+    );
+    if ($mesg->code) {
+        $base->log(LA_ERR, "Cannot rename object %s: %s", $uid, $mesg->error);
+        return;
+    }
+
+    $mesg = $base->ldap->search(
+        filter => sprintf(
+            '(&%s (%s=%s))',
+            $class->_class_filter,
+            $class->_key_attribute($base),
+            escape_filter_value($newuid),
+        ),
+        base => $base->object_base_dn($class->type),
+        attrs => [ $class->_canonical_fields($base, 'r') ],
+    );
+
+    if ($mesg->code)  {
+        $base->log(LA_ERR, 'Cannot fetch %s/%s: %s', $class->type, $uid, $mesg->code);
+        return;
+    }
+
+    my ($entry, @others) = $mesg->entries;
+
+    $obj->{entry} = $entry;
+
+    $obj->{entry}->replace(
+        $class->_key_attribute($base),
+        $newuid
+    );
+    $mesg = $obj->{entry}->update($base->ldap);
 
     if ($mesg->code) {