Centralize decryption in `jirafeau_decrypt_file()`

[jirafeau.git] / lib / functions.php

diff --git a/lib/functions.php b/lib/functions.php
index ecd7be8c7aa4506e6052fb6f35735d14ec17076e..a92509bfdc296443e063c18760d3b9b7cdf5b6d7 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -454,13 +454,15 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $l
     /* Crypt file if option is enabled. */
     $crypted = false;
     $crypt_key = '';
     /* Crypt file if option is enabled. */
     $crypted = false;
     $crypt_key = '';

-    if ($crypt == true && !(extension_loaded('mcrypt') == true)) {
-        error_log("PHP extension mcrypt not loaded, won't encrypt in Jirafeau");
+    if ($crypt == true && !(extension_loaded('sodium') == true)) {
+        error_log("PHP extension sodium not loaded, won't encrypt in Jirafeau");

     }
     }

-    if ($crypt == true && extension_loaded('mcrypt') == true) {
-        $crypt_key = jirafeau_encrypt_file($file['tmp_name'], $file['tmp_name']);
+    if ($crypt == true && extension_loaded('sodium') == true) {
+        $crypt_key = jirafeau_encrypt_file($file['tmp_name'], $file['tmp_name'].'crypt');

         if (strlen($crypt_key) > 0) {
         if (strlen($crypt_key) > 0) {

-            $crypted = true;
+            if (rename($file['tmp_name'].'crypt', $file['tmp_name']) === true) {
+                $crypted = true;
+            }

         }
     }
 
         }
     }
 


@@ -515,7 +517,7 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $l
         $handle,
         $name . NL. $mime_type . NL. $size . NL. $password . NL. $time .
             NL . $hash. NL . ($one_time_download ? 'O' : 'R') . NL . time() .
         $handle,
         $name . NL. $mime_type . NL. $size . NL. $password . NL. $time .
             NL . $hash. NL . ($one_time_download ? 'O' : 'R') . NL . time() .

-            NL . $ip . NL. $delete_link_code . NL . ($crypted ? 'C' : 'O')
+            NL . $ip . NL. $delete_link_code . NL . ($crypted ? 'C2' : 'O')

     );
     fclose($handle);
     $hash_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length);
     );
     fclose($handle);
     $hash_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length);


@@ -664,7 +666,8 @@ function jirafeau_get_link($hash)
     $out['upload_date'] = trim($c[7]);
     $out['ip'] = trim($c[8]);
     $out['link_code'] = trim($c[9]);
     $out['upload_date'] = trim($c[7]);
     $out['ip'] = trim($c[8]);
     $out['link_code'] = trim($c[9]);

-    $out['crypted'] = trim($c[10]) == 'C';
+    $out['crypted'] = trim($c[10]) == 'C2';
+    $out['crypted_legacy'] = trim($c[10]) == 'C';

 
     return $out;
 }
 
     return $out;
 }


@@ -900,6 +903,7 @@ function jirafeau_admin_bug_report($cfg)
 
     $out .= "# PHP options<br/>";
     $out .= "- php version: " . phpversion() . "<br/>";
 
     $out .= "# PHP options<br/>";
     $out .= "- php version: " . phpversion() . "<br/>";

+    $out .= "- sodium version: " . phpversion('sodium') . "<br/>";

     $out .= "- mcrypt version: " . phpversion('mcrypt') . "<br/>";
     $php_options =  [
         'post_max_size',
     $out .= "- mcrypt version: " . phpversion('mcrypt') . "<br/>";
     $php_options =  [
         'post_max_size',


@@ -1141,10 +1145,12 @@ function jirafeau_async_end($ref, $code, $crypt, $link_name_length, $file_hash_m
 
     $crypted = false;
     $crypt_key = '';
 
     $crypted = false;
     $crypt_key = '';

-    if ($crypt == true && extension_loaded('mcrypt') == true) {
-        $crypt_key = jirafeau_encrypt_file($p, $p);
+    if ($crypt == true && extension_loaded('sodium') == true) {
+        $crypt_key = jirafeau_encrypt_file($p, $p.'.crypt');

         if (strlen($crypt_key) > 0) {
         if (strlen($crypt_key) > 0) {

-            $crypted = true;
+            if (rename($p.'.crypt', $p) === true) {
+                $crypted = true;
+            }

         }
     }
 
         }
     }
 


@@ -1179,7 +1185,7 @@ function jirafeau_async_end($ref, $code, $crypt, $link_name_length, $file_hash_m
         $handle,
         $a['file_name'] . NL . $a['mime_type'] . NL . $size . NL .
             $a['key'] . NL . $a['time'] . NL . $hash . NL . $a['onetime'] . NL .
         $handle,
         $a['file_name'] . NL . $a['mime_type'] . NL . $size . NL .
             $a['key'] . NL . $a['time'] . NL . $hash . NL . $a['onetime'] . NL .

-            time() . NL . $a['ip'] . NL . $delete_link_code . NL . ($crypted ? 'C' : 'O')
+            time() . NL . $a['ip'] . NL . $delete_link_code . NL . ($crypted ? 'C2' : 'O')

     );
     fclose($handle);
     $hash_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length);
     );
     fclose($handle);
     $hash_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length);


