[TASK] rework user auth

[jirafeau_mojo42.git] / index.php

diff --git a/index.php b/index.php
index b03af7698b6b0b16b08c4daa5600cb7cf920fb61..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


@@ -27,43 +27,41 @@ require(JIRAFEAU_ROOT . 'lib/lang.php');
 
 check_errors($cfg);
 if (has_error()) {
 
 check_errors($cfg);
 if (has_error()) {

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

     show_errors();
     require(JIRAFEAU_ROOT . 'lib/template/footer.php');
     exit;
 }
     show_errors();
     require(JIRAFEAU_ROOT . 'lib/template/footer.php');
     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. */

-// First check: Challenge by IP NO PASSWORD
-if (true === jirafeau_challenge_upload_ip($cfg['upload_ip_nopassword'], get_ip_address($cfg))) {
-    $_SESSION['upload_auth'] = true;
-    $_POST['upload_password'] = '';
-    $_SESSION['user_upload_password'] = $_POST['upload_password'];
+// 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();

 }
 }

-// Second check: Challenge by IP
-elseif (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg))) {
+// 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)) {
     // Is an upload password required?
     if (jirafeau_has_upload_password($cfg)) {

-        // Logout action
-        if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
-            session_unset();
-        }
-

         // Challenge by password
         // Challenge by password

-        // …save successful logins in session

         if (isset($_POST['upload_password'])) {
             if (jirafeau_challenge_upload_password($cfg, $_POST['upload_password'])) {
         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'];
+                jirafeau_user_session_start();

             } else {
             } else {

-                $_SESSION['admin_auth'] = false;
+                jirafeau_session_end();

                 jirafeau_fatal_error(t('BAD_PSW'), $cfg);
             }
         }
 
         // Show login form if user session is not authorized yet
                 jirafeau_fatal_error(t('BAD_PSW'), $cfg);
             }
         }
 
         // Show login form if user session is not authorized yet

-        if (true === empty($_SESSION['upload_auth'])) {
+        if (!jirafeau_user_session_logged()) {

             ?>
             <form method="post" class="form login">
             <fieldset>
             ?>
             <form method="post" class="form login">
             <fieldset>


@@ -75,13 +73,12 @@ elseif (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address(
                 </tr><tr>
                     <td class = "field"><input type = "password"
                     name = "upload_password" id = "upload_password"
                 </tr><tr>
                     <td class = "field"><input type = "password"
                     name = "upload_password" id = "upload_password"

-                    size = "40" />
+                    size = "40" autocomplete = "current-password" />

                     </td>
                 </tr>
                 <tr class = "nav">
                     <td class = "nav next">
                     </td>
                 </tr>
                 <tr class = "nav">
                     <td class = "nav next">

-                    <input type = "submit" name = "key" value =
-                    "<?php echo t('LOGIN'); ?>" />
+                    <input type = "submit" name = "key" value = "<?php echo t('LOGIN'); ?>" />

                     </td>
                 </tr>
                 </table>
                     </td>
                 </tr>
                 </table>


@@ -92,8 +89,7 @@ elseif (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address(
             exit;
         }
     }
             exit;
         }
     }

-}
-else {
+} else {

     jirafeau_fatal_error(t('ACCESS_KO'), $cfg);
 }
 
     jirafeau_fatal_error(t('ACCESS_KO'), $cfg);
 }
 


@@ -169,22 +165,24 @@ else {
         <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) {
         <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.";
-        } else if ($cfg['maximal_upload_size'] > 0) { 
-          echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . $cfg['maximal_upload_size'] . " MB.";
+            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">

-        <tr>
-        <td><?php echo t('ONE_TIME_DL'); ?>:</td>
-        <td><input type="checkbox" id="one_time_download" /></td>
-        </tr>
+        <?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>
         <td><label for="input_key"><?php echo t('PSW') . ':'; ?></label></td>
         <tr>
         <td><label for="input_key"><?php echo t('PSW') . ':'; ?></label></td>

-        <td><input type="password" name="key" id="input_key" /></td>
+        <td><input type="password" name="key" id="input_key" autocomplete = "new-password"/></td>

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


@@ -207,6 +205,10 @@ else {
             'value' => 'week',
             'label' => '1_W'
           ),
             'value' => 'week',
             'label' => '1_W'
           ),

+          array(
+              'value' => 'fortnight',
+              'label' => '2_W'
+          ),

           array(
             'value' => 'month',
             'label' => '1_M'
           array(
             'value' => 'month',
             'label' => '1_M'


@@ -239,49 +241,34 @@ else {
         if ($cfg['maximal_upload_size'] >= 1024) {
             echo '<p class="config">' . t('FILE_LIM');
             echo " " . number_format($cfg['maximal_upload_size'] / 1024, 2) . " GB.</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>";

-        } else if ($cfg['maximal_upload_size'] > 0) {
+        } 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">' . t('FILE_LIM');
             echo " " . $cfg['maximal_upload_size'] . " MB.</p>";
         } else {

-           echo '<p class="config"></p>';
+            echo '<p class="config"></p>';

         }
         ?>
 
         <p id="max_file_size" class="config"></p>
     <p>
         }
         ?>
 
         <p id="max_file_size" class="config"></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'); ?>"
     onclick="
         document.getElementById('upload').style.display = 'none';
         document.getElementById('uploading').style.display = '';
     <input type="submit" id="send" value="<?php echo t('SEND'); ?>"
     onclick="
         document.getElementById('upload').style.display = 'none';
         document.getElementById('uploading').style.display = '';

-        upload (<?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)
-        && false === jirafeau_challenge_upload_ip($cfg['upload_ip_nopassword'], get_ip_address($cfg))) {
-        ?>
+    if (jirafeau_user_session_logged()) {
+    ?>

     <form method="post" class="form logout">
         <input type = "hidden" name = "action" value = "logout"/>
         <input type = "submit" value = "<?php echo t('LOGOUT'); ?>" />
     </form>
     <?php
     <form method="post" class="form logout">
         <input type = "hidden" name = "action" value = "logout"/>
         <input type = "submit" value = "<?php echo t('LOGOUT'); ?>" />
     </form>
     <?php

-

     }
     ?>
 
     }
     ?>
 


@@ -296,8 +283,11 @@ else {
     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('NO_BROWSER_SUPPORT') . 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('upload_link_button', 'upload_link');
     addCopyListener('preview_link_button', 'preview_link');