Changeset 16

Timestamp:

03/03/09 19:51:40 (15 years ago)

Author:

nanardon

Message:

• add create object to UNIX base

Location:

LATMOS-Accounts

Files:

• MANIFEST (modified) (1 diff)
• lib/LATMOS/Accounts/Bases.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Bases/Unix.pm (modified) (6 diffs)
• t/11_bases_unix.t (modified) (3 diffs)

LATMOS-Accounts/MANIFEST

@@ -1 +1 @@
 Changes
+lib/LATMOS/Accounts.pm
+lib/LATMOS/Accounts/Bases.pm
+lib/LATMOS/Accounts/Bases/Ad.pm
+lib/LATMOS/Accounts/Bases/Dummy.pm
+lib/LATMOS/Accounts/Bases/Dummy/User.pm
+lib/LATMOS/Accounts/Bases/Objects.pm
+lib/LATMOS/Accounts/Bases/Unix.pm
+lib/LATMOS/Accounts/Bases/Unix/Group.pm
+lib/LATMOS/Accounts/Bases/Unix/User.pm
 Makefile.PL
 MANIFEST
 README
+t/10_bases.t
+t/11_bases_unix.t
 t/LATMOS-Accounts.t
-lib/LATMOS/Accounts.pm
+testdata/group
+testdata/gshadow
+testdata/passwd
+testdata/shadow

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

@@ -91 +91 @@
 }
 
+=head2 create_object($type, $id, %data)
+
+Create and return an object of type $type with unique id
+$id having %data.
+
+This method should be provided by the data base handler.
+
+=cut
+
+sub create_object {
+    my ($self, $otype, $id, %data) = @_;
+    return;
+}
+
+=head2 create_c_object($type, $id, %data)
+
+Create and return an object of type $type with unique id
+$id having %data using canonical fields
+
+=cut
+
+sub create_c_object {
+    my ($self, $otype, $id, %cdata) = @_;
+
+    my %data;
+    foreach my $cfield (keys %cdata) {
+        my $field = $self->base->get_field_name($self->type, $cfield) or next;
+        $data{$field} = $cdata{$cfield};
+    }
+    keys %data or return 1; # TODO: return an error ?
+    $self->create_object($otype, $id, %data);
+}
+
 =head2 load
 

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

@@ -83 +83 @@
 }
 
-
 my @password_fields = qw(account password uid gid gecos home shell);
 my @shadow_fields =   qw(account spassword last_changed before_ch after_ch exp_warn exp_disable disable res);
@@ -196 +195 @@
             $self->{users}{$_}{home},
             $self->{users}{$_}{shell},
-        ]} keys %{$self->{users}}
+        ]} sort { $self->{users}{$a}{uid} <=> $self->{users}{$b}{uid} } keys %{$self->{users}}
     ) or return;
 
@@ -206 +205 @@
             $self->{groups}{$_}{gid},
             join(',', keys %{$self->{groups}{$_}{users} || {}}), 
-        ]} keys %{$self->{groups}}
+        ]} sort {  $self->{groups}{$a}{gid} <=> $self->{groups}{$b}{gid} } keys %{$self->{groups}}
     ) or return;
 
@@ -223 +222 @@
             $self->{users}{$_}{disable},
             $self->{users}{$_}{res},
-        ]} keys %{$self->{users}}
+        ]} sort { $self->{users}{$a}{uid} <=> $self->{users}{$b}{uid} } keys %{$self->{users}}
     ) or return;
 
@@ -234 +233 @@
             $self->{groups}{$_}{unknown},
             join(',', keys %{$self->{groups}{$_}{susers} || {}}), 
-        ]} keys %{$self->{groups}}
+        ]} sort {  $self->{groups}{$a}{gid} <=> $self->{groups}{$b}{gid} } keys %{$self->{groups}}
     ) or return;
 
@@ -240 +239 @@
 
     1
+}
+
+sub create_object {
+    my ($self, $otype, $id, %data) = @_;
+
+    my $internal_obj = {
+        user => 'users',
+        group => 'groups',
+    }->{$otype};
+
+    if ($self->{$internal_obj}{$id}) { return };
+    $self->{$internal_obj}{$id} = { account => $id };
+    my $obj = $self->get_object($otype, $id) or return;
+    $obj->set_fields(%data);
+    $obj
 }
 

LATMOS-Accounts/t/11_bases_unix.t

@@ -1 +1 @@
 use strict;
 use warnings;
-use Test::More tests => 20;
+use Test::More tests => 21;
 use File::Temp;
 
@@ -38 +38 @@
 ok($user->set_fields(shell => '/bin/tcsh'), "Can set login shell");
 is($user->get_field('shell'), '/bin/tcsh', 'Can get modified login shell');
+ok($unixb->create_object('user', 'admin',
+    uid => 2, gid => 2,
+    home => '/home/admin',
+    shell => '/bin/sh',
+), "Can create a user");
 
 ok($unixb->commit, "Can save unix base");
@@ -51 +56 @@
 is($user->get_field('shell'), '/bin/tcsh', 'Can get modified login shell');
 
-
-system('rm', '-fr', $dir);
+warn $dir
+#system('rm', '-fr', $dir);