[TASK] rework user auth

[jirafeau_mojo42.git] / index.php

diff --git a/index.php b/index.php
index 56a07b8b1cf54e03760c13626dac41ead2c9c840..f7aeb04d6b60c1c3bd48a9ea7b60d777a30b0b42 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,8 +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) 2012  Jerome Jutteau <j.jutteau@gmail.com>
+ *  Copyright (C) 2013
+ *  Jerome Jutteau <jerome@jutteau.fr>
+ *  Jimmy Beauvois <jimmy.beauvois@gmail.com>

  *
  *  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


@@ -15,153 +16,283 @@
  *  GNU Affero General Public License for more details.
  *
  *  You should have received a copy of the GNU Affero General Public License
  *  GNU Affero General Public License for more details.
  *
  *  You should have received a copy of the GNU Affero General Public License

- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *  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.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');

 
 

-if (file_exists (JIRAFEAU_ROOT . 'install.php')
-    && !file_exists (JIRAFEAU_ROOT . 'lib/config.local.php'))
-{
-    header('Location: install.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');

 
 

-/* check if the destination dirs are writable */
-$writable = is_writable (VAR_FILES) && is_writable (VAR_LINKS);
-
-$res = array ();
-if ($writable && isset ($_POST['jirafeau']))
-{
-    $key = $_POST['key'];
-
-    $time = time ();
-    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;
-    default:
-        $time = JIRAFEAU_INFINITY;
-        break;
-    }
+// Logout action
+if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
+    jirafeau_session_end();
+}

 
 

-    $res =
-        jirafeau_upload ($_FILES['file'], isset ($_POST['one_time_download']),
-                         $key, $time, $cfg, $_SERVER['REMOTE_ADDR']);
+/* Check if user is allowed to upload. */
+// 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();

 }
 }

+// 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);
+            }
+        }

 
 

-require (JIRAFEAU_ROOT . 'lib/template/header.php');
-
-/* Checking for errors. */
-if (!is_writable (VAR_FILES))
-    add_error (_('The file directory is not writable!'), VAR_FILES);
-
-if (!is_writable (VAR_LINKS))
-    add_error (_('The link directory is not writable!'), VAR_LINKS);
-
-/* Check if the install.php script is still in the directory. */
-if (file_exists (JIRAFEAU_ROOT . 'install.php'))
-    add_error (_('Installer script still present'),
-               _('Please make sure to delete the installer script ' .
-                 '"install.php" before continuing.'));
-
-if (!has_error () && !empty ($res))
-{
-    if ($res['error']['has_error'])
-        add_error (_('An error occurred.'), $res['error']['why']);
-    else
-    {
-        $link = $cfg['web_root'];
-        $delete_link = $cfg['web_root'];
-
-        if ($cfg['rewrite'])
-        {
-            $link .= 'file-'.$res['link'];
-            $delete_link .=
-                'file-'.$res['link'].'-delete-'.$res['delete_link'];
+        // 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;

         }
         }

-        else
-        {
-            /* h because 'h' looks like a jirafeau ;) */
-            $link .= 'file.php?h='.$res['link'];
-            $delete_link .=
-                'file.php?h='.$res['link'].'&amp;d='.$res['delete_link'];
+    }
+} else {
+    jirafeau_fatal_error(t('ACCESS_KO'), $cfg);
+}
+
+?>
+<div id="upload_finished">
+    <p><?php echo t('FILE_UP') ?></p>
+
+    <div id="upload_finished_download_page">
+    <p>
+        <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>
+    </div>
+
+    <?php if ($cfg['preview'] == true) {
+    ?>
+    <div id="upload_finished_preview">
+    <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>
+    <?php
+} ?>
+
+    <div id="upload_direct_download">
+    <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 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 id="upload_validity">
+    <p><?php echo t('VALID_UNTIL'); ?>:</p>
+    <p id="date"></p>
+    </div>
+</div>
+
+<div id="uploading">
+    <p>
+    <?php echo t('UP'); ?>
+    <div id="uploaded_percentage"></div>
+    <div id="uploaded_speed"></div>
+    <div id="uploaded_time"></div>
+    </p>
+</div>
+
+<div id="error_pop" class="error">
+</div>
+
+<div id="upload">
+<fieldset>
+    <legend>
+    <?php echo t('SEL_FILE'); ?>
+    </legend>
+    <p>
+        <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>

 
 

