Updated README and CHANGELOG

[jirafeau.git] / script.php

diff --git a/script.php b/script.php
index d31ce78ec7d708010b6fb952cc81b48e452f7bf4..c0cee68b3d05b4ae4fe08ee541a1cc21d469fb2b 100644 (file)
--- a/script.php
+++ b/script.php
@@ -1,7 +1,9 @@
 <?php
 /*
  *  Jirafeau, your web file repository
 <?php
 /*
  *  Jirafeau, your web file repository

+ *  Copyright (C) 2008  Julien "axolotl" BERNARD <axolotl@magieeternelle.org>

  *  Copyright (C) 2015  Jerome Jutteau <jerome@jutteau.fr>
  *  Copyright (C) 2015  Jerome Jutteau <jerome@jutteau.fr>

+ *  Copyright (C) 2024  Jirafeau project <https://gitlab.com/jirafeau> (see AUTHORS.md)

  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as


@@ -25,8 +27,8 @@ require(JIRAFEAU_ROOT . 'lib/settings.php');
 require(JIRAFEAU_ROOT . 'lib/functions.php');
 require(JIRAFEAU_ROOT . 'lib/lang.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.
 
 /* Operations may take a long time.
  * Be sure PHP's safe mode is off.


@@ -44,7 +46,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count($_GET) == 0) {
     <div class="info">
     <h2>Scripting interface</h2>
     <p>This interface permits to script your uploads and downloads.</p>
     <div class="info">
     <h2>Scripting interface</h2>
     <p>This interface permits to script your uploads and downloads.</p>

-    <p>See <a href="https://gitlab.com/mojo42/Jirafeau/blob/master/script.php">source code</a> of this interface to get available calls :)</p>
+    <p>See <a href="<?php echo JIRAFEAU_WEBSITE ?>/blob/master/script.php">source code</a> of this interface to get available calls :)</p>

     <p>You may download a preconfigured <a href="script.php?lang=bash">Bash Script</a> to easily send to and get files from the API via command line.</p>
     </div>
     <br />
     <p>You may download a preconfigured <a href="script.php?lang=bash">Bash Script</a> to easily send to and get files from the API via command line.</p>
     </div>
     <br />


@@ -62,56 +64,41 @@ if (has_error()) {
     exit;
 }
 
     exit;
 }
 

+session_start();
+

 /* Upload file */
 if (isset($_FILES['file']) && is_writable(VAR_FILES)
     && is_writable(VAR_LINKS)) {
 /* 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;
             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;
         }
     }
             echo 'Error 2: No password nor allowed IP';
             exit;
         }
     }

+

     $key = '';
     if (isset($_POST['key'])) {
         $key = $_POST['key'];
     $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();

     if (!isset($_POST['time']) || !$cfg['availabilities'][$_POST['time']]) {
         echo 'Error 4: The parameter time is invalid.';
         exit;
     } else {
     if (!isset($_POST['time']) || !$cfg['availabilities'][$_POST['time']]) {
         echo 'Error 4: The parameter time is invalid.';
         exit;
     } else {

-        switch ($_POST['time']) {
-            case 'minute':
-                $time += JIRAFEAU_MINUTE;
-                break;
-            case 'hour':
-                $time += JIRAFEAU_HOUR;
-                break;
-            case 'day':
-                $time += JIRAFEAU_DAY;
-                break;
-            case 'week':
-                $time += JIRAFEAU_WEEK;
-                break;
-            case 'month':
-                $time += JIRAFEAU_MONTH;
-                break;
-            case 'quarter':
-                $time += JIRAFEAU_QUARTER;
-                break;
-            case 'year':
-                $time += JIRAFEAU_YEAR;
-                break;
-           default:
-                $time = JIRAFEAU_INFINITY;
-                break;
-        }
+        $time = jirafeau_datestr_to_int($_POST['time']);

     }
 
     // Check file size
     }
 
     // Check file size


@@ -132,7 +119,7 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
     } else {
         $ip = "";
     }
     } else {
         $ip = "";
     }

-    
+

     $res = jirafeau_upload(
         $_FILES['file'],
         isset($_POST['one_time_download']),
     $res = jirafeau_upload(
         $_FILES['file'],
         isset($_POST['one_time_download']),


@@ -161,6 +148,15 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
     $key = '';
     if (isset($_POST['key'])) {
         $key = $_POST['key'];
     $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'])) {
     }
     $d = '';
     if (isset($_GET['d'])) {


@@ -257,8 +253,8 @@ if [ -n "$JIRAFEAU_ONE_TIME" ]; then
     one_time='1'
 fi
 
     one_time='1'
 fi
 

-if [ -n "$UPLOAD_PASSWD" ]; then
-    upload_password="$JIRAFEAU_UPLOAD_PASSWORD"
+if [ -n "$JIRAFEAU_UPLOAD_PASSWD" ]; then
+    upload_password="$JIRAFEAU_UPLOAD_PASSWD"

 fi
 
 if [ -z "$curl" ]; then
 fi
 
 if [ -z "$curl" ]; then


@@ -290,9 +286,9 @@ if [ -z "$2" ]; then
     echo "    $0 delete URL"
     echo
     echo "Global variables to export:"
     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_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"
     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"


@@ -378,9 +374,9 @@ if [ "$1" == "send" ]; then
     echo
     echo "Download via API:"
     if [[ $key_code ]]; 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
     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\""
     fi
     echo "Delete via API:"
     echo "    ${0} delete \"${url}${downloadpage}?h=$code&d=$del_code\""


@@ -402,7 +398,8 @@ fi
 }
 /* Initialize an asynchronous upload. */
 elseif (isset($_GET['init_async'])) {
 }
 /* Initialize an asynchronous upload. */
 elseif (isset($_GET['init_async'])) {

-    if (isset($_POST['upload_password'])) {
+    if (jirafeau_user_session_logged()) {
+    } elseif (isset($_POST['upload_password'])) {

         if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) {
             echo 'Error 20: Invalid password';
             exit;
         if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) {
             echo 'Error 20: Invalid password';
             exit;


@@ -427,6 +424,15 @@ elseif (isset($_GET['init_async'])) {
     $key = '';
     if (isset($_POST['key'])) {
         $key = $_POST['key'];
     $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;

     }
 
     // Check if one time download is enabled
     }
 
     // Check if one time download is enabled


@@ -435,37 +441,11 @@ elseif (isset($_GET['init_async'])) {
         exit;
     }
 
         exit;
     }
 

-    $time = time();

     if (!isset($_POST['time']) || !$cfg['availabilities'][$_POST['time']]) {
         echo 'Error 22';
         exit;
     } else {
     if (!isset($_POST['time']) || !$cfg['availabilities'][$_POST['time']]) {
         echo 'Error 22';
         exit;
     } else {

-        switch ($_POST['time']) {
-            case 'minute':
-                $time += JIRAFEAU_MINUTE;
-                break;
-            case 'hour':
-                $time += JIRAFEAU_HOUR;
-                break;
-            case 'day':
-                $time += JIRAFEAU_DAY;
-                break;
-            case 'week':
-                $time += JIRAFEAU_WEEK;
-                break;
-            case 'month':
-                $time += JIRAFEAU_MONTH;
-                break;
-            case 'quarter':
-                $time += JIRAFEAU_QUARTER;
-                break;
-            case 'year':
-                $time += JIRAFEAU_YEAR;
-                break;
-            default:
-                $time = JIRAFEAU_INFINITY;
-                break;
-        }
+        $time = jirafeau_datestr_to_int($_POST['time']);

     }
 
     if ($cfg['store_uploader_ip']) {
     }
 
     if ($cfg['store_uploader_ip']) {


@@ -473,7 +453,7 @@ elseif (isset($_GET['init_async'])) {
     } else {
         $ip = "";
     }
     } else {
         $ip = "";
     }

-    
+

     echo jirafeau_async_init(
         $_POST['filename'],
         $type,
     echo jirafeau_async_init(
         $_POST['filename'],
         $type,