Skip to content

Commit e13f78a

Browse files
bramleymarianaballa
authored andcommitted
Upgrade to PHPMailer 6.1.8
1 parent 1f61df7 commit e13f78a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+387
-161
lines changed

public_html/lists/admin/PHPMailer6/SECURITY.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
Please disclose any vulnerabilities found responsibly - report any security problems found to the maintainers privately.
44

5+
PHPMailer versions 6.1.5 and earlier contain an output escaping bug that occurs in `Content-Type` and `Content-Disposition` when filenames passed into `addAttachment` and other methods that accept attachment names contain double quote characters, in contravention of RFC822 3.4.1. No specific vulnerability has been found relating to this, but it could allow file attachments to bypass attachment filters that are based on matching filename extensions. Recorded as [CVE-2020-13625](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-13625). Reported by Elar Lang of Clarified Security.
6+
57
PHPMailer versions prior to 6.0.6 and 5.2.27 are vulnerable to an object injection attack by passing `phar://` paths into `addAttachment()` and other functions that may receive unfiltered local paths, possibly leading to RCE. Recorded as [CVE-2018-19296](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2018-19296). See [this article](https://knasmueller.net/5-answers-about-php-phar-exploitation) for more info on this type of vulnerability. Mitigated by blocking the use of paths containing URL-protocol style prefixes such as `phar://`. Reported by Sehun Oh of cyberone.kr.
68

79
PHPMailer versions prior to 5.2.24 (released July 26th 2017) have an XSS vulnerability in one of the code examples, [CVE-2017-11503](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-11503). The `code_generator.phps` example did not filter user input prior to output. This file is distributed with a `.phps` extension, so it it not normally executable unless it is explicitly renamed, and the file is not included when PHPMailer is loaded through composer, so it is safe by default. There was also an undisclosed potential XSS vulnerability in the default exception handler (unused by default). Patches for both issues kindly provided by Patrick Monnerat of the Fedora Project.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.1.5
1+
6.1.8

public_html/lists/admin/PHPMailer6/composer.json

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,32 @@
1919
"name": "Brent R. Matzelle"
2020
}
2121
],
22+
"funding": [
23+
{
24+
"url": "https://github.com/Synchro",
25+
"type": "github"
26+
}
27+
],
2228
"require": {
2329
"php": ">=5.5.0",
2430
"ext-ctype": "*",
25-
"ext-filter": "*"
31+
"ext-filter": "*",
32+
"ext-hash": "*"
2633
},
2734
"require-dev": {
28-
"friendsofphp/php-cs-fixer": "^2.2",
35+
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
36+
"doctrine/annotations": "^1.2",
37+
"phpcompatibility/php-compatibility": "^9.3.5",
2938
"phpunit/phpunit": "^4.8 || ^5.7",
30-
"doctrine/annotations": "^1.2"
39+
"roave/security-advisories": "dev-latest",
40+
"squizlabs/php_codesniffer": "^3.5.6"
3141
},
3242
"suggest": {
33-
"psr/log": "For optional PSR-3 debug logging",
34-
"league/oauth2-google": "Needed for Google XOAUTH2 authentication",
43+
"ext-mbstring": "Needed to send email in multibyte encoding charset",
3544
"hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
45+
"league/oauth2-google": "Needed for Google XOAUTH2 authentication",
46+
"psr/log": "For optional PSR-3 debug logging",
3647
"stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
37-
"ext-mbstring": "Needed to send email in multibyte encoding charset",
3848
"symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
3949
},
4050
"autoload": {

public_html/lists/admin/PHPMailer6/get_oauth_token.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* PHPMailer - PHP email creation and transport class.
45
* PHP Version 5.5
@@ -8,14 +9,15 @@
89
* @author Jim Jagielski (jimjag) <[email protected]>
910
* @author Andy Prevost (codeworxtech) <[email protected]>
1011
* @author Brent R. Matzelle (original founder)
11-
* @copyright 2012 - 2017 Marcus Bointon
12+
* @copyright 2012 - 2020 Marcus Bointon
1213
* @copyright 2010 - 2012 Jim Jagielski
1314
* @copyright 2004 - 2009 Andy Prevost
1415
* @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
1516
* @note This program is distributed in the hope that it will be useful - WITHOUT
1617
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
1718
* FITNESS FOR A PARTICULAR PURPOSE.
1819
*/
20+
1921
/**
2022
* Get an OAuth2 token from an OAuth2 provider.
2123
* * Install this script on your server so that it's accessible
@@ -44,16 +46,16 @@
4446
use Stevenmaguire\OAuth2\Client\Provider\Microsoft;
4547

4648
if (!isset($_GET['code']) && !isset($_GET['provider'])) {
47-
?>
49+
?>
4850
<html>
4951
<body>Select Provider:<br/>
5052
<a href='?provider=Google'>Google</a><br/>
5153
<a href='?provider=Yahoo'>Yahoo</a><br/>
5254
<a href='?provider=Microsoft'>Microsoft/Outlook/Hotmail/Live/Office365</a><br/>
5355
</body>
5456
</html>
55-
<?php
56-
exit;
57+
<?php
58+
exit;
5759
}
5860

5961
require 'vendor/autoload.php';

public_html/lists/admin/PHPMailer6/language/phpmailer.lang-af.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Afrikaans PHPMailer language file: refer to English translation for definitive list
45
* @package PHPMailer

public_html/lists/admin/PHPMailer6/language/phpmailer.lang-ar.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Arabic PHPMailer language file: refer to English translation for definitive list
45
* @package PHPMailer

public_html/lists/admin/PHPMailer6/language/phpmailer.lang-az.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Azerbaijani PHPMailer language file: refer to English translation for definitive list
45
* @package PHPMailer

public_html/lists/admin/PHPMailer6/language/phpmailer.lang-ba.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Bosnian PHPMailer language file: refer to English translation for definitive list
45
* @package PHPMailer
@@ -23,4 +24,4 @@
2324
$PHPMAILER_LANG['smtp_connect_failed'] = 'Spajanje na SMTP server nije uspjelo.';
2425
$PHPMAILER_LANG['smtp_error'] = 'SMTP greška: ';
2526
$PHPMAILER_LANG['variable_set'] = 'Nije moguće postaviti varijablu ili je vratiti nazad: ';
26-
$PHPMAILER_LANG['extension_missing'] = 'Nedostaje ekstenzija: ';
27+
$PHPMAILER_LANG['extension_missing'] = 'Nedostaje ekstenzija: ';

public_html/lists/admin/PHPMailer6/language/phpmailer.lang-be.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Belarusian PHPMailer language file: refer to English translation for definitive list
45
* @package PHPMailer

public_html/lists/admin/PHPMailer6/language/phpmailer.lang-bg.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Bulgarian PHPMailer language file: refer to English translation for definitive list
45
* @package PHPMailer

0 commit comments

Comments
 (0)