admin.php: fix authentication bypass vulnerability

[jirafeau_mojo42.git] / admin.php

diff --git a/admin.php b/admin.php
old mode 100755 (executable)
new mode 100644 (file)
index 7aceff9..a0ae04b
--- a/admin.php
+++ b/admin.php
@@ -1,7 +1,7 @@
 <?php
 /*
  *  Jirafeau, your web file repository
 <?php
 /*
  *  Jirafeau, your web file repository

- *  Copyright (C) 2012  Jerome Jutteau <j.jutteau@gmail.com>
+ *  Copyright (C) 2015  Jerome Jutteau <j.jutteau@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


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

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


@@ -32,23 +32,12 @@ if (file_exists (JIRAFEAU_ROOT . 'install.php')
     exit;
 }
 
     exit;
 }
 

-/* Check if the install.php script is still in the directory. */
-if (file_exists (JIRAFEAU_ROOT . 'install.php'))
-{
-    require (JIRAFEAU_ROOT . 'lib/template/header.php');
-    echo '<div class="error"><p>'.
-         _('Installer script still present') .
-         '</p></div>';
-    require (JIRAFEAU_ROOT.'lib/template/footer.php');
-    exit;
-}
-

 /* Disable admin interface if we have a empty admin password. */
 /* Disable admin interface if we have a empty admin password. */

