Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add reason for not logging exception; correct invalid user error message #2263

Merged
merged 2 commits into from
Dec 11, 2015
Merged

Add reason for not logging exception; correct invalid user error message #2263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c58ee1
Add reason for not logging exception; correct invalid user error message
Nov 4, 2015
2374232
Fixed failing unit test
Nov 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions app/code/Magento/Customer/Controller/Account/LoginPost.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ public function executeInternal()
} catch (EmailNotConfirmedException $e) {
$value = $this->customerUrl->getEmailConfirmationUrl($login['username']);
$message = __(
'This account is not confirmed.' .
' <a href="%1">Click here</a> to resend confirmation email.',
'This account is not confirmed. <a href="%1">Click here</a> to resend confirmation email.',
$value
);
$this->messageManager->addError($message);
Expand All @@ -97,7 +96,10 @@ public function executeInternal()
$this->messageManager->addError($message);
$this->session->setUsername($login['username']);
} catch (\Exception $e) {
$this->messageManager->addError(__('Invalid login or password.'));
// PA DSS violation: throwing or logging an exception here can disclose customer password
$this->messageManager->addError(
__('An unspecified error occurred. Please contact us for assistance.')
);
}
} else {
$this->messageManager->addError(__('A login and a password are required.'));
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Customer/Test/Unit/Controller/Account/LoginPostTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ protected function mockExceptions($exception, $username)
case '\Exception':
$this->messageManager->expects($this->once())
->method('addError')
->with(__('Invalid login or password.'))
->with(__('An unspecified error occurred. Please contact us for assistance.'))
->willReturnSelf();
break;
}
Expand Down