X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/2b4714c704f8ca5567c85a26e9202d5c9b3550e4..814a694cd2782c11983433ba053111c4743d07f3:/admin.php

diff --git a/admin.php b/admin.php
index 54fcde1..09bded5 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
@@ -32,51 +32,56 @@ if (file_exists(JIRAFEAU_ROOT . 'install.php')
 
 /* If called from CLI, no password or graphical interface */
 if (php_sapi_name() == "cli") {
+    if ($cfg['installation_done'] == false) {
+        die("Installation not completed yet.\n");
+    }
     if ((count($argv)>1) && $argv[1]=="clean_expired") {
         $total = jirafeau_admin_clean();
-        echo "$total expired files deleted.";
+        echo "$total expired files deleted.\n";
     } elseif ((count($argv)>1) && $argv[1]=="clean_async") {
         $total = jirafeau_admin_clean_async();
-        echo "$total old unfinished transfers deleted.";
+        echo "$total old unfinished transfers deleted.\n";
     } else {
-        die("No command found. Should be admin.php <clean_expired|clean_async>.");
+        die("No command found. Should be admin.php <clean_expired|clean_async>.\n");
     }
-} else {
+// Second check: Challenge by IP
+} elseif (true === jirafeau_challenge_admin_ip($cfg, get_ip_address($cfg))) {
     /* Disable admin interface if we have a empty admin password. */
-  if (empty($cfg['admin_password']) && empty($cfg['admin_http_auth_user'])) {
-      require(JIRAFEAU_ROOT . 'lib/template/header.php');
-      echo '<div class="error"><p>'.
+    if (empty($cfg['admin_password']) && empty($cfg['admin_http_auth_user'])) {
+        require(JIRAFEAU_ROOT . 'lib/template/header.php');
+        echo '<div class="error"><p>'.
            t('NO_ADMIN') .
            '</p></div>';
-      require(JIRAFEAU_ROOT.'lib/template/footer.php');
-      exit;
-  }
+        require(JIRAFEAU_ROOT.'lib/template/footer.php');
+        exit;
+    }
 
-  /* Unlog if asked. */
-  if (jirafeau_admin_session_logged() && isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
-      jirafeau_admin_session_end();
-  }
+    /* Logout if requested. */
+    if (jirafeau_admin_session_logged() && isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
+        jirafeau_session_end();
+    }
 
-  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'); ?>
+    if (!jirafeau_admin_session_logged()) {
+        /* Test HTTP authentication. */
+        if (!empty($cfg['admin_http_auth_user']) &&
+          ((is_array($cfg['admin_http_auth_user']) && in_array($_SERVER['PHP_AUTH_USER'], $cfg['admin_http_auth_user'])) ||
+          (($cfg['admin_http_auth_user'] == $_SERVER['PHP_AUTH_USER'])))) {
+            jirafeau_admin_session_start();
+        }
+        /* Test web password authentication. */
+        elseif (!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>
@@ -88,7 +93,7 @@ if (php_sapi_name() == "cli") {
               <tr>
                   <td class = "field"><input type = "password"
                   name = "admin_password" id = "admin_password"
-                  size = "40" />
+                  size = "40" autocomplete = "current-password" />
                   </td>
               </tr>
               <tr class = "nav">
@@ -102,23 +107,25 @@ if (php_sapi_name() == "cli") {
           </form>
           <?php
           require(JIRAFEAU_ROOT.'lib/template/footer.php');
-          exit;
-      }
-  }
+            exit;
+        }
+    }
 
-  /* Operations may take a long time.
-   * Be sure PHP's safe mode is off.
-   */
-  @set_time_limit(0);
-  /* Remove errors. */
-  @error_reporting(0);
+    /* Operations may take a long time.
+     * Be sure PHP's safe mode is off.
+     */
+    @set_time_limit(0);
 
-  /* Show admin interface if not downloading a file. */
-  if (!(isset($_POST['action']) && strcmp($_POST['action'], 'download') == 0)) {
-      require(JIRAFEAU_ROOT . 'lib/template/header.php'); ?><h2><?php echo t('ADMIN_INTERFACE'); ?></h2><?php
-          ?><h2>(version <?php echo JIRAFEAU_VERSION ?>)</h2><?php
+    /* Show admin interface if not downloading a file. */
+    if (!(isset($_POST['action']) && strcmp($_POST['action'], 'download') == 0)) {
+        require(JIRAFEAU_ROOT . 'lib/template/header.php'); ?><h2><?php echo t('ADMIN_INTERFACE'); ?></h2><?php
+        ?><h2>(version <?php echo JIRAFEAU_VERSION ?>)</h2><?php
 
-          ?><div id = "admin">
+        if ($cfg['enable_crypt'] && !(extension_loaded('sodium'))) {
+            echo '<div class="error"><p>'.t('SODIUM_UNAVAILABLE').'</p></div>';
+        }
+
+        ?><div id = "admin">
           <fieldset><legend><?php echo t('ACTIONS'); ?></legend>
           <table>
           <form method="post">
@@ -218,6 +225,19 @@ if (php_sapi_name() == "cli") {
               </td>
           </tr>
           </form>
+          <form method="post">
+          <tr>
+              <input type = "hidden" name = "action" value = "bug_report_info"/>
+              <?php echo jirafeau_admin_csrf_field() ?>
+              <td class = "info">
+                  <?php echo t('REPORTING_AN_ISSUE'); ?>
+              </td>
+              <td></td>
+              <td>
+                  <input type = "submit" value = "<?php echo t('INFO'); ?>" />
+              </td>
+          </tr>
+          </form>
           </table>
           <form method="post">
               <input type = "hidden" name = "action" value = "logout" />
@@ -225,66 +245,70 @@ if (php_sapi_name() == "cli") {
               <input type = "submit" value = "<?php echo t('LOGOUT'); ?>" />
           </form>
           </fieldset></div><?php
-  }
+    }
 
-  /* Check for actions */
-  if (isset($_POST['action'])) {
-      if (strcmp($_POST['action'], 'clean') == 0) {
-          $total = jirafeau_admin_clean();
-          echo '<div class="message">' . NL;
-          echo '<p>';
-          echo t('CLEANED_FILES_CNT') . ' : ' . $total;
-          echo '</p></div>';
-      } elseif (strcmp($_POST['action'], 'clean_async') == 0) {
-          $total = jirafeau_admin_clean_async();
-          echo '<div class="message">' . NL;
-          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) {
-          jirafeau_admin_list($_POST['name'], "", "");
-      } elseif (strcmp($_POST['action'], 'search_by_file_hash') == 0) {
-          jirafeau_admin_list("", $_POST['hash'], "");
-      } elseif (strcmp($_POST['action'], 'search_link') == 0) {
-          jirafeau_admin_list("", "", $_POST['link']);
-      } elseif (strcmp($_POST['action'], 'delete_link') == 0) {
-          jirafeau_delete_link($_POST['link']);
-          echo '<div class="message">' . NL;
-          echo '<p>' . t('LINK_DELETED') . '</p></div>';
-      } elseif (strcmp($_POST['action'], 'delete_file') == 0) {
-          $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) {
-          $l = jirafeau_get_link($_POST['link']);
-          if (!count($l)) {
-              return;
-          }
-          $p = s2p($l['hash']);
-          header('Content-Length: ' . $l['file_size']);
-          header('Content-Type: ' . $l['mime_type']);
-          header('Content-Disposition: attachment; filename="' .
+    /* Check for actions */
+    if (isset($_POST['action'])) {
+        if (strcmp($_POST['action'], 'clean') == 0) {
+            $total = jirafeau_admin_clean();
+            echo '<div class="message">' . NL;
+            echo '<p>';
+            echo t('CLEANED_FILES_CNT') . ' : ' . $total;
+            echo '</p></div>';
+        } elseif (strcmp($_POST['action'], 'clean_async') == 0) {
+            $total = jirafeau_admin_clean_async();
+            echo '<div class="message">' . NL;
+            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) {
+            jirafeau_admin_list($_POST['name'], "", "");
+        } elseif (strcmp($_POST['action'], 'search_by_file_hash') == 0) {
+            jirafeau_admin_list("", $_POST['hash'], "");
+        } elseif (strcmp($_POST['action'], 'search_link') == 0) {
+            jirafeau_admin_list("", "", $_POST['link']);
+        } elseif (strcmp($_POST['action'], 'delete_link') == 0) {
+            jirafeau_delete_link($_POST['link']);
+            echo '<div class="message">' . NL;
+            echo '<p>' . t('LINK_DELETED') . '</p></div>';
+        } elseif (strcmp($_POST['action'], 'delete_file') == 0) {
+            $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) {
+            $l = jirafeau_get_link($_POST['link']);
+            if (!count($l)) {
+                return;
+            }
+            $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['hash'])) {
-              $r = fopen(VAR_FILES . $p . $l['hash'], 'r');
-              while (!feof($r)) {
-                  print fread($r, 1024);
-                  ob_flush();
-              }
-              fclose($r);
-          }
-          exit;
-      }
-  }
+            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;
+        } elseif (strcmp($_POST['action'], 'bug_report_info') == 0) {
+            echo jirafeau_admin_bug_report($cfg);
+        }
+    }
 
     require(JIRAFEAU_ROOT.'lib/template/footer.php');
+} else {
+    require(JIRAFEAU_ROOT . 'lib/template/header.php');
+    jirafeau_fatal_error(t('ACCESS_KO'), $cfg);
 }
 ?>