';
echo '| ' .
- '' . htmlspecialchars($l['file_name']) . '';
+ '' . jirafeau_escape($l['file_name']) . '';
echo ' | ';
- echo '' . $l['mime_type'] . ' | ';
+ echo '' . jirafeau_escape($l['mime_type']) . ' | ';
echo '' . jirafeau_human_size($l['file_size']) . ' | ';
- echo '' . ($l['time'] == -1 ? '' : strftime('%c', $l['time'])) .
- ' | ';
+ echo '' . ($l['time'] == -1 ? 'â' : jirafeau_get_datetimefield($l['time'])) . ' | ';
echo '';
if ($l['onetime'] == 'O') {
echo 'Y';
@@ -608,23 +684,26 @@ function jirafeau_admin_list($name, $file_hash, $link_hash)
echo 'N';
}
echo ' | ';
- echo '' . strftime('%c', $l['upload_date']) . ' | ';
+ echo '' . jirafeau_get_datetimefield($l['upload_date']) . ' | ';
echo '' . $l['ip'] . ' | ';
echo '' .
- '' .
- '' .
- '' .
' | ';
echo '
';
@@ -661,10 +740,10 @@ function jirafeau_admin_clean()
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++;
}
@@ -874,7 +953,7 @@ function jirafeau_async_push($ref, $data, $code, $max_file_size)
* @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);
@@ -898,48 +977,48 @@ function jirafeau_async_end($ref, $code, $crypt, $link_name_length)
}
}
- $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 .
+ $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)) {
+ !rename($link_tmp_name, VAR_LINKS . $l . $hash_link)) {
echo "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)
@@ -969,10 +1048,10 @@ function jirafeau_encrypt_file($fp_src, $fp_dst)
$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');
@@ -1008,8 +1087,8 @@ function jirafeau_decrypt_file($fp_src, $fp_dst, $k)
$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');
@@ -1055,23 +1134,22 @@ function jirafeau_challenge_upload_password($cfg, $password)
}
/**
- * 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;
}
}
@@ -1079,6 +1157,42 @@ function jirafeau_challenge_upload_ip($cfg, $ip)
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
@@ -1087,35 +1201,9 @@ function jirafeau_challenge_upload_ip($cfg, $ip)
*/
function jirafeau_challenge_upload ($cfg, $ip, $password)
{
- // Allow if no ip restrictaion and no password restriction
- if ((count ($cfg['upload_ip']) == 0) and (count ($cfg['upload_password']) == 0)) {
- return true;
- }
-
- // Allow if ip is in array
- foreach ($cfg['upload_ip'] as $i) {
- if ($i == $ip) {
- 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)) {
- return true;
- }
- }
- }
- if (!jirafeau_has_upload_password($cfg)) {
- return false;
- }
-
- foreach ($cfg['upload_password'] as $p) {
- if ($password == $p) {
- return true;
- }
- }
- return false;
+ 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 */
@@ -1196,185 +1284,6 @@ function hex_to_base64($hex)
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.
*
@@ -1404,3 +1313,43 @@ function jirafeau_replace_markers($content, $htmllinebreaks = false)
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 "