2023-07-12 01:00:05 +02:00
|
|
|
<div class="tab-pane fade" id="tab-config-quarantine" role="tabpanel" aria-labelledby="tab-config-quarantine">
|
2022-06-06 20:38:24 +02:00
|
|
|
<div class="card mb-4">
|
2022-10-11 11:41:06 +02:00
|
|
|
<div class="card-header d-flex fs-5">
|
2023-07-12 01:00:05 +02:00
|
|
|
<button class="btn d-md-none flex-grow-1 text-start" data-bs-target="#collapse-tab-config-quarantine" data-bs-toggle="collapse" aria-controls="collapse-tab-config-quarantine">
|
2022-06-06 20:38:24 +02:00
|
|
|
{{ lang.admin.quarantine }}
|
|
|
|
</button>
|
|
|
|
<span class="d-none d-md-block">{{ lang.admin.quarantine }}</span>
|
|
|
|
</div>
|
|
|
|
<div id="collapse-tab-config-quarantine" class="card-body collapse" data-bs-parent="#admin-content">
|
2021-09-22 20:47:10 +02:00
|
|
|
{% if not q_data.retention_size or not q_data.max_size %}
|
|
|
|
<div class="alert alert-info">{{ lang.quarantine.disabled_by_config }}</div>
|
|
|
|
{% endif %}
|
|
|
|
<form class="form-horizontal" data-id="quarantine" role="form" method="post">
|
2022-04-13 16:37:52 +02:00
|
|
|
<div class="row mb-4">
|
|
|
|
<label class="col-sm-4 control-label text-sm-end" for="quarantine_retention_size">{{ lang.admin.quarantine_retention_size|raw }}</label>
|
2021-09-22 20:47:10 +02:00
|
|
|
<div class="col-sm-8">
|
|
|
|
<input type="number" class="form-control" id="quarantine_retention_size" name="retention_size" value="{{ q_data.retention_size }}" placeholder="0" required>
|
|
|
|
</div>
|
|
|
|
</div>
|
2022-04-13 16:37:52 +02:00
|
|
|
<div class="row mb-4">
|
|
|
|
<label class="col-sm-4 control-label text-sm-end" for="quarantine_max_size">{{ lang.admin.quarantine_max_size|raw }}</label>
|
2021-09-22 20:47:10 +02:00
|
|
|
<div class="col-sm-8">
|
|
|
|
<input type="number" class="form-control" id="quarantine_max_size" name="max_size" value="{{ q_data.max_size }}" placeholder="0" required>
|
|
|
|
</div>
|
|
|
|
</div>
|
2022-04-13 16:37:52 +02:00
|
|
|
<div class="row mb-4">
|
|
|
|
<label class="col-sm-4 control-label text-sm-end" for="quarantine_max_score">{{ lang.admin.quarantine_max_score|raw }}</label>
|
2021-09-22 20:47:10 +02:00
|
|
|
<div class="col-sm-8">
|
|
|
|
<input type="number" class="form-control" id="quarantine_max_score" name="max_score" value="{{ q_data.max_score }}" placeholder="9999.0">
|
|
|
|
</div>
|
|
|
|
</div>
|
2022-04-13 16:37:52 +02:00
|
|
|
<div class="row mb-4">
|
|
|
|
<label class="col-sm-4 control-label text-sm-end" for="quarantine_max_age">{{ lang.admin.quarantine_max_age|raw }}</label>
|
2021-09-22 20:47:10 +02:00
|
|
|
<div class="col-sm-8">
|
|
|
|
<input type="number" class="form-control" id="quarantine_max_age" name="max_age" value="{{ q_data.max_age }}" min="1" required>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<hr>
|
2022-04-13 16:37:52 +02:00
|
|
|
<div class="row mb-4">
|
|
|
|
<label class="col-sm-4 control-label text-sm-end" for="quarantine_redirect"><i class="bi bi-box-arrow-right"></i> {{ lang.admin.quarantine_redirect|raw }}</label>
|
2021-09-22 20:47:10 +02:00
|
|
|
<div class="col-sm-8">
|
|
|
|
<input type="email" class="form-control" id="quarantine_redirect" name="redirect" value="{{ q_data.redirect }}" placeholder="">
|
|
|
|
</div>
|
|
|
|
</div>
|
2022-04-13 16:37:52 +02:00
|
|
|
<div class="row mb-4">
|
|
|
|
<label class="col-sm-4 control-label text-sm-end" for="quarantine_bcc"><i class="bi bi-files"></i> {{ lang.admin.quarantine_bcc|raw }}</label>
|
2021-09-22 20:47:10 +02:00
|
|
|
<div class="col-sm-8">
|
|
|
|
<input type="email" class="form-control" id="quarantine_bcc" name="bcc" value="{{ q_data.bcc }}" placeholder="">
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<hr>
|
2022-04-13 16:37:52 +02:00
|
|
|
<div class="row mb-2">
|
|
|
|
<label class="col-sm-4 control-label text-sm-end" for="quarantine_sender">{{ lang.admin.quarantine_notification_sender }}:</label>
|
2021-09-22 20:47:10 +02:00
|
|
|
<div class="col-sm-8">
|
|
|
|
<input type="email" class="form-control" id="quarantine_sender" name="sender" value="{{ q_data.sender }}" placeholder="quarantine@localhost">
|
|
|
|
</div>
|
|
|
|
</div>
|
2022-04-13 16:37:52 +02:00
|
|
|
<div class="row mb-4">
|
|
|
|
<label class="col-sm-4 control-label text-sm-end" for="quarantine_subject">{{ lang.admin.quarantine_notification_subject }}:</label>
|
2021-09-22 20:47:10 +02:00
|
|
|
<div class="col-sm-8">
|
|
|
|
<input type="text" class="form-control" id="quarantine_subject" name="subject" value="{{ q_data.subject }}" placeholder="Spam Quarantine Notification">
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<hr>
|
2022-04-13 16:37:52 +02:00
|
|
|
<div class="row mb-2">
|
|
|
|
<label class="col-sm-4 control-label text-sm-end" for="quarantine_release_format">{{ lang.admin.quarantine_release_format }}:</label>
|
|
|
|
<div class="col-sm-8 col-md-6 col-lg-4 col-xl-3">
|
2021-09-22 20:47:10 +02:00
|
|
|
<select data-width="100%" id="quarantine_release_format" name="release_format" class="selectpicker" title="{{ lang.tfa.select }}">
|
|
|
|
<option {% if q_data.release_format == 'raw' %}selected{% endif %} value="raw">{{ lang.admin.quarantine_release_format_raw }}</option>
|
|
|
|
<option {% if q_data.release_format == 'attachment' %}selected{% endif %} value="attachment">{{ lang.admin.quarantine_release_format_att }}</option>
|
|
|
|
</select>
|
|
|
|
</div>
|
|
|
|
</div>
|
2022-04-13 16:37:52 +02:00
|
|
|
<div class="row mb-4">
|
|
|
|
<label class="col-sm-4 control-label text-sm-end" for="exclude_domains">{{ lang.admin.quarantine_exclude_domains }}:</label>
|
|
|
|
<div class="col-sm-8 col-md-6 col-lg-4 col-xl-3">
|
2021-09-22 20:47:10 +02:00
|
|
|
<select data-width="100%" name="exclude_domains" class="selectpicker" title="{{ lang.tfa.select }}" multiple>
|
|
|
|
{% for domain in all_domains %}
|
🐄 Moorch Update 2022 - ClamAV, Dovecot & Olefy Update (#4497)
* [API] Fix minor issue in api docs
* [GH-Actions][stale] Add neverstale label to exempt list
* [Web] add github version tag
* [Web] add github version tag
* [Web] add github version tag
* [Web] add github version tag
* [Web] add github version tag
* [Web] add github version tag error handling
* [Web] add github version tag error handling
* Passwordless SOGo auth: support for calendar invitations and calendar/contacts subscriptions
Inviting someone to a calendar event triggers a request to /SOGo/so/otheruser@example.com/freebusy.ifb/ajaxRead. Subscribing to someone's calendar/contacts triggers a request to /SOGo/so/otheruser@example.com/foldersSearch. The email address in the URL is different from the logged-in user, which needs to be handled appropriately by sogo-auth.php.
* [Web] add github version tag - adjust css
* [Compose] Update SOGo Autoreply Schedule to 5m
Based on the advice of inverse (SOGo developer). Thanks to https://github.com/jmber
Closes: https://github.com/mailcow/mailcow-dockerized/issues/4436
* [Web] add github version tag - move twig globals
* [Web] add github version tag - missing </div>
* Passwordless SOGo auth: improvements for when accessing other users
* [WebAuthn] fido2 passwordless auth - fix (#4440)
* [WebAuthn] fido2 revert
* [WebAuthn] set UV flags to 'discouraged'
* [WebAuthn] revert - set UV flags to 'discouraged'
* Update clamav to 0.104.2
* Update clamav to 0.104.2
* Update dovecot to 2.3.18
Update gosu to 1.14
Use debian bullseye as base
* [Web] Updated lang.es.json [CI SKIP] (#4453)
Co-authored-by: Fijxu <fijxu@zzls.xyz>
Co-authored-by: milkmaker <milkmaker@mailcow.de>
Co-authored-by: Fijxu <fijxu@zzls.xyz>
* Fix broken documentation links (#4458)
* Fix broken documentation links
* Fix a few more broken documentation links
* Fix broken documentation links in translation files
* Fall back to empty string if WATCHDOG_NOTIFY_EMAIL undefined (#4457)
By default, `.env` (`mailcow.conf`) does not define `WATCHDOG_NOTIFY_EMAIL`.
Using it in `docker-compose.yml` without having it defined leads to Compose v2 displaying this warning on startup:
> WARNING: The WATCHDOG_NOTIFY_EMAIL variable is not set. Defaulting to a blank string.
Related to https://github.com/mailcow/mailcow-dockerized/issues/4315
* [Web] Updated lang.sk.json [CI SKIP] (#4461)
Co-authored-by: Lukáš Matula <lukas@gbely.net>
Co-authored-by: milkmaker <milkmaker@mailcow.de>
Co-authored-by: Lukáš Matula <lukas@gbely.net>
* oletools: disable template injection detection (#4464)
Seems to be causing a lot of false positives lately
* Fix minor typo in comment (#4466)
Correction of the comment, so that the explanation is correct and can be understood.
* Update issue templates to issue forms (#4465)
This PR updates the issue templates to GitHubs new issue forms
* [Web] Fix padding issue in UI admin panel (#4481)
* [Web] fix admin panel padding issue
* [Web] fix admin panel padding issue
* [Web] Updated lang.sk.json [CI SKIP] (#4489)
Co-authored-by: Lukáš Matula <lukas@gbely.net>
Co-authored-by: milkmaker <milkmaker@mailcow.de>
Co-authored-by: Lukáš Matula <lukas@gbely.net>
* increase opcache.interned_strings_buffer to 16 (#4487)
since version 23.0.2 Nextcloud recommends having a value greater than 8 for `opcache.interned_strings_buffer`. As this memory will be only used when needed this should have no impact on installations that are not using nextcloud.
related discussion: https://help.nextcloud.com/t/nextcloud-23-02-opcache-interned-strings-buffer/134007/19
related nextcloud issue: https://github.com/nextcloud/server/issues/31223
* nextcloud - add missing redirections (#4366)
adds missing location directives to the nginx configuration of nextcloud 22, to prevent warnings in nextcloud admin center of missing redirections
* Update imapsync to 2.178 (#4491)
* Update and fix oletools (#4479)
As noticed by @MAGICCC (#4464 (comment)), our olefy image does not work anymore if you rebuild it. This is because @HeinleinSupport recently updated their repository with the changes from @decalage2's repository, which renamed olvba3 to olevba. Since @HeinleinSupport does not recommend using its own patched branch and is very slow in pulling in changes from upstream (@decalage2), let's switch to the latter. This also allowed me to revert #4464.
Finally, a minor patch to rspamd is necessary. While the documentation says
In the extended mode the oletools module will not trigger on specific categories, but will always set a threat string with all found flags when at least a macro was found.
This is not actually true -- it only sets it when suspicious or autoexec threats were detected. But it's a one-line patch to make rspamd behave as documented and we should submit that patch to @rspamd too. With this patch, I have confirmed that Mailcow will reject any incoming, non-whitelisted message containing attachments with macros.
* [Web] Fix excluded domain list in quaratine view
Previously excluded domains from quarantine were not shown.
* [Dovecot] Update syslogng Version to 3.28 (#4496)
Co-authored-by: Niklas Meyer <niklas.meyer@tinc.gmbh>
Co-authored-by: ntimo <git@nowitzki.me>
Co-authored-by: Peter <magic@kthx.at>
Co-authored-by: FreddleSpl0it <patschul@posteo.de>
Co-authored-by: FreddleSpl0it <75116288+FreddleSpl0it@users.noreply.github.com>
Co-authored-by: Michael Kuron <mkuron@users.noreply.github.com>
Co-authored-by: milkmaker <milkmaker@mailcow.de>
Co-authored-by: Fijxu <fijxu@zzls.xyz>
Co-authored-by: Slavi Pantaleev <slavi@devture.com>
Co-authored-by: Lukáš Matula <lukas@gbely.net>
Co-authored-by: Max <mail@heavygale.de>
Co-authored-by: Michael Cramer <michael@bigmichi1.de>
Co-authored-by: Robert Christian <soulsymphonies@users.noreply.github.com>
Co-authored-by: André <andre.peters@debinux.de>
Co-authored-by: Niklas Meyer <niklas.meyer@tinc.gmbh>
2022-03-02 17:32:17 +02:00
|
|
|
<option {% if domain in q_data.exclude_domains %}selected{% endif %}>{{ domain }}</option>
|
2021-09-22 20:47:10 +02:00
|
|
|
{% endfor %}
|
|
|
|
</select>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<hr>
|
2022-03-30 13:04:54 +02:00
|
|
|
<legend data-bs-target="#quarantine_template" style="cursor:pointer" unselectable="on" data-bs-toggle="collapse">
|
2021-09-22 20:47:10 +02:00
|
|
|
<i style="font-size:10pt;" class="bi bi-plus-square"></i> {{ lang.admin.quarantine_notification_html|raw }}
|
|
|
|
</legend>
|
2022-03-31 12:57:33 +02:00
|
|
|
<hr />
|
2021-09-22 20:47:10 +02:00
|
|
|
<div id="quarantine_template" class="collapse" >
|
|
|
|
<textarea autocorrect="off" spellcheck="false" autocapitalize="none" class="form-control textarea-code" rows="40" name="html_tmpl">{{ q_data.html_tmpl|raw }}</textarea>
|
|
|
|
</div>
|
2022-03-31 15:24:10 +02:00
|
|
|
<button class="btn btn-sm d-block d-sm-inline btn-success" data-action="edit_selected" data-item="self" data-id="quarantine" data-api-url='edit/quarantine' data-api-attr='{"action":"settings"}' href="#"><i class="bi bi-check-lg"></i> {{ lang.admin.save }}</button>
|
2021-09-22 20:47:10 +02:00
|
|
|
</form>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|