[BUGFIX] fix broken password auth and deny access

[jirafeau_mojo42.git] / admin.php

diff --git a/admin.php b/admin.php
index 62fd5eee86eacbc8b3c9a7eb9adc30b6a5e00387..230c512954dabe8c54dfc0a14ea53c511e240d57 100644 (file)
--- a/admin.php
+++ b/admin.php
@@ -17,46 +17,38 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
+define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');

 
 

-require (JIRAFEAU_ROOT . 'lib/config.original.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');

 
 /* Check if installation is OK. */
 
 /* Check if installation is OK. */

-if (file_exists (JIRAFEAU_ROOT . 'install.php')
-    && !file_exists (JIRAFEAU_ROOT . 'lib/config.local.php'))
-{
+if (file_exists(JIRAFEAU_ROOT . 'install.php')
+    && !file_exists(JIRAFEAU_ROOT . 'lib/config.local.php')) {

     header('Location: install.php');
     exit;
 }
 
 /* If called from CLI, no password or graphical interface */
 if (php_sapi_name() == "cli") {
     header('Location: install.php');
     exit;
 }
 
 /* If called from CLI, no password or graphical interface */
 if (php_sapi_name() == "cli") {

-     if ((count($argv)>1) && $argv[1]=="clean_expired") {
-          $total = jirafeau_admin_clean ();
-          echo "$total expired files deleted.";
-     }
-     elseif ((count($argv)>1) && $argv[1]=="clean_async") {
-          $total = jirafeau_admin_clean_async ();
-          echo "$total old unfinished transfers deleted.";
-     }
-     else
-     {
-          die("No command found. Should be admin.php <clean_expired|clean_async>.");
-     }
-}
-else
-{
-  /* 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');
+    if ((count($argv)>1) && $argv[1]=="clean_expired") {
+        $total = jirafeau_admin_clean();
+        echo "$total expired files deleted.";
+    } elseif ((count($argv)>1) && $argv[1]=="clean_async") {
+        $total = jirafeau_admin_clean_async();
+        echo "$total old unfinished transfers deleted.";
+    } else {
+        die("No command found. Should be admin.php <clean_expired|clean_async>.");
+    }
+} else {
+    /* 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>'.
            t('Sorry, the admin interface is not enabled.') .
            '</p></div>';
       echo '<div class="error"><p>'.
            t('Sorry, the admin interface is not enabled.') .
            '</p></div>';

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

       exit;
   }
 
       exit;
   }
 


@@ -64,35 +56,34 @@ else
   session_start();
 
   /* Unlog if asked. */
   session_start();
 
   /* Unlog if asked. */

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

       $_SESSION['admin_auth'] = false;
       $_SESSION['admin_auth'] = false;

+  }

 
   /* Check classic admin password authentification. */
 
   /* Check classic admin password authentification. */

-  if (isset ($_POST['admin_password']) && empty($cfg['admin_http_auth_user']))
-  {
-      if ($cfg['admin_password'] === $_POST['admin_password'])
+  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;
           $_SESSION['admin_auth'] = true;

-      else
-      {
+      } else {

           $_SESSION['admin_auth'] = false;
           $_SESSION['admin_auth'] = false;

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

           echo '<div class="error"><p>'.
                t('Wrong password.') . '</p></div>';
           echo '<div class="error"><p>'.
                t('Wrong password.') . '</p></div>';

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

           exit;
       }
   }
   /* Ask for classic admin password authentification. */
           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 action = "<?php echo basename(__FILE__); ?>" method = "post">
+  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">

       <fieldset>
           <table>
           <tr>
               <td class = "label"><label for = "enter_password">
       <fieldset>
           <table>
           <tr>
               <td class = "label"><label for = "enter_password">

-              <?php echo t('Administration password') . ':';?></label>
+              <?php echo t('Administration password') . ':'; ?></label>

               </td>
               <td class = "field"><input type = "password"
               name = "admin_password" id = "admin_password"
               </td>
               <td class = "field"><input type = "password"
               name = "admin_password" id = "admin_password"


@@ -110,27 +101,26 @@ else
       </fieldset>
       </form>
       <?php
       </fieldset>
       </form>
       <?php

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

       exit;
   }
   /* Check authenticated user if HTTP authentification is enable. */
       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'])
+  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;
           $_SESSION['admin_auth'] = true;

