*/
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;
}
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());
}
/**
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)) {
{
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('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="f.php?h='. htmlspecialchars($node) .'" title="' .
- t('DL_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 . '"/>' .
+ 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 . '"/>' .
+ 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'] . '"/>' .
+ jirafeau_admin_csrf_field() .
'<input type = "submit" value = "' . t('DEL_FILE_LINKS') . '" />' .
'</form>' .
'</td>';
}
/**
- * Test if visitor's IP is authorized to upload.
+ * 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($allowedIpList, $challengedIp)
+function jirafeau_challenge_ip($allowedIpList, $challengedIp)
{
- // skip if list is empty = all IPs allowed
- if (count($allowedIpList) == 0) {
- return true;
- }
- // test given IP against each allowed IP
foreach ($allowedIpList as $i) {
if ($i == $challengedIp) {
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 $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_mojo42.git / blobdiff