From 1cdbf32aa2b6487f2e685e89a51db8a00d02c341 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 12 Oct 2019 21:05:19 -0400 Subject: [PATCH 1/2] Remove duplicate array entry in Core\Logger --- src/Core/Logger.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Core/Logger.php b/src/Core/Logger.php index e376485e56..e8d95fa857 100644 --- a/src/Core/Logger.php +++ b/src/Core/Logger.php @@ -64,7 +64,6 @@ class Logger extends BaseObject self::TRACE => 'Trace', self::DEBUG => 'Debug', self::DATA => 'Data', - self::ALL => 'All', ]; /** From db0630b0f9b11a8014c893a5f570fd63ef574d78 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 12 Oct 2019 21:06:47 -0400 Subject: [PATCH 2/2] Catch missing Certainty bundle exception when checking for exposed password in Model\User --- src/Model/User.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/Model/User.php b/src/Model/User.php index b6121ad04e..ef49f45eda 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -412,6 +412,7 @@ class User * * @param string $password * @return bool + * @throws Exception */ public static function isPasswordExposed($password) { @@ -420,9 +421,20 @@ class User 'cacheDirectory' => get_temppath() . '/password-exposed-cache/', ]); - $PasswordExposedCHecker = new PasswordExposed\PasswordExposedChecker(null, $cache); + try { + $passwordExposedChecker = new PasswordExposed\PasswordExposedChecker(null, $cache); - return $PasswordExposedCHecker->passwordExposed($password) === PasswordExposed\PasswordStatus::EXPOSED; + return $passwordExposedChecker->passwordExposed($password) === PasswordExposed\PasswordStatus::EXPOSED; + } catch (\Exception $e) { + Logger::error('Password Exposed Exception: ' . $e->getMessage(), [ + 'code' => $e->getCode(), + 'file' => $e->getFile(), + 'line' => $e->getLine(), + 'trace' => $e->getTraceAsString() + ]); + + return false; + } } /**