+      }

   }
 
   /* Be sure that no one can access further without admin_auth. */
   }
 
   /* 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>'.
+  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('Sorry, you are not authenticated on admin interface.') .
            '</p></div>';
            t('Sorry, you are not authenticated on admin interface.') .
            '</p></div>';

-          require (JIRAFEAU_ROOT.'lib/template/footer.php');
-          exit;
+      require(JIRAFEAU_ROOT.'lib/template/footer.php');
+      exit;

   }
 
   /* Operations may take a long time.
   }
 
   /* Operations may take a long time.


@@ -141,16 +131,14 @@ else
   @error_reporting(0);
 
   /* Show admin interface if not downloading a file. */
   @error_reporting(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
+  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">
           ?><h2>(version <?php echo JIRAFEAU_VERSION ?>)</h2><?php
 
           ?><div id = "admin">

-          <fieldset><legend><?php echo t('Actions');?></legend>
+          <fieldset><legend><?php echo t('Actions'); ?></legend>

           <table>
           <table>

-          <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+          <form method="post">

           <tr>
               <input type = "hidden" name = "action" value = "clean"/>
               <td class = "info">
           <tr>
               <input type = "hidden" name = "action" value = "clean"/>
               <td class = "info">


@@ -162,7 +150,7 @@ else
               </td>
           </tr>
           </form>
               </td>
           </tr>
           </form>

-          <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+          <form method="post">

           <tr>
               <input type = "hidden" name = "action" value = "clean_async"/>
               <td class = "info">
           <tr>
               <input type = "hidden" name = "action" value = "clean_async"/>
               <td class = "info">


@@ -174,7 +162,7 @@ else
               </td>
           </tr>
           </form>
               </td>
           </tr>
           </form>

-          <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+          <form method="post">

           <tr>
               <input type = "hidden" name = "action" value = "list"/>
               <td class = "info">
           <tr>
               <input type = "hidden" name = "action" value = "list"/>
               <td class = "info">


@@ -186,7 +174,7 @@ else
               </td>
           </tr>
           </form>
               </td>
           </tr>
           </form>

-          <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+          <form method="post">

           <tr>
               <input type = "hidden" name = "action" value = "search_by_name"/>
               <td class = "info">
           <tr>
               <input type = "hidden" name = "action" value = "search_by_name"/>
               <td class = "info">


@@ -200,7 +188,7 @@ else
               </td>
           </tr>
           </form>
               </td>
           </tr>
           </form>

-          <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+          <form method="post">

           <tr>
               <input type = "hidden" name = "action" value = "search_by_file_hash"/>
               <td class = "info">
           <tr>
               <input type = "hidden" name = "action" value = "search_by_file_hash"/>
               <td class = "info">


@@ -214,7 +202,7 @@ else
               </td>
           </tr>
           </form>
               </td>
           </tr>
           </form>

-          <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+          <form method="post">

           <tr>
               <input type = "hidden" name = "action" value = "search_link"/>
               <td class = "info">
           <tr>
               <input type = "hidden" name = "action" value = "search_link"/>
               <td class = "info">


@@ -229,76 +217,61 @@ else
           </tr>
           </form>
           </table>
           </tr>
           </form>
           </table>

-          <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+          <form method="post">

               <input type = "hidden" name = "action" value = "logout" />
               <input type = "submit" value = "<?php echo t('Logout'); ?>" />
           </form>
           </fieldset></div><?php
               <input type = "hidden" name = "action" value = "logout" />
               <input type = "submit" value = "<?php echo t('Logout'); ?>" />
           </form>
           </fieldset></div><?php

+

   }
 
   /* Check for actions */
   }
 
   /* Check for actions */

-  if (isset ($_POST['action']))
-  {
-      if (strcmp ($_POST['action'], 'clean') == 0)
-      {
-          $total = jirafeau_admin_clean ();
+  if (isset($_POST['action'])) {
+      if (strcmp($_POST['action'], 'clean') == 0) {
+          $total = jirafeau_admin_clean();

           echo '<div class="message">' . NL;
           echo '<p>';
           echo t('Number of cleaned files') . ' : ' . $total;
           echo '</p></div>';
           echo '<div class="message">' . NL;
           echo '<p>';
           echo t('Number of cleaned files') . ' : ' . $total;
           echo '</p></div>';

-      }
-      elseif (strcmp ($_POST['action'], 'clean_async') == 0)
-      {
-          $total = jirafeau_admin_clean_async ();
+      } elseif (strcmp($_POST['action'], 'clean_async') == 0) {
+          $total = jirafeau_admin_clean_async();

           echo '<div class="message">' . NL;
           echo '<p>';
           echo t('Number of cleaned files') . ' : ' . $total;
           echo '</p></div>';
           echo '<div class="message">' . NL;
           echo '<p>';
           echo t('Number of cleaned files') . ' : ' . $total;
           echo '</p></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']);
+      } 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>';
           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']);
+      } elseif (strcmp($_POST['action'], 'delete_file') == 0) {
+          $count = jirafeau_delete_file($_POST['md5']);

           echo '<div class="message">' . NL;
           echo '<p>' . t('Deleted links') . ' : ' . $count . '</p></div>';
           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))
+      } elseif (strcmp($_POST['action'], 'download') == 0) {
+          $l = jirafeau_get_link($_POST['link']);
+          if (!count($l)) {

               return;
               return;

-          $p = s2p ($l['md5']);
-          header ('Content-Length: ' . $l['file_size']);
-          header ('Content-Type: ' . $l['mime_type']);
-          header ('Content-Disposition: attachment; filename="' .
+          }
+          $p = s2p($l['md5']);
+          header('Content-Length: ' . $l['file_size']);
+          header('Content-Type: ' . $l['mime_type']);
+          header('Content-Disposition: attachment; filename="' .

                   $l['file_name'] . '"');
                   $l['file_name'] . '"');

-          if (file_exists(VAR_FILES . $p . $l['md5']))
-              readfile (VAR_FILES . $p . $l['md5']);
+          if (file_exists(VAR_FILES . $p . $l['md5'])) {
+              readfile(VAR_FILES . $p . $l['md5']);
+          }

           exit;
       }
   }
 
           exit;
       }
   }
 

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

 }
 ?>
 }
 ?>