/*
* Jirafeau, your web file repository
* Copyright (C) 2008 Julien "axolotl" BERNARD <axolotl@magieeternelle.org>
- * Copyright (C) 2015 Jerome Jutteau <j.jutteau@gmail.com>
+ * Copyright (C) 2015 Jerome Jutteau <jerome@jutteau.fr>
* Copyright (C) 2015 Nicola Spanti (RyDroid) <dev@nicola-spanti.info>
*
* This program is free software: you can redistribute it and/or modify
*/
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;
}
return round($o, 1) . $u[$p];
}
+// Convert UTC timestamp to a datetime field
+function jirafeau_get_datetimefield($timestamp)
+{
+ $content = '<span class="datetime" data-datetime="' . strftime('%Y-%m-%d %H:%M', $timestamp) . '">'
+ . strftime('%Y-%m-%d %H:%M', $timestamp) . ' (GMT)</span>';
+ return $content;
+}
+
+function jirafeau_fatal_error($errorText, $cfg = array())
+{
+ echo '<div class="error"><h2>Error</h2><p>' . $errorText . '</p></div>';
+ require(JIRAFEAU_ROOT . 'lib/template/footer.php');
+ exit;
+}
+
function jirafeau_clean_rm_link($link)
{
$p = s2p("$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);
}
switch (strtoupper($modifier)) {
case 'P':
$bytes *= 1024;
+ // no break
case 'T':
$bytes *= 1024;
+ // no break
case 'G':
$bytes *= 1024;
+ // no break
case 'M':
$bytes *= 1024;
+ // no break
case 'K':
$bytes *= 1024;
}
*/
function jirafeau_get_max_upload_size_bytes()
{
- return min(jirafeau_ini_to_bytes(ini_get('post_max_size')),
- jirafeau_ini_to_bytes(ini_get('upload_max_filesize')));
+ return min(
+ jirafeau_ini_to_bytes(ini_get('post_max_size')),
+ jirafeau_ini_to_bytes(ini_get('upload_max_filesize'))
+ );
}
/**
*/
function jirafeau_get_max_upload_size()
{
- return jirafeau_human_size(
- min(jirafeau_ini_to_bytes(ini_get('post_max_size')),
- jirafeau_ini_to_bytes(ini_get('upload_max_filesize'))));
+ return jirafeau_human_size(jirafeau_get_max_upload_size_bytes());
}
/**
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. */
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[]
* '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(
}
/* 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) {
return (array(
'error' =>
array('has_error' => true,
- 'why' => t('Internal error during file creation.')),
+ 'why' => t('INTERNAL_ERROR_DEL')),
'link' =>'',
'delete_link' => ''));
}
/* 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 . $ip . NL. $delete_link_code . NL . ($crypted ? 'C' : 'O'));
+ fwrite(
+ $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')
+ );
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' =>
'delete_link' => '');
}
return array( 'error' => $noerr,
- 'link' => $md5_link,
+ 'link' => $hash_link,
'delete_link' => $delete_link_code,
'crypt_key' => $crypt_key);
}
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('The async directory is not 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<br>litespeed_workaround=true');
+ }
+
+ if ($cfg['one_time_download'] && $cfg['litespeed_workaround']) {
+ add_error(t('INCOMPATIBLE_OPTIONS_W'), 'one_time_download=true<br>litespeed_workaround=true');
}
}
$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]);
{
echo '<fieldset><legend>';
if (!empty($name)) {
- echo t('Filename') . ": $name ";
+ echo t('FILENAME') . ": " . jirafeau_escape($name);
}
if (!empty($file_hash)) {
- echo t('file') . ": $file_hash ";
+ echo t('FILE') . ": " . jirafeau_escape($file_hash);
}
if (!empty($link_hash)) {
- echo t('link') . ": $link_hash ";
+ echo t('LINK') . ": " . jirafeau_escape($link_hash);
}
if (empty($name) && empty($file_hash) && empty($link_hash)) {
- echo t('List all files');
+ echo t('LS_FILES');
}
echo '</legend>';
echo '<table>';
echo '<tr>';
- echo '<td>' . t('Filename') . '</td>';
- echo '<td>' . t('Type') . '</td>';
- echo '<td>' . t('Size') . '</td>';
- echo '<td>' . t('Expire') . '</td>';
- echo '<td>' . t('Onetime') . '</td>';
- echo '<td>' . t('Upload date') . '</td>';
- echo '<td>' . t('Origin') . '</td>';
- echo '<td>' . t('Action') . '</td>';
+ echo '<th></th>';
+ echo '<th>' . t('ACTION') . '</th>';
echo '</tr>';
/* Get all links files. */
}
/* Filter. */
- if (!empty($name) && !preg_match("/$name/i", htmlspecialchars($l['file_name']))) {
+ if (!empty($name) && !@preg_match("/$name/i", jirafeau_escape($l['file_name']))) {
continue;
}
- if (!empty($file_hash) && $file_hash != $l['md5']) {
+ if (!empty($file_hash) && $file_hash != $l['hash']) {
continue;
}
if (!empty($link_hash) && $link_hash != $node) {
/* Print link informations. */
echo '<tr>';
echo '<td>' .
- '<strong><a id="upload_link" href="/f.php?h='. htmlspecialchars($node) .'" title="' .
- t('Download page') . '">' . htmlspecialchars($l['file_name']) . '</a></strong>';
- echo '</td>';
- echo '<td>' . $l['mime_type'] . '</td>';
- echo '<td>' . jirafeau_human_size($l['file_size']) . '</td>';
- echo '<td>' . ($l['time'] == -1 ? '' : strftime('%c', $l['time'])) .
- '</td>';
- echo '<td>';
- if ($l['onetime'] == 'O') {
- echo 'Y';
- } else {
- echo 'N';
- }
- echo '</td>';
- echo '<td>' . strftime('%c', $l['upload_date']) . '</td>';
- echo '<td>' . $l['ip'] . '</td>';
- echo '<td>' .
- '<form action = "admin.php" method = "post">' .
+ '<strong><a id="upload_link" href="f.php?h='. jirafeau_escape($node) .'" title="' .
+ t('DL_PAGE') . '">' . jirafeau_escape($l['file_name']) . '</a></strong><br/>';
+ echo t('TYPE') . ': ' . jirafeau_escape($l['mime_type']) . '<br/>';
+ echo t('SIZE') . ': ' . jirafeau_human_size($l['file_size']) . '<br>';
+ echo t('EXPIRE') . ': ' . ($l['time'] == -1 ? '∞' : jirafeau_get_datetimefield($l['time'])) . '<br/>';
+ echo t('ONETIME') . ': ' . ($l['onetime'] == 'O' ? 'Yes' : 'No') . '<br/>';
+ echo t('UPLOAD_DATE') . ': ' . jirafeau_get_datetimefield($l['upload_date']) . '<br/>';
+ echo t('ORIGIN') . ': ' . $l['ip'] . '<br/>';
+ echo '</td><td>';
+ echo '<form method="post">' .
'<input type = "hidden" name = "action" value = "download"/>' .
'<input type = "hidden" name = "link" value = "' . $node . '"/>' .
- '<input type = "submit" value = "' . t('Download') . '" />' .
+ jirafeau_admin_csrf_field() .
+ '<input type = "submit" value = "' . t('DL') . '" />' .
'</form>' .
- '<form action = "admin.php" method = "post">' .
+ '<form method="post">' .
'<input type = "hidden" name = "action" value = "delete_link"/>' .
'<input type = "hidden" name = "link" value = "' . $node . '"/>' .
- '<input type = "submit" value = "' . t('Del link') . '" />' .
+ jirafeau_admin_csrf_field() .
+ '<input type = "submit" value = "' . t('DEL_LINK') . '" />' .
'</form>' .
- '<form action = "admin.php" method = "post">' .
+ '<form method="post">' .
'<input type = "hidden" name = "action" value = "delete_file"/>' .
- '<input type = "hidden" name = "md5" value = "' . $l['md5'] . '"/>' .
- '<input type = "submit" value = "' . t('Del file and links') . '" />' .
+ '<input type = "hidden" name = "hash" value = "' . $l['hash'] . '"/>' .
+ jirafeau_admin_csrf_field() .
+ '<input type = "submit" value = "' . t('DEL_FILE_LINKS') . '" />' .
'</form>' .
'</td>';
echo '</tr>';
if (!count($l)) {
continue;
}
- $p = s2p($l['md5']);
+ $p = s2p($l['hash']);
if ($l['time'] > 0 && $l['time'] < time() || // expired
- !file_exists(VAR_FILES . $p . $l['md5']) || // invalid
- !file_exists(VAR_FILES . $p . $l['md5'] . '_count')) { // invalid
+ !file_exists(VAR_FILES . $p . $l['hash']) || // invalid
+ !file_exists(VAR_FILES . $p . $l['hash'] . '_count')) { // invalid
jirafeau_delete_link($node);
$count++;
}
return;
}
+ /* touch empty data file */
+ $w_path = $p . $ref . '_data';
+ touch($w_path);
+
/* md5 password or empty */
$password = '';
if (!empty($key)) {
/* Store informations. */
$p .= $ref;
$handle = fopen($p, 'w');
- fwrite($handle,
- str_replace(NL, '', trim($filename)) . NL .
+ fwrite(
+ $handle,
+ str_replace(NL, '', trim($filename)) . NL .
str_replace(NL, '', trim($type)) . NL . $password . NL .
$time . NL . ($one_time ? 'O' : 'R') . NL . $ip . NL .
- time() . NL . $code . NL);
+ time() . NL . $code . NL
+ );
fclose($handle);
return $ref . NL . $code ;
/* Update async file. */
$code = jirafeau_gen_random(4);
$handle = fopen(VAR_ASYNC . $p . $ref, 'w');
- fwrite($handle,
- $a['file_name'] . NL. $a['mime_type'] . NL. $a['key'] . NL .
+ fwrite(
+ $handle,
+ $a['file_name'] . NL. $a['mime_type'] . NL. $a['key'] . NL .
$a['time'] . NL . $a['onetime'] . NL . $a['ip'] . NL .
- time() . NL . $code . NL);
+ time() . NL . $code . NL
+ );
fclose($handle);
return $code;
}
* @param $link_name_length link name length
* @return a string containing the download reference followed by a delete code or the string 'Error'
*/
-function jirafeau_async_end($ref, $code, $crypt, $link_name_length)
+function jirafeau_async_end($ref, $code, $crypt, $link_name_length, $file_hash_method)
{
/* Get async infos. */
$a = jirafeau_get_async_ref($ref);
}
}
- $md5 = md5_file($p);
+ $hash = jirafeau_hash_file($file_hash_method, $p);
$size = filesize($p);
- $np = s2p($md5);
+ $np = s2p($hash);
$delete_link_code = jirafeau_gen_random(5);
/* File already exist ? */
if (!file_exists(VAR_FILES . $np)) {
@mkdir(VAR_FILES . $np, 0755, true);
}
- if (!file_exists(VAR_FILES . $np . $md5)) {
- rename($p, VAR_FILES . $np . $md5);
+ if (!file_exists(VAR_FILES . $np . $hash)) {
+ rename($p, VAR_FILES . $np . $hash);
}
/* Increment or create count file. */
$counter = 0;
- if (file_exists(VAR_FILES . $np . $md5 . '_count')) {
- $content = file(VAR_FILES . $np . $md5. '_count');
+ if (file_exists(VAR_FILES . $np . $hash . '_count')) {
+ $content = file(VAR_FILES . $np . $hash. '_count');
$counter = trim($content[0]);
}
$counter++;
- $handle = fopen(VAR_FILES . $np . $md5. '_count', 'w');
+ $handle = fopen(VAR_FILES . $np . $hash. '_count', 'w');
fwrite($handle, $counter);
fclose($handle);
/* Create link. */
- $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,
- $a['file_name'] . NL . $a['mime_type'] . NL . $size . NL .
- $a['key'] . NL . $a['time'] . NL . $md5 . NL . $a['onetime'] . NL .
- time() . NL . $a['ip'] . NL . $delete_link_code . NL . ($crypted ? 'C' : 'O'));
+ fwrite(
+ $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')
+ );
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)) {
- echo "Error";
+ !rename($link_tmp_name, VAR_LINKS . $l . $hash_link)) {
+ return 'Error';
}
/* Clean async upload. */
jirafeau_async_delete($ref);
- return $md5_link . NL . $delete_link_code . NL . urlencode($crypt_key);
+ return $hash_link . NL . $delete_link_code . NL . urlencode($crypt_key);
}
function jirafeau_crypt_create_iv($base, $size)
$m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
/* Generate key. */
$crypt_key = jirafeau_gen_random(10);
- $md5_key = md5($crypt_key);
- $iv = jirafeau_crypt_create_iv($md5_key, mcrypt_enc_get_iv_size($m));
+ $hash_key = md5($crypt_key);
+ $iv = jirafeau_crypt_create_iv($hash_key, mcrypt_enc_get_iv_size($m));
/* Init module. */
- mcrypt_generic_init($m, $md5_key, $iv);
+ mcrypt_generic_init($m, $hash_key, $iv);
/* Crypt file. */
$r = fopen($fp_src, 'r');
$w = fopen($fp_dst, 'c');
$m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
/* Extract key and iv. */
$crypt_key = $k;
- $md5_key = md5($crypt_key);
- $iv = jirafeau_crypt_create_iv($md5_key, mcrypt_enc_get_iv_size($m));
+ $hash_key = md5($crypt_key);
+ $iv = jirafeau_crypt_create_iv($hash_key, mcrypt_enc_get_iv_size($m));
/* Decrypt file. */
$r = fopen($fp_src, 'r');
$w = fopen($fp_dst, 'c');
}
/**
- * Test if visitor's IP is authorized to upload.
- * @param $ip IP to be challenged
+ * Test if the given IP is whitelisted by the given list.
+ *
+ * @param $allowedIpList array of allowed IPs
+ * @param $challengedIp IP to be challenged
* @return true if IP is authorized, false otherwise.
*/
-function jirafeau_challenge_upload_ip($cfg, $ip)
+function jirafeau_challenge_ip($allowedIpList, $challengedIp)
{
- if (count($cfg['upload_ip']) == 0) {
- return true;
- }
- foreach ($cfg['upload_ip'] as $i) {
- if ($i == $ip) {
+ foreach ($allowedIpList as $i) {
+ if ($i == $challengedIp) {
return true;
}
// CIDR test for IPv4 only.
if (strpos($i, '/') !== false) {
list($subnet, $mask) = explode('/', $i);
- if ((ip2long($ip) & ~((1 << (32 - $mask)) - 1)) == ip2long($subnet)) {
+ if ((ip2long($challengedIp) & ~((1 << (32 - $mask)) - 1)) == ip2long($subnet)) {
return true;
}
}
return false;
}
+/**
+ * Check if Jirafeau has a restriction on the IP address for uploading.
+ * @return true if uploading is IP restricted, false otherwise.
+ */
+function jirafeau_upload_has_ip_restriction($cfg)
+{
+ return count($cfg['upload_ip']) > 0;
+}
+
+/**
+ * Test if visitor's IP is authorized to upload at all.
+ *
+ * @param $cfg configuration
+ * @param $challengedIp IP to be challenged
+ * @return true if IP is authorized, false otherwise.
+ */
+function jirafeau_challenge_upload_ip($cfg, $challengedIp)
+{
+ // If no IP address have been listed, allow upload from any IP
+ if (!jirafeau_upload_has_ip_restriction($cfg)) {
+ return true;
+ }
+ return jirafeau_challenge_ip($cfg['upload_ip'], $challengedIp);
+}
+
+/**
+ * Test if visitor's IP is authorized to upload without a password.
+ *
+ * @param $cfg configuration
+ * @param $challengedIp IP to be challenged
+ * @return true if IP is authorized, false otherwise.
+ */
+function jirafeau_challenge_upload_ip_without_password($cfg, $challengedIp)
+{
+ return jirafeau_challenge_ip($cfg['upload_ip_nopassword'], $challengedIp);
+}
+
+/**
+ * Test if visitor's IP is authorized or password is supplied and authorized
+ * @param $ip IP to be challenged
+ * @param $password password to be challenged
+ * @return true if access is valid, false otherwise.
+ */
+function jirafeau_challenge_upload($cfg, $ip, $password)
+{
+ return jirafeau_challenge_upload_ip_without_password($cfg, $ip) ||
+ (!jirafeau_has_upload_password($cfg) && !jirafeau_upload_has_ip_restriction($cfg)) ||
+ (jirafeau_challenge_upload_password($cfg, $password) && jirafeau_challenge_upload_ip($cfg, $ip));
+}
+
/** Tell if we have some HTTP headers generated by a proxy */
function has_http_forwarded()
{
return base64_encode($b);
}
-/**
- * Read alias informations
- * @return array containing informations.
- */
-function jirafeau_get_alias($hash)
-{
- $out = array();
- $link = VAR_ALIAS . s2p("$hash") . $hash;
-
- if (!file_exists($link)) {
- return $out;
- }
-
- $c = file($link);
- $out['md5_password'] = trim($c[0]);
- $out['ip'] = trim($c[1]);
- $out['update_date'] = trim($c[2]);
- $out['destination'] = trim($c[3], NL);
-
- return $out;
-}
-
-/** Create an alias to a jirafeau's link.
- * @param $alias alias name
- * @param $destination reference of the destination
- * @param $password password to protect alias
- * @param $ip client's IP
- * @return a string containing the edit code of the alias or the string "Error"
- */
-function jirafeau_alias_create($alias, $destination, $password, $ip)
-{
- /* Check that alias and password are long enough. */
- if (strlen($alias) < 8 ||
- strlen($alias) > 32 ||
- strlen($password) < 8 ||
- strlen($password) > 32) {
- return 'Error';
- }
-
- /* Check that destination exists. */
- $l = jirafeau_get_link($destination);
- if (!count($l)) {
- return 'Error';
- }
-
- /* Check that alias does not already exists. */
- $alias = md5($alias);
- $p = VAR_ALIAS . s2p($alias);
- if (file_exists($p)) {
- return 'Error';
- }
-
- /* Create alias folder. */
- @mkdir($p, 0755, true);
- if (!file_exists($p)) {
- return 'Error';
- }
-
- /* Generate password. */
- $md5_password = md5($password);
-
- /* Store informations. */
- $p .= $alias;
- $handle = fopen($p, 'w');
- fwrite($handle,
- $md5_password . NL .
- $ip . NL .
- time() . NL .
- $destination . NL);
- fclose($handle);
-
- return 'Ok';
-}
-
-/** Update an alias.
- * @param $alias alias to update
- * @param $destination reference of the new destination
- * @param $password password to protect alias
- * @param $new_password optional new password to protect alias
- * @param $ip client's IP
- * @return "Ok" or "Error" string
- */
-function jirafeau_alias_update($alias, $destination, $password,
- $new_password, $ip)
-{
- $alias = md5($alias);
- /* Check that alias exits. */
- $a = jirafeau_get_alias($alias);
- if (!count($a)) {
- return 'Error';
- }
-
- /* Check that destination exists. */
- $l = jirafeau_get_link($a["destination"]);
- if (!count($l)) {
- return 'Error';
- }
-
- /* Check password. */
- if ($a["md5_password"] != md5($password)) {
- return 'Error';
- }
-
- $p = $a['md5_password'];
- if (strlen($new_password) >= 8 &&
- strlen($new_password) <= 32) {
- $p = md5($new_password);
- } elseif (strlen($new_password) > 0) {
- return 'Error';
- }
-
- /* Rewrite informations. */
- $p = VAR_ALIAS . s2p($alias) . $alias;
- $handle = fopen($p, 'w');
- fwrite($handle,
- $p . NL .
- $ip . NL .
- time() . NL .
- $destination . NL);
- fclose($handle);
- return 'Ok';
-}
-
-/** Get an alias.
- * @param $alias alias to get
- * @return alias destination or "Error" string
- */
-function jirafeau_alias_get($alias)
-{
- $alias = md5($alias);
- /* Check that alias exits. */
- $a = jirafeau_get_alias($alias);
- if (!count($a)) {
- return 'Error';
- }
-
- return $a['destination'];
-}
-
-function jirafeau_clean_rm_alias($alias)
-{
- $p = s2p("$alias");
- if (file_exists(VAR_ALIAS . $p . $alias)) {
- unlink(VAR_ALIAS . $p . $alias);
- }
- $parse = VAR_ALIAS . $p;
- $scan = array();
- while (file_exists($parse)
- && ($scan = scandir($parse))
- && count($scan) == 2 // '.' and '..' folders => empty.
- && basename($parse) != basename(VAR_ALIAS)) {
- rmdir($parse);
- $parse = substr($parse, 0, strlen($parse) - strlen(basename($parse)) - 1);
- }
-}
-
-/** Delete an alias.
- * @param $alias alias to delete
- * @param $password password to protect alias
- * @return "Ok" or "Error" string
- */
-function jirafeau_alias_delete($alias, $password)
-{
- $alias = md5($alias);
- /* Check that alias exits. */
- $a = jirafeau_get_alias($alias);
- if (!count($a)) {
- return "Error";
- }
-
- /* Check password. */
- if ($a["md5_password"] != md5($password)) {
- return 'Error';
- }
-
- jirafeau_clean_rm_alias($alias);
- return 'Ok';
-}
-
/**
* Replace markers in templates.
*
return $content;
}
+
+function jirafeau_escape($string)
+{
+ return htmlspecialchars($string, ENT_QUOTES);
+}
+
+function jirafeau_admin_session_start()
+{
+ $_SESSION['admin_auth'] = true;
+ $_SESSION['admin_csrf'] = md5(uniqid(mt_rand(), true));
+}
+
+function jirafeau_admin_session_end()
+{
+ $_SESSION = array();
+ session_destroy();
+}
+
+function jirafeau_admin_session_logged()
+{
+ return isset($_SESSION['admin_auth']) &&
+ isset($_SESSION['admin_csrf']) &&
+ isset($_POST['admin_csrf']) &&
+ $_SESSION['admin_auth'] === true &&
+ $_SESSION['admin_csrf'] === $_POST['admin_csrf'];
+}
+
+function jirafeau_admin_csrf_field()
+{
+ return "<input type='hidden' name='admin_csrf' value='". $_SESSION['admin_csrf'] . "'/>";
+}
+
+function jirafeau_dir_size($dir)
+{
+ $size = 0;
+ foreach (glob(rtrim($dir, '/').'/*', GLOB_NOSORT) as $entry) {
+ $size += is_file($entry) ? filesize($entry) : jirafeau_dir_size($entry);
+ }
+ return $size;
+}
git.p6c8.net / jirafeau_mojo42.git / blobdiff