Changeset 2612

Timestamp:

05/14/24 03:17:01 (2 weeks ago)

Author:

nanardon

Message:

use real attribute number in unix base, fixe test

Location:

trunk/LATMOS-Accounts

Files:

• lib/LATMOS/Accounts/Bases.pm (modified) (2 diffs)
• lib/LATMOS/Accounts/Bases/Unix.pm (modified) (6 diffs)
• lib/LATMOS/Accounts/Bases/Unix/User.pm (modified) (6 diffs)
• lib/LATMOS/Accounts/Synchro.pm (modified) (2 diffs)
• t/11_bases_unix.t (modified) (1 diff)
• t/25_la_synchro.t (modified) (1 diff)

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

@@ -1102 +1102 @@
     my $KeyAttribute = $self->config( 'keyAttribute.' . $srcobj->base->label . '.' . $srcobj->type  );
 
-    my $destid = $options{ KeyAttribute }
-        ? $srcobj->get_attibutes( $options{ KeyAttribute } )
+    my $destid = $KeyAttribute
+        ? $srcobj->get_attibutes( $KeyAttribute )
         : $srcobj->id;
+
     if (my $dstobj = $self->get_object($srcobj->type, $destid)) {
         keys %data or return 'SYNCED';
@@ -1124 +1125 @@
             return;
         }
-        if (my $res = $self->_create_c_object($srcobj->type, $srcobj->id, %data)) {
+        if (my $res = $self->_create_c_object($srcobj->type, $destid, %data)) {
             return 'CREATED'
         } else {

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

@@ -67 +67 @@
 }
 
-my @password_fields = qw(account password uid gid gecos home shell);
+my @password_fields = qw(account password uidNumber gidNumber gecos home shell);
 my @shadow_fields =   qw(account spassword last_changed before_ch after_ch exp_warn exp_disable disable res);
 my @group_fields =    qw(group_name passwd gid user_list);
@@ -247 +247 @@
                 ? '!!' . ($self->{users}{$_}{password} || '')
                 : ($self->{users}{$_}{password} || 'x')), # No empty pass !!
-            $self->{users}{$_}{uid},
-            $self->{users}{$_}{gid},
+            $self->{users}{$_}{uidNumber},
+            $self->{users}{$_}{gidNumber},
             $self->{users}{$_}{gecos} || '',
             $self->{users}{$_}{home} || '/dev/null',
             ($self->{users}{$_}{locked} ? '-' : '') . ($self->{users}{$_}{shell}
                 || '/bin/false'),
-        ]} sort { $self->{users}{$a}{uid} <=> $self->{users}{$b}{uid} } keys %{$self->{users}}
+        ]} sort { $self->{users}{$a}{uidNumber} <=> $self->{users}{$b}{uidNumber} } keys %{$self->{users}}
     ) or return;
 
@@ -324 +324 @@
             $self->{users}{$_}{disable},
             $self->{users}{$_}{res},
-        ]} sort { $self->{users}{$a}{uid} <=> $self->{users}{$b}{uid} } keys %{$self->{users}}
+        ]} sort { $self->{users}{$a}{uidNumber} <=> $self->{users}{$b}{uidNumber} } keys %{$self->{users}}
     ) or return;
 
@@ -354 +354 @@
     for ($otype) {
         /^user$/ and
-            return grep { $self->{$internal_obj}{$_}{uid} >= ($self->{min_uid} || 0) } @obj;
+            return grep { $self->{$internal_obj}{$_}{uidNumber} >= ($self->{min_uid} || 0) } @obj;
         /^group$/ and
             return grep { $self->{$internal_obj}{$_}{gid} >= ($self->{min_gid} || 0) } @obj;
@@ -379 +379 @@
     }->{$otype};
     for ($otype) {
-        if (/^user$/ && (!defined($data{uid}) || !defined($data{gid}))) {
+        if (/^user$/ && (!defined($data{uidNumber}) || !defined($data{gidNumber}))) {
             $self->log(LA_ERR, "uid or gid missing to create $otype");
             return;
@@ -398 +398 @@
         uid => $data{uid},
         gid => $data{gid},
+        uidNumber => $data{uidNumber},
+        gidNumber => $data{gidNumber},
         _id => $id,
     };

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

@@ -31 +31 @@
     my ($class, $base) = @_;
     {
-        uidNumber       => { iname => 'uid', uniq => 1, },
-        gidNumber       => { iname => 'gid',
+        uidNumber       => { uniq => 1, },
+        gidNumber       => {
             can_values => sub {
                 map { $_->get_attributes('gidNumber') }
@@ -55 +55 @@
         sn              => { ro => 1 },
         sAMAccountName  => { iname => 'login', ro => 1 },
+        uid             => { iname => 'account', ro => 1 },
         $base->{use_shadow} ?
         (
@@ -76 +77 @@
     # we profit of ref, quite easy
     if (exists($base->{users}{$id}) && $base->{users}{$id}) {
-        if ($base->{users}{$id}{uid} < ($base->{min_uid} || 0)) {
+        if ($base->{users}{$id}{uidNumber} < ($base->{min_uid} || 0)) {
             return;
         }
@@ -85 +86 @@
 sub get_field {
     my ($self, $field) = @_;
+
     for ($field) {
         /^login$/ and return $self->id;
@@ -100 +102 @@
             return \@res;
         };
-    }
-    $self->{$field}
+        last;
+    }
+
+    if (my $oattr = $self->attribute($field)) {
+        return $self->{ $oattr->iname };
+    } else {
+        return $self->{$field}
+    }
 }
 
@@ -118 +126 @@
 
     foreach my $field (keys %data) {
-        $field =~ /^(uid|gid)$/ and do {
+        $field =~ /^(uidNumber|gidNumber)$/ and do {
             if(!(defined($data{$field}) && $data{$field} =~ /^\d+$/)) {
                 $self->base->log(LA_ERR,

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

@@ -283 +283 @@
             $destbase->is_supported_object($otype) or next;
 
-            my $SyncKeyAttribute = $self->from->key_field( $otype );
+            my $SyncKeyAttribute;
             if ( my $attr = $destbase->config( 'keyAttribute.' . $self->from->label . '.' . $otype ) ) {
                 $SyncKeyAttribute = $attr;
@@ -366 +366 @@
                     $otype,
                     $self->val($self->from->label, $destbase->label, 0),
+                    $SyncKeyAttribute,
                 ));
 

trunk/LATMOS-Accounts/t/11_bases_unix.t

@@ -41 +41 @@
 is($user->get_field('shell'), '/bin/tcsh', 'Can get modified login shell');
 ok($unixb->create_object('user', 'admin',
-    uid => 2, gid => 2,
+    uidNumber => 2, gidNumber => 2,
     home => '/home/admin',
     shell => '/bin/sh',

trunk/LATMOS-Accounts/t/25_la_synchro.t

@@ -31 +31 @@
 
 isa_ok(
-    my $accounts = LATMOS::Accounts->new($workdir),
+    my $accounts = LATMOS::Accounts->new($workdir, noacl => 1),
     'LATMOS::Accounts'
 );