✅🩹 — Update tests and code after dependencies upgrade

lib/Lutim.pm

@@ -291,7 +291,7 @@ sub startup {
     });
 
     $r->get('/')->
-        over('authorized')->
+        requires('authorized')->
         to('Image#home')->
         name('index');
     $r->get('/')->
@@ -330,7 +330,7 @@ sub startup {
         to('Image#change_lang')->
         name('lang');
 
-    $r->get('/partial/:file' => sub {
+    $r->get('/partial/<:file>.<:f>' => sub {
         my $c = shift;
         $c->render(
             template => 'partial/'.$c->param('file'),
@@ -351,7 +351,7 @@ sub startup {
     })->name('gallery');
 
     $r->get('/myfiles')->
-        over('authorized')->
+        requires('authorized')->
         name('myfiles');
     $r->get('/myfiles')->
         to('Authent#index');
@@ -369,28 +369,28 @@ sub startup {
         ->name('random');
 
     $r->post('/')->
-        over('authorized')->
+        requires('authorized')->
         to('Image#add')->
         name('add');
     $r->post('/')->
         to('Authent#index');
 
     $r->get('/d/:short/:token')->
-        over('authorized')->
+        requires('authorized')->
         to('Image#delete')->
         name('delete');
     $r->get('/d/:short/:token')->
         to('Authent#index');
 
     $r->post('/m/:short/:token')->
-        over('authorized')->
+        requires('authorized')->
         to('Image#modify')->
         name('modify');
     $r->post('/m/:short/:token')->
         to('Authent#index');
 
     $r->post('/c')->
-        over('authorized')->
+        requires('authorized')->
         to('Image#get_counter')->
         name('counter');
     $r->post('/c')->

lib/Lutim/Controller/Image.pm

@@ -1,8 +1,8 @@
 # vim:set sw=4 ts=4 sts=4 expandtab:
 package Lutim::Controller::Image;
+use Mojo::Asset::Memory;
 use Mojo::Base 'Mojolicious::Controller';
 use Mojo::Util qw(url_escape url_unescape b64_encode encode);
-use Mojo::Asset::Memory;
 use Mojo::JSON qw(true false);
 use Lutim::DB::Image;
 use DateTime;
@@ -487,12 +487,10 @@ sub add {
                     if ($mediatype ne 'image/svg+xml' && $mediatype !~ m#image/(x-)?xcf# && $mediatype ne 'image/webp') {
                         # Remove the EXIF tags
                         my $data = new IO::Scalar \$upload->slurp();
-                        my $et   = new Image::ExifTool;
+                        my $et   = Image::ExifTool->new;
 
-                        # Use $data in Image::ExifTool object
-                        $et->ExtractInfo($data);
                         # Remove all metadata
-                        $et->SetNewValue('*', undef);
+                        $et->SetNewValue('*');
 
                         # Create a temporary IO::Scalar to write into
                         my $temp;

lib/Lutim/Plugin/Helpers.pm

@@ -8,6 +8,7 @@ use Data::Entropy qw(entropy_source);
 use DateTime;
 use Mojo::Util qw(decode);
 use ISO::639_1;
+use Digest::MD5 'md5';
 
 sub register {
     my ($self, $app) = @_;
@@ -258,6 +259,18 @@ sub _is_wm_selected {
     return ($wm eq $c->config('watermark_default')) ? 'selected="selected"' : '';
 }
 
+sub _key_from_key {
+    my $key = shift;
+
+    # Key size for Blowfish is 56
+    my $ks = 56;
+    my $material = md5($key);
+    while (length($material) < $ks) {
+        $material .= md5($material);
+    }
+    return substr($material,0,$ks);
+}
+
 sub _crypt {
     my $c        = shift;
     my $upload   = shift;
@@ -267,10 +280,12 @@ sub _crypt {
     my $iv    = $c->shortener(8);
 
     my $cipher = Crypt::CBC->new(
-        -key    => $key,
-        -cipher => 'Blowfish',
-        -header => 'none',
-        -iv     => $iv
+        -key         => _key_from_key($key),
+        -cipher      => 'Blowfish',
+        -header      => 'none',
+        -literal_key => 1,
+        -pbkdf       => 'pbkdf2',
+        -iv          => $iv
     );
 
     $cipher->start('encrypting');
@@ -289,16 +304,18 @@ sub _crypt {
 
 sub _decrypt {
     my $c    = shift;
-    my $key  = shift;
+    my $key  = _key_from_key(shift);
     my $file = shift;
     my $iv   = shift;
     $iv = 'dupajasi' unless $iv;
 
     my $cipher = Crypt::CBC->new(
-        -key    => $key,
-        -cipher => 'Blowfish',
-        -header => 'none',
-        -iv     => $iv
+        -key         => $key,
+        -cipher      => 'Blowfish',
+        -header      => 'none',
+        -literal_key => 1,
+        -pbkdf       => 'pbkdf2',
+        -iv          => $iv
     );
 
     $cipher->start('decrypting');