Changeset 1943

Timestamp:

02/03/17 18:49:37 (7 years ago)

Author:

nanardon

Message:

Wait a minimum of time before setting alias for expired accounts

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Expiredaliases.pm (modified) (2 diffs)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Expiredaliases.pm

@@ -38 +38 @@
     my ($self) = @_;
 
+    my $modifDelay = $self->{syncm}->ini->val($self->{name}, 'modifdelay', 60);
+    my $waitAfterModif = DateTime->now->subtract( minutes => $modifDelay  )->iso8601;
+
     # Unset aliases when user get active:
 
-    my @aliases = $self->{_base}->search_objects('aliases', 'user.active=1', 'comment=EXPIREDACCOUNT');
+    my @aliases = $self->{_base}->search_objects('aliases',
+        'user.active=1',
+        'comment=EXPIREDACCOUNT',
+        'user.date<' . $waitAfterModif,
+    );
     foreach (@aliases) {
         $self->{_base}->log(LA_NOTICE, 'Deleting aliases %s because user is active', $_);
@@ -53 +60 @@
 
     my %existedAliases = map { $_ => 1 } $self->{_base}->search_objects('aliases', 'user.active=0');
-    foreach my $user ($self->{_base}->search_objects('user', 'status=expired')) {
+
+    foreach my $user ($self->{_base}->search_objects('user',
+            'status=expired',
+            'date<' . $waitAfterModif,
+            'oalias=NULL')
+        ) {
         $existedAliases{$user} and next; # An alias existed, doing nothing
         $self->{_base}->log(LA_NOTICE, "Adding alias to expired user $user");