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

glpi-project · Aug 4, 2020 · f0e14f1 · f0e14f1
1 parent eea25c2
commit f0e14f1
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 60 deletions.
diff --git a/composer.json b/composer.json
@@ -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",

diff --git a/composer.lock b/composer.lock
diff --git a/inc/auth.class.php b/inc/auth.class.php
@@ -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'],

diff --git a/inc/mail/protocol/protocolinterface.class.php b/inc/mail/protocol/protocolinterface.class.php
@@ -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.
     *

diff --git a/inc/mailcollector.class.php b/inc/mailcollector.class.php
@@ -1310,6 +1310,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) {

diff --git a/tests/imap/Toolbox.php b/tests/imap/Toolbox.php
@@ -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) {}
 }