From 3ebac0167bf20104fb7a2a55934765117760264c Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 18 Aug 2014 03:53:18 -0400
Subject: [PATCH] Only add zen-mode text labels in compose step
---
plugins/password/password.php | 570 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 339 insertions(+), 231 deletions(-)
diff --git a/plugins/password/password.php b/plugins/password/password.php
index 1ff755b..0db57af 100644
--- a/plugins/password/password.php
+++ b/plugins/password/password.php
@@ -1,262 +1,370 @@
<?php
/**
- * Change Password
+ * Password Plugin for Roundcube
*
- * Plugin that adds a possibility to change password using a database
- * (Settings -> Password tab)
+ * @version @package_version@
+ * @author Aleksander Machniak <alec@alec.pl>
*
- * @version 1.1
- * @author Aleksander 'A.L.E.C' Machniak
- * @editor Daniel Black
+ * Copyright (C) 2005-2013, The Roundcube Dev Team
*
- * Configuration Items (config/main.inc.php):
- * password_confirm_current - boolean to determine whether current password
- * is required to change password. Defaults to FALSE.
- * db_passwd_dsn - is the PEAR database DSN for performing the query. Defaults
- * to the default databse setting in config/db.inc.php
- * password_query - the SQL query used to change the password.
- * If the SQL query is a SELECT it will return an error message in a row if unsuccessful
- * If the SQL query is a UPDATE it will update a single row only.
- * An UPDATE where zero rows changed will be inteperated to be a wrong username/password
- * More than one row changed will be inteperated as an internal error
- * The query can contain the following macros that will be expanded as follows:
- * %p is replaced with the plaintext new password
- * %c is replaced with the crypt version of the new password, MD5 if available
- * otherwise DES.
- * %u is replaced with the username (from the session info)
- * %o is replaced with the password before the change
- * %h is replaced with the imap host (from the session info)
- * Escaping of macros is handled by this module.
- * Defaults to "SELECT update_passwd(%c, %u)"
- * To use this you need to define the update_passwd function in your
- * database.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
- * Example SQL queries:
- * These will typically need to define a function to change the password:
- *
- * Example implementations of an update_passwd function:
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * This is for use with LMS (http://lms.org.pl) database and postgres:
- * CREATE OR REPLACE FUNCTION update_passwd(hash text, account text) RETURNS integer AS $$
- * DECLARE
- * res integer;
- * BEGIN
- * UPDATE passwd SET password = hash
- * WHERE login = split_part(account, '@', 1)
- * AND domainid = (SELECT id FROM domains WHERE name = split_part(account, '@', 2))
- * RETURNING id INTO res;
- * RETURN res;
- * END;
- * $$ LANGUAGE plpgsql SECURITY DEFINER;
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ */
+
+define('PASSWORD_CRYPT_ERROR', 1);
+define('PASSWORD_ERROR', 2);
+define('PASSWORD_CONNECT_ERROR', 3);
+define('PASSWORD_SUCCESS', 0);
+
+/**
+ * Change password plugin
*
- * This is for use with a SELECT update_passwd(%o,%c,%u) query
- * Uupdates the password only when the old password matches the MD5 password in the database
- * CREATE FUNCTION update_password (oldpass text, cryptpass text, user text) RETURNS text
- * MODIFIES SQL DATA
- * BEGIN
- * DECLARE currentsalt varchar(20);
- * DECLARE error text;
- * SET error = 'incorrect current password';
- * SELECT substring_index(substr(user.password,4),_latin1'$',1) INTO currentsalt FROM users WHERE username=user;
- * SELECT '' INTO error FROM users WHERE username=user AND password=ENCRYPT(oldpass,currentsalt);
- * UPDATE users SET password=cryptpass WHERE username=user AND password=ENCRYPT(oldpass,currentsalt);
- * RETURN error;
- * END
+ * Plugin that adds functionality to change a users password.
+ * It provides common functionality and user interface and supports
+ * several backends to finally update the password.
*
- * Example SQL UPDATEs:
- *
- * Plain text passwords:
- * UPDATE users SET password=%p WHERE username=%u AND password=%o AND domain=%h LIMIT 1
- *
- * Crypt text passwords:
- * UPDATE users SET password=%c WHERE username=%u LIMIT 1
+ * For installation and configuration instructions please read the README file.
*
- * Use a MYSQL crypt function (*nix only) with random 8 character salt
- * UPDATE users SET password=ENCRYPT(%p,concat(_utf8'$1$',right(md5(rand()),8),_utf8'$')) WHERE username=%u LIMIT 1
- *
- * MD5 stored passwords:
- * UPDATE users SET password=MD5(%p) WHERE username=%u AND password=MD5(%o) LIMIT 1
- *
+ * @author Aleksander Machniak
*/
class password extends rcube_plugin
{
- public $task = 'settings';
+ public $task = 'settings|login';
+ public $noframe = true;
+ public $noajax = true;
- function init()
- {
- $rcmail = rcmail::get_instance();
- // add Tab label
- $rcmail->output->add_label('password');
- $this->register_action('plugin.password', array($this, 'password_init'));
- $this->register_action('plugin.password-save', array($this, 'password_save'));
- $this->register_handler('plugin.body', array($this, 'password_form'));
- $this->include_script('password.js');
- }
+ private $newuser = false;
- function password_init()
- {
- $this->add_texts('localization/');
- rcmail::get_instance()->output->send('plugin');
- }
-
- function password_save()
- {
- $rcmail = rcmail::get_instance();
+ function init()
+ {
+ $rcmail = rcmail::get_instance();
- $confirm = $this->_confirm($rcmail->config);
- $this->add_texts('localization/');
+ $this->load_config();
- if (($confirm && !isset($_POST['_curpasswd'])) || !isset($_POST['_newpasswd']))
- $rcmail->output->command('display_message', $this->gettext('nopassword'), 'error');
- else {
- $curpwd = get_input_value('_curpasswd', RCUBE_INPUT_POST);
- $newpwd = get_input_value('_newpasswd', RCUBE_INPUT_POST);
+ if ($rcmail->task == 'settings') {
+ if (!$this->check_host_login_exceptions()) {
+ return;
+ }
- if ($confirm && $_SESSION['password'] != $rcmail->encrypt_passwd($curpwd))
- $rcmail->output->command('display_message', $this->gettext('passwordincorrect'), 'error');
- else if (!($res = $this->_save($curpwd,$newpwd))) {
- $rcmail->output->command('display_message', $this->gettext('successfullysaved'), 'confirmation');
- $_SESSION['password'] = $rcmail->encrypt_passwd($newpwd);
- } else
- $rcmail->output->command('display_message', $res, 'error');
+ $this->add_texts('localization/');
+
+ $this->add_hook('settings_actions', array($this, 'settings_actions'));
+
+ $this->register_action('plugin.password', array($this, 'password_init'));
+ $this->register_action('plugin.password-save', array($this, 'password_save'));
+
+ if (strpos($rcmail->action, 'plugin.password') === 0) {
+ $this->include_script('password.js');
+ }
+ }
+ else if ($rcmail->config->get('password_force_new_user')) {
+ $this->add_hook('user_create', array($this, 'user_create'));
+ $this->add_hook('login_after', array($this, 'login_after'));
+ }
}
- rcmail_overwrite_action('plugin.password');
- rcmail::get_instance()->output->send('plugin');
- }
+ function settings_actions($args)
+ {
+ // register as settings action
+ $args['actions'][] = array(
+ 'action' => 'plugin.password',
+ 'class' => 'password',
+ 'label' => 'password',
+ 'title' => 'changepasswd',
+ 'domain' => 'password',
+ );
- function password_form()
- {
- $rcmail = rcmail::get_instance();
-
- $confirm = $this->_confirm($rcmail->config);
- // add some labels to client
- $rcmail->output->add_label(
- 'password.nopassword',
- 'password.nocurpassword',
- 'password.passwordinconsistency',
- 'password.changepasswd'
- );
-// $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
- $rcmail->output->set_env('product_name', $rcmail->config->get('product_name'));
-
- // allow the following attributes to be added to the <table> tag
- $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'));
-
- // return the complete edit form as table
- $out = '<table' . $attrib_str . ">\n\n";
-
- $a_show_cols = array('newpasswd' => array('type' => 'text'),
- 'confpasswd' => array('type' => 'text'));
-
- if ($confirm) {
- $a_show_cols['curpasswd'] = array('type' => 'text');
- // show current password selection
- $field_id = 'curpasswd';
- $input_newpasswd = new html_passwordfield(array('name' => '_curpasswd', 'id' => $field_id, 'size' => 20));
-
- $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
- $field_id,
- rep_specialchars_output($this->gettext('curpasswd')),
- $input_newpasswd->show($rcmail->config->get('curpasswd')));
+ return $args;
}
- // show new password selection
- $field_id = 'newpasswd';
- $input_newpasswd = new html_passwordfield(array('name' => '_newpasswd', 'id' => $field_id, 'size' => 20));
+ function password_init()
+ {
+ $this->register_handler('plugin.body', array($this, 'password_form'));
- $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
- $field_id,
- rep_specialchars_output($this->gettext('newpasswd')),
- $input_newpasswd->show($rcmail->config->get('newpasswd')));
+ $rcmail = rcmail::get_instance();
+ $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
- // show confirm password selection
- $field_id = 'confpasswd';
- $input_confpasswd = new html_passwordfield(array('name' => '_confpasswd', 'id' => $field_id, 'size' => 20));
+ if (rcube_utils::get_input_value('_first', rcube_utils::INPUT_GET)) {
+ $rcmail->output->command('display_message', $this->gettext('firstloginchange'), 'notice');
+ }
- $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
- $field_id,
- rep_specialchars_output($this->gettext('confpasswd')),
- $input_confpasswd->show($rcmail->config->get('confpasswd')));
-
- $out .= "\n</table>";
-
- $out .= '<br />';
-
- $out .= $rcmail->output->button(array(
- 'command' => 'plugin.password-save',
- 'type' => 'input',
- 'class' => 'button mainaction',
- 'label' => 'save'
- ));
-
- $rcmail->output->add_gui_object('passform', 'password-form');
-
- return $rcmail->output->form_tag(array(
- 'id' => 'password-form',
- 'name' => 'password-form',
- 'method' => 'post',
- 'action' => './?_task=settings&_action=plugin.password-save',
- ), $out);
- }
-
- private function _confirm($cfg) {
- $val = $cfg->get('password_confirm_current');
- //return empty($val) || $val;
- return $val;
- }
-
- private function _save($curpass,$passwd)
- {
- $cfg = rcmail::get_instance()->config;
-
- if (!($sql = $cfg->get('password_query')))
- $sql = "SELECT update_passwd(%c, %u)";
-
- if ($dsn = $cfg->get('db_passwd_dsn')) {
- $db = new rcube_mdb2($dsn, '', FALSE);
- $db->set_debug((bool)$cfg->get('sql_debug'));
- $db->db_connect('w');
- } else {
- $db = rcmail::get_instance()->get_dbh();
- }
- if ($err = $db->is_error())
- return $err;
-
- if (strpos($sql,'%c') !== FALSE) {
- $salt = '';
- if (CRYPT_MD5) {
- $len = rand(3,CRYPT_SALT_LENGTH);
- } else if (CRYPT_STD_DES) {
- $len = 2;
- } else {
- return $this->gettext('nocryptfunction');
- }
- for ($i = 0; $i < $len ; $i++) {
- $salt .= chr(rand(ord('.'),ord('z')));
- }
- $sql = str_replace('%c', $db->quote(crypt($passwd, CRYPT_MD5 ? '$1$'.$salt.'$' : $salt)), $sql);
- }
- $sql = str_replace('%u', $db->quote($_SESSION['username'],'text'), $sql);
- $sql = str_replace('%p', $db->quote($passwd,'text'), $sql);
- $sql = str_replace('%o', $db->quote($curpass,'text'), $sql);
- $sql = str_replace('%h', $db->quote($_SESSION['imap_host'],'text'), $sql);
-
- $res = $db->query($sql);
- if ($err = $db->is_error())
- return $err;
- if (strtolower(substr(trim($query),0,6))=='select') {
- return $db->fetch_array($res);
- } else {
- $res = $db->affected_rows($res);
- if ($res == 0) return $this->gettext('errorsaving');
- if ($res == 1) return FALSE; // THis is the good case - 1 row updated
- return $this->gettext('internalerror');
+ $rcmail->output->send('plugin');
}
- }
+ function password_save()
+ {
+ $this->register_handler('plugin.body', array($this, 'password_form'));
+ $rcmail = rcmail::get_instance();
+ $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
+
+ $confirm = $rcmail->config->get('password_confirm_current');
+ $required_length = intval($rcmail->config->get('password_minimum_length'));
+ $check_strength = $rcmail->config->get('password_require_nonalpha');
+
+ if (($confirm && !isset($_POST['_curpasswd'])) || !isset($_POST['_newpasswd'])) {
+ $rcmail->output->command('display_message', $this->gettext('nopassword'), 'error');
+ }
+ else {
+ $charset = strtoupper($rcmail->config->get('password_charset', 'ISO-8859-1'));
+ $rc_charset = strtoupper($rcmail->output->get_charset());
+
+ $sespwd = $rcmail->decrypt($_SESSION['password']);
+ $curpwd = $confirm ? rcube_utils::get_input_value('_curpasswd', rcube_utils::INPUT_POST, true, $charset) : $sespwd;
+ $newpwd = rcube_utils::get_input_value('_newpasswd', rcube_utils::INPUT_POST, true);
+ $conpwd = rcube_utils::get_input_value('_confpasswd', rcube_utils::INPUT_POST, true);
+
+ // check allowed characters according to the configured 'password_charset' option
+ // by converting the password entered by the user to this charset and back to UTF-8
+ $orig_pwd = $newpwd;
+ $chk_pwd = rcube_charset::convert($orig_pwd, $rc_charset, $charset);
+ $chk_pwd = rcube_charset::convert($chk_pwd, $charset, $rc_charset);
+
+ // WARNING: Default password_charset is ISO-8859-1, so conversion will
+ // change national characters. This may disable possibility of using
+ // the same password in other MUA's.
+ // We're doing this for consistence with Roundcube core
+ $newpwd = rcube_charset::convert($newpwd, $rc_charset, $charset);
+ $conpwd = rcube_charset::convert($conpwd, $rc_charset, $charset);
+
+ if ($chk_pwd != $orig_pwd) {
+ $rcmail->output->command('display_message', $this->gettext('passwordforbidden'), 'error');
+ }
+ // other passwords validity checks
+ else if ($conpwd != $newpwd) {
+ $rcmail->output->command('display_message', $this->gettext('passwordinconsistency'), 'error');
+ }
+ else if ($confirm && $sespwd != $curpwd) {
+ $rcmail->output->command('display_message', $this->gettext('passwordincorrect'), 'error');
+ }
+ else if ($required_length && strlen($newpwd) < $required_length) {
+ $rcmail->output->command('display_message', $this->gettext(
+ array('name' => 'passwordshort', 'vars' => array('length' => $required_length))), 'error');
+ }
+ else if ($check_strength && (!preg_match("/[0-9]/", $newpwd) || !preg_match("/[^A-Za-z0-9]/", $newpwd))) {
+ $rcmail->output->command('display_message', $this->gettext('passwordweak'), 'error');
+ }
+ // password is the same as the old one, do nothing, return success
+ else if ($sespwd == $newpwd && !$rcmail->config->get('password_force_save')) {
+ $rcmail->output->command('display_message', $this->gettext('successfullysaved'), 'confirmation');
+ }
+ // try to save the password
+ else if (!($res = $this->_save($curpwd, $newpwd))) {
+ $rcmail->output->command('display_message', $this->gettext('successfullysaved'), 'confirmation');
+
+ // allow additional actions after password change (e.g. reset some backends)
+ $plugin = $rcmail->plugins->exec_hook('password_change', array(
+ 'old_pass' => $curpwd, 'new_pass' => $newpwd));
+
+ // Reset session password
+ $_SESSION['password'] = $rcmail->encrypt($plugin['new_pass']);
+
+ // Log password change
+ if ($rcmail->config->get('password_log')) {
+ rcube::write_log('password', sprintf('Password changed for user %s (ID: %d) from %s',
+ $rcmail->get_user_name(), $rcmail->user->ID, rcube_utils::remote_ip()));
+ }
+ }
+ else {
+ $rcmail->output->command('display_message', $res, 'error');
+ }
+ }
+
+ $rcmail->overwrite_action('plugin.password');
+ $rcmail->output->send('plugin');
+ }
+
+ function password_form()
+ {
+ $rcmail = rcmail::get_instance();
+
+ // add some labels to client
+ $rcmail->output->add_label(
+ 'password.nopassword',
+ 'password.nocurpassword',
+ 'password.passwordinconsistency'
+ );
+
+ $rcmail->output->set_env('product_name', $rcmail->config->get('product_name'));
+
+ $table = new html_table(array('cols' => 2));
+
+ if ($rcmail->config->get('password_confirm_current')) {
+ // show current password selection
+ $field_id = 'curpasswd';
+ $input_curpasswd = new html_passwordfield(array('name' => '_curpasswd', 'id' => $field_id,
+ 'size' => 20, 'autocomplete' => 'off'));
+
+ $table->add('title', html::label($field_id, rcube::Q($this->gettext('curpasswd'))));
+ $table->add(null, $input_curpasswd->show());
+ }
+
+ // show new password selection
+ $field_id = 'newpasswd';
+ $input_newpasswd = new html_passwordfield(array('name' => '_newpasswd', 'id' => $field_id,
+ 'size' => 20, 'autocomplete' => 'off'));
+
+ $table->add('title', html::label($field_id, rcube::Q($this->gettext('newpasswd'))));
+ $table->add(null, $input_newpasswd->show());
+
+ // show confirm password selection
+ $field_id = 'confpasswd';
+ $input_confpasswd = new html_passwordfield(array('name' => '_confpasswd', 'id' => $field_id,
+ 'size' => 20, 'autocomplete' => 'off'));
+
+ $table->add('title', html::label($field_id, rcube::Q($this->gettext('confpasswd'))));
+ $table->add(null, $input_confpasswd->show());
+
+ $rules = '';
+
+ $required_length = intval($rcmail->config->get('password_minimum_length'));
+ if ($required_length > 0) {
+ $rules .= html::tag('li', array('id' => 'required-length'), $this->gettext(array(
+ 'name' => 'passwordshort',
+ 'vars' => array('length' => $required_length)
+ )));
+ }
+
+ if ($rcmail->config->get('password_require_nonalpha')) {
+ $rules .= html::tag('li', array('id' => 'require-nonalpha'), $this->gettext('passwordweak'));
+ }
+
+ if (!empty($rules)) {
+ $rules = html::tag('ul', array('id' => 'ruleslist'), $rules);
+ }
+
+ $out = html::div(array('class' => 'box'),
+ html::div(array('id' => 'prefs-title', 'class' => 'boxtitle'), $this->gettext('changepasswd')) .
+ html::div(array('class' => 'boxcontent'), $table->show() .
+ $rules .
+ html::p(null,
+ $rcmail->output->button(array(
+ 'command' => 'plugin.password-save',
+ 'type' => 'input',
+ 'class' => 'button mainaction',
+ 'label' => 'save'
+ )))));
+
+ $rcmail->output->add_gui_object('passform', 'password-form');
+
+ return $rcmail->output->form_tag(array(
+ 'id' => 'password-form',
+ 'name' => 'password-form',
+ 'method' => 'post',
+ 'action' => './?_task=settings&_action=plugin.password-save',
+ ), $out);
+ }
+
+ private function _save($curpass, $passwd)
+ {
+ $config = rcmail::get_instance()->config;
+ $driver = $config->get('password_driver', 'sql');
+ $class = "rcube_{$driver}_password";
+ $file = $this->home . "/drivers/$driver.php";
+
+ if (!file_exists($file)) {
+ rcube::raise_error(array(
+ 'code' => 600,
+ 'type' => 'php',
+ 'file' => __FILE__, 'line' => __LINE__,
+ 'message' => "Password plugin: Unable to open driver file ($file)"
+ ), true, false);
+ return $this->gettext('internalerror');
+ }
+
+ include_once $file;
+
+ if (!class_exists($class, false) || !method_exists($class, 'save')) {
+ rcube::raise_error(array(
+ 'code' => 600,
+ 'type' => 'php',
+ 'file' => __FILE__, 'line' => __LINE__,
+ 'message' => "Password plugin: Broken driver $driver"
+ ), true, false);
+ return $this->gettext('internalerror');
+ }
+
+ $object = new $class;
+ $result = $object->save($curpass, $passwd);
+
+ if (is_array($result)) {
+ $message = $result['message'];
+ $result = $result['code'];
+ }
+
+ switch ($result) {
+ case PASSWORD_SUCCESS:
+ return;
+ case PASSWORD_CRYPT_ERROR;
+ $reason = $this->gettext('crypterror');
+ break;
+ case PASSWORD_CONNECT_ERROR;
+ $reason = $this->gettext('connecterror');
+ break;
+ case PASSWORD_ERROR:
+ default:
+ $reason = $this->gettext('internalerror');
+ }
+
+ if ($message) {
+ $reason .= ' ' . $message;
+ }
+
+ return $reason;
+ }
+
+ function user_create($args)
+ {
+ $this->newuser = true;
+ return $args;
+ }
+
+ function login_after($args)
+ {
+ if ($this->newuser && $this->check_host_login_exceptions()) {
+ $args['_task'] = 'settings';
+ $args['_action'] = 'plugin.password';
+ $args['_first'] = 'true';
+ }
+
+ return $args;
+ }
+
+ // Check if host and login is allowed to change the password, false = not allowed, true = not allowed
+ private function check_host_login_exceptions()
+ {
+ $rcmail = rcmail::get_instance();
+
+ // Host exceptions
+ $hosts = $rcmail->config->get('password_hosts');
+ if (!empty($hosts) && !in_array($_SESSION['storage_host'], $hosts)) {
+ return false;
+ }
+
+ // Login exceptions
+ if ($exceptions = $rcmail->config->get('password_login_exceptions')) {
+ $exceptions = array_map('trim', (array) $exceptions);
+ $exceptions = array_filter($exceptions);
+ $username = $_SESSION['username'];
+
+ foreach ($exceptions as $ec) {
+ if ($username === $ec) {
+ return false;
+ }
+ }
+ }
+
+ return true;
+ }
}
-
-?>
--
Gitblit v1.9.1