diff --git a/data/conf/rspamd/custom/global_from_blacklist.map b/data/conf/rspamd/custom/global_from_blacklist.map index dd04f45c..926c6b32 100644 --- a/data/conf/rspamd/custom/global_from_blacklist.map +++ b/data/conf/rspamd/custom/global_from_blacklist.map @@ -1 +1 @@ -# /.*@example.com/i' +# /.*@example.com/i diff --git a/data/conf/rspamd/custom/global_from_whitelist.map b/data/conf/rspamd/custom/global_from_whitelist.map index dd04f45c..926c6b32 100644 --- a/data/conf/rspamd/custom/global_from_whitelist.map +++ b/data/conf/rspamd/custom/global_from_whitelist.map @@ -1 +1 @@ -# /.*@example.com/i' +# /.*@example.com/i diff --git a/data/conf/rspamd/custom/global_rcpt_blacklist.map b/data/conf/rspamd/custom/global_rcpt_blacklist.map new file mode 100644 index 00000000..926c6b32 --- /dev/null +++ b/data/conf/rspamd/custom/global_rcpt_blacklist.map @@ -0,0 +1 @@ +# /.*@example.com/i diff --git a/data/conf/rspamd/custom/global_rcpt_whitelist.map b/data/conf/rspamd/custom/global_rcpt_whitelist.map new file mode 100644 index 00000000..926c6b32 --- /dev/null +++ b/data/conf/rspamd/custom/global_rcpt_whitelist.map @@ -0,0 +1 @@ +# /.*@example.com/i diff --git a/data/conf/rspamd/local.d/multimap.conf b/data/conf/rspamd/local.d/multimap.conf index 40cbfda7..47eca4ff 100644 --- a/data/conf/rspamd/local.d/multimap.conf +++ b/data/conf/rspamd/local.d/multimap.conf @@ -49,3 +49,19 @@ GLOBAL_FROM_BL { prefilter = true; action = "reject"; } + +GLOBAL_RCPT_WL { + type = "rcpt"; + map = "$LOCAL_CONFDIR/custom/global_rcpt_whitelist.map"; + regexp = true; + prefilter = true; + action = "accept"; +} + +GLOBAL_RCPT_BL { + type = "rcpt"; + map = "$LOCAL_CONFDIR/custom/global_rcpt_blacklist.map"; + regexp = true; + prefilter = true; + action = "reject"; +} diff --git a/data/web/css/mailcow.css b/data/web/css/mailcow.css index 04d1b874..ee6eb2a5 100644 --- a/data/web/css/mailcow.css +++ b/data/web/css/mailcow.css @@ -3,28 +3,24 @@ font-style: normal; font-weight: 300; src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url('../fonts/SourceSansPro-Light.woff2') format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215; } @font-face { font-family: 'Source Sans Pro'; font-style: normal; font-weight: 400; src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('../fonts/SourceSansPro-Regular.woff2') format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215; } @font-face { font-family: 'Source Sans Pro'; font-style: normal; font-weight: 700; src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url('../fonts/SourceSansPro-Bold.woff2') format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215; } @font-face { font-family: 'Source Sans Pro'; font-style: italic; font-weight: 700; src: local('Source Sans Pro Bold Italic'), local('SourceSansPro-BoldIt'), url('../fonts/SourceSansPro-BoldIt.woff2') format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215; } #maxmsgsize { min-width: 80px; } #slider1 .slider-selection { diff --git a/data/web/fonts/SourceSansPro-Bold.woff2 b/data/web/fonts/SourceSansPro-Bold.woff2 index 89bfd796..e6f92a55 100644 Binary files a/data/web/fonts/SourceSansPro-Bold.woff2 and b/data/web/fonts/SourceSansPro-Bold.woff2 differ diff --git a/data/web/fonts/SourceSansPro-BoldIt.woff2 b/data/web/fonts/SourceSansPro-BoldIt.woff2 index 83d5b491..50c117d9 100644 Binary files a/data/web/fonts/SourceSansPro-BoldIt.woff2 and b/data/web/fonts/SourceSansPro-BoldIt.woff2 differ diff --git a/data/web/fonts/SourceSansPro-Light.woff2 b/data/web/fonts/SourceSansPro-Light.woff2 index 75ec2c04..9b18cc1a 100644 Binary files a/data/web/fonts/SourceSansPro-Light.woff2 and b/data/web/fonts/SourceSansPro-Light.woff2 differ diff --git a/data/web/fonts/SourceSansPro-Regular.woff2 b/data/web/fonts/SourceSansPro-Regular.woff2 index 6dda30cd..e49739d4 100644 Binary files a/data/web/fonts/SourceSansPro-Regular.woff2 and b/data/web/fonts/SourceSansPro-Regular.woff2 differ diff --git a/data/web/js/quarantine.js b/data/web/js/quarantine.js index f8438099..9f655564 100644 --- a/data/web/js/quarantine.js +++ b/data/web/js/quarantine.js @@ -60,6 +60,12 @@ jQuery(function($){ $( "#qid_error" ).text(data.error); $( "#qid_error" ).show(); } + $( "li" ).each(function( index ) { + console.log( index + ": " + $( this ).text() ); + }); + $('[data-id="qitems_single"]').each(function( index ) { + $(this).attr("data-item", qitem); + }); $('#qid_detail_subj').text(data.subject); $('#qid_detail_text').text(data.text_plain); $('#qid_detail_text_from_html').text(data.text_html); diff --git a/data/web/modals/quarantine.php b/data/web/modals/quarantine.php index 41a63413..30a0d3b8 100644 --- a/data/web/modals/quarantine.php +++ b/data/web/modals/quarantine.php @@ -12,6 +12,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {

+
@@ -29,6 +30,16 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
-
+
+ + +
diff --git a/docker-compose.yml b/docker-compose.yml index 0d0e610a..20c123cb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -72,7 +72,7 @@ services: - clamd rspamd-mailcow: - image: mailcow/rspamd:1.30 + image: mailcow/rspamd:1.31 build: ./data/Dockerfiles/rspamd stop_grace_period: 30s depends_on: