[TASK] rework user auth

[jirafeau_mojo42.git] / index.php

diff --git a/index.php b/index.php
index 4371e9e0e5fb475002fa0fdc08a139d9b218f02e..f7aeb04d6b60c1c3bd48a9ea7b60d777a30b0b42 100644 (file)
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 /*
  *  Jirafeau, your web file repository
  *  Copyright (C) 2013
 /*
  *  Jirafeau, your web file repository
  *  Copyright (C) 2013

- *  Jerome Jutteau <j.jutteau@gmail.com>
+ *  Jerome Jutteau <jerome@jutteau.fr>

  *  Jimmy Beauvois <jimmy.beauvois@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  Jimmy Beauvois <jimmy.beauvois@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify


@@ -18,127 +18,135 @@
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */

-define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
+session_start();
+define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');

 
 

-require (JIRAFEAU_ROOT . 'lib/config.original.php');
-require (JIRAFEAU_ROOT . 'lib/settings.php');
-require (JIRAFEAU_ROOT . 'lib/functions.php');
-require (JIRAFEAU_ROOT . 'lib/lang.php');
+require(JIRAFEAU_ROOT . 'lib/settings.php');
+require(JIRAFEAU_ROOT . 'lib/functions.php');
+require(JIRAFEAU_ROOT . 'lib/lang.php');

 
 

-check_errors ($cfg);
-if (has_error ())
-{
-    show_errors ();
-    require (JIRAFEAU_ROOT . 'lib/template/footer.php');
+check_errors($cfg);
+if (has_error()) {
+    require(JIRAFEAU_ROOT . 'lib/template/header.php');
+    show_errors();
+    require(JIRAFEAU_ROOT . 'lib/template/footer.php');

     exit;
 }
     exit;
 }

+require(JIRAFEAU_ROOT . 'lib/template/header.php');

 
 

-require (JIRAFEAU_ROOT . 'lib/template/header.php');
+// Logout action
+if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
+    jirafeau_session_end();
+}

 
 /* Check if user is allowed to upload. */
 
 /* Check if user is allowed to upload. */

-if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
-{
-    echo '<div class="error"><p>' . t('Access denied') . '</p></div>';
-    require (JIRAFEAU_ROOT.'lib/template/footer.php');
-    exit;
+// First check: Is user already logged
+if (jirafeau_user_session_logged()) {}
+// Second check: Challenge by IP NO PASSWORD
+elseif (true === jirafeau_challenge_upload_ip_without_password($cfg, get_ip_address($cfg))) {
+    jirafeau_user_session_start();

 }
 }

-
-/* Ask password if upload password is set. */
-if (jirafeau_has_upload_password ($cfg))
-{
-    session_start();
-
-    /* Unlog if asked. */
-    if (isset ($_POST['action']) && (strcmp ($_POST['action'], 'logout') == 0))
-        session_unset ();
-
-    /* Auth. */
-    if (isset ($_POST['upload_password']))
-    {
-        if (jirafeau_challenge_upload_password ($cfg, $_POST['upload_password']))
-        {
-            $_SESSION['upload_auth'] = true;
-            $_SESSION['user_upload_password'] = $_POST['upload_password'];
+// Third check: Challenge by IP
+elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
+    // Is an upload password required?
+    if (jirafeau_has_upload_password($cfg)) {
+        // Challenge by password
+        if (isset($_POST['upload_password'])) {
+            if (jirafeau_challenge_upload_password($cfg, $_POST['upload_password'])) {
+                jirafeau_user_session_start();
+            } else {
+                jirafeau_session_end();
+                jirafeau_fatal_error(t('BAD_PSW'), $cfg);
+            }

         }
         }

-        else
-        {
-            $_SESSION['admin_auth'] = false;
-            echo '<div class="error"><p>' . t('Wrong password.') . '</p></div>';
-            require (JIRAFEAU_ROOT.'lib/template/footer.php');
+
+        // Show login form if user session is not authorized yet
+        if (!jirafeau_user_session_logged()) {
+            ?>
+            <form method="post" class="form login">
+            <fieldset>
+                <table>
+                <tr>
+                    <td class = "label"><label for = "enter_password">
+                    <?php echo t('UP_PSW') . ':'; ?></label>
+                    </td>
+                </tr><tr>
+                    <td class = "field"><input type = "password"
+                    name = "upload_password" id = "upload_password"
+                    size = "40" autocomplete = "current-password" />
+                    </td>
+                </tr>
+                <tr class = "nav">
+                    <td class = "nav next">
+                    <input type = "submit" name = "key" value = "<?php echo t('LOGIN'); ?>" />
+                    </td>
+                </tr>
+                </table>
+            </fieldset>
+            </form>
+            <?php
+            require(JIRAFEAU_ROOT.'lib/template/footer.php');

             exit;
         }
     }
             exit;
         }
     }

-
-    /* Show auth page. */
-    if (!isset ($_SESSION['upload_auth']) || $_SESSION['upload_auth'] != true)
-    {
-       ?>
-        <form action = "<?php echo basename(__FILE__); ?>" method = "post">
-        <fieldset>
-            <table>
-            <tr>
-                <td class = "label"><label for = "enter_password">
-                <?php echo t('Upload password') . ':';?></label>
-                </td>
-                <td class = "field"><input type = "password"
-                name = "upload_password" id = "upload_password"
-                size = "40" />
-                </td>
-            </tr>
-            <tr class = "nav">
-                <td></td>
-                <td class = "nav next">
-                <input type = "submit" name = "key" value =
-                "<?php echo t('Login'); ?>" />
-                </td>
-            </tr>
-            </table>
-        </fieldset>
-        </form>
-        <?php
-        require (JIRAFEAU_ROOT.'lib/template/footer.php');
-        exit;
-    }
+} else {
+    jirafeau_fatal_error(t('ACCESS_KO'), $cfg);

 }
 
 ?>
 <div id="upload_finished">
 }
 
 ?>
 <div id="upload_finished">

-    <p><?php echo t('File uploaded !') ?></p>
+    <p><?php echo t('FILE_UP') ?></p>

 
     <div id="upload_finished_download_page">
     <p>
 
     <div id="upload_finished_download_page">
     <p>

-          <?php echo t('Download page') ?>
-          <a id="upload_link_email" href=""><img id="upload_image_email"/></a>
+        <a id="upload_link" href=""><?php echo t('DL_PAGE') ?></a>
+        <a id="upload_link_email" href=""><img id="upload_image_email"/></a>
+    </p><p>
+        <code id=upload_link_text></code>
+        <button id="upload_link_button">&#128203;</button>

     </p>
     </p>

-    <p><a id="upload_link" href=""></a></p>

     </div>
 
     </div>
 

-    <?php if ($cfg['preview'] == true) { ?>
+    <?php if ($cfg['preview'] == true) {
+    ?>

     <div id="upload_finished_preview">
     <div id="upload_finished_preview">

-    <p><?php echo t('View link') ?>:</p>
-    <p><a id="preview_link" href=""></a></p>
+    <p>
+        <a id="preview_link" href=""><?php echo t('VIEW_LINK') ?></a>
+    </p><p>
+        <code id=preview_link_text></code>
+        <button id="preview_link_button">&#128203;</button>
+    </p>

     </div>
     </div>

-    <?php } ?>
+    <?php
+} ?>

 
     <div id="upload_direct_download">
 
     <div id="upload_direct_download">

-    <p><?php echo t('Direct download link') ?>:</p>
-    <p><a id="direct_link" href=""></a></p>
+    <p>
+        <a id="direct_link" href=""><?php echo t('DIRECT_DL') ?></a>
+    </p><p>
+        <code id=direct_link_text></code>
+        <button id="direct_link_button">&#128203;</button>
+    </p>

     </div>
 
     </div>
 

-    <div>
-    <p><?php echo t('Delete link') ?>:</p>
-    <p><a id="delete_link" href=""></a></p>
+    <div id="upload_delete">
+    <p>
+        <a id="delete_link" href=""><?php echo t('DELETE_LINK') ?></a>
+    </p><p>
+        <code id=delete_link_text></code>
+        <button id="delete_link_button">&#128203;</button>
+    </p>

     </div>
 
     </div>
 

-    <div id="validity">
-    <p><?php echo t('This file is valid until the following date'); ?>:</p>
+    <div id="upload_validity">
+    <p><?php echo t('VALID_UNTIL'); ?>:</p>

     <p id="date"></p>
     </div>
 </div>
 
 <div id="uploading">
     <p>
     <p id="date"></p>
     </div>
 </div>
 
 <div id="uploading">
     <p>

-    <?php echo t ('Uploading ...'); ?>
+    <?php echo t('UP'); ?>

     <div id="uploaded_percentage"></div>
     <div id="uploaded_speed"></div>
     <div id="uploaded_time"></div>
     <div id="uploaded_percentage"></div>
     <div id="uploaded_speed"></div>
     <div id="uploaded_time"></div>


@@ -151,113 +159,114 @@ if (jirafeau_has_upload_password ($cfg))
 <div id="upload">
 <fieldset>
     <legend>
 <div id="upload">
 <fieldset>
     <legend>

-    <?php echo t('Select a file'); ?>
+    <?php echo t('SEL_FILE'); ?>

     </legend>
     <p>
     </legend>
     <p>

-    <input type="file" id="file_select" size="30"
-    onchange="control_selected_file_size(<?php echo $cfg['maximal_upload_size'] ?>, '<?php echo t ('File is too big') . ', ' . t ('File size is limited to') . " " . $cfg['maximal_upload_size'] . " MB"; ?>')"/>
+        <input type="file" id="file_select" size="30"
+    onchange="control_selected_file_size(<?php echo $cfg['maximal_upload_size'] ?>, '<?php
+        if ($cfg['maximal_upload_size'] >= 1024) {
+            echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . number_format($cfg['maximal_upload_size']/1024, 2) . " GB.";
+        } elseif ($cfg['maximal_upload_size'] > 0) {
+            echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . $cfg['maximal_upload_size'] . " MB.";
+        }
+    ?>')"/>

     </p>
 
     <div id="options">
         <table id="option_table">
     </p>
 
     <div id="options">
         <table id="option_table">

+        <?php
+        if ($cfg['one_time_download']) {
+            echo '<tr><td>' . t('ONE_TIME_DL') . ':</td>';
+            echo '<td><input type="checkbox" id="one_time_download" /></td></tr>';
+        }
+        ?>

         <tr>
         <tr>

-        <td><?php echo t('One time download'); ?>:</td>
-        <td><input type="checkbox" id="one_time_download" /></td>
-        </tr>
-        <tr>
-        <td><label for="input_key"><?php echo t('Password') . ':'; ?></label></td>
-        <td><input type="text" name="key" id="input_key" /></td>
+        <td><label for="input_key"><?php echo t('PSW') . ':'; ?></label></td>
+        <td><input type="password" name="key" id="input_key" autocomplete = "new-password"/></td>

         </tr>
         <tr>
         </tr>
         <tr>

-        <td><label for="select_time"><?php echo t('Time limit') . ':'; ?></label></td>
+        <td><label for="select_time"><?php echo t('TIME_LIM') . ':'; ?></label></td>

         <td><select name="time" id="select_time">
         <?php
         $expirationTimeOptions = array(
           array(
             'value' => 'minute',
         <td><select name="time" id="select_time">
         <?php
         $expirationTimeOptions = array(
           array(
             'value' => 'minute',

-            'label' => 'One minute'
+            'label' => '1_MIN'

           ),
           array(
             'value' => 'hour',
           ),
           array(
             'value' => 'hour',

-            'label' => 'One hour'
+            'label' => '1_H'

           ),
           array(
             'value' => 'day',
           ),
           array(
             'value' => 'day',

-            'label' => 'One day'
+            'label' => '1_D'

           ),
           array(
             'value' => 'week',
           ),
           array(
             'value' => 'week',

-            'label' => 'One week'
+            'label' => '1_W'
+          ),
+          array(
+              'value' => 'fortnight',
+              'label' => '2_W'

           ),
           array(
             'value' => 'month',
           ),
           array(
             'value' => 'month',

-            'label' => 'One month'
+            'label' => '1_M'

           ),
           array(
             'value' => 'quarter',
           ),
           array(
             'value' => 'quarter',

-            'label' => 'One quarter'
+            'label' => '1_Q'

           ),
           array(
             'value' => 'year',
           ),
           array(
             'value' => 'year',

-            'label' => 'One year'
+            'label' => '1_Y'

           ),
           array(
             'value' => 'none',
           ),
           array(
             'value' => 'none',

-            'label' => 'None'
+            'label' => 'NONE'

           )
         );
         foreach ($expirationTimeOptions as $expirationTimeOption) {
           )
         );
         foreach ($expirationTimeOptions as $expirationTimeOption) {

-          $selected = ($expirationTimeOption['value'] === $cfg['availability_default'])? 'selected="selected"' : '';
-          if(true === $cfg['availabilities'][$expirationTimeOption['value']]) {
-            echo '<option value="' . $expirationTimeOption['value'] . '" ' .
+            $selected = ($expirationTimeOption['value'] === $cfg['availability_default'])? 'selected="selected"' : '';
+            if (true === $cfg['availabilities'][$expirationTimeOption['value']]) {
+                echo '<option value="' . $expirationTimeOption['value'] . '" ' .

               $selected . '>' . t($expirationTimeOption['label']) . '</option>';
               $selected . '>' . t($expirationTimeOption['label']) . '</option>';

-          }
+            }

         }
         ?>
         </select></td>
         </tr>
 
         <?php
         }
         ?>
         </select></td>
         </tr>
 
         <?php

