X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/96707e02b8b24054e0827eaf169cc88504a1e78c..ecfc8a70b8f33915e53ef2fc9ab14e77daa96e72:/script.php

diff --git a/script.php b/script.php
index 2eb6b4a..5fe60e2 100644
--- a/script.php
+++ b/script.php
@@ -50,7 +50,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count($_GET) == 0) {
     <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>You may download a preconfigured <a href="<?php echo JIRAFEAU_ABSPREFIX . 'script.php?lang=bash'; ?>">Bash Script</a> to easily send to and get files from the API via command line.</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 />
     <?php
@@ -70,18 +70,17 @@ if (has_error()) {
 /* Upload file */
 if (isset($_FILES['file']) && is_writable(VAR_FILES)
     && is_writable(VAR_LINKS)) {
-    if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
-        echo 'Error 2';
-        exit;
-    }
-
-    if (jirafeau_has_upload_password($cfg) &&
-         (!isset($_POST['upload_password']) ||
-          !jirafeau_challenge_upload_password($cfg, $_POST['upload_password']))) {
-        echo 'Error 3';
-        exit;
+    if (isset ($_POST['upload_password'])) {
+        if (!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)) {
+            echo 'Error 2: No password nor allowed IP';
+            exit;
+        }
     }
-
     $key = '';
     if (isset($_POST['key'])) {
         $key = $_POST['key'];
@@ -128,9 +127,10 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
     }
 
     $res = jirafeau_upload($_FILES['file'],
-                            isset($_POST['one_time_download']),
-                            $key, $time, get_ip_address($cfg),
-                            $cfg['enable_crypt'], $cfg['link_name_length']);
+                           isset($_POST['one_time_download']),
+                           $key, $time, get_ip_address($cfg),
+                           $cfg['enable_crypt'], $cfg['link_name_length'],
+                           $cfg['file_hash']);
 
     if (empty($res) || $res['error']['has_error']) {
         echo 'Error 6 ' . $res['error']['why'];
@@ -180,8 +180,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,7 +192,7 @@ 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();
@@ -204,8 +204,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'])) {
@@ -333,17 +332,35 @@ if [ "$1" == "send" ]; then
         fi
         cnt=$(( cnt + 1 ))
         done)
+    key_code=$(cnt=0; echo "$res" | while read l; do
+        if [[ "$cnt" == "2" ]]; then
+            echo "$l"
+        fi
+        cnt=$(( cnt + 1 ))
+        done)
 
     echo
     echo "Download page:"
-    echo "    ${url}${downloadpage}?h=$code"
+    if [[ $key_code ]]; then
+        echo "    ${url}${downloadpage}?h=$code&k=$key_code"
+    else
+        echo "    ${url}${downloadpage}?h=$code"
+    fi
     echo "Direct download:"
-    echo "    ${url}${downloadpage}?h=$code&d=1"
+    if [[ $key_code ]]; then
+        echo "    ${url}${downloadpage}?h=$code&k=$key_code&d=1"
+    else
+        echo "    ${url}${downloadpage}?h=$code&d=1"
+    fi
     echo "Delete link:"
     echo "    ${url}${downloadpage}?h=$code&d=$del_code"
     echo
     echo "Download via API:"
-    echo "    ${0} get ${url}${apipage}?h=$code [PASSWORD}"
+    if [[ $key_code ]]; then
+        echo "    ${0} get ${url}${apipage}?h=$code&k=$key_code [PASSWORD}"
+    else
+        echo "    ${0} get ${url}${apipage}?h=$code [PASSWORD}"
+    fi
     echo "Delete via API:"
     echo "    ${0} delete ${url}${downloadpage}?h=$code&d=$del_code"
 
@@ -363,85 +380,18 @@ fi
         exit;
     }
 }
-/* Create alias. */
-elseif (isset($_GET['alias_create'])) {
-    $ip = get_ip_address($cfg);
-    if (!jirafeau_challenge_upload_ip($cfg, $ip)) {
-        echo 'Error 13';
-        exit;
-    }
-
-    if (jirafeau_has_upload_password($cfg) &&
-         (!isset($_POST['upload_password']) ||
-          !jirafeau_challenge_upload_password($cfg, $_POST['upload_password']))) {
-        echo 'Error 14';
-        exit;
-    }
-
-    if (!isset($_POST['alias']) ||
-        !isset($_POST['destination']) ||
-        !isset($_POST['password'])) {
-        echo 'Error 15';
-        exit;
-    }
-
-    echo jirafeau_alias_create($_POST['alias'],
-                                $_POST['destination'],
-                                $_POST['password'],
-                                $ip);
-}
-/* Get alias. */
-elseif (isset($_GET['alias_get'])) {
-    if (!isset($_POST['alias'])) {
-        echo 'Error 16';
-        exit;
-    }
-
-    echo jirafeau_alias_get($_POST['alias']);
-}
-/* Update alias. */
-elseif (isset($_GET['alias_update'])) {
-    if (!isset($_POST['alias']) ||
-        !isset($_POST['destination']) ||
-        !isset($_POST['password'])) {
-        echo 'Error 17';
-        exit;
-    }
-
-    $new_password = '';
-    if (isset($_POST['new_password'])) {
-        $new_password = $_POST['new_password'];
-    }
-
-    echo jirafeau_alias_update($_POST['alias'],
-                                $_POST['destination'],
-                                $_POST['password'],
-                                $new_password,
-                                get_ip_address($cfg));
-}
-/* Delete alias. */
-elseif (isset($_GET['alias_delete'])) {
-    if (!isset($_POST['alias']) ||
-        !isset($_POST['password'])) {
-        echo 'Error 18';
-        exit;
-    }
-
-    echo jirafeau_alias_delete($_POST['alias'],
-                                $_POST['password']);
-}
 /* Initialize an asynchronous upload. */
 elseif (isset($_GET['init_async'])) {
-    if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
-        echo 'Error 19';
-        exit;
-    }
-
-    if (jirafeau_has_upload_password($cfg) &&
-         (!isset($_POST['upload_password']) ||
-          !jirafeau_challenge_upload_password($cfg, $_POST['upload_password']))) {
-        echo 'Error 20';
-        exit;
+    if (isset($_POST['upload_password'])){
+        if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) {
+            echo 'Error 20: Invalid password';
+            exit;
+        }
+    } else {
+        if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), null)) {
+            echo 'Error 19: No password nor allowed IP';
+            exit;
+        }
     }
 
     if (!isset($_POST['filename'])) {
@@ -517,7 +467,7 @@ elseif (isset($_GET['end_async'])) {
         || !isset($_POST['code'])) {
         echo 'Error 24';
     } else {
-        echo jirafeau_async_end($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_length']);
+        echo jirafeau_async_end($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_length'], $cfg['file_hash']);
     }
 } else {
     echo 'Error 25';