-        echo '<div class="message">'.NL;
-        echo '<p>' . _('File uploaded! Copy the following URL to get it') .
-            ':<br />' . NL;
-        echo '<a href="'.$link.'">'.$link.'</a>' . NL;
+    <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>
+        <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>
+        <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',
+            'label' => '1_MIN'
+          ),
+          array(
+            'value' => 'hour',
+            'label' => '1_H'
+          ),
+          array(
+            'value' => 'day',
+            'label' => '1_D'
+          ),
+          array(
+            'value' => 'week',
+            'label' => '1_W'
+          ),
+          array(
+              'value' => 'fortnight',
+              'label' => '2_W'
+          ),
+          array(
+            'value' => 'month',
+            'label' => '1_M'
+          ),
+          array(
+            'value' => 'quarter',
+            'label' => '1_Q'
+          ),
+          array(
+            'value' => 'year',
+            'label' => '1_Y'
+          ),
+          array(
+            'value' => 'none',
+            'label' => 'NONE'
+          )
+        );
+        foreach ($expirationTimeOptions as $expirationTimeOption) {
+            $selected = ($expirationTimeOption['value'] === $cfg['availability_default'])? 'selected="selected"' : '';
+            if (true === $cfg['availabilities'][$expirationTimeOption['value']]) {
+                echo '<option value="' . $expirationTimeOption['value'] . '" ' .
+              $selected . '>' . t($expirationTimeOption['label']) . '</option>';
+            }
+        }
+        ?>
+        </select></td>
+        </tr>

 
 

-        if ($time != JIRAFEAU_INFINITY)
-        {
-            echo '<br />' . _('This file is valid until the following date') .
-                ':<br /><strong>' . strftime ('%c', $time) . '</strong>';
+        <?php
+        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>';

         }
         }

+        ?>

 
 

-        echo '</p></div>';
+        <p id="max_file_size" class="config"></p>
+    <p>
+    <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_chunk_size_bytes($cfg['max_upload_chunk_size_bytes']); ?>);
+    "/>
+    </p>
+        </table>
+    </div> </fieldset>

 
 

-        echo '<div class="message">' . NL;
-        echo '<p>' . _('Keep the following URL to delete it at any moment') . ':<br />' . NL;
-        echo '<a href="' . $delete_link . '">' . $delete_link . '</a>' . NL;
-        echo '</p></div>';
+    <?php
+    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

     }
     }

-}
+    ?>

 
 

-if (has_error ())
-    show_errors ();
-
-if (!has_error () && $writable)
-{
-    ?><div id = "upload">
-        <form enctype = "multipart/form-data" action = "
-        <?php echo $cfg['web_root']; ?>" method =
-        "post"> <div><input type = "hidden" name = "jirafeau" value = "
-        <?php echo JIRAFEAU_VERSION; ?>" /></div> <fieldset>
-        <legend><?php echo _('Upload a file');
-    ?></legend> <p><input type = "file" name = "file" size =
-        "30" /></p> <p class =
-        "config"><?php printf ('%s: %dMB', _('Maximum file size'),
-                               jirafeau_get_max_upload_size () / (1024 *
-                                                                  1024));
-    ?></p> <p><input type = "submit" value =
-        "<?php echo _('Send'); ?>" /></p>
-        <hr /><div id = "moreoptions"> <p><label><input type =
-        "checkbox" name =
-        "one_time_download" /><?php echo _('One time download');
-    ?></label></p><br/><p><label for = "input_key"
-       ><?php echo _('Password') . ':';
-    ?></label> <input type = "text" name = "key" id = "input_key" /></p>
-        <p><label for = "select_time"
-       ><?php echo _('Time limit') . ':';
-    ?></label>
-        <select name = "time" id = "select_time">
-        <option value = "none"><?php echo _('None');
-    ?></option> <option value = "minute"><?php echo _('One minute');
-    ?></option> <option value = "hour"><?php echo _('One hour');
-    ?></option> <option value = "day"><?php echo _('One day');
-    ?></option> <option value = "week"><?php echo _('One week');
-    ?></option> <option value = "month"><?php echo _('One month');
-    ?></option>
-        </select> </p> </div> </fieldset> </form> </div> <?php
-}
+</div>

 
 

-require (JIRAFEAU_ROOT.'lib/template/footer.php');
-?>
+<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('options').style.display = 'none';
+    document.getElementById('send').style.display = 'none';
+    if (!check_html5_file_api ())
+        document.getElementById('max_file_size').innerHTML = '<?php
+            $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>
+<?php require(JIRAFEAU_ROOT . 'lib/template/footer.php'); ?>