X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/0d312b3c20fc8d17a4808442c49b72a499d0dc76..2b4714c704f8ca5567c85a26e9202d5c9b3550e4:/lib/functions.php
diff --git a/lib/functions.php b/lib/functions.php
index 01d0638..84f2a44 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -25,9 +25,16 @@
*/
function s2p($s)
{
+ $block_size = 8;
$p = '';
for ($i = 0; $i < strlen($s); $i++) {
- $p .= $s{$i} . '/';
+ $p .= $s{$i};
+ if (($i + 1) % $block_size == 0) {
+ $p .= '/';
+ }
+ }
+ if (strlen($s) % $block_size != 0) {
+ $p .= '/';
}
return $p;
}
@@ -152,10 +159,10 @@ function jirafeau_clean_rm_link($link)
}
}
-function jirafeau_clean_rm_file($md5)
+function jirafeau_clean_rm_file($hash)
{
- $p = s2p("$md5");
- $f = VAR_FILES . $p . $md5;
+ $p = s2p("$hash");
+ $f = VAR_FILES . $p . $hash;
if (file_exists($f) && is_file($f)) {
unlink($f);
}
@@ -254,31 +261,31 @@ function jirafeau_delete_link($link)
jirafeau_clean_rm_link($link);
- $md5 = $l['md5'];
- $p = s2p("$md5");
+ $hash = $l['hash'];
+ $p = s2p("$hash");
$counter = 1;
- if (file_exists(VAR_FILES . $p . $md5. '_count')) {
- $content = file(VAR_FILES . $p . $md5. '_count');
+ if (file_exists(VAR_FILES . $p . $hash. '_count')) {
+ $content = file(VAR_FILES . $p . $hash. '_count');
$counter = trim($content[0]);
}
$counter--;
if ($counter >= 1) {
- $handle = fopen(VAR_FILES . $p . $md5. '_count', 'w');
+ $handle = fopen(VAR_FILES . $p . $hash. '_count', 'w');
fwrite($handle, $counter);
fclose($handle);
}
if ($counter == 0) {
- jirafeau_clean_rm_file($md5);
+ jirafeau_clean_rm_file($hash);
}
}
/**
* Delete a file and it's links.
*/
-function jirafeau_delete_file($md5)
+function jirafeau_delete_file($hash)
{
$count = 0;
/* Get all links files. */
@@ -301,17 +308,69 @@ function jirafeau_delete_file($md5)
if (!count($l)) {
continue;
}
- if ($l['md5'] == $md5) {
+ if ($l['hash'] == $hash) {
$count++;
jirafeau_delete_link($node);
}
}
}
}
- jirafeau_clean_rm_file($md5);
+ jirafeau_clean_rm_file($hash);
return $count;
}
+
+/** hash file's content
+ * @param $method hash method, see 'file_hash' option. Valid methods are 'md5', 'md5_outside' or 'random'
+ * @param $file_path file to hash
+ * @returns hash string
+ */
+function jirafeau_hash_file($method, $file_path)
+{
+ switch ($method) {
+ case 'md5_outside':
+ return jirafeau_md5_outside($file_path);
+ case 'md5':
+ return md5_file($file_path);
+ case 'random':
+ return jirafeau_gen_random(32);
+ }
+ return md5_file($file_path);
+}
+
+/** hash part of file: start, end and size.
+ * This is a partial file hash, faster but weaker.
+ * @param $file_path file to hash
+ * @returns hash string
+ */
+function jirafeau_md5_outside($file_path)
+{
+ $out = false;
+ $handle = fopen($file_path, "r");
+ if ($handle === false) {
+ return false;
+ }
+ $size = filesize($file_path);
+ if ($size === false) {
+ goto err;
+ }
+ $first = fread($handle, 64);
+ if ($first === false) {
+ goto err;
+ }
+ if (fseek($handle, $size < 64 ? 0 : $size - 64) == -1) {
+ goto err;
+ }
+ $last = fread($handle, 64);
+ if ($last === false) {
+ goto err;
+ }
+ $out = md5($first . $last . $size);
+ err:
+ fclose($handle);
+ return $out;
+}
+
/**
* handles an uploaded file
* @param $file the file struct given by $_FILE[]
@@ -326,7 +385,7 @@ function jirafeau_delete_file($md5)
* 'link' => the link name of the uploaded file
* 'delete_link' => the link code to delete file
*/
-function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $link_name_length)
+function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $link_name_length, $file_hash_method)
{
if (empty($file['tmp_name']) || !is_uploaded_file($file['tmp_name'])) {
return (array(
@@ -354,18 +413,18 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $l
}
/* file informations */
- $md5 = md5_file($file['tmp_name']);
+ $hash = jirafeau_hash_file($file_hash_method, $file['tmp_name']);
$name = str_replace(NL, '', trim($file['name']));
$mime_type = $file['type'];
$size = $file['size'];
/* does file already exist ? */
$rc = false;
- $p = s2p("$md5");
- if (file_exists(VAR_FILES . $p . $md5)) {
+ $p = s2p("$hash");
+ if (file_exists(VAR_FILES . $p . $hash)) {
$rc = unlink($file['tmp_name']);
} elseif ((file_exists(VAR_FILES . $p) || @mkdir(VAR_FILES . $p, 0755, true))
- && move_uploaded_file($file['tmp_name'], VAR_FILES . $p . $md5)) {
+ && move_uploaded_file($file['tmp_name'], VAR_FILES . $p . $hash)) {
$rc = true;
}
if (!$rc) {
@@ -379,47 +438,47 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $l
/* Increment or create count file. */
$counter = 0;
- if (file_exists(VAR_FILES . $p . $md5 . '_count')) {
- $content = file(VAR_FILES . $p . $md5. '_count');
+ if (file_exists(VAR_FILES . $p . $hash . '_count')) {
+ $content = file(VAR_FILES . $p . $hash. '_count');
$counter = trim($content[0]);
}
$counter++;
- $handle = fopen(VAR_FILES . $p . $md5. '_count', 'w');
+ $handle = fopen(VAR_FILES . $p . $hash. '_count', 'w');
fwrite($handle, $counter);
fclose($handle);
/* Create delete code. */
$delete_link_code = jirafeau_gen_random(5);
- /* md5 password or empty. */
+ /* hash password or empty. */
$password = '';
if (!empty($key)) {
$password = md5($key);
}
/* create link file */
- $link_tmp_name = VAR_LINKS . $md5 . rand(0, 10000) . '.tmp';
+ $link_tmp_name = VAR_LINKS . $hash . rand(0, 10000) . '.tmp';
$handle = fopen($link_tmp_name, 'w');
fwrite($handle,
$name . NL. $mime_type . NL. $size . NL. $password . NL. $time .
- NL . $md5. NL . ($one_time_download ? 'O' : 'R') . NL . time() .
+ NL . $hash. NL . ($one_time_download ? 'O' : 'R') . NL . time() .
NL . $ip . NL. $delete_link_code . NL . ($crypted ? 'C' : 'O'));
fclose($handle);
- $md5_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length);
- $l = s2p("$md5_link");
+ $hash_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length);
+ $l = s2p("$hash_link");
if (!@mkdir(VAR_LINKS . $l, 0755, true) ||
- !rename($link_tmp_name, VAR_LINKS . $l . $md5_link)) {
+ !rename($link_tmp_name, VAR_LINKS . $l . $hash_link)) {
if (file_exists($link_tmp_name)) {
unlink($link_tmp_name);
}
$counter--;
if ($counter >= 1) {
- $handle = fopen(VAR_FILES . $p . $md5. '_count', 'w');
+ $handle = fopen(VAR_FILES . $p . $hash. '_count', 'w');
fwrite($handle, $counter);
fclose($handle);
} else {
- jirafeau_clean_rm_file($md5_link);
+ jirafeau_clean_rm_file($hash_link);
}
return array(
'error' =>
@@ -429,7 +488,7 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $l
'delete_link' => '');
}
return array( 'error' => $noerr,
- 'link' => $md5_link,
+ 'link' => $hash_link,
'delete_link' => $delete_link_code,
'crypt_key' => $crypt_key);
}
@@ -498,21 +557,26 @@ function check_errors($cfg)
exit;
}
- /* check if the destination dirs are writable */
- $writable = is_writable(VAR_FILES) && is_writable(VAR_LINKS);
-
/* Checking for errors. */
if (!is_writable(VAR_FILES)) {
- add_error(t('The file directory is not writable!'), VAR_FILES);
+ add_error(t('FILE_DIR_W'), VAR_FILES);
}
if (!is_writable(VAR_LINKS)) {
- add_error(t('The link directory is not writable!'), VAR_LINKS);
+ add_error(t('LINK_DIR_W'), VAR_LINKS);
}
if (!is_writable(VAR_ASYNC)) {
add_error(t('ASYNC_DIR_W'), VAR_ASYNC);
}
+
+ if ($cfg['enable_crypt'] && $cfg['litespeed_workaround']) {
+ add_error(t('INCOMPATIBLE_OPTIONS_W'), 'enable_crypt=true
litespeed_workaround=true');
+ }
+
+ if ($cfg['one_time_download'] && $cfg['litespeed_workaround']) {
+ add_error(t('INCOMPATIBLE_OPTIONS_W'), 'one_time_download=true
litespeed_workaround=true');
+ }
}
/**
@@ -534,7 +598,7 @@ function jirafeau_get_link($hash)
$out['file_size'] = trim($c[2]);
$out['key'] = trim($c[3], NL);
$out['time'] = trim($c[4]);
- $out['md5'] = trim($c[5]);
+ $out['hash'] = trim($c[5]);
$out['onetime'] = trim($c[6]);
$out['upload_date'] = trim($c[7]);
$out['ip'] = trim($c[8]);
@@ -563,16 +627,16 @@ function jirafeau_admin_list($name, $file_hash, $link_hash)
echo t('LS_FILES');
}
echo '';
- echo '
' . t('FILENAME') . ' | '; - echo '' . t('TYPE') . ' | '; - echo '' . t('SIZE') . ' | '; - echo '' . t('EXPIRE') . ' | '; - echo '' . t('ONETIME') . ' | '; - echo '' . t('UPLOAD_DATE') . ' | '; - echo '' . t('ORIGIN') . ' | '; - echo '' . t('ACTION') . ' | '; + echo '' . t('FILENAME') . ' | '; + echo '' . t('TYPE') . ' | '; + echo '' . t('SIZE') . ' | '; + echo '' . t('EXPIRE') . ' | '; + echo '' . t('ONETIME') . ' | '; + echo '' . t('UPLOAD_DATE') . ' | '; + echo '' . t('ORIGIN') . ' | '; + echo '' . t('ACTION') . ' | '; echo '
---|