-        if ($cfg['maximal_upload_size'] > 0)
-        {
-        echo '<p class="config">' . t ('File size is limited to');
-        echo " " . $cfg['maximal_upload_size'] . " MB</p>";
+        if ($cfg['maximal_upload_size'] >= 1024) {
+            echo '<p class="config">' . t('FILE_LIM');
+            echo " " . number_format($cfg['maximal_upload_size'] / 1024, 2) . " GB.</p>";
+        } elseif ($cfg['maximal_upload_size'] > 0) {
+            echo '<p class="config">' . t('FILE_LIM');
+            echo " " . $cfg['maximal_upload_size'] . " MB.</p>";
+        } else {
+            echo '<p class="config"></p>';

         }
         ?>
 
         }
         ?>
 

-               <p id="max_file_size" class="config"></p>
+        <p id="max_file_size" class="config"></p>

     <p>
     <p>

-    <?php
-    if (jirafeau_has_upload_password ($cfg) && $_SESSION['upload_auth'])
-    {
-    ?>
-    <input type="hidden" id="upload_password" name="upload_password" value="<?php echo $_SESSION['user_upload_password'] ?>"/>
-    <?php
-    }
-    else
-    {
-    ?>
-    <input type="hidden" id="upload_password" name="upload_password" value=""/>
-    <?php
-    }
-    ?>
-    <input type="submit" id="send" value="<?php echo t('Send'); ?>"
+    <input type="submit" id="send" value="<?php echo t('SEND'); ?>"

     onclick="
         document.getElementById('upload').style.display = 'none';
         document.getElementById('uploading').style.display = '';
     onclick="
         document.getElementById('upload').style.display = 'none';
         document.getElementById('uploading').style.display = '';

-        upload ('<?php echo $cfg['web_root']; ?>', <?php echo jirafeau_get_max_upload_size_bytes (); ?>);
+        upload (<?php echo jirafeau_get_max_upload_chunk_size_bytes($cfg['max_upload_chunk_size_bytes']); ?>);

     "/>
     </p>
         </table>
     </div> </fieldset>
 
     <?php
     "/>
     </p>
         </table>
     </div> </fieldset>
 
     <?php

-    if (jirafeau_has_upload_password ($cfg))
-    {
+    if (jirafeau_user_session_logged()) {

     ?>
     ?>

-    <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+    <form method="post" class="form logout">

         <input type = "hidden" name = "action" value = "logout"/>
         <input type = "hidden" name = "action" value = "logout"/>

-        <input type = "submit" value = "<?php echo t('Logout'); ?>" />
+        <input type = "submit" value = "<?php echo t('LOGOUT'); ?>" />

     </form>
     <?php
     }
     </form>
     <?php
     }


@@ -266,6 +275,7 @@ if (jirafeau_has_upload_password ($cfg))
 </div>
 
 <script type="text/javascript" lang="Javascript">
 </div>
 
 <script type="text/javascript" lang="Javascript">

+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later

     document.getElementById('error_pop').style.display = 'none';
     document.getElementById('uploading').style.display = 'none';
     document.getElementById('upload_finished').style.display = 'none';
     document.getElementById('error_pop').style.display = 'none';
     document.getElementById('uploading').style.display = 'none';
     document.getElementById('upload_finished').style.display = 'none';


@@ -273,7 +283,16 @@ if (jirafeau_has_upload_password ($cfg))
     document.getElementById('send').style.display = 'none';
     if (!check_html5_file_api ())
         document.getElementById('max_file_size').innerHTML = '<?php
     document.getElementById('send').style.display = 'none';
     if (!check_html5_file_api ())
         document.getElementById('max_file_size').innerHTML = '<?php

-             echo t('You browser may not support HTML5 so the maximum file size is ') . jirafeau_get_max_upload_size ();
-             ?>';
+            $max_size = jirafeau_get_max_upload_size();
+            if ($max_size > 0) {
+                echo t('NO_BROWSER_SUPPORT') . $max_size;
+            }
+        ?>';
+
+    addCopyListener('upload_link_button', 'upload_link');
+    addCopyListener('preview_link_button', 'preview_link');
+    addCopyListener('direct_link_button', 'direct_link');
+    addCopyListener('delete_link_button', 'delete_link');
+// @license-end

 </script>
 </script>

-<?php require (JIRAFEAU_ROOT . 'lib/template/footer.php'); ?>
+<?php require(JIRAFEAU_ROOT . 'lib/template/footer.php'); ?>