N°8545 - Change log severity depending on the error source

Author: steffunky

application/exceptions/ForgotPasswordApplicationException.php

@@ -0,0 +1,5 @@
+<?php
+
+class ForgotPasswordApplicationException extends Exception
+{
+}

application/exceptions/ForgotPasswordUserInputException.php

@@ -0,0 +1,5 @@
+<?php
+
+class ForgotPasswordUserInputException extends Exception
+{
+}

application/loginwebpage.class.inc.php

@@ -221,15 +221,15 @@ protected function ForgotPwdGo()
 
 			if ($oUser != null) {
 				if (!MetaModel::IsValidAttCode(get_class($oUser), 'reset_pwd_token')) {
-					throw new Exception(Dict::S('UI:ResetPwd-Error-NotPossible'));
+                    throw new ForgotPasswordUserInputException(Dict::S('UI:ResetPwd-Error-NotPossible'));
 				}
 				if (!$oUser->CanChangePassword()) {
-					throw new Exception(Dict::S('UI:ResetPwd-Error-FixedPwd'));
+                    throw new ForgotPasswordUserInputException(Dict::S('UI:ResetPwd-Error-FixedPwd'));
 				}
 
 				$sTo = $oUser->GetResetPasswordEmail(); // throws Exceptions if not allowed
 				if ($sTo == '') {
-					throw new Exception(Dict::S('UI:ResetPwd-Error-NoEmail'));
+                    throw new ForgotPasswordUserInputException(Dict::S('UI:ResetPwd-Error-NoEmail'));
 				}
 
 				// This token allows the user to change the password without knowing the previous one
@@ -255,13 +255,14 @@ protected function ForgotPwdGo()
 
 					case EMAIL_SEND_ERROR:
 					default:
-						IssueLog::Error('Failed to send the email with the NEW password for '.$oUser->Get('friendlyname').': '.implode(', ', $aIssues));
-						throw new Exception(Dict::S('UI:ResetPwd-Error-Send'));
+                    throw new ForgotPasswordApplicationException('Failed to send the email with the NEW password for ' . $oUser->Get('friendlyname') . ': ' . implode(', ', $aIssues));
 				}
 			}
 
-		} catch (Exception $e) {
-			IssueLog::Info('Failed to process the forgot password request for user "'.$sAuthUser.'": '.$e->getMessage());
+        } catch (ForgotPasswordApplicationException $e) {
+            IssueLog::Error('Failed to process the forgot password request for user "' . $sAuthUser . '": ' . $e->getMessage());
+        } catch (ForgotPasswordUserInputException $e) {
+            IssueLog::Info('Failed to process the forgot password request for user "' . $sAuthUser . '": ' . $e->getMessage());
 		}
 
 		$oTwigContext = new LoginTwigRenderer();

lib/composer/autoload_classmap.php

@@ -745,6 +745,8 @@
     'Firebase\\JWT\\JWTExceptionWithPayloadInterface' => $vendorDir . '/firebase/php-jwt/src/JWTExceptionWithPayloadInterface.php',
     'Firebase\\JWT\\Key' => $vendorDir . '/firebase/php-jwt/src/Key.php',
     'Firebase\\JWT\\SignatureInvalidException' => $vendorDir . '/firebase/php-jwt/src/SignatureInvalidException.php',
+    'ForgotPasswordApplicationException' => $baseDir . '/application/exceptions/ForgotPasswordApplicationException.php',
+    'ForgotPasswordUserInputException' => $baseDir . '/application/exceptions/ForgotPasswordUserInputException.php',
     'FunctionExpression' => $baseDir . '/core/oql/expression.class.inc.php',
     'FunctionOqlExpression' => $baseDir . '/core/oql/oqlquery.class.inc.php',
     'GraphEdge' => $baseDir . '/core/simplegraph.class.inc.php',