-if (!$cfg['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>'.
 {
     require (JIRAFEAU_ROOT . 'lib/template/header.php');
     echo '<div class="error"><p>'.

-         _('Sorry, the admin interface is not enabled.') .
+         t('Sorry, the admin interface is not enabled.') .

          '</p></div>';
     require (JIRAFEAU_ROOT.'lib/template/footer.php');
     exit;
          '</p></div>';
     require (JIRAFEAU_ROOT.'lib/template/footer.php');
     exit;


@@ -61,23 +50,24 @@ session_start();
 if (isset ($_POST['action']) && (strcmp ($_POST['action'], 'logout') == 0))
     $_SESSION['admin_auth'] = false;
 
 if (isset ($_POST['action']) && (strcmp ($_POST['action'], 'logout') == 0))
     $_SESSION['admin_auth'] = false;
 

-/* Check password. */
-if (isset ($_POST['admin_password']))
+/* Check classic admin password authentification. */
+if (isset ($_POST['admin_password']) && empty($cfg['admin_http_auth_user']))

 {
 {

-    if (strcmp ($cfg['admin_password'], $_POST['admin_password']) == 0)
+    if ($cfg['admin_password'] === $_POST['admin_password'])

         $_SESSION['admin_auth'] = true;
     else
     {
         $_SESSION['admin_auth'] = false;
         require (JIRAFEAU_ROOT . 'lib/template/header.php');
         echo '<div class="error"><p>'.
         $_SESSION['admin_auth'] = true;
     else
     {
         $_SESSION['admin_auth'] = false;
         require (JIRAFEAU_ROOT . 'lib/template/header.php');
         echo '<div class="error"><p>'.

-             _('Wrong password.') . '</p></div>';
+             t('Wrong password.') . '</p></div>';

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

-/* Ask for password. */
-elseif (!isset ($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true)
+/* 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">
 {
     require (JIRAFEAU_ROOT . 'lib/template/header.php'); ?>
     <form action = "<?php echo basename(__FILE__); ?>" method = "post">


@@ -85,7 +75,7 @@ elseif (!isset ($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true)
         <table>
         <tr>
             <td class = "label"><label for = "enter_password">
         <table>
         <tr>
             <td class = "label"><label for = "enter_password">

-            <?php echo _('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"


@@ -96,7 +86,7 @@ elseif (!isset ($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true)
             <td></td>
             <td class = "nav next">
             <input type = "submit" name = "key" value =
             <td></td>
             <td class = "nav next">
             <input type = "submit" name = "key" value =

-            "<?php echo _('Login'); ?>" />
+            "<?php echo t('Login'); ?>" />

             </td>
         </tr>
         </table>
             </td>
         </tr>
         </table>


@@ -106,25 +96,64 @@ elseif (!isset ($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true)
     require (JIRAFEAU_ROOT.'lib/template/footer.php');
     exit;
 }
     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('Sorry, you are not authenticated on admin interface.') .
+         '</p></div>';
+        require (JIRAFEAU_ROOT.'lib/template/footer.php');
+        exit;
+}

 
 

-/* Admin interface. */
-require (JIRAFEAU_ROOT . 'lib/template/header.php');
-?><h2><?php echo _('Admin interface'); ?></h2><?php
+/* 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. */
+/* Show admin interface if not downloading a file. */
+if (!(isset ($_POST['action']) && strcmp ($_POST['action'], 'download') == 0))

 {
 {

-        ?><div id = "install">
-        <fieldset><legend><?php echo _('Actions');?></legend>
+        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">
+        <fieldset><legend><?php echo t('Actions');?></legend>

         <table>
         <form action = "<?php echo basename(__FILE__); ?>" method = "post">
         <tr>
             <input type = "hidden" name = "action" value = "clean"/>
             <td class = "info">
         <table>
         <form action = "<?php echo basename(__FILE__); ?>" method = "post">
         <tr>
             <input type = "hidden" name = "action" value = "clean"/>
             <td class = "info">

-                <?php echo _('Clean expired files'); ?>
+                <?php echo t('Clean expired files'); ?>

             </td>
             <td></td>
             <td>
             </td>
             <td></td>
             <td>

-                <input type = "submit" value = "<?php echo _('Clean'); ?>" />
+                <input type = "submit" value = "<?php echo t('Clean'); ?>" />
+            </td>
+        </tr>
+        </form>
+        <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+        <tr>
+            <input type = "hidden" name = "action" value = "clean_async"/>
+            <td class = "info">
+                <?php echo t('Clean old unfinished transfers'); ?>
+            </td>
+            <td></td>
+            <td>
+                <input type = "submit" value = "<?php echo t('Clean'); ?>" />

             </td>
         </tr>
         </form>
             </td>
         </tr>
         </form>


@@ -132,11 +161,11 @@ require (JIRAFEAU_ROOT . 'lib/template/header.php');
         <tr>
             <input type = "hidden" name = "action" value = "list"/>
             <td class = "info">
         <tr>
             <input type = "hidden" name = "action" value = "list"/>
             <td class = "info">

-                <?php echo _('List all files'); ?>
+                <?php echo t('List all files'); ?>

             </td>
             <td></td>
             <td>
             </td>
             <td></td>
             <td>

-                <input type = "submit" value = "<?php echo _('List'); ?>" />
+                <input type = "submit" value = "<?php echo t('List'); ?>" />

             </td>
         </tr>
         </form>
             </td>
         </tr>
         </form>


@@ -144,13 +173,13 @@ require (JIRAFEAU_ROOT . 'lib/template/header.php');
         <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">

-                <?php echo _('Search files by name'); ?>
+                <?php echo t('Search files by name'); ?>

             </td>
             <td>
                 <input type = "text" name = "name" id = "name"/>
             </td>
             <td>
             </td>
             <td>
                 <input type = "text" name = "name" id = "name"/>
             </td>
             <td>

-                <input type = "submit" value = "<?php echo _('Search'); ?>" />
+                <input type = "submit" value = "<?php echo t('Search'); ?>" />

             </td>
         </tr>
         </form>
             </td>
         </tr>
         </form>


@@ -158,13 +187,13 @@ require (JIRAFEAU_ROOT . 'lib/template/header.php');
         <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">

-                <?php echo _('Search files by file hash'); ?>
+                <?php echo t('Search files by file hash'); ?>

             </td>
             <td>
                 <input type = "text" name = "hash" id = "hash"/>
             </td>
             <td>
             </td>
             <td>
                 <input type = "text" name = "hash" id = "hash"/>
             </td>
             <td>

-                <input type = "submit" value = "<?php echo _('Search'); ?>" />
+                <input type = "submit" value = "<?php echo t('Search'); ?>" />

             </td>
         </tr>
         </form>
             </td>
         </tr>
         </form>


@@ -172,20 +201,20 @@ require (JIRAFEAU_ROOT . 'lib/template/header.php');
         <tr>
             <input type = "hidden" name = "action" value = "search_link"/>
             <td class = "info">
         <tr>
             <input type = "hidden" name = "action" value = "search_link"/>
             <td class = "info">

-                <?php echo _('Search a specific link'); ?>
+                <?php echo t('Search a specific link'); ?>

             </td>
             <td>
                 <input type = "text" name = "link" id = "link"/>
             </td>
             <td>
             </td>
             <td>
                 <input type = "text" name = "link" id = "link"/>
             </td>
             <td>

-                <input type = "submit" value = "<?php echo _('Search'); ?>" />
+                <input type = "submit" value = "<?php echo t('Search'); ?>" />

             </td>
         </tr>
         </form>
         </table>
         <form action = "<?php echo basename(__FILE__); ?>" method = "post">
             </td>
         </tr>
         </form>
         </table>
         <form action = "<?php echo basename(__FILE__); ?>" method = "post">

-        <input type = "hidden" name = "action" value = "logout"/>
-        <input type = "submit" value = "<?php echo _('Logout'); ?>" />
+            <input type = "hidden" name = "action" value = "logout" />
+            <input type = "submit" value = "<?php echo t('Logout'); ?>" />

         </form>
         </fieldset></div><?php
 }
         </form>
         </fieldset></div><?php
 }


@@ -198,7 +227,15 @@ if (isset ($_POST['action']))
         $total = jirafeau_admin_clean ();
         echo '<div class="message">' . NL;
         echo '<p>';
         $total = jirafeau_admin_clean ();
         echo '<div class="message">' . NL;
         echo '<p>';

-        echo _('Number of cleaned files') . ' : ' . $total;
+        echo t('Number of cleaned files') . ' : ' . $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('Number of cleaned files') . ' : ' . $total;

         echo '</p></div>';
     }
     elseif (strcmp ($_POST['action'], 'list') == 0)
         echo '</p></div>';
     }
     elseif (strcmp ($_POST['action'], 'list') == 0)


@@ -219,18 +256,32 @@ if (isset ($_POST['action']))
     }
     elseif (strcmp ($_POST['action'], 'delete_link') == 0)
     {
     }
     elseif (strcmp ($_POST['action'], 'delete_link') == 0)
     {

-        jirafeau_delete ($_POST['link']);
+        jirafeau_delete_link ($_POST['link']);

         echo '<div class="message">' . NL;
         echo '<div class="message">' . NL;

-        echo '<p>' . _('Link deleted') . '</p></div>';
+        echo '<p>' . t('Link deleted') . '</p></div>';

     }
     elseif (strcmp ($_POST['action'], 'delete_file') == 0)
     {
         $count = jirafeau_delete_file ($_POST['md5']);
         echo '<div class="message">' . NL;
     }
     elseif (strcmp ($_POST['action'], 'delete_file') == 0)
     {
         $count = jirafeau_delete_file ($_POST['md5']);
         echo '<div class="message">' . NL;

-        echo '<p>' . _('Deleted links') . ' : ' . $count . '</p></div>';
+        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['md5']);
+        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']);
+        exit;

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

-?>
\ No newline at end of file
+?>