Changeset 2006 for trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller

Timestamp:

04/28/17 10:54:50 (7 years ago)

Author:

nanardon

Message:

Improve loadpasswd feature

File:

• trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Tools/LoadPasswd.pm (modified) (2 diffs)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Tools/LoadPasswd.pm

@@ -2 +2 @@
 use Moose;
 use namespace::autoclean;
+
+use LATMOS::Accounts::Log;
 
 BEGIN { extends 'Catalyst::Controller'; }
@@ -25 +27 @@
     my ( $self, $c ) = @_;
 
-    my $account = $c->model('Account');
+    my $account = $c->model('Accounts');
 
     if (my $upload = $c->req->upload('input')) {
 
         my $crypt = $c->req->param('crypt');
+        my $force = $c->req->param('force');
 
         my $fh =  $upload->fh;
         while (my $line = <$fh>) {
-            my ($username, $password) = split(/:/);
+            my ($username, $password) = split(/:/, $line);
             $username or next;
             $password or next;
 
             if ($crypt) {
-                my $user = $c->model('Accounts')->db->get_objects('user', $username)
-                    or next;
-                $user->InjectCryptPasswd($password);
+                my $user = $account->db->get_objects('user', $username)
+                    or do {
+                    push(@{ $c->stash->{Pass} }, { u => $username, r => 'No such user' });  
+                    next;
+                };
+                $account->db->check_acl($user, 'userPassword', 'w') 
+                    or do {
+                    push(@{ $c->stash->{Pass} }, { u => $username, r => 'Permission denied' });  
+                    next;
+                };
+
+                if ($user->InjectCryptPasswd($password)) {
+                    push(@{ $c->stash->{Pass} }, { u => $username, r => 'Injected' });
+                } else {
+                    push(@{ $c->stash->{Pass} }, { u => $username, r => 'Error: ' . LATMOS::Accounts::Log::lastmessage(LA_ERR) });
+                }
             } else {
-                $c->model('Accounts')->ChangeUserPassword($username, $password);
+                my $message = $account->ChangeUserPassword($username, $password, $force);
+                push(@{ $c->stash->{Pass} }, { u => $username, r => $message || 'Changed' });
             }
         }
     }
 }
-
-
 
 =encoding utf8