X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/d5b85f9c7bda15446c271edf809c4dde150f6f3d..refs/heads/next-release:/script.php?ds=inline diff --git a/script.php b/script.php index 90b2c11..600b1d5 100644 --- a/script.php +++ b/script.php @@ -1,7 +1,7 @@ + * Copyright (C) 2015 Jerome Jutteau * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,26 +17,21 @@ * along with this program. If not, see . */ -/* - * This file permits to easyly script file sending, receiving, deleting, ... - * If you don't want this feature, you can simply delete this file from your - * web directory. - */ +/* This file offer a kind of API for jirafeau. */ + define('JIRAFEAU_ROOT', dirname(__FILE__) . '/'); require(JIRAFEAU_ROOT . 'lib/settings.php'); require(JIRAFEAU_ROOT . 'lib/functions.php'); require(JIRAFEAU_ROOT . 'lib/lang.php'); - global $script_langages; - $script_langages = array('bash' => 'Bash'); +global $script_langages; +$script_langages = array('bash' => 'Bash'); /* Operations may take a long time. * Be sure PHP's safe mode is off. */ @set_time_limit(0); -/* Remove errors. */ -@error_reporting(0); if ($_SERVER['REQUEST_METHOD'] == "GET" && count($_GET) == 0) { require(JIRAFEAU_ROOT . 'lib/template/header.php'); @@ -67,24 +62,34 @@ if (has_error()) { exit; } +session_start(); + /* Upload file */ if (isset($_FILES['file']) && is_writable(VAR_FILES) && is_writable(VAR_LINKS)) { - if (isset ($_POST['upload_password'])) { - if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) { + if (!jirafeau_user_session_logged()) { + if (isset($_POST['upload_password']) && + !jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) { echo 'Error 3: Invalid password'; exit; - } - } else { - if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), null)) { + } elseif (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), null)) { echo 'Error 2: No password nor allowed IP'; exit; } } - + $key = ''; if (isset($_POST['key'])) { $key = $_POST['key']; + if ($cfg['download_password_requirement'] !== 'generated' && $cfg['download_password_policy'] === 'regex'){ + if (!preg_match($cfg['download_password_policy_regex'], $key)){ + echo 'Error 14: The download password is not complying to the security standards.'; + exit; + } + } + }elseif ($cfg['download_password_requirement'] !== 'optional'){ + echo 'Error 13: The parameter password is required.'; + exit; } $time = time(); @@ -105,6 +110,9 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) case 'week': $time += JIRAFEAU_WEEK; break; + case 'fortnight': + $time += JIRAFEAU_FORTNIGHT; + break; case 'month': $time += JIRAFEAU_MONTH; break; @@ -114,7 +122,7 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) case 'year': $time += JIRAFEAU_YEAR; break; - default: + default: $time = JIRAFEAU_INFINITY; break; } @@ -127,10 +135,28 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) exit; } - $res = jirafeau_upload($_FILES['file'], - isset($_POST['one_time_download']), - $key, $time, get_ip_address($cfg), - $cfg['enable_crypt'], $cfg['link_name_length']); + // Check if one time download is enabled + if (!$cfg['one_time_download'] && isset($_POST['one_time_download'])) { + echo 'Error 26: One time download is disabled.'; + exit; + } + + if ($cfg['store_uploader_ip']) { + $ip = get_ip_address($cfg); + } else { + $ip = ""; + } + + $res = jirafeau_upload( + $_FILES['file'], + isset($_POST['one_time_download']), + $key, + $time, + $ip, + $cfg['enable_crypt'], + $cfg['link_name_length'], + $cfg['file_hash'] + ); if (empty($res) || $res['error']['has_error']) { echo 'Error 6 ' . $res['error']['why']; @@ -149,6 +175,15 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) $key = ''; if (isset($_POST['key'])) { $key = $_POST['key']; + if ($cfg['download_password_requirement'] !== 'generated' && $cfg['download_password_policy'] === 'regex'){ + if (!preg_match($cfg['download_password_policy_regex'], $key)){ + echo 'Error 14: The download password is not complying to the security standards.'; + exit; + } + } + }elseif ($cfg['download_password_requirement'] !== 'optional'){ + echo 'Error 13: The parameter password is required.'; + exit; } $d = ''; if (isset($_GET['d'])) { @@ -180,8 +215,8 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) echo 'Error 10'; exit; } - $p = s2p($link['md5']); - if (!file_exists(VAR_FILES . $p . $link['md5'])) { + $p = s2p($link['hash']); + if (!file_exists(VAR_FILES . $p . $link['hash'])) { echo 'Error 11'; exit; } @@ -192,10 +227,9 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) header('Content-Disposition: attachment; filename="' . $link['file_name'] . '"'); - $r = fopen(VAR_FILES . $p . $link['md5'], 'r'); + $r = fopen(VAR_FILES . $p . $link['hash'], 'r'); while (!feof($r)) { print fread($r, 1024); - ob_flush(); } fclose($r); @@ -204,8 +238,7 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) } exit; } elseif (isset($_GET['get_capacity'])) { - echo min(jirafeau_ini_to_bytes(ini_get('post_max_size')), - jirafeau_ini_to_bytes(ini_get('upload_max_filesize'))); + echo jirafeau_get_max_upload_size_bytes(); } elseif (isset($_GET['get_maximal_upload_size'])) { echo $cfg['maximal_upload_size']; } elseif (isset($_GET['get_version'])) { @@ -224,6 +257,7 @@ url='' # Or set JIRAFEAU_URL. time='' # Or set JIRAFEAU_TIME. one_time='' # Or set JIRAFEAU_ONE_TIME. curl='' # Or set JIRAFEAU_CURL_PATH. +upload_password='' # Or set JIRAFEAU_UPLOAD_PASSWD # Config end if [ -n "$JIRAFEAU_PROXY" ]; then @@ -246,6 +280,10 @@ if [ -n "$JIRAFEAU_ONE_TIME" ]; then one_time='1' fi +if [ -n "$JIRAFEAU_UPLOAD_PASSWD" ]; then + upload_password="$JIRAFEAU_UPLOAD_PASSWD" +fi + if [ -z "$curl" ]; then curl="$JIRAFEAU_CURL_PATH" fi @@ -275,11 +313,12 @@ if [ -z "$2" ]; then echo " $0 delete URL" echo echo "Global variables to export:" - echo " JIRAFEAU_PROXY: Domain and port of proxy server, eg. »proxysever.example.com:3128«" + echo " JIRAFEAU_PROXY: Domain and port of proxy server, eg. »proxyserver.example.com:3128«" echo " JIRAFEAU_URL : URI to Jirafeau installation with trailing slash, eg. »https://example.com/jirafeau/«" - echo " JIRAFEAU_TIME : expiration time, eg. »minute«, »hour«, »day«, »week«, »month«, »quarter«, »year« or »none«" + echo " JIRAFEAU_TIME : expiration time, eg. »minute«, »hour«, »day«, »week«, fortnight, »month«, »quarter«, »year« or »none«" echo " JIRAFEAU_ONE_TIME : self-destroy after first download, eg. »1« to enable or »« (empty) to disable" echo " JIRAFEAU_CURL : alternative path to curl binary" + echo " JIRAFEAU_UPLOAD_PASSWD : upload password" exit 0 fi @@ -293,6 +332,10 @@ if [ -n "$one_time" ]; then options="$options -F one_time_download=1" fi +if [ -n "$upload_password" ]; then + options="$options -F upload_password=$upload_password" +fi + password='' if [ -n "$3" ]; then password="$3" @@ -358,12 +401,12 @@ if [ "$1" == "send" ]; then echo echo "Download via API:" if [[ $key_code ]]; then - echo " ${0} get ${url}${apipage}?h=$code&k=$key_code [PASSWORD}" + echo " ${0} get ${url}${apipage}?h=$code&k=$key_code [PASSWORD]" else - echo " ${0} get ${url}${apipage}?h=$code [PASSWORD}" + echo " ${0} get ${url}${apipage}?h=$code [PASSWORD]" fi echo "Delete via API:" - echo " ${0} delete ${url}${downloadpage}?h=$code&d=$del_code" + echo " ${0} delete \"${url}${downloadpage}?h=$code&d=$del_code\"" elif [ "$1" == "get" ]; then if [ -z "$password" ]; then @@ -372,10 +415,9 @@ elif [ "$1" == "get" ]; then $curl $proxy -OJ -X POST -F key=$password "$2" fi elif [ "$1" == "delete" ]; then - $curl $proxy "$2" + $curl $proxy "$2" --data-raw "do_delete=1%2F" | grep "div class" |sed -e "s/<[^>]\+>//g" fi