Changeset 2456

Timestamp:

03/05/21 16:32:33 (3 years ago)

Author:

nanardon

Message:

Ajout testpass à la-cli

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts

Files:

• Bases.pm (modified) (1 diff)
• Bases/Sql/User.pm (modified) (1 diff)
• Cli.pm (modified) (1 diff)

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

@@ -1208 +1208 @@
     };
 
-    if ($uobj->_get_c_field('expired')) {
-        la_log(LA_ERR, "Account $username has expired (%s)",
-            $uobj->_get_c_field('expired'));
-        return;
-    }
-
-    if ($uobj->_get_c_field('locked')) {
-        la_log(LA_ERR, "Account $username is currently locked");
-        return;
-    }
-
-    my $password = $uobj->get_field('userPassword') or do {
-        la_log(LA_ERR, "Cannot authenticate user $username having no passwd");
-        return;
-    };
-    if ($password eq crypt($passwd, $password)) { # crypt unix
-        la_log(LA_NOTICE, "User $username authenticated");
-        return 1;
-    } else {
-        la_log(LA_ERR, "Cannot authenticate user $username: wrong password");
-        return 0;
-    }
+    $uobj->Authenticate( $passwd );
 }
 

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

@@ -2200 +2200 @@
 }
 
+=head2 CheckAccountValidity
+
+Check account is still valid.
+
+=cut
+
+sub CheckAccountValidity {
+    my ( $self ) = @_;
+
+    my $username = $self->id;
+
+    if ($self->_get_c_field('unexported')) {
+        la_log(LA_ERR, "Account $username is unexported");
+        return;
+    }
+
+    if ($self->_get_c_field('expired')) {
+        la_log(LA_ERR, "Account $username has expired (%s)",
+            $self->_get_c_field('expired'));
+        return;
+    }
+
+    if ($self->_get_c_field('locked')) {
+        la_log(LA_ERR, "Account $username is currently locked");
+        return;
+    }
+
+    1;
+}
+
+=head2 ComparePassword ($password)
+
+Check the password is the current one
+
+=cut
+
+sub ComparePassword {
+    my ( $self, $passwd ) = @_;
+
+    my $username = $self->id;
+
+    my $password = $self->get_field('userPassword') or do {
+        la_log(LA_ERR, "Cannot authenticate user $username having no passwd");
+        return;
+    };
+    if ($password eq crypt($passwd, $password)) { # crypt unix
+        la_log(LA_NOTICE, "User $username authenticated");
+        return 1;
+    } else {
+        la_log(LA_ERR, "Cannot authenticate user $username: wrong password");
+        return 0;
+    }
+}
+
+
+=head2 Authenticate( $password )
+
+Authenticate the user
+
+=cut
+
+sub Authenticate {
+    my ( $self, $password ) = @_;
+
+    $self->CheckAccountValidity or return;
+
+    $self->ComparePassword( $password );
+}
+
 =head2 storeBannedPassword($epassword)
 

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

@@ -232 +232 @@
             },
         });
+=head2 testpass
+
+=cut
+
+    $self->add_func('testpass', {
+            help => 'Test password for given user',
+            completion => sub {
+                if (! $_[2]) {
+                    return $_[0]->base->list_objects('user');
+                }
+            },
+            code => sub {
+                my ($self, $user, @passwd) = @_;
+                my $uobj = $self->base->get_object('user', $user) or do {
+                    $self->print("Cannot get user $user\n");
+                    return;
+                };
+
+                if (! $uobj->CheckAccountValidity ) {
+                    $self->print("Account $user cannot currently log\n");
+                }
+
+                foreach (@passwd) {
+                    my $is = $uobj->ComparePassword( $_ );
+                    if ($is) {
+                        $self->print("Passord for $user is $_\n");
+                        last;
+                    }
+                }
+            },
+        });
 
 =head3 create