Changeset 2256

Timestamp:

06/03/19 19:53:20 (5 years ago)

Author:

nanardon

Message:

Add attrbiute to add/remove user to autoFiltred group and aliases

Location:

trunk

Files:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm (modified) (2 diffs)
• LATMOS-Accounts/bin/la-sql-upgrade (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql.pm (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Aliases.pm (modified) (2 diffs)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Group.pm (modified) (2 diffs)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/upgrade.pm (modified) (1 diff)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm

@@ -162 +162 @@
             autoMemberFilter
             autoFromSutype
+            autoInclude
+            autoExclude
             sutype
             services
@@ -240 +242 @@
             autoMemberFilter
             autoFromSutype
+            autoInclude
             autoExclude
+            autoAddEmail
             create
             createdby

trunk/LATMOS-Accounts/bin/la-sql-upgrade

@@ -50 +50 @@
 
 my $LA = LATMOS::Accounts->new($config, noacl => 1);
+
+$base ||= $LA->default_base_name;
+
 my $labase = $LA->_load_base($base);
 $labase->unexported(1);

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

@@ -18 +18 @@
 our $VERSION = (q$Rev$ =~ /^Rev: (\d+) /)[0];
 
-sub SCHEMA_VERSION { 32 };
+sub SCHEMA_VERSION { 33 };
 
 =head1 NAME

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

@@ -188 +188 @@
                 label => l('User excluded'),
             },
+            autoInclude => {
+                multiple => 1,
+                reference => 'user',
+                label => l('User included'),
+            },
+            autoAddEmail => {
+                multiple => 1,
+                label => l('Extra email'),
+            },
         }
     )
@@ -269 +278 @@
 
     my %email = $self->base->attributes_summary_by_object('user', 'mail');
-    my %users;
-
-    my $autoex = $self->get_field('autoExclude');
-    my %exclude = map { $_ => 1 } grep { $_  } (ref $autoex ? @$autoex : $autoex);
-
-    if (my $filter = $self->get_field('autoMemberFilter')) {
-        $users{$_} = 1 foreach( $self->base->search_objects(
-                'user',
-                'oalias=NULL',
-                ref $filter ? @{ $filter } : $filter)
-        );
-    }
-
-    if (my $filter = $self->get_field('autoFromSutype')) {
-        my @suTypeFilter = map { "sutype=$_" } (ref $filter ? @{ $filter } : $filter);
-        foreach my $group ($self->base->search_objects('group', @suTypeFilter)) {
-            foreach ($self->base->search_objects('user', 'oalias=NULL', "memberOf=$group")) {
-                $users{$_} = 1;
-            }
-        }
-    }
+
+    my @UserList = $self->_filterToUser();
 
     my %forward = ();
 
-    foreach my $user (keys %users) {
-        $exclude{$user} and next;
+    foreach my $user (@UserList) {
         $email{$user} or next;
         my $mail = $email{$user}->[0] or next;
-        $forward{$mail} = 1;
+        $forward{ lc($mail) } = 1;
+    }
+
+    my $autoAddEmail = $self->get_field('autoAddEmail');
+
+    foreach my $mail (grep { $_ } (ref $autoAddEmail ? @$autoAddEmail : $autoAddEmail)) {
+        $forward{ lc($mail) } = 1;
     }
 

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

@@ -151 +151 @@
                 },
                 label => l('Automatics filters'),
+            },
+            autoExclude => {
+                multiple => 1,
+                reference => 'user',
+                label => l('User excluded'),
+            },
+            autoInclude => {
+                multiple => 1,
+                reference => 'user',
+                label => l('User included'),
             },
             autoFromSutype => {
@@ -243 +253 @@
     );
 
