X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/2dc4984ad57dfcb0ded829bfc9d45493484fe6e3..989cb76f326b696484beb04ba5a4044f816de522:/admin.php?ds=sidebyside

diff --git a/admin.php b/admin.php
index 4500a19..bcc291b 100644
--- a/admin.php
+++ b/admin.php
@@ -1,7 +1,7 @@
 <?php
 /*
  *  Jirafeau, your web file repository
- *  Copyright (C) 2015  Jerome Jutteau <j.jutteau@gmail.com>
+ *  Copyright (C) 2015  Jerome Jutteau <jerome@jutteau.fr>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
@@ -53,79 +53,63 @@ if (php_sapi_name() == "cli") {
   }
 
   /* Unlog if asked. */
-  if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
-      $_SESSION['admin_auth'] = false;
+  if (jirafeau_admin_session_logged() && isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
+      jirafeau_admin_session_end();
   }
 
-  /* Check classic admin password authentification. */
-  if (isset($_POST['admin_password']) && empty($cfg['admin_http_auth_user'])) {
-      if ($cfg['admin_password'] === $_POST['admin_password'] ||
-          $cfg['admin_password'] === hash('sha256', $_POST['admin_password'])) {
-          $_SESSION['admin_auth'] = true;
-      } else {
-          $_SESSION['admin_auth'] = false;
-          require(JIRAFEAU_ROOT . 'lib/template/header.php');
-          echo '<div class="error"><p>'.
-               t('BAD_PSW') . '</p></div>';
+  if (!jirafeau_admin_session_logged()) {
+      /* Test HTTP authentification. */
+      if (!empty($cfg['admin_http_auth_user']) &&
+          $cfg['admin_http_auth_user'] == $_SERVER['PHP_AUTH_USER']) {
+          jirafeau_admin_session_start();
+      }
+      /* Test web password authentification. */
+      else if (!empty($cfg['admin_password']) && isset($_POST['admin_password'])) {
+          if ($cfg['admin_password'] === hash('sha256', $_POST['admin_password'])) {
+              jirafeau_admin_session_start();
+          } else {
+              require(JIRAFEAU_ROOT . 'lib/template/header.php');
+              echo '<div class="error"><p>'. t('BAD_PSW') . '</p></div>';
+              require(JIRAFEAU_ROOT.'lib/template/footer.php');
+              exit;
+          }
+      }
+      /* Admin password prompt form. */
+      else {
+          require(JIRAFEAU_ROOT . 'lib/template/header.php'); ?>
+          <form method="post" class="form login">
+          <fieldset>
+              <table>
+              <tr>
+                  <td class = "label"><label for = "enter_password">
+                  <?php echo t('ADMIN_PSW') . ':'; ?></label>
+                  </td>
+              </tr>
+              <tr>
+                  <td class = "field"><input type = "password"
+                  name = "admin_password" id = "admin_password"
+                  size = "40" />
+                  </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;
       }
   }
-  /* Ask for classic admin password authentification. */
-  elseif ((!isset($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true)
-          && empty($cfg['admin_http_auth_user'])) {
-      require(JIRAFEAU_ROOT . 'lib/template/header.php'); ?>
-      <form method="post" class="form login">
-      <fieldset>
-          <table>
-          <tr>
-              <td class = "label"><label for = "enter_password">
-              <?php echo t('ADMIN_PSW') . ':'; ?></label>
-              </td>
-              <td class = "field"><input type = "password"
-              name = "admin_password" id = "admin_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;
-  }
-  /* Check authenticated user if HTTP authentification is enable. */
-  elseif ((!isset($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true)
-          && !empty($cfg['admin_http_auth_user'])) {
-      if ($cfg['admin_http_auth_user'] == $_SERVER['PHP_AUTH_USER']) {
-          $_SESSION['admin_auth'] = true;
-      }
-  }
-
-  /* Be sure that no one can access further without admin_auth. */
-  if (!isset($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true) {
-      $_SESSION['admin_auth'] = false;
-      require(JIRAFEAU_ROOT . 'lib/template/header.php');
-      echo '<div class="error"><p>'.
-           t('NO_ADMIN_AUTH') .
-           '</p></div>';
-      require(JIRAFEAU_ROOT.'lib/template/footer.php');
-      exit;
-  }
 
   /* Operations may take a long time.
    * Be sure PHP's safe mode is off.
    */
   @set_time_limit(0);
-  /* Remove errors. */
-  @error_reporting(0);
 
   /* Show admin interface if not downloading a file. */
   if (!(isset($_POST['action']) && strcmp($_POST['action'], 'download') == 0)) {
@@ -138,6 +122,7 @@ if (php_sapi_name() == "cli") {
           <form method="post">
           <tr>
               <input type = "hidden" name = "action" value = "clean"/>
+              <?php echo jirafeau_admin_csrf_field() ?>
               <td class = "info">
                   <?php echo t('CLEAN_EXPIRED'); ?>
               </td>
@@ -150,6 +135,7 @@ if (php_sapi_name() == "cli") {
           <form method="post">
           <tr>
               <input type = "hidden" name = "action" value = "clean_async"/>
+              <?php echo jirafeau_admin_csrf_field() ?>
               <td class = "info">
                   <?php echo t('CLEAN_INCOMPLETE'); ?>
               </td>
@@ -162,6 +148,7 @@ if (php_sapi_name() == "cli") {
           <form method="post">
           <tr>
               <input type = "hidden" name = "action" value = "list"/>
+              <?php echo jirafeau_admin_csrf_field() ?>
               <td class = "info">
                   <?php echo t('LS_FILES'); ?>
               </td>
@@ -171,9 +158,23 @@ if (php_sapi_name() == "cli") {
               </td>
           </tr>
           </form>
+          <form method="post">
+              <tr>
+                  <input type = "hidden" name = "action" value = "size"/>
+                  <?php echo jirafeau_admin_csrf_field() ?>
+                  <td class = "info">
+                      <?php echo t('SIZE_DATA'); ?>
+                  </td>
+                  <td></td>
+                  <td>
+                      <input type = "submit" value = "<?php echo t('SIZE'); ?>" />
+                  </td>
+              </tr>
+          </form>
           <form method="post">
           <tr>
               <input type = "hidden" name = "action" value = "search_by_name"/>
+              <?php echo jirafeau_admin_csrf_field() ?>
               <td class = "info">
                   <?php echo t('SEARCH_NAME'); ?>
               </td>
@@ -188,6 +189,7 @@ if (php_sapi_name() == "cli") {
           <form method="post">
           <tr>
               <input type = "hidden" name = "action" value = "search_by_file_hash"/>
+              <?php echo jirafeau_admin_csrf_field() ?>
               <td class = "info">
                   <?php echo t('SEARH_BY_HASH'); ?>
               </td>
@@ -202,8 +204,9 @@ if (php_sapi_name() == "cli") {
           <form method="post">
           <tr>
               <input type = "hidden" name = "action" value = "search_link"/>
+              <?php echo jirafeau_admin_csrf_field() ?>
               <td class = "info">
-                  <?php echo t('SEARCH'); ?>
+                  <?php echo t('SEARCH_LINK'); ?>
               </td>
               <td>
                   <input type = "text" name = "link" id = "link"/>
@@ -216,10 +219,10 @@ if (php_sapi_name() == "cli") {
           </table>
           <form method="post">
               <input type = "hidden" name = "action" value = "logout" />
+              <?php echo jirafeau_admin_csrf_field() ?>
               <input type = "submit" value = "<?php echo t('LOGOUT'); ?>" />
           </form>
           </fieldset></div><?php
-
   }
 
   /* Check for actions */
@@ -236,6 +239,12 @@ if (php_sapi_name() == "cli") {
           echo '<p>';
           echo t('CLEANED_FILES_CNT') . ' : ' . $total;
           echo '</p></div>';
+      } elseif (strcmp($_POST['action'], 'size') == 0) {
+          $size = jirafeau_dir_size($cfg['var_root']);
+          $human_size = jirafeau_human_size($size);
+          echo '<div class="message">' . NL;
+          echo '<p>' . t('SIZE_DATA') . ': ' . $human_size .'</p>';
+          echo '</div>';
       } elseif (strcmp($_POST['action'], 'list') == 0) {
           jirafeau_admin_list("", "", "");
       } elseif (strcmp($_POST['action'], 'search_by_name') == 0) {
@@ -249,7 +258,7 @@ if (php_sapi_name() == "cli") {
           echo '<div class="message">' . NL;
           echo '<p>' . t('LINK_DELETED') . '</p></div>';
       } elseif (strcmp($_POST['action'], 'delete_file') == 0) {
-          $count = jirafeau_delete_file($_POST['md5']);
+          $count = jirafeau_delete_file($_POST['hash']);
           echo '<div class="message">' . NL;
           echo '<p>' . t('DELETED_LINKS') . ' : ' . $count . '</p></div>';
       } elseif (strcmp($_POST['action'], 'download') == 0) {
@@ -257,13 +266,17 @@ if (php_sapi_name() == "cli") {
           if (!count($l)) {
               return;
           }
-          $p = s2p($l['md5']);
+          $p = s2p($l['hash']);
           header('Content-Length: ' . $l['file_size']);
           header('Content-Type: ' . $l['mime_type']);
           header('Content-Disposition: attachment; filename="' .
                   $l['file_name'] . '"');
-          if (file_exists(VAR_FILES . $p . $l['md5'])) {
-              readfile(VAR_FILES . $p . $l['md5']);
+          if (file_exists(VAR_FILES . $p . $l['hash'])) {
+              $r = fopen(VAR_FILES . $p . $l['hash'], 'r');
+              while (!feof($r)) {
+                  print fread($r, 1024);
+              }
+              fclose($r);
           }
           exit;
       }