Skip to content

Fix usage of novalidatecert IMAP/POP3 param; fixes #7693 #7779

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
trasher merged 1 commit into from
Aug 4, 2020
Merged

Fix usage of novalidatecert IMAP/POP3 param; fixes #7693 #7779

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"iamcal/lib_autolink": "^1.7",
"laminas/laminas-cache": "^2.8",
"laminas/laminas-i18n": "^2.10",
"laminas/laminas-mail": "^2.10",
"laminas/laminas-mail": "^2.12",
"laminas/laminas-mime": "^2.7",
"laminas/laminas-serializer": "^2.8",
"mexitek/phpcolors": "^0.4.0",
Expand Down
70 changes: 11 additions & 59 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions inc/auth.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,9 @@ function connection_imap($host, $login, $pass) {
if ($protocol === null) {
throw new \RuntimeException(sprintf(__('Unsupported mail server type:%s.'), $config['type']));
}
if ($config['validate-cert'] === false) {
$protocol->setNoValidateCert(true);
}
$protocol->connect(
$config['address'],
$config['port'],
Expand Down
9 changes: 9 additions & 0 deletions inc/mail/protocol/protocolinterface.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,15 @@

interface ProtocolInterface {

/**
* Do not validate SSL certificate
*
* @param bool $novalidatecert Set to true to disable certificate validation
*
* @return self
*/
public function setNoValidateCert(bool $novalidatecert);

/**
* Open connection to server.
*
Expand Down
4 changes: 4 additions & 0 deletions inc/mailcollector.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1305,6 +1305,10 @@ function connect() {
$params['folder'] = $config['mailbox'];
}

if ($config['validate-cert'] === false) {
$params['novalidatecert'] = true;
}

try {
$storage = Toolbox::getMailServerStorageInstance($config['type'], $params);
if ($storage === null) {
Expand Down
1 change: 1 addition & 0 deletions tests/imap/Toolbox.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ protected function mailServerProtocolsHookProvider() {
// Create valid classes
eval(<<<CLASS
class PluginTesterFakeProtocol implements Glpi\Mail\Protocol\ProtocolInterface {
public function setNoValidateCert(bool \$novalidatecert) {}
public function connect(\$host, \$port = null, \$ssl = false) {}
public function login(\$user, \$password) {}
}
Expand Down