Changeset 1354 for trunk/LATMOS-Accounts

Timestamp:

06/24/15 15:36:23 (9 years ago)

Author:

nanardon

Message:

Add filtering option on object to sync to base

Location:

trunk/LATMOS-Accounts

Files:

• lib/LATMOS/Accounts.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Synchro.pm (modified) (4 diffs)
• man/man5/latmos-accounts.ini.pod (modified) (1 diff)

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

@@ -223 +223 @@
     }
 
-    my $labfrom = $options{from} ? $self->base($options{from}) : $self->default_base;
+    my $labfrom = $options{from} ? $self->base($options{from}) : $self->base;
 
     my @labto =

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

@@ -274 +274 @@
 
     my %desterror;
-    my %existings;
     my $updated = 0;
     foreach my $destbase ($self->to) {
@@ -281 +280 @@
             $destbase->is_supported_object($otype) or next;
 
-            $existings{$otype} ||= { map { $_ => 1 }
+            my %existings;
+            my %filtering;
+
+            $existings{$otype} = { map { $_ => 1 }
                 $self->from->list_objects($otype) };
 
+            # Is there a filter to apply:
+            my $filtername = 'filter.' . $destbase->label . '.' . $otype;
+            if (my $filter = $self->{options}->{$filtername}) {
+                la_log(LA_DEBUG, "Found %s param, using it: %s", $filtername, $filter);
+                $filtering{$otype} = { map { $_ => 1 }
+                    $self->from->search_objects($otype, $filter) };
+            } else {
+                $filtering{$otype} = $existings{$otype};
+            }
+
+
             # deleting non existing object in dest:
+            my $deletefiltered = 'deletefiltered.' . $destbase->label . '.' . $otype;
             foreach ($destbase->list_objects($otype)) {
-                if(!$existings{$otype}{$_}) {
-                    if (my $res = $destbase->sync_object_from($self->from,
-                            $otype, $_, %options)) {
-                        la_log(LA_NOTICE, "%s::%s::%s => %s %s",
-                            $self->from->label, $otype, $_, $destbase->label, $res,
-                        );
-                        if ($destbase->is_transactionnal) {
-                            $destbase->commit;
-                        }
-                        $updated = 1;
-                    } else {
-                        if ($destbase->is_transactionnal) {
-                            $destbase->rollback;
-                        }
+
+                if ($filtering{$otype}{$_}) {
+                    # the object must exists
+                    next;
+                } elsif ($existings{$otype}{$_}) {
+                    # object exists but is filtered
+                    if (!$self->{options}->{$deletefiltered}) {
+                        next;
+                    }
+                }
+
+                if (my $res = $destbase->sync_object_from($self->from,
+                        $otype, $_, %options)) {
+                    la_log(LA_NOTICE, "%s::%s::%s => %s %s",
+                        $self->from->label, $otype, $_, $destbase->label, $res,
+                    );
+                    if ($destbase->is_transactionnal) {
+                        $destbase->commit;
+                    }
+                    $updated = 1;
+                } else {
+                    if ($destbase->is_transactionnal) {
+                        $destbase->rollback;
                     }
                 }
             }
 
-            @{$objlist{$otype}} = $self->from->list_objects_from_rev(
+            # Finding object to synchronize:
+            @{$objlist{$otype}} = grep { $filtering{$otype}{$_} } $self->from->list_objects_from_rev(
                 $otype,
                 $self->val($self->from->label, $destbase->label, 0),
             );
         }
+
+        my %objectok;
         foreach my $pass (1, 0) {
             foreach my $otype ($destbase->ordered_objects) {
                 exists($objlist{$otype}) or next;
                 foreach (@{$objlist{$otype} || []}) {
+
+                    # If first synchro is not ok, don't retry to sync the object
+                    if ((!$pass) && (!$objectok{$otype}{$_})) {
+                        next;
+                    }
+
                     my $res = $destbase->sync_object_from($self->from, $otype, $_,
                         %options, firstpass => $pass);
@@ -325 +357 @@
                             }
                             $updated = 1;
+                            $objectok{$otype}{$_} = 1;
                         }
                     } else {
@@ -336 +369 @@
                         }
                     }
-
                 }
             }

trunk/LATMOS-Accounts/man/man5/latmos-accounts.ini.pod

@@ -135 +135 @@
 feature (SQL only at time)
 
+=head3 filtering object propagation
+
+It is possible to filter the objects you want to propagate into peer base.
+
+The filter to apply must be set into the parameter named
+C<filter.BASENAME.OTYPE>, where C<BASENAME> is the name of the destination
+base and C<OTYPE> the object type to filter.
+
+For example to push into C<ldap> base only user being into group C<unix>:
+
+  filter.ldap.user = memberOf=unix
+
+=head3 Deleting filtered object
+
+By default filtered object will not be deleted to the destination base, neither
+touched.
+
+Setting option in form C<deletefiltered.BASENAME.OTYPE> to true will allow
+deletion. This option has effects only if filtering objects is enabled.
+
 =head1 SEE ALSO