Changeset 1357

Timestamp:

06/25/15 15:38:44 (9 years ago)

Author:

nanardon

Message:

Fix id information into Unix base

Location:

trunk/LATMOS-Accounts

Files:

• lib/LATMOS/Accounts/Bases.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Bases/Attributes.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Bases/Objects.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Bases/Unix.pm (modified) (4 diffs)
• lib/LATMOS/Accounts/Bases/Unix/Group.pm (modified) (3 diffs)
• lib/LATMOS/Accounts/Bases/Unix/User.pm (modified) (2 diffs)
• testdata/synchro/dest/group (modified) (1 diff)
• testdata/synchro/source/group (modified) (1 diff)

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

@@ -898 +898 @@
             return;
         }
-        if ($self->_create_c_object($srcobj->type, $srcobj->id, %data)) {
+        if (my $res = $self->_create_c_object($srcobj->type, $srcobj->id, %data)) {
             return 'CREATED'
         } else {

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

@@ -223 +223 @@
                     $self->object->id,
                 );
+                $self->base->log(LA_DEBUG, "Possible value for %s: %s",
+                    $self->name,
+                    join(', ', @possible)
+                );
                 return;
             }

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

@@ -79 +79 @@
     my $pclass = $base->_load_obj_class($otype) or return;
     my $newobj = "$pclass"->new($base, $id, @args) or return;
+
     $newobj->{_base} = $base;
     $newobj->{_type} = lc($otype);
     $newobj->{_id} ||= $id;
+
     return $newobj;
 }

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

@@ -125 +125 @@
             $self->{users}{$user}{shell} ||= '';
             $self->{users}{$user}{shell} =~ s/^-//;
+            $self->{users}{$user}{_id} = $user;
         },
     ) or return;
@@ -137 +138 @@
                 $self->{groups}{$group}{$_} = shift(@ch);
             }
+            $self->{groups}{$group}{_id} = $group;
 
             # split user in the group
@@ -336 +338 @@
         user => 'users',
         group => 'groups',
-    }->{$otype};
+    }->{$otype} or return;
     my @obj = sort keys %{$self->{$internal_obj} || {} };
     for ($otype) {
@@ -355 +357 @@
     }->{$otype};
     for ($otype) {
-        /^user$/ && !defined($data{uid}) && !defined($data{gid}) and return;
-        /^group$/ && !defined($data{gid}) and return;
-    }
-
-    if ($self->{$internal_obj}{$id}) { return };
+        if (/^user$/ && (!defined($data{uid}) || !defined($data{gid}))) {
+            $self->log(LA_ERR, "uid or gid missing to create $otype");
+            return;
+        }
+        if(/^group$/ && !defined($data{gid})) {
+            $self->log(LA_ERR, "uid or gid missing to create $otype");
+            return;
+        }
+    }
+
+    if ($self->{$internal_obj}{$id}) {
+        $self->log(LA_ERR, "Object %s.%s already exists", $otype, $id);
+        return
+    }
+
     $self->{$internal_obj}{$id} = {
         account => $id,
         uid => $data{uid},
         gid => $data{gid},
-    };
-    my $obj = $self->get_object($otype, $id) or return;
+        _id => $id,
+    };
+
+    my $obj = $self->get_object($otype, $id) or do {
+        $self->log(LA_ERR, "Cannot find freshly create $otype $id");
+        return;
+    };
+
     $obj->set_fields(%data) or return;
     $obj

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

@@ -58 +58 @@
 sub new {
     my ($class, $base, $id, @args) = @_;
-    # we profit of ref, quite easy
-    if (exists($base->{groups}{$id}) && $base->{groups}{$id}) {
+
+    if (exists($base->{groups}{$id})) {
         if ($base->{groups}{$id}{gid} < ($base->{min_gid} || 0)) {
+            $base->log(LA_DEBUG, "gid %d less than minimal %d", $base->{groups}{$id}{gid}, ($base->{min_gid} || 0));
             return;
         }
         return bless($base->{groups}{$id}, $class);
-    } else { return }
-}
-
-sub id {
-    $_[0]->{group_name}
+    } else {
+        $base->log(LA_ERR, "Cannot find group $id");
+        return
+    }
 }
 
@@ -75 +75 @@
     if ($field eq 'user_list') {
         return [ keys %{ $self->{'users'} || {} } ];
-    } elsif ($field eq 'goup_name') {
+    } elsif ($field eq 'group_name') {
         return $self->id;
     }
@@ -88 +88 @@
             if (!(defined($data{$field}) && $data{$field} =~ /^\d+$/)) {
                 $self->base->log(LA_ERR,
-                    "Invalid data for $field: " . ($data{$field} || ''));
+                    "Invalid Group data for $field: " . (defined($data{$field}) ? $data{$field} : ''));
                 return;
             }

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

@@ -84 +84 @@
 }
 
-sub id {
-    $_[0]->{account}
-}
-
 sub get_field {
     my ($self, $field) = @_;
@@ -115 +111 @@
             if(!(defined($data{$field}) && $data{$field} =~ /^\d+$/)) {
                 $self->base->log(LA_ERR,
-                    "Invalid data for $field: " . ($data{$field} || ''));
+                    "Invalid data for $field: " . (defined($data{$field}) ? $data{$field} : '(none)'));
                 return;
             }

trunk/LATMOS-Accounts/testdata/synchro/dest/group

@@ -1 +1 @@
 root:x:0:
+test:x:4:

trunk/LATMOS-Accounts/testdata/synchro/source/group

@@ -1 +1 @@
 root:x:0:
+test1:x:1:
+test2:x:2:
+test3:x:3:
+test4:x:4: