Changeset 2406

Timestamp:

06/23/20 00:45:41 (4 years ago)

Author:

nanardon

Message:

Add support for GroupOfNames? object in ldap (from group)

Location:

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

Files:

• Ldap/Group.pm (modified) (1 diff)
• Ldap/Groupofnames.pm (copied) (copied from trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ldap/Group.pm) (6 diffs)
• Sql/Groupofnames.pm (added)

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

@@ -48 +48 @@
         gidNumber => { uniq => 1, },
         description => { },
-        memberUID => { multiple => 1, delayed => 1, },
+        memberUID => {
+            multiple => 1,
+            delayed => 1,
+            reference => 'user',
+        },
         cn => { ro => 1 },
         dn => { ro => 1 },

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

@@ -1 @@
-package LATMOS::Accounts::Bases::Ldap::Group;
+package LATMOS::Accounts::Bases::Ldap::Groupofnames;
 
 use 5.010000;
@@ -36 +36 @@
 =cut
 
-sub _class_filter { '(ObjectClass=posixGroup)' }
+sub is_supported {
+    my ($class, $base) = @_;
+    return $base->config('groupofnames_container') ? 1 : 0;
+}
+
+
+sub _class_filter { '(ObjectClass=groupOfNames)' }
 
 sub _key_attr { 'cn' } 
 
-sub _my_ldap_classes { qw(top posixGroup) }
+sub _my_ldap_classes { qw(top groupOfNames) }
 
 sub _get_attr_schema {
@@ -46 +52 @@
     $class->SUPER::_get_attr_schema($base,
     {
-        gidNumber => { uniq => 1, },
         description => { },
-        memberUID => { multiple => 1, delayed => 1, },
+        member => {
+            mandatory => 1,
+            multiple => 1,
+            reference => 'user',
+        },
         cn => { ro => 1 },
         dn => { ro => 1 },
@@ -71 +80 @@
     $data{$class->_key_attribute($base)} = $id;
     foreach (keys %data) {
-        /^(memberUID)$/ and do {
-            $delayed{memberUID} = $data{$_};
-            next;
+        /^(member)$/ and do {
+            my @DNs;
+            foreach my $user ( ref $data{$_} ? @{ $data{$_} } : $data{$_} ) {
+                my $OUser = $base->get_object('user', $user) or next;
+                push(@DNs, $OUser->{entry}->dn);
+            }
+            $data{$_} = \@DNs;
         };
         $class->_populate_entry($entry, $_, $data{$_});
@@ -88 +101 @@
     my ($self, $field) = @_;
 
-    $field eq 'memberUID' and do {
-        my $val = $self->SUPER::get_field('memberUid');
-        return ref $val ? $val : [ grep { $_ } $val ];
+    $field eq 'member' and do {
+        my @res;
+        foreach my $dn ($self->{entry}->get_value('member')) {
+            my $User = $self->base->_get_object_from_dn($dn) or next;
+            push(@res, $User->get_value( LATMOS::Accounts::Bases::Ldap::User::_key_attr() ) );
+        }
+        return [ sort(@res) ];
     };
+
     $self->SUPER::get_field($field);
 }
@@ -99 +117 @@
     my %ndata;
     while (my ($f, $val) = each(%data)) {
-        $f eq 'memberUID' and do {
+        $f eq 'member' and do {
+            my %users;
             $val = [ $val ] unless(ref $val);
-            my %users;
-            $users{$_}{e} = 1 foreach (@{ $self->get_field('memberUID') || []});
-            $users{$_}{n} = 1 foreach (grep { $_ } @{ $val || []});
+            $users{$_}{e} = 1 foreach (grep { defined($_) } @{ $self->get_field('member') || []});
+            $users{$_}{n} = 1 foreach (grep { defined($_) } @{ $val || []});
             foreach (keys %users) {
                 $users{$_}{e} && $users{$_}{n} and next;
+                my $user = $self->base->get_object('user', $_) or next;
                 if ($users{$_}{e}) {
-                    $self->{entry}->delete(memberUid => $_);
-                } elsif ($users{$_}{n} && $self->base->get_object('user', $_)) {
-                    $self->{entry}->add(memberUid => $_);
+                    $self->{entry}->delete(member => $user->get_field('dn'));
+                } elsif ($users{$_}{n}) {
+                    $self->{entry}->add(member => $user->get_field('dn'));
                 } # else {} # can't happen
-                my $mesg = $self->{entry}->update($self->base->ldap);
             }
             next;