Changeset 74

Timestamp:

05/08/09 17:07:20 (15 years ago)

Author:

nanardon

Message:

• support object deletion
• fix synchro of delayed fields

Location:

LATMOS-Accounts/lib/LATMOS

Files:

• Accounts.pm (modified) (1 diff)
• Accounts/Bases.pm (modified) (1 diff)
• Accounts/Bases/Ad.pm (modified) (1 diff)
• Accounts/Bases/Ad/objects.pm (modified) (2 diffs)
• Accounts/Bases/Sql/Group.pm (modified) (1 diff)
• Accounts/Bases/Sql/User.pm (modified) (1 diff)
• Accounts/Bases/Sql/objects.pm (modified) (7 diffs)
• Accounts/Bases/Unix.pm (modified) (1 diff)
• Accounts/Synchro.pm (modified) (2 diffs)

LATMOS-Accounts/lib/LATMOS/Accounts.pm

@@ -91 +91 @@
     if ($name) {
         foreach my $param ($self->Parameters("sync:$name")) {
-            warn "$param $options{$param}";
             if (!defined($options{$param})) {
                 my @args = $self->val("sync:$name", $param);
-                warn join(', ', $param, @args);
                 $options{$param} = ($args[1] || $param eq 'to')
                     ? [ @args ]

LATMOS-Accounts/lib/LATMOS/Accounts/Bases.pm

@@ -186 +186 @@
 }
 
+=head2 delete_object($otype, $id)
+
+Destroy from data base object type $otype having id $id.
+
+=cut
+
+sub delete_object {
+    my ($self, $otype, $id) = @_;
+    my $pclass = $self->_load_obj_class($otype);
+    $pclass->_delete($self, $id) or return;
+}
+
 =head2 load
 

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ad.pm

@@ -89 +89 @@
 sub object_base_dn {
     my ($self, $otype) = @_;
-    warn $otype;
     return join(',',
         ($self->param($otype . '_container') || 'cn=Users'),

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ad/objects.pm

@@ -46 +46 @@
         callback => sub {
             my ($mesg, $entry) = @_;
-            $mesg->code and die $mesg->error;
+            #$mesg->code and die $mesg->error;
             $entry or return;
             ref $entry eq 'Net::LDAP::Entry' or return;
@@ -85 +85 @@
     return if(@others); # we cannot have multiple entries...
     return if (!$entry);
-    bless({ entry => $entry }, $class);
+    bless({ entry => $entry, _base => $base }, $class);
+}
+
+sub _delete {
+    my ($class, $base, $uid) = @_;
+    my $obj = $class->new($base, $uid) or return;
+
+    my $mesg = $base->ldap->delete($obj->{entry}->dn);
+
+    if ($mesg->code) {
+        warn $mesg->error;
+        return;
+    } else { return 1 }
 }
 

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Group.pm

@@ -40 +40 @@
 
 sub key_field { 'groupname' }
+
+sub has_extended_attributes { 1 }
 
 sub _initial_fields {

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm

@@ -40 +40 @@
 
 sub key_field { 'login' }
+
+sub has_extended_attributes { 1 }
 
 sub _inline_fields {

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm

@@ -74 +74 @@
 }
 
+sub has_extended_attributes { 0 }
+
 sub _initial_fields {
     my ($self, $for) = @_;
@@ -87 +89 @@
     my ($class, $base, $for) = @_;
     $for ||= 'rw';
-    my $sth = $base->db->prepare_cached(
-        sprintf(
-            q{select canonical from %s order by canonical},
-            $base->db->quote_identifier($class->object_table . '_attributes_list'),
-        )
-    );
-    $sth->execute;
     my @attr;
-    while (my $res = $sth->fetchrow_hashref) {
-        push(@attr, $res->{canonical});
+    if ($class->has_extended_attributes) {
+        my $sth = $base->db->prepare_cached(
+            sprintf(
+                q{select canonical from %s order by canonical},
+                $base->db->quote_identifier($class->object_table . '_attributes_list'),
+            )
+        );
+        $sth->execute;
+        while (my $res = $sth->fetchrow_hashref) {
+            push(@attr, $res->{canonical});
+        }
     }
     @attr, keys %{ $class->_inline_fields($for) || {} }
@@ -103 +107 @@
 sub _get_field_name_db {
     my ($class, $c_field, $base) = @_;
+    $class->has_extended_attributes or return;
     $class->object_table or return;
     my $sth = $base->db->prepare_cached(
@@ -160 +165 @@
 }
 
+sub _delete {
+    my ($class, $base, $id) = @_;
+
+    my $sthd = $base->db->prepare_cached(
+        sprintf(
+            q{delete from %s where %s = ?},
+            $base->db->quote_identifier($class->object_table),
+            $base->db->quote_identifier($class->key_field),
+        )
+    );
+    $sthd->execute($id);
+}
+
 sub db {
     return $_[0]->base->db;
@@ -176 +194 @@
 
 sub get_field {
-    my ($self, $field, $for) = @_;
-    $for ||= 'rw';
-    my $inl = $self->_inline_fields($for) || {};
+    my ($self, $field) = @_;
+    my $inl = $self->_inline_fields('r') || {};
     my %inline = map { $inl->{$_} => 1 }  keys %{ $inl || {}};
     if ($inline{$field}) {
@@ -193 +210 @@
     $sth->finish;
     return $res->{$field};
-    } else {
+    } elsif ($self->has_extended_attributes) { # else, then we mandatory have extend attr
         my $sth = $self->db->prepare_cached(
             sprintf(
@@ -235 +252 @@
     }
     
-    my $sthd = $self->db->prepare_cached(
-        sprintf(
-            q{delete from %s where id = ? and attr = ?},
-            $self->db->quote_identifier($self->object_table. '_attributes'),
-        ),
-    );
-    my $sthx = $self->db->prepare_cached(
-        sprintf(
-            q{insert into %s (id, attr, value) values (?,?,?)},
-            $self->db->quote_identifier($self->object_table. '_attributes'),
-        )
-    );
-
-    foreach (keys %ext) {
-        $sthd->execute($self->{id}, $_) or return;
-        $ext{$_} or next;
-        $sthx->execute($self->{id}, $_, $ext{$_}) or return;
+    if ($self->has_extended_attributes) {
+        my $sthd = $self->db->prepare_cached(
+            sprintf(
+                q{delete from %s where id = ? and attr = ?},
+                $self->db->quote_identifier($self->object_table. '_attributes'),
+            ),
+        );
+        my $sthx = $self->db->prepare_cached(
+            sprintf(
+                q{insert into %s (id, attr, value) values (?,?,?)},
+                $self->db->quote_identifier($self->object_table. '_attributes'),
+            )
+        );
+
+        foreach (keys %ext) {
+            $sthd->execute($self->{id}, $_) or return;
+            $ext{$_} or next;
+            $sthx->execute($self->{id}, $_, $ext{$_}) or return;
+        }
     }
 }

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Unix.pm

@@ -307 +307 @@
 }
 
+sub delete_object {
+    my ($self, $otype, $id, %data) = @_;
+
+    # objects are store into sub ref:
+    my $internal_obj = {
+        user => 'users',
+        group => 'groups',
+    }->{$otype};
+    delete $self->{$internal_obj}{$id};
+    1
+}
+
 1;
 

LATMOS-Accounts/lib/LATMOS/Accounts/Synchro.pm

@@ -137 +137 @@
                 }
             }
+            my %srcexists = map { $_ => 1 } $self->from->list_objects($otype);
+            foreach (keys %exists) {
+                if (!$srcexists{$_}) {
+                    warn "delete $otype $_\n";
+                    $destbase->delete_object($otype, $_);
+                }
+            }
         }
     }
@@ -178 +185 @@
             my %delayed = map { $_ => 1 } $to->delayed_fields($otype);
             foreach ($from->list_canonicals_fields($otype, 'r')) {
-                $delayed{$_} and next;
+                $delayed{$_} or next;
                 $fields{$_} ||= 0; # avoid 
                 $fields{$_}++;
             }
             foreach ($to->list_canonicals_fields($otype, 'w')) {
-                $delayed{$_} and next;
+                $delayed{$_} or next;
                 $fields{$_} ||= 0; # avoid 
                 $fields{$_}++;