Merge branch 'bug_admin_download_encrypted' into 'next-release'

[jirafeau_project.git] / admin.php

diff --git a/admin.php b/admin.php
index 7974ce6f5cb145c55e8b3fb3b516564c546be071..a6bacd337f379507b8d242f27b0f68fd6623aea6 100644 (file)
--- a/admin.php
+++ b/admin.php
@@ -1,7 +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) 2015  Jerome Jutteau <jerome@jutteau.fr>
  *  Copyright (C) 2015  Jerome Jutteau <jerome@jutteau.fr>

+ *  Copyright (C) 2024  Jirafeau project <https://gitlab.com/jirafeau> (see AUTHORS.md)

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


@@ -14,7 +16,7 @@
  *  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/>.

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


@@ -44,7 +46,8 @@ if (php_sapi_name() == "cli") {
     } else {
         die("No command found. Should be admin.php <clean_expired|clean_async>.\n");
     }
     } else {
         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');
     /* 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');


@@ -55,18 +58,19 @@ if (php_sapi_name() == "cli") {
         exit;
     }
 
         exit;
     }
 

-    /* Unlog if asked. */
+    /* Logout if requested. */

     if (jirafeau_admin_session_logged() && isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
     if (jirafeau_admin_session_logged() && isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {

-        jirafeau_admin_session_end();
+        jirafeau_session_end();

     }
 
     if (!jirafeau_admin_session_logged()) {
     }
 
     if (!jirafeau_admin_session_logged()) {

-        /* Test HTTP authentification. */
+        /* Test HTTP authentication. */

         if (!empty($cfg['admin_http_auth_user']) &&
         if (!empty($cfg['admin_http_auth_user']) &&

-          $cfg['admin_http_auth_user'] == $_SERVER['PHP_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();
         }
             jirafeau_admin_session_start();
         }

-        /* Test web password authentification. */
+        /* 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();
         elseif (!empty($cfg['admin_password']) && isset($_POST['admin_password'])) {
             if ($cfg['admin_password'] === hash('sha256', $_POST['admin_password'])) {
                 jirafeau_admin_session_start();


@@ -91,7 +95,7 @@ if (php_sapi_name() == "cli") {
               <tr>
                   <td class = "field"><input type = "password"
                   name = "admin_password" id = "admin_password"
               <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">
                   </td>
               </tr>
               <tr class = "nav">


@@ -117,9 +121,13 @@ if (php_sapi_name() == "cli") {
     /* 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
     /* 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
+        ?><h2>(version <?php echo JIRAFEAU_VERSION ?>)</h2><?php
+
+        if ($cfg['enable_crypt'] && !(extension_loaded('sodium'))) {
+            echo '<div class="error"><p>'.t('SODIUM_UNAVAILABLE').'</p></div>';
+        }

 
 

-          ?><div id = "admin">
+        ?><div id = "admin">

           <fieldset><legend><?php echo t('ACTIONS'); ?></legend>
           <table>
           <form method="post">
           <fieldset><legend><?php echo t('ACTIONS'); ?></legend>
           <table>
           <form method="post">


@@ -301,5 +309,8 @@ if (php_sapi_name() == "cli") {
     }
 
     require(JIRAFEAU_ROOT.'lib/template/footer.php');
     }
 
     require(JIRAFEAU_ROOT.'lib/template/footer.php');

+} else {
+    require(JIRAFEAU_ROOT . 'lib/template/header.php');
+    jirafeau_fatal_error(t('ACCESS_KO'), $cfg);

 }
 ?>
 }
 ?>