Skip to content

MAGETWO-63137: Fix Zend Mail vulnerability #6

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

Merged
merged 1 commit into from
Jan 17, 2017
Merged

MAGETWO-63137: Fix Zend Mail vulnerability #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions library/Zend/Mail/Transport/Sendmail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,18 @@ protected function _prepareHeaders($headers)
unset($headers['Subject']);
}

// Sanitize the From header
if (isset($headers['From'])) {
$addressList = array_filter($headers['From'], function($key) {
return $key !== 'append';
}, ARRAY_FILTER_USE_KEY);
foreach ($addressList as $address) {
if (preg_match('/\\\"/', $address)) {
throw new Zend_Mail_Transport_Exception('Potential code injection in From header');
}
}
}

// Prepare headers
parent::_prepareHeaders($headers);

Expand Down