Changeset 1405

Timestamp:

08/31/15 17:57:50 (9 years ago)

Author:

nanardon

Message:

Fix password change when user does not exists, trap more errors

Location:

trunk

Files:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Users.pm (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts.pm (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/SynchAccess.pm (modified) (2 diffs)
• LATMOS-Accounts/lib/LATMOS/Accounts/SynchAccess/base.pm (modified) (1 diff)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Users.pm

@@ -44 +44 @@
     # synchaccess do not manage connect() at time, opening a
     # backdoor then :\
-    foreach ($sync->bases) { $_->{_user} = $username }
-
-    my $suser = $sync->get_object('user', $username);
+    foreach ($sync->bases) { $_->{_user} = $c->user->username }
+
+    my $suser = $sync->get_object_ifexists('user', $username);
     my $msg = $c->stash->{user}->check_password($password);
     if ($msg ne 'ok') {

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

@@ -268 +268 @@
         );
     }
+
+    if (!@obases) {
+        la_log(LA_ERR, "Cannot load any bases for syncronised action");
+        return;
+    }
+
+    la_log(LA_DEBUG, "Load databases: %s", join(', ', map { $_->label } @obases));
 
     LATMOS::Accounts::SynchAccess->new([ @obases ]);

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

@@ -17 +17 @@
 =cut 
 
-# TODO WTF is difference with LATMOS::Accounts::SynchAccess::base
-
 =head2 get_object ($otype, $uid)
 
-Compatibility function: return a set of object for which action must be done.
+Compatibility function: return a set of objects for which action must be done.
 
 =cut
@@ -31 +29 @@
         if ($_->is_supported_object($otype)) {
             my $u = $_->get_object($otype, $uid) or do {
-                la_log(LA_ERR,
-                    "Cannot get object $otype/$uid in %s/%s",
-                    $_->type,
-                    $_->label
+                $_->log(LA_ERR,
+                    "Cannot get object $otype/$uid",
                 );
                 return;
-                };
+            };
             push(@subobj, $u);
         }
     }
+
+    return LATMOS::Accounts::SynchAccess::Objects->new(
+        [ @subobj ]
+    );
+}
+
+=head2 get_object_ifexists ($otype, $uid)
+
+Compatibility function: return a set of objects for which action must be done.
+
+Instead get_object, if the named object does not exists in a database no error is returned
+
+=cut
+
+sub get_object_ifexists {
+    my ($self, $otype, $uid) = @_;
+    my @subobj;
+    foreach ($self->bases) {
+        $_->log(LA_DEBUG,
+            "trying to get object $otype/$uid",
+        );
+        if ($_->is_supported_object($otype)) {
+            my $u = $_->get_object($otype, $uid) or do {
+                $_->log(LA_WARN,
+                    "Cannot get object $otype/$uid",
+                );
+                next
+            };
+            push(@subobj, $u);
+        }
+    }
+
+    if (!@subobj) {
+        la_log(LA_ERR, "No object $otype/$uid found in any bases");
+        return;
+    }
+
     return LATMOS::Accounts::SynchAccess::Objects->new(
         [ @subobj ]

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

@@ -17 +17 @@
 This module fake a base object to send same actions tu multiple base. This is
 used for actions basic synchronisation process cannot handle.
+
+This module contain common functions between Base and Object managment.
 
 =head1 FUNCTIONS