Add Sieve support

* Expose managesieve port
* Add sieve client factory
* Add support for sieve to provisioning
* Refactor test connectivity logic and add sieve.
* Add support for sieve to provisioning
* Add sieve to account form
* Add debug logger for ManageSieve
* Add api to get and update active script
* Add error for managesieve exception
* Add text editor to update existing script

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

3 files changed, 98 insertions, 3 deletions

diff --git a/lib/Service/Provisioning/Config.php b/lib/Service/Provisioning/Config.php
index 2af2f1827..74b8cda8d 100644
--- a/lib/Service/Provisioning/Config.php
+++ b/lib/Service/Provisioning/Config.php
@@ -111,6 +111,45 @@ class Config implements JsonSerializable {
 	}
 
 	/**
+	 * @return boolean
+	 */
+	public function getSieveEnabled(): bool {
+		return (bool)$this->data['sieveEnabled'];
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getSieveHost() {
+		return $this->data['sieveHost'];
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getSievePort(): int {
+		return (int)$this->data['sievePort'];
+	}
+
+	/**
+	 * @param IUser $user
+	 * @return string
+	 */
+	public function buildSieveUser(IUser $user) {
+		if (isset($this->data['sieveUser'])) {
+			return $this->buildUserEmail($this->data['sieveUser'], $user);
+		}
+		return $this->buildEmail($user);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getSieveSslMode() {
+		return $this->data['sieveSslMode'];
+	}
+
+	/**
 	 * Replace %USERID% and %EMAIL% to allow special configurations
 	 *
 	 * @param string $original
diff --git a/lib/Service/Provisioning/Manager.php b/lib/Service/Provisioning/Manager.php
index c948f0e69..742c87f13 100644
--- a/lib/Service/Provisioning/Manager.php
+++ b/lib/Service/Provisioning/Manager.php
@@ -100,7 +100,12 @@ class Manager {
 									string $smtpUser,
 									string $smtpHost,
 									int $smtpPort,
-									string $smtpSslMode): void {
+									string $smtpSslMode,
+									bool $sieveEnabled,
+									string $sieveUser,
+									string $sieveHost,
+									int $sievePort,
+									string $sieveSslMode): void {
 		$config = $this->configMapper->save(new Config([
 			'active' => true,
 			'email' => $email,
@@ -112,6 +117,11 @@ class Manager {
 			'smtpHost' => $smtpHost,
 			'smtpPort' => $smtpPort,
 			'smtpSslMode' => $smtpSslMode,
+			'sieveEnabled' => $sieveEnabled,
+			'sieveUser' => $sieveUser,
+			'sieveHost' => $sieveHost,
+			'sievePort' => $sievePort,
+			'sieveSslMode' => $sieveSslMode,
 		]));
 
 		$this->provision($config);
@@ -128,6 +138,19 @@ class Manager {
 		$account->setOutboundHost($config->getSmtpHost());
 		$account->setOutboundPort($config->getSmtpPort());
 		$account->setOutboundSslMode($config->getSmtpSslMode());
+		$account->setSieveEnabled($config->getSieveEnabled());
+
+		if ($config->getSieveEnabled()) {
+			$account->setSieveUser($config->buildSieveUser($user));
+			$account->setSieveHost($config->getSieveHost());
+			$account->setSievePort($config->getSievePort());
+			$account->setSieveSslMode($config->getSieveSslMode());
+		} else {
+			$account->setSieveUser(null);
+			$account->setSieveHost(null);
+			$account->setSievePort(null);
+			$account->setSieveSslMode(null);
+		}
 
 		return $account;
 	}
diff --git a/lib/Service/SetupService.php b/lib/Service/SetupService.php
index 0be5984bf..ffd6146ac 100644
--- a/lib/Service/SetupService.php
+++ b/lib/Service/SetupService.php
@@ -26,9 +26,14 @@ declare(strict_types=1);
 
 namespace OCA\Mail\Service;
 
+use Horde_Imap_Client_Exception;
+use Horde_Mail_Exception;
+use Horde_Mail_Transport_Smtphorde;
 use OCA\Mail\Account;
 use OCA\Mail\Db\MailAccount;
+use OCA\Mail\Exception\CouldNotConnectException;
 use OCA\Mail\Exception\ServiceException;
+use OCA\Mail\IMAP\IMAPClientFactory;
 use OCA\Mail\Service\AutoConfig\AutoConfig;
 use OCA\Mail\SMTP\SmtpClientFactory;
 use OCP\Security\ICrypto;
@@ -48,6 +53,9 @@ class SetupService {
 	/** @var SmtpClientFactory */
 	private $smtpClientFactory;
 
+	/** @var IMAPClientFactory */
+	private $imapClientFactory;
+
 	/** var LoggerInterface */
 	private $logger;
 
@@ -55,11 +63,13 @@ class SetupService {
 								AccountService $accountService,
 								ICrypto $crypto,
 								SmtpClientFactory $smtpClientFactory,
+								IMAPClientFactory $imapClientFactory,
 								LoggerInterface $logger) {
 		$this->autoConfig = $autoConfig;
 		$this->accountService = $accountService;
 		$this->crypto = $crypto;
 		$this->smtpClientFactory = $smtpClientFactory;
+		$this->imapClientFactory = $imapClientFactory;
 		$this->logger = $logger;
 	}
 
@@ -124,12 +134,35 @@ class SetupService {
 
 		$account = new Account($newAccount);
 		$this->logger->debug('Connecting to account {account}', ['account' => $newAccount->getEmail()]);
-		$transport = $this->smtpClientFactory->create($account);
-		$account->testConnectivity($transport);
+		$this->testConnectivity($account);
 
 		$this->accountService->save($newAccount);
 		$this->logger->debug("account created " . $newAccount->getId());
 
 		return $account;
 	}
+
+	/**
+	 * @param Account $account
+	 * @throws CouldNotConnectException
+	 */
+	protected function testConnectivity(Account $account): void {
+		$mailAccount = $account->getMailAccount();
+
+		$imapClient = $this->imapClientFactory->getClient($account);
+		try {
+			$imapClient->login();
+		} catch (Horde_Imap_Client_Exception $e) {
+			throw CouldNotConnectException::create($e, 'IMAP', $mailAccount->getInboundHost(), $mailAccount->getInboundPort());
+		}
+
+		$transport = $this->smtpClientFactory->create($account);
+		if ($transport instanceof Horde_Mail_Transport_Smtphorde) {
+			try {
+				$transport->getSMTPObject();
+			} catch (Horde_Mail_Exception $e) {
+				throw CouldNotConnectException::create($e, 'SMTP', $mailAccount->getOutboundHost(), $mailAccount->getOutboundPort());
+			}
+		}
+	}
 }