summaryrefslogtreecommitdiffstats
path: root/web/lib
diff options
context:
space:
mode:
authorLukas Fleischer <lfleischer@archlinux.org>2020-01-30 10:23:50 +0100
committerLukas Fleischer <lfleischer@archlinux.org>2020-01-30 10:31:26 +0100
commitdaee20c694000e1e85a98760773bcbbdc0709527 (patch)
tree939c7d7f57ffd3b2aab1dbe7a4e25f27d929cd9d /web/lib
parenteeaa1c3a3220e3735445d094dc7d2cd9ac07b621 (diff)
downloadaur-daee20c694000e1e85a98760773bcbbdc0709527.tar.gz
aur-daee20c694000e1e85a98760773bcbbdc0709527.tar.xz
Require current password when setting a new one
Prevent from easily taking over an account by changing the password with a stolen session ID. Fixes FS#65325. Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
Diffstat (limited to 'web/lib')
-rw-r--r--web/lib/acctfuncs.inc.php15
1 files changed, 13 insertions, 2 deletions
diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php
index e754989a..1de49b01 100644
--- a/web/lib/acctfuncs.inc.php
+++ b/web/lib/acctfuncs.inc.php
@@ -96,6 +96,7 @@ function display_account_form($A,$U="",$T="",$S="",$E="",$H="",$P="",$C="",$R=""
* @param string $S Whether or not the account is suspended
* @param string $E The e-mail address for the user
* @param string $H Whether or not the e-mail address should be hidden
+ * @param string $PO The old password of the user
* @param string $P The password for the user
* @param string $C The confirmed password for the user
* @param string $R The real name of the user
@@ -116,7 +117,7 @@ function display_account_form($A,$U="",$T="",$S="",$E="",$H="",$P="",$C="",$R=""
*
* @return array Boolean indicating success and message to be printed
*/
-function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$H="",$P="",$C="",
+function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$H="",$PO="",$P="",$C="",
$R="",$L="",$TZ="",$HP="",$I="",$K="",$PK="",$J="",$CN="",$UN="",$ON="",$UID=0,$N="",$captcha_salt="",$captcha="") {
global $SUPPORTED_LANGS;
@@ -134,6 +135,7 @@ function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$H="",$P="",$C=""
if(isset($_COOKIE['AURSID'])) {
$editor_user = uid_from_sid($_COOKIE['AURSID']);
+ $row = account_details(in_request("ID"), in_request("U"));
}
else {
$editor_user = null;
@@ -159,9 +161,18 @@ function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$H="",$P="",$C=""
. "</li>\n</ul>";
}
- if (!$error && $P && $C && ($P != $C)) {
+ if (!$error && $P && !$C) {
+ $error = __("Please confirm your new password.");
+ }
+ if (!$error && $P && !$PO) {
+ $error = __("Please enter your old password in order to set a new one.");
+ }
+ if (!$error && $P && $P != $C) {
$error = __("Password fields do not match.");
}
+ if (!$error && $P && check_passwd($UID, $PO) != 1) {
+ $error = __("The old password is invalid.");
+ }
if (!$error && $P != '' && !good_passwd($P)) {
$length_min = config_get_int('options', 'passwd_min_len');
$error = __("Your password must be at least %s characters.",