Changeset 1310 for branches

Timestamp:

04/01/15 18:45:08 (9 years ago)

Author:

nanardon

Message:

Don't use SSH storage form

After several hour to try to figure out it seems Crypt::RSA::Key::Private::SSH
is unable to properly encrypt the private, making everything readable.

This patch replace the SSH form by the native one.

Location:

branches/4.0

Files:

• . (modified) (1 prop)
• LATMOS-Accounts/bin/la-sql-crypt-passwd (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql.pm (modified) (4 diffs)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm (modified) (2 diffs)

branches/4.0/LATMOS-Accounts/bin/la-sql-crypt-passwd

@@ -94 +94 @@
             $clear_passwd{$_} = $clearp;
         } else {
-            warn "$_ :" . $rsa->errstr();
+            die "Cannot get password for $_, crypt module said :" . $rsa->errstr();
         }
     }

branches/4.0/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql.pm

@@ -12 +12 @@
 use Crypt::RSA::Key::Public::SSH;
 use Crypt::RSA::Key::Private::SSH;
+use Crypt::RSA::Key::Public;
+use Crypt::RSA::Key::Private;
 use MIME::Base64;
 
@@ -225 +227 @@
     my ($public, $private) = $rsa->keygen (
         Identity  => 'LATMOS-Accounts',
-        Size      => 768,
+        Size      => 2048,
         Password  => $password,
         Verbosity => 0,
-        KF=>'SSH',
     ) or die $rsa->errstr(); # TODO avoid die
     return ($public, $private);
@@ -243 +244 @@
     my $base = $self;
     my $serialize = $base->get_global_value('rsa_private_key') or return;
-    my $privkey = Crypt::RSA::Key::Private::SSH->new;
-    $privkey->deserialize(String => [ decode_base64($serialize) ],
-        Passphrase => $password);
-    $privkey
+    my $string = decode_base64($serialize);
+    my $privkey = $string =~ /^SSH PRIVATE KEY FILE/
+        ? Crypt::RSA::Key::Private::SSH->new
+        : Crypt::RSA::Key::Private->new;
+    $privkey = $privkey->deserialize(
+        String => [ $string ],
+        Password => $password
+    );
+    $privkey->reveal( Password => $password );
+    $privkey;
 }
 
@@ -280 +287 @@
     my ($self, $public, $private) = @_;
     my $base = $self;
+    $private->hide;
     $base->set_global_value('rsa_private_key',
         encode_base64($private->serialize));

branches/4.0/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm

@@ -493 +493 @@
 
             if (my $serialize = $self->base->get_global_value('rsa_public_key')) {
-                my $public = Crypt::RSA::Key::Public::SSH->new;
-                $public->deserialize(String => [ $serialize ]);
+                my $public = Crypt::RSA::Key::Public->new;
+                $public = $public->deserialize(String => [ $serialize ]);
                 my $rsa = new Crypt::RSA ES => 'PKCS1v15';
                 my $rsa_password = $rsa->encrypt (
@@ -500 +500 @@
                     Key        => $public,
                     Armour     => 1,
-                ) || die $self->poll->rsa->errstr();
+                ) || die $rsa->errstr();
                 if (!$self->_set_c_fields('encryptedPassword', $rsa_password)) {
                     $self->log(LA_ERR,