Fixups

Author: tchapi

.env

@@ -48,8 +48,10 @@ AUTH_REALM=SabreDAV
 # "Basic", "IMAP", or "LDAP"
 AUTH_METHOD=Basic
 
-# In case of IMAP Auth, you must specify the url of the mailbox in the following format {host[:port]}.
+# In case of IMAP Auth, you must specify the url of the mailbox in the following format host[:port].
 IMAP_AUTH_URL=null
+IMAP_ENCRYPTION_METHOD=ssl
+IMAP_CERTIFICATE_VALIDATION=true
 IMAP_AUTH_USER_AUTOCREATE=false
 
 # In case of LDAP Auth, you must specify the url of the LDAP server

config/services.yaml

@@ -34,6 +34,8 @@ services:
         arguments:
             $IMAPAuthUrl: "%env(IMAP_AUTH_URL)%"
             $autoCreate: "%env(bool:IMAP_AUTH_USER_AUTOCREATE)%"
+            $IMAPEncryptionMethod: "%env(IMAP_ENCRYPTION_METHOD)%"
+            $IMAPCertificateValidation: "%env(bool:IMAP_CERTIFICATE_VALIDATION)%"
 
     App\Services\LDAPAuth:
         arguments:

src/Services/BirthdayService.php

@@ -229,7 +229,7 @@ public function buildDataFromContact(string $cardData): ?VCalendar
         $vEvent->{'TRANSP'} = 'TRANSPARENT';
 
         // Set a reminder, if needed
-        if (strtolower($this->birthdayReminderOffset) !== "false") {
+        if ('false' !== strtolower($this->birthdayReminderOffset)) {
             $alarm = $vCal->createComponent('VALARM');
             $alarm->add($vCal->createProperty('TRIGGER', $this->birthdayReminderOffset, ['VALUE' => 'DURATION']));
             $alarm->add($vCal->createProperty('ACTION', 'DISPLAY'));

src/Services/IMAPAuth.php

@@ -33,16 +33,41 @@ final class IMAPAuth extends AbstractBasic
     private $autoCreate;
 
     /**
-     * IMAP server in the form {host[:port]}.
+     * IMAP server in the form host[:port].
      *
      * @var string
      */
     private $IMAPAuthUrl;
 
-    public function __construct(ManagerRegistry $doctrine, Utils $utils, string $IMAPAuthUrl, bool $autoCreate)
+    /**
+     * IMAP encryption method. Could be ssl, tls or false.
+     *
+     * @var mixed (string or bool)
+     */
+    private $IMAPEncryptionMethod;
+
+    /**
+     * Should we validate the certificate?
+     *
+     * @var bool
+     */
+    private $IMAPCertificateValidation;
+
+    public function __construct(ManagerRegistry $doctrine, Utils $utils, string $IMAPAuthUrl, bool $autoCreate, string $IMAPEncryptionMethod, bool $IMAPCertificateValidation)
     {
         $this->IMAPAuthUrl = $IMAPAuthUrl;
 
+        // We're making sure that only ssl, tls or 'false' are passed down to the IMAP client
+        $IMAPEncryptionMethodCleaned = strtolower($IMAPEncryptionMethod);
+        if ('false' === $IMAPEncryptionMethodCleaned) {
+            $this->IMAPEncryptionMethod = false;
+        } elseif ('tls' === $IMAPEncryptionMethodCleaned) {
+            $this->IMAPEncryptionMethod = 'tls';
+        } else {
+            $this->IMAPEncryptionMethod = 'ssl';
+        }
+        $this->IMAPCertificateValidation = $IMAPCertificateValidation;
+
         $this->autoCreate = $autoCreate;
 
         $this->doctrine = $doctrine;
@@ -55,7 +80,6 @@ public function __construct(ManagerRegistry $doctrine, Utils $utils, string $IMA
      */
     protected function imapOpen(string $username, string $password): bool
     {
-        // $cm = new ClientManager('path/to/config/imap.php');
         $cm = new ClientManager($options = []);
 
         $components = parse_url($this->IMAPAuthUrl);
@@ -66,12 +90,21 @@ protected function imapOpen(string $username, string $password): bool
             return false;
         }
 
+        // Trying to choose the best port if it was not provided
+        if ($components['port']) {
+            $port = $components['port'];
+        } elseif (false === $this->IMAPEncryptionMethod) {
+            $port = 143;
+        } else {
+            $port = 993;
+        }
+
         // Create a new instance of the IMAP client manually
         $client = $cm->make([
             'host' => $components['host'],
-            'port' => $components['port'] ?? 993,
-            'encryption' => 'ssl',
-            'validate_cert' => true,
+            'port' => $port,
+            'encryption' => $this->IMAPEncryptionMethod,
+            'validate_cert' => $this->IMAPCertificateValidation,
             'username' => $username,
             'password' => $password,
             'protocol' => 'imap',
@@ -110,7 +143,7 @@ protected function imapOpen(string $username, string $password): bool
     /**
      * Validates a username and password by trying to authenticate against IMAP.
      */
-    protected function validateUserPass($username, $password)
+    protected function validateUserPass($username, $password): bool
     {
         return $this->imapOpen($username, $password);
     }

templates/dashboard.html.twig

@@ -42,7 +42,7 @@
         <span>{{ "dashboard.version"|trans }} : <code>{{ version }}</code> (SabreDAV <code>{{ sabredav_version }}</code>)</span>
         <a class="github-link" href="https://github.com/tchapi/davis" data-bs-toggle="popover" data-bs-trigger="hover" data-bs-content="Project Github page" data-bs-placement="bottom"></a>
       </li>
-      <li class="list-group-item list-group-item-secondary">{{ "dashboard.auth"|trans }} : <code>{{ authMethod }}</code> ({{ "dashboard.auth_realm"|trans }}: <code>{{ authRealm }}</code>)</li>
+      <li class="list-group-item list-group-item-secondary">{{ "dashboard.auth"|trans }} : <code>{{ authMethod }}</code>{% if authMethod == 'Basic' %} ({{ "dashboard.auth_realm"|trans }}: <code>{{ authRealm }}</code>){% endif %}</li>
       <li class="list-group-item list-group-item-secondary">{{ "dashboard.invite_from_address"|trans }} : <code>{{ invite_from_address|default('Not set') }}</code></li>
       <li class="list-group-item list-group-item-secondary d-flex justify-content-between align-items-center ">
         <span>{{ "dashboard.server_timezone"|trans }} : <code>{{ timezone.actual_default }}</code></span>