- don't set password via remoting if field is empty

Marius Cramer

2015-08-06 37b29231e47a0c4458dc1c15d98588f16f07e1e2

 interface/web/login/password_reset.php

@@ -7,14 +7,14 @@
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

    * Redistributions of source code must retain the above copyright notice,
      this list of conditions and the following disclaimer.
    * Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
    * Neither the name of ISPConfig nor the names of its contributors
      may be used to endorse or promote products derived from this software without
      specific prior written permission.
   * Redistributions of source code must retain the above copyright notice,
     this list of conditions and the following disclaimer.
   * Redistributions in binary form must reproduce the above copyright notice,
     this list of conditions and the following disclaimer in the documentation
     and/or other materials provided with the distribution.
   * Neither the name of ISPConfig nor the names of its contributors
     may be used to endorse or promote products derived from this software without
     specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -26,10 +26,15 @@
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 */

require_once '../../lib/config.inc.php';
require_once '../../lib/app.inc.php';

$app->load('getconf');

$security_config = $app->getconf->get_security_config('permissions');
if($security_config['password_reset_allowed'] != 'yes') die('Password reset function has been disabled.');

// Loading the template
$app->uses('tpl');
@@ -46,39 +51,45 @@
   if(!preg_match("/^[\w\.\-\_]{1,64}$/", $_POST['username'])) die($app->lng('user_regex_error'));
   if(!preg_match("/^\w+[\w.-]*\w+@\w+[\w.-]*\w+\.[a-z]{2,10}$/i", $_POST['email'])) die($app->lng('email_error'));

   $username = $app->db->quote($_POST['username']);
   $email = $app->db->quote($_POST['email']);
   $username = $_POST['username'];
   $email = $_POST['email'];

   $client = $app->db->queryOneRecord("SELECT * FROM client WHERE username = '$username' AND email = '$email'");
   $client = $app->db->queryOneRecord("SELECT client.*, sys_user.lost_password_function FROM client,sys_user WHERE client.username = ? AND client.email = ? AND client.client_id = sys_user.client_id", $username, $email);

   if($client['client_id'] > 0) {
      $new_password = $app->auth->get_random_password();
      $new_password_encrypted = $app->auth->crypt_password($new_password);
      $new_password_encrypted = $app->db->quote($new_password_encrypted);

      $username = $app->db->quote($client['username']);
      $app->db->query("UPDATE sys_user SET passwort = '$new_password_encrypted' WHERE username = '$username'");
      $app->db->query("UPDATE client SET password = '$new_password_encrypted' WHERE username = '$username'");
      $app->tpl->setVar("message", $wb['pw_reset']);

      $app->uses('getconf,ispcmail');
      $mail_config = $app->getconf->get_global_config('mail');
      if($mail_config['smtp_enabled'] == 'y') {
         $mail_config['use_smtp'] = true;
         $app->ispcmail->setOptions($mail_config);
      }
      $app->ispcmail->setSender($mail_config['admin_mail'], $mail_config['admin_name']);
      $app->ispcmail->setSubject($wb['pw_reset_mail_title']);
      $app->ispcmail->setMailText($wb['pw_reset_mail_msg'].$new_password);
      $app->ispcmail->send(array($client['contact_name'] => $client['email']));
      $app->ispcmail->finish();

      $app->plugin->raiseEvent('password_reset', true);
      $app->tpl->setVar("msg", $wb['pw_reset']);
   if($client['lost_password_function'] == 0) {
      $app->tpl->setVar("error", $wb['lost_password_function_disabled_txt']);
   } else {
      $app->tpl->setVar("error", $wb['pw_error']);
   }
      if($client['client_id'] > 0) {
         $server_config_array = $app->getconf->get_global_config();
         $min_password_length = 8;
         if(isset($server_config_array['misc']['min_password_length'])) $min_password_length = $server_config_array['misc']['min_password_length'];
			
         $new_password = $app->auth->get_random_password($min_password_length, true);
         $new_password_encrypted = $app->auth->crypt_password($new_password);

         $username = $client['username'];
         $app->db->query("UPDATE sys_user SET passwort = ? WHERE username = ?", $new_password_encrypted, $username);
         $app->db->query("UPDATE client SET password = ? WHERE username = ?", $new_password_encrypted, $username);
         $app->tpl->setVar("message", $wb['pw_reset']);

         $app->uses('getconf,ispcmail');
         $mail_config = $server_config_array['mail'];
         if($mail_config['smtp_enabled'] == 'y') {
            $mail_config['use_smtp'] = true;
            $app->ispcmail->setOptions($mail_config);
         }
         $app->ispcmail->setSender($mail_config['admin_mail'], $mail_config['admin_name']);
         $app->ispcmail->setSubject($wb['pw_reset_mail_title']);
         $app->ispcmail->setMailText($wb['pw_reset_mail_msg'].$new_password);
         $app->ispcmail->send(array($client['contact_name'] => $client['email']));
         $app->ispcmail->finish();

         $app->plugin->raiseEvent('password_reset', true);
         $app->tpl->setVar("msg", $wb['pw_reset']);
      } else {
         $app->tpl->setVar("error", $wb['pw_error']);
      }
   }
} else {
   $app->tpl->setVar("msg", $wb['pw_error_noinput']);
}