Sieve

.github/workflows/test.yml

@@ -68,6 +68,7 @@ jobs:
                   - 25:25
                   - 143:143
                   - 993:993
+                  - 4190:4190
           mysql-service:
               image: mariadb:10
               env:

Makefile

@@ -49,6 +49,7 @@ start-docker:
 	-p 25:25 \
 	-p 143:143 \
 	-p 993:993 \
+	-p 4190:4190 \
 	--hostname mail.domain.tld \
 	-e MAILNAME=mail.domain.tld \
 	-e MAIL_ADDRESS=user@domain.tld \

appinfo/info.xml

@@ -12,7 +12,7 @@
 - **🙈 We’re not reinventing the wheel!** Based on the great [Horde](http://horde.org) libraries.
 - **📬 Want to host your own mail server?** We don’t have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!
 	]]></description>
-	<version>1.9.0-alpha.1</version>
+	<version>1.9.0-alpha.2</version>
 	<licence>agpl</licence>
 	<author>Christoph Wurst</author>
 	<author>Greta Doçi</author>
@@ -42,6 +42,7 @@
 			<step>OCA\Mail\Migration\FixBackgroundJobs</step>
 			<step>OCA\Mail\Migration\MakeItineraryExtractorExecutable</step>
 			<step>OCA\Mail\Migration\MigrateProvisioningConfig</step>
+			<step>OCA\Mail\Migration\AddSieveToProvisioningConfig</step>
 			<step>OCA\Mail\Migration\ProvisionAccounts</step>
 		</post-migration>
 	</repair-steps>

appinfo/routes.php

@@ -204,6 +204,21 @@
 			'url' => '/api/trustedsenders',
 			'verb' => 'GET'
 		],
+		[
+			'name' => 'sieve#updateAccount',
+			'url' => '/api/sieve/account/{id}',
+			'verb' => 'PUT'
+		],
+		[
+			'name' => 'sieve#getActiveScript',
+			'url' => '/api/sieve/active/{id}',
+			'verb' => 'GET'
+		],
+		[
+			'name' => 'sieve#updateActiveScript',
+			'url' => '/api/sieve/active/{id}',
+			'verb' => 'PUT'
+		]
 	],
 	'resources' => [
 		'accounts' => ['url' => '/api/accounts'],

composer.json

@@ -32,6 +32,7 @@
 		"pear-pear.horde.org/horde_exception": "^2.0.8@stable",
 		"pear-pear.horde.org/horde_imap_client": "^2.29.16@stable",
 		"pear-pear.horde.org/horde_mail": "^2.6.4@stable",
+		"pear-pear.horde.org/horde_managesieve": "^1.0",
 		"pear-pear.horde.org/horde_mime": "^2.11.0@stable",
 		"pear-pear.horde.org/horde_nls": "^2.2.1@stable",
 		"pear-pear.horde.org/horde_smtp": "^1.9.5@stable",

doc/admin.md

@@ -28,6 +28,11 @@ Depending on your mail host, it may be necessary to increase your IMAP and/or SM
 ```php
 'app.mail.smtp.timeout' => 2
 ```
+#### Sieve timeout
+```php
+'app.mail.sieve.timeout' => 2
+```
+
 ### Use php-mail for sending mail
 You can use the php-mail function to send mails. This is needed for some webhosters (1&1 (1und1)):
 ```php

lib/Controller/SettingsController.php

@@ -50,7 +50,12 @@ public function provisioning(string $emailTemplate,
 								 string $smtpUser,
 								 string $smtpHost,
 								 int $smtpPort,
-								 string $smtpSslMode): JSONResponse {
+								 string $smtpSslMode,
+								 bool $sieveEnabled,
+								 string $sieveUser,
+								 string $sieveHost,
+								 int $sievePort,
+								 string $sieveSslMode): JSONResponse {
 		$this->provisioningManager->newProvisioning(
 			$emailTemplate,
 			$imapUser,
@@ -60,7 +65,12 @@ public function provisioning(string $emailTemplate,
 			$smtpUser,
 			$smtpHost,
 			$smtpPort,
-			$smtpSslMode
+			$smtpSslMode,
+			$sieveEnabled,
+			$sieveUser,
+			$sieveHost,
+			$sievePort,
+			$sieveSslMode
 		);
 
 		return new JSONResponse([]);