manage visitor IP behind reverse proxies, refs #36

[jirafeau_mojo42.git] / script.php

diff --git a/script.php b/script.php
index fb41cb8903e54ae86ea5059c46fe90e76e6806a9..1c154b104727504e62f579ccb498f7263cdae244 100644 (file)
--- a/script.php
+++ b/script.php
@@ -157,7 +157,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
         echo "$name: <a href=\"" . $web_root . "script.php?lang=$lang\">" . $web_root . "script.php?lang=$lang</a> ";
     echo '</p>';
     
         echo "$name: <a href=\"" . $web_root . "script.php?lang=$lang\">" . $web_root . "script.php?lang=$lang</a> ";
     echo '</p>';
     

-    echo '<h3>' . t('Initalize an asynchronous transfert') . ':</h3>';
+    echo '<h3>' . t('Initalize an asynchronous transfer') . ':</h3>';

     echo '<p>';
     echo t('The goal is to permit to transfer big file, chunk by chunk.') . ' ';
     echo t('Chunks of data must be sent in order.');
     echo '<p>';
     echo t('The goal is to permit to transfer big file, chunk by chunk.') . ' ';
     echo t('Chunks of data must be sent in order.');


@@ -176,7 +176,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
     echo '<p>' . t('This will return brut text content.') . ' ' .
          t('First line is the asynchronous transfer reference and the second line the code to use in the next operation.') . '<br /></p>';
 
     echo '<p>' . t('This will return brut text content.') . ' ' .
          t('First line is the asynchronous transfer reference and the second line the code to use in the next operation.') . '<br /></p>';
 

-    echo '<h3>' . t('Push data during asynchronous transfert') . ':</h3>';
+    echo '<h3>' . t('Push data during asynchronous transfer') . ':</h3>';

     echo '<p>';
     echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?push_async</i><br />';
     echo '<br />';
     echo '<p>';
     echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?push_async</i><br />';
     echo '<br />';


@@ -188,7 +188,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
     echo '<p>' . t('This will return brut text content.') . ' ' .
          t('Returns the next code to use.') . '<br /></p>';
 
     echo '<p>' . t('This will return brut text content.') . ' ' .
          t('Returns the next code to use.') . '<br /></p>';
 

-    echo '<h3>' . t('Finalize asynchronous transfert') . ':</h3>';
+    echo '<h3>' . t('Finalize asynchronous transfer') . ':</h3>';

     echo '<p>';
     echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?end_async</i><br />';
     echo '<br />';
     echo '<p>';
     echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?end_async</i><br />';
     echo '<br />';


@@ -218,6 +218,12 @@ if (has_error ())
 if (isset ($_FILES['file']) && is_writable (VAR_FILES)
     && is_writable (VAR_LINKS))
 {
 if (isset ($_FILES['file']) && is_writable (VAR_FILES)
     && is_writable (VAR_LINKS))
 {

+    if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
+    {
+        echo "Error";
+        exit;
+    }
+

     if (jirafeau_has_upload_password ($cfg) &&
          (!isset ($_POST['upload_password']) ||
           !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
     if (jirafeau_has_upload_password ($cfg) &&
          (!isset ($_POST['upload_password']) ||
           !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))


@@ -272,7 +278,7 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
 
     $res = jirafeau_upload ($_FILES['file'],
                             isset ($_POST['one_time_download']),
 
     $res = jirafeau_upload ($_FILES['file'],
                             isset ($_POST['one_time_download']),

-                            $key, $time, $_SERVER['REMOTE_ADDR'],
+                            $key, $time, get_ip_address($cfg),

                             $cfg['enable_crypt'], $cfg['link_name_length']);
     
     if (empty($res) || $res['error']['has_error'])
                             $cfg['enable_crypt'], $cfg['link_name_length']);
     
     if (empty($res) || $res['error']['has_error'])


@@ -505,6 +511,12 @@ fi
 /* Initialize an asynchronous upload. */
 elseif (isset ($_GET['init_async']))
 {
 /* Initialize an asynchronous upload. */
 elseif (isset ($_GET['init_async']))
 {

+    if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
+    {
+        echo "Error";
+        exit;
+    }
+

     if (jirafeau_has_upload_password ($cfg) &&
          (!isset ($_POST['upload_password']) ||
           !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
     if (jirafeau_has_upload_password ($cfg) &&
          (!isset ($_POST['upload_password']) ||
           !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))


@@ -563,7 +575,7 @@ elseif (isset ($_GET['init_async']))
                               isset ($_POST['one_time_download']),
                               $key,
                               $time,
                               isset ($_POST['one_time_download']),
                               $key,
                               $time,

-                              $_SERVER['REMOTE_ADDR']);
+                              get_ip_address($cfg));

 }
 /* Continue an asynchronous upload. */
 elseif (isset ($_GET['push_async']))
 }
 /* Continue an asynchronous upload. */
 elseif (isset ($_GET['push_async']))