Show value of "debug_enforce_classic_upload" in bug report info

[jirafeau/jirafeau.git] / lib / functions.php

diff --git a/lib/functions.php b/lib/functions.php
index f55da7bf5415b018caeba8c7575e4a3f6abe1a14..6c8d56db6b839b9d7cf6fc786be1d00540587eca 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -464,9 +464,9 @@ function jirafeau_handle_add_file_encryption($crypt_module_enabled, $file_path)
         error_log("PHP extension sodium not loaded, won't encrypt in Jirafeau");
     }
     if ($crypt_module_enabled == true && extension_loaded('sodium') == true) {
         error_log("PHP extension sodium not loaded, won't encrypt in Jirafeau");
     }
     if ($crypt_module_enabled == true && extension_loaded('sodium') == true) {

-        $crypt_key = jirafeau_encrypt_file($file_path, $file_path.'crypt');
+        $crypt_key = jirafeau_encrypt_file($file_path, $file_path.'.crypt');

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

-            if (rename($file_path.'crypt', $file_path) === true) {
+            if (rename($file_path.'.crypt', $file_path) === true) {

                 $crypted = true;
             }
         }
                 $crypted = true;
             }
         }


@@ -544,7 +544,7 @@ function jirafeau_add_file($file, $one_time_download, $key, $time, $ip, $crypt,
     /* hash password or empty. */
     $password = '';
     if (!empty($key)) {
     /* hash password or empty. */
     $password = '';
     if (!empty($key)) {

-        $password = hash('sha256',$key);
+        $password = '[SHA256]' . hash('sha256', $key);

     }
 
     /* create link file */
     }
 
     /* create link file */


@@ -554,7 +554,7 @@ function jirafeau_add_file($file, $one_time_download, $key, $time, $ip, $crypt,
         $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);


@@ -947,6 +947,7 @@ function jirafeau_admin_bug_report($cfg)
     $out .= "- version: " . JIRAFEAU_VERSION . "<br/>";
     $jirafeau_options = [
         'debug',
     $out .= "- version: " . JIRAFEAU_VERSION . "<br/>";
     $jirafeau_options = [
         'debug',

+        'debug_enforce_classic_upload',

         'file_hash',
         'litespeed_workaround',
         'store_uploader_ip',
         'file_hash',
         'litespeed_workaround',
         'store_uploader_ip',


@@ -1091,7 +1092,7 @@ function jirafeau_async_init($filename, $type, $one_time, $key, $time, $ip)
     /* sha256 password or empty */
     $password = '';
     if (!empty($key)) {
     /* sha256 password or empty */
     $password = '';
     if (!empty($key)) {

-        $password = hash('sha256',$key);
+        $password = '[SHA256]' . hash('sha256', $key);

     }
 
     /* Store information. */
     }
 
     /* Store information. */


@@ -1379,7 +1380,7 @@ function jirafeau_decrypt_file_legacy($fp_src, $fp_dst, $k)
     $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
     /* Extract key and iv. */
     $crypt_key = $k;
     $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
     /* Extract key and iv. */
     $crypt_key = $k;

-    $hash_key = hash('sha256',$crypt_key);
+    $hash_key = md5($crypt_key);

     $iv = jirafeau_crypt_create_iv($hash_key, mcrypt_enc_get_iv_size($m));
     /* Init module. */
     mcrypt_generic_init($m, $hash_key, $iv);
     $iv = jirafeau_crypt_create_iv($hash_key, mcrypt_enc_get_iv_size($m));
     /* Init module. */
     mcrypt_generic_init($m, $hash_key, $iv);


@@ -1642,7 +1643,7 @@ function jirafeau_escape($string)
 function jirafeau_admin_session_start()
 {
     $_SESSION['admin_auth'] = true;
 function jirafeau_admin_session_start()
 {
     $_SESSION['admin_auth'] = true;

-    $_SESSION['admin_csrf'] = hash('sha256',uniqid(mt_rand(), true));
+    $_SESSION['admin_csrf'] = hash('sha256', uniqid(mt_rand(), true));

 }
 
 function jirafeau_session_end()
 }
 
 function jirafeau_session_end()