From 0c8c28fe4125d4c4ffbc59f091be65bfbd91252e Mon Sep 17 00:00:00 2001
From: djmaze <djmaze@djmaze.lan>
Date: Thu, 4 Mar 2021 14:54:35 +0100
Subject: [PATCH] Bugfix: Undefined property ChangePasswordPlugin::$oLogger

---
 plugins/change-password/index.php             | 51 +++++++++++++++----
 .../js/ChangePasswordUserSettings.js          |  6 +--
 .../templates/SettingsChangePassword.html     |  1 -
 3 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/plugins/change-password/index.php b/plugins/change-password/index.php
index ee9311c2b..6ec1037ff 100644
--- a/plugins/change-password/index.php
+++ b/plugins/change-password/index.php
@@ -86,6 +86,13 @@ class ChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
 				->SetDescription('Minimum length of the password')
 				->SetDefaultValue(10),
 		];
+		$result = [
+			\RainLoop\Plugins\Property::NewInstance("pass_min_strength")
+				->SetLabel('Password minimum strength')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::INT)
+				->SetDescription('Minimum strength of the password in %')
+				->SetDefaultValue(60),
+		];
 		foreach ($this->getSupportedDrivers(true) as $name => $class) {
 			$result[] = \RainLoop\Plugins\Property::NewInstance("driver_{$name}_enabled")
 				->SetLabel('Enable ' . $class::NAME)
@@ -122,7 +129,7 @@ class ChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
 			throw new ClientException(static::NewPasswordShort, null, $oActions->StaticI18N('NOTIFICATIONS/NEW_PASSWORD_SHORT'));
 		}
 
-		if (!static::PasswordWeaknessCheck($sPasswordForCheck)) {
+		if ($this->Config()->Get('plugin', 'pass_min_strength', 60) > static::PasswordStrength($sPasswordForCheck)) {
 			throw new ClientException(static::NewPasswordWeak, null, $oActions->StaticI18N('NOTIFICATIONS/NEW_PASSWORD_WEAK'));
 		}
 
@@ -132,26 +139,27 @@ class ChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
 			$sFoundedValue = '';
 			if (\RainLoop\Plugins\Helper::ValidateWildcardValues($oAccount->Email(), $oConfig->Get('plugin', "driver_{$name}_allowed_emails"), $sFoundedValue)) {
 				$name = $class::NAME;
+				$oLogger = $oActions->Logger();
 				try
 				{
 					$oDriver = new $class(
 						$oConfig(),
-						$oActions->Logger()
+						$oLogger
 					);
 					if (!$oDriver->ChangePassword($oAccount, $sPrevPassword, $sNewPassword)) {
 						throw new ClientException(static::CouldNotSaveNewPassword);
 					}
 					$bResult = true;
-					if ($this->oLogger) {
-						$this->oLogger->Write("{$name} password changed for {$oAccount->Email()}");
+					if ($oLogger) {
+						$oLogger->Write("{$name} password changed for {$oAccount->Email()}");
 					}
 				}
 				catch (\Throwable $oException)
 				{
-					if ($this->oLogger) {
-						$this->oLogger->Write("ERROR: {$name} password change for {$oAccount->Email()} failed");
-						$this->oLogger->WriteException($oException);
-//						$this->oLogger->WriteException($oException, \MailSo\Log\Enumerations\Type::WARNING, $name);
+					if ($oLogger) {
+						$oLogger->Write("ERROR: {$name} password change for {$oAccount->Email()} failed");
+						$oLogger->WriteException($oException);
+//						$oLogger->WriteException($oException, \MailSo\Log\Enumerations\Type::WARNING, $name);
 					}
 				}
 			}
@@ -192,9 +200,32 @@ class ChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
 		return $sPassword;
 	}
 
-	private static function PasswordWeaknessCheck(string $sPassword) : bool
+	private static function PasswordStrength(string $sPassword) : int
 	{
-		return !\preg_match('/111|1234|password|abc|qwerty|monkey|letmein|dragon|baseball|iloveyou|trustno1|sunshine|master|welcome|shadow|ashley|football|jesus|michael|ninja|mustang|vkontakte/i', $sPassword);
+		$i = \strlen($sPassword);
+		$s = $i ? 1 : 0;
+		while (--$i) {
+			if ($sPassword[$i] != $sPassword[$i-1]) {
+				++$s;
+			} else {
+				$s -= 0.5;
+			}
+		}
+		$c = 0;
+		$re = [ '/[^0-9A-Za-z]+/g', '/[0-9]+/g', '/[A-Z]+/g', '/[a-z]+/g' ];
+		foreach ($re as $regex) {
+			if (\preg_match_all($regex, $sPassword, $m)) {
+				++$c;
+				foreach ($m[0] as $str) {
+					if (5 > \strlen($str)) {
+						++$s;
+					}
+				}
+			}
+		}
+		$s = ($s / 3 * $c);
+
+		return \max(0, \min(100, $s * 5));
 	}
 
 }
diff --git a/plugins/change-password/js/ChangePasswordUserSettings.js b/plugins/change-password/js/ChangePasswordUserSettings.js
index 32995e93c..831645beb 100644
--- a/plugins/change-password/js/ChangePasswordUserSettings.js
+++ b/plugins/change-password/js/ChangePasswordUserSettings.js
@@ -8,11 +8,11 @@
 
 	let pw_re = [/[^0-9A-Za-z]+/g, /[0-9]+/g, /[A-Z]+/g, /[a-z]+/g],
 		getPassStrength = v => {
-			var m,
+			let m,
 				i = v.length,
 				s = i?1:0,
 				c = 0,
-				ii = 0;
+				ii;
 			while (i--) {
 				if (v[i] != v[i+1]) {
 					++s;
@@ -24,7 +24,7 @@
 				m = v.match(pw_re[i]);
 				if (m) {
 					++c;
-					for (; ii < m.length; ++ii) {
+					for (ii = 0; ii < m.length; ++ii) {
 						if (5 > m[ii].length) {
 							++s;
 						}
diff --git a/plugins/change-password/templates/SettingsChangePassword.html b/plugins/change-password/templates/SettingsChangePassword.html
index 7cd1dc36e..f16b1b7fe 100644
--- a/plugins/change-password/templates/SettingsChangePassword.html
+++ b/plugins/change-password/templates/SettingsChangePassword.html
@@ -14,7 +14,6 @@
 					<label class="control-label" data-i18n="SETTINGS_CHANGE_PASSWORD/LABEL_NEW_PASSWORD"></label>
 					<div class="controls">
 						<input style="margin:0" class="new-password" type="password" autocomplete="new-password" autocorrect="off" autocapitalize="off" spellcheck="false"
-							minlength="10"
 							data-bind="textInput: newPassword" />
 						<br/>
 						<meter style="width:210px" class="new-password-meter" min="0" low="35" optimum="85" high="70" max="100" value="0"></meter>