Changeset 2041 for trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Timestamp:

06/13/17 19:28:43 (7 years ago)

Author:

nanardon

Message:

Allow to choose crypt algorythm per configuration

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Files:

• Ldap/User.pm (modified) (2 diffs)
• Objects.pm (modified) (1 diff)
• Sql/User.pm (modified) (1 diff)

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

@@ -276 +276 @@
     my ($self, $clear_pass) = @_;
 
-    my @salt_char = (('a' .. 'z'), ('A' .. 'Z'), (0 .. 9), '/', '.');
-    my $salt = join('', map { $salt_char[rand(scalar(@salt_char))] } (1 .. 8));
     # openldap use prefix to identify encryption passwd
     # {CRYPT} is system dependant, eg use crypt from system
@@ -283 +281 @@
     # as we use perl crypt() which does the same
     # This code will have to be changed if we use openldap on other UNIX
-    my $md5 = '{CRYPT}' . crypt($clear_pass, '$1$' . $salt);
+    my $crypt = '{CRYPT}' . $self->base->passCrypt($clear_pass);
 
     my ($lm, $nt) = ntlmgen $clear_pass;
 
     my $res = $self->set_fields(
-        userPassword    => $md5,
+        userPassword    => $crypt,
         sambaLMPassword => $lm,
         sambaNTPassword => $nt,

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

@@ -543 +543 @@
     my ($self, $clear_pass) = @_;
     if (my $attribute = $self->base->attribute($self->type, 'userPassword')) {
-        my @salt_char = (('a' .. 'z'), ('A' .. 'Z'), (0 .. 9), '/', '.');
-        my $salt = join('', map { $salt_char[rand(scalar(@salt_char))] } (1 .. 8));
-        my $res = $self->set_fields($attribute->iname, crypt($clear_pass, '$1$' . $salt));
+        my $res = $self->set_fields($attribute->iname, $self->base->passCrypt($clear_pass));
         $self->base->log(LA_NOTICE, 'Mot de passe changé pour %s', $self->id)
             if($res);

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

@@ -1947 +1947 @@
         }
 
-        my @salt_char = (('a' .. 'z'), ('A' .. 'Z'), (0 .. 9), '/', '.');
-        my $salt = join('', map { $salt_char[rand(scalar(@salt_char))] } (1 .. 8));
-        my $res = $self->set_fields($field, crypt($clear_pass, '$1$' . $salt));
+        my $res = $self->set_fields($field, $self->base->passCrypt($clear_pass));
         if ($res) {
             if ($self->base->get_global_value('rsa_public_key')) {