*/
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 $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_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')));
+ 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());
}
/**
return (array(
'error' =>
array('has_error' => true,
- 'why' => t('Internal error during file creation.')),
+ 'why' => t('INTERNAL_ERROR_DEL')),
'link' =>'',
'delete_link' => ''));
}
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);
}
}
{
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 '<table border="1" width="1100">';
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>' . t('FILENAME') . '</th>';
+ echo '<th>' . t('TYPE') . '</th>';
+ echo '<th>' . t('SIZE') . '</th>';
+ echo '<th>' . t('EXPIRE') . '</th>';
+ echo '<th>' . t('ONETIME') . '</th>';
+ echo '<th>' . t('UPLOAD_DATE') . '</th>';
+ echo '<th>' . t('ORIGIN') . '</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']) {
/* Print link informations. */
echo '<tr>';
echo '<td>' .
- '<strong><a id="upload_link" href="' . JIRAFEAU_ABSPREFIX . 'f.php?h='. htmlspecialchars($node) .'" title="' .
- t('Download page') . '">' . htmlspecialchars($l['file_name']) . '</a></strong>';
+ '<strong><a id="upload_link" href="f.php?h='. jirafeau_escape($node) .'" title="' .
+ t('DL_PAGE') . '">' . jirafeau_escape($l['file_name']) . '</a></strong>';
echo '</td>';
- echo '<td>' . $l['mime_type'] . '</td>';
+ echo '<td>' . jirafeau_escape($l['mime_type']) . '</td>';
echo '<td>' . jirafeau_human_size($l['file_size']) . '</td>';
echo '<td>' . ($l['time'] == -1 ? '∞' : jirafeau_get_datetimefield($l['time'])) . '</td>';
echo '<td>';
'<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 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 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') . '" />' .
+ jirafeau_admin_csrf_field() .
+ '<input type = "submit" value = "' . t('DEL_FILE_LINKS') . '" />' .
'</form>' .
'</td>';
echo '</tr>';
}
/**
- * 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
*/
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 */
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'] . "'/>";
+}
git.p6c8.net / jirafeau.git / blobdiff