[BUGFIX] Add CSRF protection for admin

Signed-off-by: Jerome Jutteau <mojo@couak.net>

diff --git a/admin.php b/admin.php
index 4500a1922769671ff116d6251b4936b3726685f9..d3a069cc74e221ec6b0e067fe7032555cf7bcc8b 100644 (file)
--- a/admin.php
+++ b/admin.php
@@ -53,72 +53,58 @@ if (php_sapi_name() == "cli") {
   }
 
   /* Unlog if asked. */
   }
 
   /* 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'] === $_POST['admin_password'] ||
+              $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>
+                  <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;
       }
   }
           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.
 
   /* Operations may take a long time.
    * Be sure PHP's safe mode is off.


@@ -138,6 +124,7 @@ if (php_sapi_name() == "cli") {
           <form method="post">
           <tr>
               <input type = "hidden" name = "action" value = "clean"/>
           <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>
               <td class = "info">
                   <?php echo t('CLEAN_EXPIRED'); ?>
               </td>


@@ -150,6 +137,7 @@ if (php_sapi_name() == "cli") {
           <form method="post">
           <tr>
               <input type = "hidden" name = "action" value = "clean_async"/>
           <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>
               <td class = "info">
                   <?php echo t('CLEAN_INCOMPLETE'); ?>
               </td>


@@ -162,6 +150,7 @@ if (php_sapi_name() == "cli") {
           <form method="post">
           <tr>
               <input type = "hidden" name = "action" value = "list"/>
           <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>
               <td class = "info">
                   <?php echo t('LS_FILES'); ?>
               </td>


@@ -174,6 +163,7 @@ if (php_sapi_name() == "cli") {
           <form method="post">
           <tr>
               <input type = "hidden" name = "action" value = "search_by_name"/>
           <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>
               <td class = "info">
                   <?php echo t('SEARCH_NAME'); ?>
               </td>


@@ -188,6 +178,7 @@ if (php_sapi_name() == "cli") {
           <form method="post">
           <tr>
               <input type = "hidden" name = "action" value = "search_by_file_hash"/>
           <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>
               <td class = "info">
                   <?php echo t('SEARH_BY_HASH'); ?>
               </td>


@@ -202,8 +193,9 @@ if (php_sapi_name() == "cli") {
           <form method="post">
           <tr>
               <input type = "hidden" name = "action" value = "search_link"/>
           <form method="post">
           <tr>
               <input type = "hidden" name = "action" value = "search_link"/>

+              <?php echo jirafeau_admin_csrf_field() ?>

               <td class = "info">
               <td class = "info">

-                  <?php echo t('SEARCH'); ?>
+                  <?php echo t('SEARCH_LINK'); ?>

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


@@ -216,10 +208,10 @@ if (php_sapi_name() == "cli") {
           </table>
           <form method="post">
               <input type = "hidden" name = "action" value = "logout" />
           </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
               <input type = "submit" value = "<?php echo t('LOGOUT'); ?>" />
           </form>
           </fieldset></div><?php

-

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

diff --git a/lib/functions.php b/lib/functions.php
index 3a50eac828cc42fa58cb46e6c53d910371dbd3eb..9fa0e5edd90a99de3d7a936250bf307afa3115aa 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -628,16 +628,19 @@ function jirafeau_admin_list($name, $file_hash, $link_hash)
                 '<form method="post">' .
                 '<input type = "hidden" name = "action" value = "download"/>' .
                 '<input type = "hidden" name = "link" value = "' . $node . '"/>' .
                 '<form method="post">' .
                 '<input type = "hidden" name = "action" value = "download"/>' .
                 '<input type = "hidden" name = "link" value = "' . $node . '"/>' .

+                jirafeau_admin_csrf_field() .

                 '<input type = "submit" value = "' . t('DL') . '" />' .
                 '</form>' .
                 '<form method="post">' .
                 '<input type = "hidden" name = "action" value = "delete_link"/>' .
                 '<input type = "hidden" name = "link" value = "' . $node . '"/>' .
                 '<input type = "submit" value = "' . t('DL') . '" />' .
                 '</form>' .
                 '<form method="post">' .
                 '<input type = "hidden" name = "action" value = "delete_link"/>' .
                 '<input type = "hidden" name = "link" value = "' . $node . '"/>' .

+                jirafeau_admin_csrf_field() .

                 '<input type = "submit" value = "' . t('DEL_LINK') . '" />' .
                 '</form>' .
                 '<form method="post">' .
                 '<input type = "hidden" name = "action" value = "delete_file"/>' .
                 '<input type = "hidden" name = "md5" value = "' . $l['md5'] . '"/>' .
                 '<input type = "submit" value = "' . t('DEL_LINK') . '" />' .
                 '</form>' .
                 '<form method="post">' .
                 '<input type = "hidden" name = "action" value = "delete_file"/>' .
                 '<input type = "hidden" name = "md5" value = "' . $l['md5'] . '"/>' .

+                jirafeau_admin_csrf_field() .

                 '<input type = "submit" value = "' . t('DEL_FILE_LINKS') . '" />' .
                 '</form>' .
                 '</td>';
                 '<input type = "submit" value = "' . t('DEL_FILE_LINKS') . '" />' .
                 '</form>' .
                 '</td>';


@@ -1248,3 +1251,29 @@ function jirafeau_escape($string)
 {
     return htmlspecialchars($string, ENT_QUOTES);
 }
 {
     return htmlspecialchars($string, ENT_QUOTES);
 }

+
+function jirafeau_admin_session_start()
+{
+    $_SESSION['admin_auth'] = true;
+    $_SESSION['admin_csrf'] = md5(uniqid(mt_rand(), true));
+}
+
+function jirafeau_admin_session_end()
+{
+    $_SESSION = array();
+    session_destroy();
+}
+
+function jirafeau_admin_session_logged()
+{
+    return isset($_SESSION['admin_auth']) &&
+           isset($_SESSION['admin_csrf']) &&
+           isset($_POST['admin_csrf']) &&
+           $_SESSION['admin_auth'] === true &&
+           $_SESSION['admin_csrf'] === $_POST['admin_csrf'];
+}
+
+function jirafeau_admin_csrf_field()
+{
+    return "<input type='hidden' name='admin_csrf' value='". $_SESSION['admin_csrf'] . "'/>";
+}