-    my %users;
-
-    if (my $filter = $self->get_field('autoFromSutype')) {
-        my @suTypeFilter = map { "sutype=$_" } (ref $filter ? @{ $filter } : $filter);
-        foreach my $group ($self->base->search_objects('group', @suTypeFilter)) {
-            foreach ($self->base->search_objects('user', "memberOf=$group")) {
-                $users{$_} = 1;
-            }
-        }
-    }
-
-    if (my $filter = $self->get_field('autoMemberFilter')) {
-        foreach ($self->base->search_objects(
-                'user',
-                'oalias=NULL',
-                ref $filter ? @{ $filter } : $filter)) {
-            $users{$_} = 1;
-        }
-    }
-
-    my $res = $self->_set_group_members([ keys %users ]);
+    my @Userlist = $self->_filterToUser;
+
+    my $res = $self->_set_group_members( \@Userlist );
 
     $res;

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

@@ -897 +897 @@
 }
 
+sub _filterToUser {
+    my ($self) = @_;
+
+    if (
+           !$self->get_field('autoMemberFilter')
+        && !$self->get_field('autoFromSutype')) {
+        return 0;
+    }
+    $self->base->log(LA_DEBUG,
+        "Populating group %s from autoMemberFilter/autoFromSutype attribute",
+        $self->id
+    );
+
+    my $autoin = $self->get_field('autoInclude');
+    my %include = map { $_ => 1 } grep { $_  } (ref $autoin ? @$autoin : $autoin);
+
+    my $autoex = $self->get_field('autoExclude');
+    my %exclude = map { $_ => 1 } grep { $_  } (ref $autoex ? @$autoex : $autoex);
+
+    my %users = %include;
+
+    if (my $filter = $self->get_field('autoFromSutype')) {
+        my @suTypeFilter = map { "sutype=$_" } (ref $filter ? @{ $filter } : $filter);
+        foreach my $group ($self->base->search_objects('group', @suTypeFilter)) {
+            foreach ($self->base->search_objects('user', "memberOf=$group")) {
+                $users{$_} = 1;
+            }
+        }
+    }
+
+    if (my $filter = $self->get_field('autoMemberFilter')) {
+        foreach ($self->base->search_objects(
+                'user',
+                'oalias=NULL',
+                ref $filter ? @{ $filter } : $filter)) {
+            $users{$_} = 1;
+        }
+    }
+
+    my @Userlist = grep { ! $exclude{ $_ } } keys %users;
+
+    @Userlist
+}
+ 
+
 =head2 attributes_summary_by_object($base, $attribute)
 

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

@@ -1199 +1199 @@
             ver => 32,
             recompute => 1,
-        }
+        },
+        {
+            ver => 33,
+            sql => [
+                q{
+                CREATE OR REPLACE FUNCTION public.group_sort_fields() RETURNS trigger AS
+            $BODY$BEGIN
+
+              IF (TG_OP='INSERT') then
+              IF (new.attr='managedBy'
+                  OR  new.attr='managedAlsoBy'
+                  OR  new.attr='member'
+                  OR  new.attr='memberUID'
+                  OR  new.attr='autoExclude'
+                  OR  new.attr='autoInclude') THEN
+              insert into group_attributes_users VALUES (new.*);
+              RETURN NULL;
+              END IF;
+
+              IF (new.attr='sutype') THEN
+              insert into group_attributes_sutypes VALUES (new.*);
+              RETURN NULL;
+              END IF;
+              end if;
+
+
+              IF (TG_OP = 'UPDATE') THEN
+              IF (new.attr='gidNumber') then
+              update "group" set gidnumber = new.value::integer where
+              "group".ikey = new.okey;
+              RETURN NULL;
+              END IF;
+              END IF;
+
+              IF (TG_OP = 'DELETE') THEN
+              IF (old.attr='exported') then
+              update "group" set exported = false where "group".ikey = old.okey;
+              return null;
+              end if;
+              else
+              IF (new.attr='exported') then
+              update "group" set exported = true where "group".ikey = new.okey;
+              RETURN NULL;
+              end if;
+              END IF;
+
+              if (TG_OP='DELETE') THEN
+              RETURN old;
+              else
+              RETURN new;
+              end if;
+              END;$BODY$
+        LANGUAGE plpgsql VOLATILE NOT LEAKPROOF
+        COST 100;
+                }
+            ],
+        },
     );