@@ -1207,54 +1213,96 @@ function jirafeau_crypt_create_iv($base, $size)
 }
 
 /**
 }
 
 /**

- * Crypt file and returns decrypt key.
+ * Crypt file using Sodium and returns decrypt key.

  * @param $fp_src file path to the file to crypt.
  * @param $fp_src file path to the file to crypt.

- * @param $fp_dst file path to the file to write crypted file (could be the same).
+ * @param $fp_dst file path to the file to write crypted file (must not be the same).

  * @return decrypt key composed of the key and the iv separated by a point ('.')
  */
 function jirafeau_encrypt_file($fp_src, $fp_dst)
 {
     $fs = filesize($fp_src);
  * @return decrypt key composed of the key and the iv separated by a point ('.')
  */
 function jirafeau_encrypt_file($fp_src, $fp_dst)
 {
     $fs = filesize($fp_src);

-    if ($fs === false || $fs == 0 || !(extension_loaded('mcrypt') == true)) {
+    if ($fs === false || $fs == 0 || extension_loaded('sodium') == false || $fp_src == $fp_dst) {

         return '';
     }
 
         return '';
     }
 

-    /* Prepare module. */
-    $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');

     /* Generate key. */
     /* Generate key. */

-    $crypt_key = jirafeau_gen_random(10);
-    $hash_key = md5($crypt_key);
-    $iv = jirafeau_crypt_create_iv($hash_key, mcrypt_enc_get_iv_size($m));
+    $crypt_key = bin2hex(random_bytes(SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES / 2));

     /* Init module. */
     /* Init module. */

-    mcrypt_generic_init($m, $hash_key, $iv);
+    [$crypt_state, $crypt_header] = sodium_crypto_secretstream_xchacha20poly1305_init_push($crypt_key);

     /* Crypt file. */
     /* Crypt file. */

-    $r = fopen($fp_src, 'r');
-    $w = fopen($fp_dst, 'c');
-    while (!feof($r)) { 
-        $to_enc = fread($r, 1024);
-        if (strlen($to_enc) > 0) {
-            $enc = mcrypt_generic($m, $to_enc);
-            if (fwrite($w, $enc) === false) {
-                return '';
-            }
+    $r = fopen($fp_src, 'rb');
+    $w = fopen($fp_dst, 'wb');
+    fwrite($w, $crypt_header);
+
+    for ($i = 0; $i < $fs; $i += JIRAFEAU_SODIUM_CHUNKSIZE) {
+        $to_enc = fread($r, JIRAFEAU_SODIUM_CHUNKSIZE);
+        $enc = sodium_crypto_secretstream_xchacha20poly1305_push($crypt_state, $to_enc);
+
+        if (fwrite($w, $enc) === false) {
+           return '';

         }
     }
         }
     }

+

     fclose($r);
     fclose($w);
     fclose($r);
     fclose($w);

+

     /* Cleanup. */
     /* Cleanup. */

-    mcrypt_generic_deinit($m);
-    mcrypt_module_close($m);
+    sodium_memzero($crypt_state);
+

     return $crypt_key;
 }
 
 /**
     return $crypt_key;
 }
 
 /**

- * Decrypt file.
+ * Decrypt file using Sodium.

  * @param $fp_src file path to the file to decrypt.
  * @param $fp_src file path to the file to decrypt.

- * @param $fp_dst file path to the file to write decrypted file (could be the same).
+ * @param $fp_dst file path to the file to write decrypted file (must not be the same).

  * @param $k string composed of the key and the iv separated by a point ('.')
  * @return key used to decrypt. a string of length 0 is returned if failed.
  */
 function jirafeau_decrypt_file($fp_src, $fp_dst, $k)
  * @param $k string composed of the key and the iv separated by a point ('.')
  * @return key used to decrypt. a string of length 0 is returned if failed.
  */
 function jirafeau_decrypt_file($fp_src, $fp_dst, $k)

+{
+    $fs = filesize($fp_src);
+    if ($fs === false || $fs == 0 || extension_loaded('sodium') == false || $fp_src == $fp_dst) {
+        return false;
+    }
+
+    /* Decrypt file. */
+    $r = fopen($fp_src, 'rb');
+    $w = fopen($fp_dst, 'wb');
+
+    $crypt_header = fread($r, SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES);
+
+    /* Init module. */
+    $crypt_state = sodium_crypto_secretstream_xchacha20poly1305_init_pull($crypt_header, $k);
+
+    /* Decrypt file. */
+
+    for ($i = SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES; $i < $fs; $i += JIRAFEAU_SODIUM_CHUNKSIZE + SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES) {
+        $to_dec = fread($r, JIRAFEAU_SODIUM_CHUNKSIZE + SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES);
+        [$dec, $crypt_tag] = sodium_crypto_secretstream_xchacha20poly1305_pull($crypt_state, $to_dec);
+        
+        if (fwrite($w, $dec) === false) {
+            return false;
+        }
+    }
+
+    fclose($r);
+    fclose($w);
+
+    /* Cleanup. */
+    sodium_memzero($crypt_state);
+
+    return true;
+}
+
+/**
+ * Decrypt file using mcrypt.
+ * @param $fp_src file path to the file to decrypt.
+ * @param $fp_dst file path to the file to write decrypted file (could be the same).
+ * @param $k string composed of the key and the iv separated by a point ('.')
+ * @return key used to decrypt. a string of length 0 is returned if failed.
+ */
+function jirafeau_decrypt_file_legacy($fp_src, $fp_dst, $k)

 {
     $fs = filesize($fp_src);
     if ($fs === false || $fs == 0 || extension_loaded('mcrypt') == false) {
 {
     $fs = filesize($fp_src);
     if ($fs === false || $fs == 0 || extension_loaded('mcrypt') == false) {