From 5b4b184778ac04bd90fb2745d6d5a19f8423d7cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Thu, 23 Aug 2018 08:49:02 +0200 Subject: [PATCH 01/56] [Web] Fixes to mailcow logo (stickers are coming!) [Web] Fix adding multiple domain aliases, fixes #1705 --- data/web/img/cow_mailcow.svg | 316 ++++++++++++------------- data/web/inc/functions.mailbox.inc.php | 42 ++-- 2 files changed, 174 insertions(+), 184 deletions(-) diff --git a/data/web/img/cow_mailcow.svg b/data/web/img/cow_mailcow.svg index d4577821..6ba98e46 100644 --- a/data/web/img/cow_mailcow.svg +++ b/data/web/img/cow_mailcow.svg @@ -1,5 +1,5 @@ - + image/svg+xml \ No newline at end of file + id="white_1_"> \ No newline at end of file diff --git a/data/web/inc/functions.mailbox.inc.php b/data/web/inc/functions.mailbox.inc.php index 200ff0ae..b17e204f 100644 --- a/data/web/inc/functions.mailbox.inc.php +++ b/data/web/inc/functions.mailbox.inc.php @@ -637,7 +637,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) { ); return false; } - foreach ($alias_domains as $i => &$alias_domain) { + foreach ($alias_domains as $i => $alias_domain) { $alias_domain = idn_to_ascii(strtolower(trim($alias_domain))); if (!is_valid_domain_name($alias_domain)) { $_SESSION['return'][] = array( @@ -680,30 +680,30 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) { ); continue; } - } - $stmt = $pdo->prepare("INSERT INTO `alias_domain` (`alias_domain`, `target_domain`, `active`) - VALUES (:alias_domain, :target_domain, :active)"); - $stmt->execute(array( - ':alias_domain' => $alias_domain, - ':target_domain' => $target_domain, - ':active' => $active - )); - try { - $redis->hSet('DOMAIN_MAP', $alias_domain, 1); - } - catch (RedisException $e) { + $stmt = $pdo->prepare("INSERT INTO `alias_domain` (`alias_domain`, `target_domain`, `active`) + VALUES (:alias_domain, :target_domain, :active)"); + $stmt->execute(array( + ':alias_domain' => $alias_domain, + ':target_domain' => $target_domain, + ':active' => $active + )); + try { + $redis->hSet('DOMAIN_MAP', $alias_domain, 1); + } + catch (RedisException $e) { + $_SESSION['return'][] = array( + 'type' => 'danger', + 'log' => array(__FUNCTION__, $_action, $_type, $_data_log, $_attr), + 'msg' => array('redis_error', $e) + ); + return false; + } $_SESSION['return'][] = array( - 'type' => 'danger', + 'type' => 'success', 'log' => array(__FUNCTION__, $_action, $_type, $_data_log, $_attr), - 'msg' => array('redis_error', $e) + 'msg' => array('aliasd_added', htmlspecialchars($alias_domain)) ); - return false; } - $_SESSION['return'][] = array( - 'type' => 'success', - 'log' => array(__FUNCTION__, $_action, $_type, $_data_log, $_attr), - 'msg' => array('aliasd_added', htmlspecialchars($alias_domain)) - ); break; case 'mailbox': $local_part = strtolower(trim($_data['local_part'])); From 4b09b5b1bb78cb5e5623954bc9680342e982a725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Peters?= Date: Sun, 26 Aug 2018 18:31:44 +0200 Subject: [PATCH 02/56] Update functions.mailbox.inc.php [Web] Remove invalid parameter from sieve_filters update query, fixes #1714 --- data/web/inc/functions.mailbox.inc.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/web/inc/functions.mailbox.inc.php b/data/web/inc/functions.mailbox.inc.php index b17e204f..dd40fa0e 100644 --- a/data/web/inc/functions.mailbox.inc.php +++ b/data/web/inc/functions.mailbox.inc.php @@ -139,7 +139,6 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) { $stmt = $pdo->prepare("UPDATE `sieve_filters` SET `script_name` = 'inactive' WHERE `username` = :username AND `filter_type` = :filter_type"); $stmt->execute(array( ':username' => $username, - 'log' => array(__FUNCTION__, $_action, $_type, $_data_log, $_attr), ':filter_type' => $filter_type )); } @@ -3394,4 +3393,4 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) { if ($_action != 'get' && in_array($_type, array('domain', 'alias', 'alias_domain', 'mailbox'))) { update_sogo_static_view(); } -} \ No newline at end of file +} From 5e56a46c8434ab4289687a20852678c99b02c429 Mon Sep 17 00:00:00 2001 From: sriccio Date: Tue, 28 Aug 2018 17:14:05 +0200 Subject: [PATCH 03/56] [dovecot] Enhancement to allow to use auth_default_realm When using auth_default_realm in dovecot configuration to setup a default domain name (to allow users to login with only a username instead of the full e-mail address), it breaks the compatibility with imapsync and sogo/sieve vacation. Adding a domain name to dovecot master user/pass fixes this. This never made it do the master branch, so I'm trying a PR again :) See: https://github.com/mailcow/mailcow-dockerized/pull/1331#issuecomment-386534307 --- data/Dockerfiles/dovecot/docker-entrypoint.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/Dockerfiles/dovecot/docker-entrypoint.sh b/data/Dockerfiles/dovecot/docker-entrypoint.sh index 70ffb701..50e91a12 100755 --- a/data/Dockerfiles/dovecot/docker-entrypoint.sh +++ b/data/Dockerfiles/dovecot/docker-entrypoint.sh @@ -110,8 +110,9 @@ if [[ $(stat -c %U /var/vmail/) != "vmail" ]] ; then chown -R vmail:vmail /var/v # Create random master for SOGo sieve features RAND_USER=$(cat /dev/urandom | tr -dc 'a-z0-9' | fold -w 16 | head -n 1) RAND_PASS=$(cat /dev/urandom | tr -dc 'a-z0-9' | fold -w 24 | head -n 1) -echo ${RAND_USER}:$(doveadm pw -s SHA1 -p ${RAND_PASS}) > /usr/local/etc/dovecot/dovecot-master.passwd -echo ${RAND_USER}:${RAND_PASS} > /etc/sogo/sieve.creds + +echo ${RAND_USER}@mailcow.local:$(doveadm pw -s SHA1 -p ${RAND_PASS}) > /usr/local/etc/dovecot/dovecot-master.passwd +echo ${RAND_USER}@mailcow.local:${RAND_PASS} > /etc/sogo/sieve.creds # 401 is user dovecot if [[ ! -f /mail_crypt/ecprivkey.pem || ! -f /mail_crypt/ecpubkey.pem ]]; then From e5b830adeaea28d7c5a79f72b72911cbda0cf668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Fri, 31 Aug 2018 23:33:55 +0200 Subject: [PATCH 04/56] [Dovecot] Fix shared namespace --- data/conf/dovecot/dovecot.conf | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/conf/dovecot/dovecot.conf b/data/conf/dovecot/dovecot.conf index dd8db8a3..5fc0024d 100644 --- a/data/conf/dovecot/dovecot.conf +++ b/data/conf/dovecot/dovecot.conf @@ -175,7 +175,7 @@ namespace { type = shared separator = / prefix = Shared/%%u/ - location = maildir:%%h/:CONTROL=~/Shared/%%u:INDEXPVT=~/Shared/%%u + location = maildir:%%h/:INDEX=~/Shared/%%u;CONTROL=~/Shared/%%u subscriptions = no list = children } diff --git a/docker-compose.yml b/docker-compose.yml index 871961a8..c1a3a1c8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -136,7 +136,7 @@ services: - phpfpm sogo-mailcow: - image: mailcow/sogo:1.34 + image: mailcow/sogo:1.35 build: ./data/Dockerfiles/sogo environment: - DBNAME=${DBNAME} From 8a88514dfde20b277ace76b87a126513e040fade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Fri, 7 Sep 2018 16:40:37 +0200 Subject: [PATCH 05/56] [SOGo] Declare /usr/lib/GNUstep/SOGo as volume [Nginx] Mount vols from sogo-mailcow to access /usr/lib/GNUstep/SOGo --- data/Dockerfiles/sogo/Dockerfile | 2 ++ docker-compose.yml | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/data/Dockerfiles/sogo/Dockerfile b/data/Dockerfiles/sogo/Dockerfile index 30a06d24..9d3965a7 100644 --- a/data/Dockerfiles/sogo/Dockerfile +++ b/data/Dockerfiles/sogo/Dockerfile @@ -49,4 +49,6 @@ COPY sogo-full.svg /usr/lib/GNUstep/SOGo/WebServerResources/img/sogo-full.svg COPY acl.diff /acl.diff CMD exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf +VOLUME /usr/lib/GNUstep/SOGo/ + RUN rm -rf /tmp/* /var/tmp/* diff --git a/docker-compose.yml b/docker-compose.yml index c1a3a1c8..353772eb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -136,7 +136,7 @@ services: - phpfpm sogo-mailcow: - image: mailcow/sogo:1.35 + image: mailcow/sogo:1.36 build: ./data/Dockerfiles/sogo environment: - DBNAME=${DBNAME} @@ -264,6 +264,8 @@ services: - ./data/assets/ssl/:/etc/ssl/mail/:ro - ./data/conf/nginx/:/etc/nginx/conf.d/:rw - ./data/conf/rspamd/meta_exporter:/meta_exporter:ro + volumes_from: + - sogo-mailcow ports: - "${HTTPS_BIND:-0.0.0.0}:${HTTPS_PORT:-443}:${HTTPS_PORT:-443}" - "${HTTP_BIND:-0.0.0.0}:${HTTP_PORT:-80}:${HTTP_PORT:-80}" From afc18fd46935e201a9be85ab636f0ed0b77209be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sun, 9 Sep 2018 09:47:47 +0200 Subject: [PATCH 06/56] [Rspamd] Update bad asn, move KEEP_SPAM to a custom lua function --- data/conf/rspamd/custom/bad_asn.map | 15 +++---- data/conf/rspamd/local.d/multimap.conf | 15 ------- data/conf/rspamd/lua/rspamd.local.lua | 54 ++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 22 deletions(-) diff --git a/data/conf/rspamd/custom/bad_asn.map b/data/conf/rspamd/custom/bad_asn.map index 8b7a4407..bc9e10f6 100644 --- a/data/conf/rspamd/custom/bad_asn.map +++ b/data/conf/rspamd/custom/bad_asn.map @@ -1,11 +1,10 @@ # High spam networks, disabled by default #201942:5 #Soltia Consulting SL - ipinfo.io -#16276:5 #OVH -#12876:5 #ONLINE S.A.S -#31034:5 -#12874:5 -#30823:5 -#197071:5 +#16276:2 #OVH +#12876:2 #ONLINE S.A.S +#31034:5 #ARUBA-ASN, IT +#12874:5 #FASTWEB, IT +#30823:3 #PKV spam #42831:5 #UK Dedicated Servers Ltd #29119:5 #Aire Networks del Mediterraneo S.L.U. #13335:5 #Cloudflare @@ -17,7 +16,7 @@ #14061:4 #Digitalocean #55293:4 #A2 Hosting #63018:4 #US Dedicated -#197518:2 +#197518:2 #RACKMARKT #44493:2 #46606:2 #49505:2 @@ -25,3 +24,5 @@ #197695:2 #198068:2 #43146:2 +#49100:4 +#39364:4 diff --git a/data/conf/rspamd/local.d/multimap.conf b/data/conf/rspamd/local.d/multimap.conf index da4afaf2..c27a9d63 100644 --- a/data/conf/rspamd/local.d/multimap.conf +++ b/data/conf/rspamd/local.d/multimap.conf @@ -25,13 +25,6 @@ WHITELISTED_FWD_HOST { symbols_set = ["WHITELISTED_FWD_HOST"]; } -KEEP_SPAM { - type = "ip"; - map = "redis://KEEP_SPAM"; - action = "accept"; - symbols_set = ["KEEP_SPAM"]; -} - LOCAL_BL_ASN { require_symbols = "!MAILCOW_WHITE"; type = "asn"; @@ -40,11 +33,3 @@ LOCAL_BL_ASN { description = "Sender's ASN is on the local blacklist"; symbols_set = ["LOCAL_BL_ASN"]; } - -#SPOOFED_SENDER { -# type = "rcpt"; -# filter = "email:domain:tld"; -# map = "redis://DOMAIN_MAP"; -# require_symbols = "AUTH_NA | !RCVD_VIA_SMTP_AUTH"; -# symbols_set = ["SPOOFED_SENDER"]; -#} diff --git a/data/conf/rspamd/lua/rspamd.local.lua b/data/conf/rspamd/lua/rspamd.local.lua index 7c9efbb4..92d223b1 100644 --- a/data/conf/rspamd/lua/rspamd.local.lua +++ b/data/conf/rspamd/lua/rspamd.local.lua @@ -7,6 +7,60 @@ rspamd_config.MAILCOW_AUTH = { end } +rspamd_config:register_symbol({ + name = 'KEEP_SPAM', + type = 'prefilter', + callback = function(task) + local util = require("rspamd_util") + local rspamd_logger = require "rspamd_logger" + local rspamd_ip = require 'rspamd_ip' + local uname = task:get_user() + if uname then + return false + end + local redis_params = rspamd_parse_redis_server('keep_spam') + local ip = task:get_from_ip() + local from_ip_string = ip:to_string() + ip_check_table = {from_ip_string} + local maxbits = 128 + local minbits = 32 + if ip:get_version() == 4 then + maxbits = 32 + minbits = 8 + end + for i=maxbits,minbits,-1 do + local nip = ip:apply_mask(i):to_string() .. "/" .. i + table.insert(ip_check_table, nip) + end + local function keep_spam_cb(err, data) + if err then + rspamd_logger.infox(rspamd_config, "keep_spam query request for ip %s returned invalid or empty data (\"%s\") or error (\"%s\")", ip, data, err) + return false + else + for k,v in pairs(data) do + if (v and v ~= userdata and v == '1') then + rspamd_logger.infox(rspamd_config, "found ip in keep_spam map, setting pre-result", v) + task:set_pre_result('accept', 'IP matched with forward hosts') + end + end + end + end + table.insert(ip_check_table, 1, 'KEEP_SPAM') + local redis_ret_user = rspamd_redis_make_request(task, + redis_params, -- connect params + 'KEEP_SPAM', -- hash key + false, -- is write + keep_spam_cb, --callback + 'HMGET', -- command + ip_check_table -- arguments + ) + if not redis_ret_user then + rspamd_logger.infox(rspamd_config, "cannot check keep_spam redis map") + end + end, + priority = 19 +}) + rspamd_config:register_symbol({ name = 'TAG_MOO', type = 'postfilter', From ad902f0ad8ab781d08583f4c69d6c70570531671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sun, 9 Sep 2018 09:48:11 +0200 Subject: [PATCH 07/56] [SOGo] Remove HTTP server on port 9192 --- data/Dockerfiles/sogo/supervisord.conf | 7 ------- 1 file changed, 7 deletions(-) diff --git a/data/Dockerfiles/sogo/supervisord.conf b/data/Dockerfiles/sogo/supervisord.conf index 2a889560..1c1422b3 100644 --- a/data/Dockerfiles/sogo/supervisord.conf +++ b/data/Dockerfiles/sogo/supervisord.conf @@ -16,13 +16,6 @@ command=/usr/sbin/cron -f autorestart=true priority=2 -[program:sogo-webres] -command=/usr/bin/python -u -m SimpleHTTPServer 9192 -directory=/usr/lib/GNUstep/SOGo/ -user=sogo -autorestart=true -priority=4 - [program:bootstrap-sogo] command=/bootstrap-sogo.sh stdout_logfile=/dev/stdout From ea4a26eabfbb19c04a2bcdcb3e510147ab5c65c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sun, 9 Sep 2018 09:51:37 +0200 Subject: [PATCH 08/56] [Nginx] Use SOGo web resources from local mount --- data/conf/nginx/site.conf | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/data/conf/nginx/site.conf b/data/conf/nginx/site.conf index d25d3b61..9ea4c385 100644 --- a/data/conf/nginx/site.conf +++ b/data/conf/nginx/site.conf @@ -156,44 +156,19 @@ server { } location /SOGo.woa/WebServerResources/ { - proxy_pass http://sogo:9192/WebServerResources/; - proxy_set_header Host $http_host; - proxy_cache sogo; - proxy_cache_valid 200 1d; - proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504; - #alias /usr/lib/GNUstep/SOGo/WebServerResources/; - expires $expires; - allow all; + alias /usr/lib/GNUstep/SOGo/WebServerResources/; } location /.woa/WebServerResources/ { - proxy_pass http://sogo:9192/WebServerResources/; - proxy_set_header Host $http_host; - proxy_cache sogo; - proxy_cache_valid 200 1d; - proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504; - #alias /usr/lib/GNUstep/SOGo/WebServerResources/; - expires $expires; - allow all; + alias /usr/lib/GNUstep/SOGo/WebServerResources/; } location /SOGo/WebServerResources/ { - proxy_pass http://sogo:9192/WebServerResources/; - proxy_set_header Host $http_host; - proxy_cache sogo; - proxy_cache_valid 200 1d; - proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504; - #alias /usr/lib/GNUstep/SOGo/WebServerResources/; - allow all; + alias /usr/lib/GNUstep/SOGo/WebServerResources/; } location (^/SOGo/so/ControlPanel/Products/[^/]*UI/Resources/.*\.(jpg|png|gif|css|js)$) { - proxy_pass http://sogo:9192/$1.SOGo/Resources/$2; - proxy_set_header Host $http_host; - proxy_cache sogo; - proxy_cache_valid 200 1d; - proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504; - #alias /usr/lib/GNUstep/SOGo/$1.SOGo/Resources/$2; + alias /usr/lib/GNUstep/SOGo/$1.SOGo/Resources/$2; } include /etc/nginx/conf.d/site.*.custom; From c9554ca02291e64e56a786217de8d4b34b25544d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sun, 9 Sep 2018 21:17:59 +0200 Subject: [PATCH 09/56] [Compose] Update watchdog image [Watchdog] Fix IP detection with multiple networks [Web] Show API field (no docs, no support, wip) [Web] haveibeenpwned.com implementation [Web] User and domain admin ACL (no docs, no support, wip) [Web] Some minor fixes --- data/Dockerfiles/watchdog/watchdog.sh | 27 ++- data/web/admin.php | 15 +- data/web/css/admin.css | 6 - data/web/css/mailbox.css | 3 - data/web/css/mailcow.css | 10 + data/web/edit.php | 68 +++++- data/web/inc/footer.inc.php | 117 ++-------- data/web/inc/functions.acl.inc.php | 216 ++++++++++++++++++ .../inc/functions.address_rewriting.inc.php | 32 +++ data/web/inc/functions.domain_admin.inc.php | 208 ++++++----------- data/web/inc/functions.inc.php | 50 +--- data/web/inc/functions.mailbox.inc.php | 17 +- data/web/inc/functions.policy.inc.php | 32 +-- data/web/inc/functions.ratelimit.inc.php | 8 + data/web/inc/init_db.inc.php | 34 ++- data/web/inc/prerequisites.inc.php | 3 +- data/web/inc/triggers.inc.php | 2 +- data/web/js/admin.js | 4 + data/web/js/api.js | 4 +- data/web/js/edit.js | 12 +- data/web/js/mailbox.js | 19 +- data/web/js/mailcow.js | 193 ++++++++++++++++ data/web/js/sha1.min.js | 1 + data/web/json_api.php | 6 + data/web/lang/lang.de.php | 23 +- data/web/lang/lang.en.php | 21 ++ data/web/mailbox.php | 15 +- data/web/modals/admin.php | 4 +- data/web/modals/mailbox.php | 7 +- data/web/modals/user.php | 4 +- data/web/quarantine.php | 2 +- data/web/user.php | 89 ++------ docker-compose.yml | 2 +- 33 files changed, 793 insertions(+), 461 deletions(-) create mode 100644 data/web/inc/functions.acl.inc.php create mode 100644 data/web/js/mailcow.js create mode 100644 data/web/js/sha1.min.js diff --git a/data/Dockerfiles/watchdog/watchdog.sh b/data/Dockerfiles/watchdog/watchdog.sh index c06abbc2..ec3d5aca 100755 --- a/data/Dockerfiles/watchdog/watchdog.sh +++ b/data/Dockerfiles/watchdog/watchdog.sh @@ -59,10 +59,10 @@ function mail_error() { log_msg "Sent notification email to ${1}" } - get_container_ip() { # ${1} is container CONTAINER_ID=() + CONTAINER_IPS=() CONTAINER_IP= LOOP_C=1 until [[ ${CONTAINER_IP} =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]] || [[ ${LOOP_C} -gt 5 ]]; do @@ -72,15 +72,21 @@ get_container_ip() { # returned id can have multiple elements (if scaled), shuffle for random test CONTAINER_ID=($(printf "%s\n" "${CONTAINER_ID[@]}" | shuf)) if [[ ! -z ${CONTAINER_ID} ]]; then - for matched_container in "${CONTAINER_ID[@]}"; do - CONTAINER_IP=$(curl --silent http://dockerapi:8080/containers/${matched_container}/json | jq -r '.NetworkSettings.Networks[].IPAddress') - # grep will do nothing if one of these vars is empty - [[ -z ${CONTAINER_IP} ]] && continue - [[ -z ${IPV4_NETWORK} ]] && continue - # only return ips that are part of our network - if ! grep -q ${IPV4_NETWORK} <(echo ${CONTAINER_IP}); then - CONTAINER_IP= - fi + for matched_container in "${CONTAINER_ID[@]}"; do + CONTAINER_IPS=($(curl --silent http://dockerapi:8080/containers/${matched_container}/json | jq -r '.NetworkSettings.Networks[].IPAddress')) + for ip_match in "${CONTAINER_IPS[@]}"; do + # grep will do nothing if one of these vars is empty + [[ -z ${ip_match} ]] && continue + [[ -z ${IPV4_NETWORK} ]] && continue + # only return ips that are part of our network + if ! grep -q ${IPV4_NETWORK} <(echo ${ip_match}); then + continue + else + CONTAINER_IP=${ip_match} + break + fi + done + [[ ! -z ${CONTAINER_IP} ]] && break done fi LOOP_C=$((LOOP_C + 1)) @@ -88,7 +94,6 @@ get_container_ip() { [[ ${LOOP_C} -gt 5 ]] && echo 240.0.0.0 || echo ${CONTAINER_IP} } -# Check functions nginx_checks() { err_count=0 diff_c=0 diff --git a/data/web/admin.php b/data/web/admin.php index d2734431..749c96b6 100644 --- a/data/web/admin.php +++ b/data/web/admin.php @@ -29,7 +29,7 @@ $tfa_data = get_tfa();
- +
@@ -44,7 +44,7 @@ $tfa_data = get_tfa();
-
+
:
@@ -76,12 +76,10 @@ $tfa_data = get_tfa();
- - - - diff --git a/data/web/css/admin.css b/data/web/css/admin.css index a53d721c..bc89f1dd 100644 --- a/data/web/css/admin.css +++ b/data/web/css/admin.css @@ -65,12 +65,6 @@ body.modal-open { font-size:9pt; background:transparent; } -.bootstrap-select { - width: auto!important; -} .table-condensed .input-sm { width: 100%!important; } -.full-width-select { - width: 100%!important; -} diff --git a/data/web/css/mailbox.css b/data/web/css/mailbox.css index da2e96e3..488150d3 100644 --- a/data/web/css/mailbox.css +++ b/data/web/css/mailbox.css @@ -5,9 +5,6 @@ table.footable>tbody>tr.footable-empty>td { .pagination a { text-decoration: none !important; } -.panel panel-default { - overflow: visible !important; -} .btn-group { width: max-content; } diff --git a/data/web/css/mailcow.css b/data/web/css/mailcow.css index 374688a1..04d1b874 100644 --- a/data/web/css/mailcow.css +++ b/data/web/css/mailcow.css @@ -148,3 +148,13 @@ nav .glyphicon { color: #5a5a5a; white-space: nowrap; } +.haveibeenpwned { + cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} +.full-width-select { + width: 100%!important; +} \ No newline at end of file diff --git a/data/web/edit.php b/data/web/edit.php index c4903c28..417f2a7c 100644 --- a/data/web/edit.php +++ b/data/web/edit.php @@ -92,7 +92,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- @@ -111,7 +111,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -140,6 +140,30 @@ if (isset($_SESSION['mailcow_cc_role'])) {
+
+
+
+

ACL

+
+
+
+ +
+
+ +
+
+
+
- +
@@ -278,14 +302,14 @@ if (isset($_SESSION['mailcow_cc_role'])) {
-
+
-
+
@@ -300,14 +324,14 @@ if (isset($_SESSION['mailcow_cc_role'])) {
-
+
-
+
@@ -474,7 +498,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -527,6 +551,30 @@ if (isset($_SESSION['mailcow_cc_role'])) {
+
+
+
+

ACL

+
+
+
+ +
+
+ +
+
+
+
- +
@@ -965,7 +1013,7 @@ else { + + diff --git a/data/web/modals/admin.php b/data/web/modals/admin.php index 7e8656e5..8bca0d87 100644 --- a/data/web/modals/admin.php +++ b/data/web/modals/admin.php @@ -67,7 +67,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- ".htmlspecialchars($domain).""; @@ -79,7 +79,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
diff --git a/data/web/modals/mailbox.php b/data/web/modals/mailbox.php index b4a51893..160ab178 100644 --- a/data/web/modals/mailbox.php +++ b/data/web/modals/mailbox.php @@ -23,7 +23,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- ".htmlspecialchars($domain).""; @@ -48,10 +48,9 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
- - (Generate) +
diff --git a/data/web/modals/user.php b/data/web/modals/user.php index 62ccf1b1..5e0849e2 100644 --- a/data/web/modals/user.php +++ b/data/web/modals/user.php @@ -37,7 +37,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -155,7 +155,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
diff --git a/data/web/quarantine.php b/data/web/quarantine.php index 87f565a1..3e193586 100644 --- a/data/web/quarantine.php +++ b/data/web/quarantine.php @@ -18,7 +18,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
-
+
    diff --git a/data/web/user.php b/data/web/user.php index 07e28616..dd75e360 100644 --- a/data/web/user.php +++ b/data/web/user.php @@ -88,7 +88,6 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == ' fclose($fh); } } - ?>

    @@ -145,7 +144,7 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == '
    :
    -

    +

    @@ -172,87 +171,71 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == '

    / ,

    +
    '; // Show tagging options - if ($_SESSION['acl']['delimiter_action'] == 1): $get_tagging_options = mailbox('get', 'delimiter_action', $username); ?>
    :
    -
    - +
    - - -

    :
    -
    - +
    - -

    - +
    :
    - +

    - +
    @@ -273,11 +256,9 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == '
- +
-
+
@@ -299,9 +280,7 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == '
- +
@@ -309,7 +288,7 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == '
-

- +
-
- +
@@ -354,26 +329,22 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == '
- +
-
+
-
+
- +

@@ -381,28 +352,22 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == '
- +
-
+
-
+
- -
- +
@@ -411,11 +376,9 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == '
- +
-
+
    @@ -427,9 +390,7 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == '
- +
diff --git a/docker-compose.yml b/docker-compose.yml index 353772eb..cd0c69f8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -330,7 +330,7 @@ services: - /lib/modules:/lib/modules:ro watchdog-mailcow: - image: mailcow/watchdog:1.19 + image: mailcow/watchdog:1.21 # Debug #command: /watchdog.sh build: ./data/Dockerfiles/watchdog From 1a5ec7655ec24ec7c2093e09c858a20440a06835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sun, 9 Sep 2018 21:52:35 +0200 Subject: [PATCH 10/56] [Compose] Update watchdog image --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index cd0c69f8..b8cdbeea 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -330,7 +330,7 @@ services: - /lib/modules:/lib/modules:ro watchdog-mailcow: - image: mailcow/watchdog:1.21 + image: mailcow/watchdog:1.22 # Debug #command: /watchdog.sh build: ./data/Dockerfiles/watchdog From 29aeb5b85d52eb39805dbaf70c1e475b73dbd679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sun, 9 Sep 2018 21:52:48 +0200 Subject: [PATCH 11/56] [Watchdog] Fix SOGo check, fixes #1750 --- data/Dockerfiles/watchdog/watchdog.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/data/Dockerfiles/watchdog/watchdog.sh b/data/Dockerfiles/watchdog/watchdog.sh index ec3d5aca..64795ad3 100755 --- a/data/Dockerfiles/watchdog/watchdog.sh +++ b/data/Dockerfiles/watchdog/watchdog.sh @@ -143,7 +143,6 @@ sogo_checks() { while [ ${err_count} -lt ${THRESHOLD} ]; do host_ip=$(get_container_ip sogo-mailcow) err_c_cur=${err_count} - /usr/lib/nagios/plugins/check_http -4 -H ${host_ip} -u /WebServerResources/css/theme-default.css -p 9192 -R md-default-theme 1>&2; err_count=$(( ${err_count} + $? )) /usr/lib/nagios/plugins/check_http -4 -H ${host_ip} -u /SOGo.index/ -p 20000 -R "SOGo\.MainUI" 1>&2; err_count=$(( ${err_count} + $? )) [ ${err_c_cur} -eq ${err_count} ] && [ ! $((${err_count} - 1)) -lt 0 ] && err_count=$((${err_count} - 1)) diff_c=1 [ ${err_c_cur} -ne ${err_count} ] && diff_c=$(( ${err_c_cur} - ${err_count} )) From ce604232e26fdca6a39b00e69b717255c97d4852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Mon, 10 Sep 2018 10:56:32 +0200 Subject: [PATCH 12/56] [Web] Add missing data-acl for sync jobs --- data/web/mailbox.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/web/mailbox.php b/data/web/mailbox.php index 32880837..7e865fbb 100644 --- a/data/web/mailbox.php +++ b/data/web/mailbox.php @@ -184,7 +184,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
-
+
- +
@@ -403,10 +403,10 @@ $tfa_data = get_tfa();
@@ -415,7 +415,7 @@ $tfa_data = get_tfa();
- +
- +
@@ -438,41 +438,41 @@ $tfa_data = get_tfa();
- +
- +
- +
/ - +
/ - +

- +
- +
- +
@@ -490,9 +490,9 @@ $tfa_data = get_tfa(); - [] - [whitelist] - [blacklist] + [] + [whitelist] + [blacklist] @@ -527,10 +527,10 @@ $tfa_data = get_tfa();
    -
    • -
    • +
    • +
    • -
    • +
@@ -539,17 +539,17 @@ $tfa_data = get_tfa();
- +
- +
- +
- +
@@ -564,19 +564,19 @@ $tfa_data = get_tfa();
- +
- +

- @@ -586,7 +586,7 @@ $tfa_data = get_tfa(); ?>
- +
@@ -648,19 +648,19 @@ $tfa_data = get_tfa();
- +
- +
- - + +

- +

@@ -754,21 +754,21 @@ $tfa_data = get_tfa();
- +
- +
- +
- +
diff --git a/data/web/autodiscover.php b/data/web/autodiscover.php index f5bcbf8f..9a167af7 100644 --- a/data/web/autodiscover.php +++ b/data/web/autodiscover.php @@ -27,7 +27,8 @@ if (strpos($data, 'autodiscover/outlook/responseschema') !== false) { } } -$dsn = $database_type . ":host=" . $database_host . ";dbname=" . $database_name; +//$dsn = $database_type . ":host=" . $database_host . ";dbname=" . $database_name; +$dsn = $database_type . ":unix_socket=" . $database_sock . ";dbname=" . $database_name; $opt = [ PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC, diff --git a/data/web/edit.php b/data/web/edit.php index 417f2a7c..a2eb4fb7 100644 --- a/data/web/edit.php +++ b/data/web/edit.php @@ -39,13 +39,13 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
- +
- +
@@ -58,7 +58,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -92,7 +92,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- @@ -111,13 +111,13 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
- +
@@ -136,7 +136,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -159,7 +159,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -189,7 +189,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
- +
- +
- +
- +
- @@ -257,7 +257,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -280,17 +280,17 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
-
- +
@@ -304,15 +304,15 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
- + - +
@@ -326,15 +326,15 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
- + - +
@@ -362,7 +362,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -374,7 +374,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -382,17 +382,17 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
-
- +
- +
@@ -438,13 +438,13 @@ if (isset($_SESSION['mailcow_cc_role'])) {
max. MiB
- +
-
- +
- +
@@ -524,7 +524,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -536,17 +536,17 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
-
- +
@@ -570,7 +570,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -589,19 +589,19 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
- +
- +
@@ -613,7 +613,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -636,13 +636,13 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
- @@ -652,7 +652,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- @@ -673,7 +673,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -719,7 +719,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -766,7 +766,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -933,7 +933,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -984,7 +984,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
diff --git a/data/web/inc/footer.inc.php b/data/web/inc/footer.inc.php index 14d2acf2..9e8daf7b 100644 --- a/data/web/inc/footer.inc.php +++ b/data/web/inc/footer.inc.php @@ -59,7 +59,7 @@ $(document).ready(function() { }); $('#u2f_status_auth').html('

Initializing, please wait...

'); $('#ConfirmTFAModal').on('shown.bs.modal', function(){ - $(this).find('#token').focus(); + $(this).find('input[name=token]').focus(); // If U2F if(document.getElementById("u2f_auth_data") !== null) { $.ajax({ @@ -146,7 +146,7 @@ $(document).ready(function() { }); // CSRF - $('').attr('id', 'csrf_token').attr('name', 'csrf_token').appendTo('form'); + $('').attr('name', 'csrf_token').appendTo('form'); if (sessionStorage.scrollTop != "undefined") { $(window).scrollTop(sessionStorage.scrollTop); } diff --git a/data/web/inc/functions.docker.inc.php b/data/web/inc/functions.docker.inc.php index dbd26375..9c63eec7 100644 --- a/data/web/inc/functions.docker.inc.php +++ b/data/web/inc/functions.docker.inc.php @@ -2,10 +2,13 @@ function docker($action, $service_name = null, $attr1 = null, $attr2 = null, $extra_headers = null) { global $DOCKER_TIMEOUT; $curl = curl_init(); - curl_setopt($curl, CURLOPT_HTTPHEADER,array( 'Content-Type: application/json' )); + curl_setopt($curl, CURLOPT_HTTPHEADER,array('Content-Type: application/json' )); + // We are using our mail certificates for dockerapi, the names will not match, the certs are trusted anyway + curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 0); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); switch($action) { case 'get_id': - curl_setopt($curl, CURLOPT_URL, 'http://dockerapi:8080/containers/json'); + curl_setopt($curl, CURLOPT_URL, 'https://dockerapi:443/containers/json'); curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curl, CURLOPT_POST, 0); curl_setopt($curl, CURLOPT_TIMEOUT, $DOCKER_TIMEOUT); @@ -38,7 +41,7 @@ function docker($action, $service_name = null, $attr1 = null, $attr2 = null, $ex } return false; case 'containers': - curl_setopt($curl, CURLOPT_URL, 'http://dockerapi:8080/containers/json'); + curl_setopt($curl, CURLOPT_URL, 'https://dockerapi:443/containers/json'); curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curl, CURLOPT_POST, 0); curl_setopt($curl, CURLOPT_TIMEOUT, $DOCKER_TIMEOUT); @@ -74,7 +77,7 @@ function docker($action, $service_name = null, $attr1 = null, $attr2 = null, $ex break; case 'info': if (empty($service_name)) { - curl_setopt($curl, CURLOPT_URL, 'http://dockerapi:8080/containers/json'); + curl_setopt($curl, CURLOPT_URL, 'https://dockerapi:443/containers/json'); curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curl, CURLOPT_POST, 0); curl_setopt($curl, CURLOPT_TIMEOUT, $DOCKER_TIMEOUT); @@ -82,7 +85,7 @@ function docker($action, $service_name = null, $attr1 = null, $attr2 = null, $ex else { $container_id = docker('get_id', $service_name); if (ctype_xdigit($container_id)) { - curl_setopt($curl, CURLOPT_URL, 'http://dockerapi:8080/containers/' . $container_id . '/json'); + curl_setopt($curl, CURLOPT_URL, 'https://dockerapi:443/containers/' . $container_id . '/json'); } else { // logger(array('return' => array( @@ -144,7 +147,7 @@ function docker($action, $service_name = null, $attr1 = null, $attr2 = null, $ex if (!empty($attr1)) { $container_id = docker('get_id', $service_name); if (ctype_xdigit($container_id) && ctype_alnum($attr1)) { - curl_setopt($curl, CURLOPT_URL, 'http://dockerapi:8080/containers/' . $container_id . '/' . $attr1); + curl_setopt($curl, CURLOPT_URL, 'https://dockerapi:443/containers/' . $container_id . '/' . $attr1); curl_setopt($curl, CURLOPT_POST, 1); curl_setopt($curl, CURLOPT_TIMEOUT, $DOCKER_TIMEOUT); if (!empty($attr2)) { @@ -158,19 +161,19 @@ function docker($action, $service_name = null, $attr1 = null, $attr2 = null, $ex if ($response === false) { $err = curl_error($curl); curl_close($curl); - logger(array('return' => array(array( - 'type' => 'danger', - 'log' => array(__FUNCTION__, $action, $service_name, $attr1, $attr2, $extra_headers), - 'msg' => $err, - )))); + // logger(array('return' => array(array( + // 'type' => 'danger', + // 'log' => array(__FUNCTION__, $action, $service_name, $attr1, $attr2, $extra_headers), + // 'msg' => $err, + // )))); return $err; } else { curl_close($curl); - logger(array('return' => array(array( - 'type' => 'success', - 'log' => array(__FUNCTION__, $action, $service_name, $attr1, $attr2, $extra_headers), - )))); + // logger(array('return' => array(array( + // 'type' => 'success', + // 'log' => array(__FUNCTION__, $action, $service_name, $attr1, $attr2, $extra_headers), + // )))); if (empty($response)) { return true; } diff --git a/data/web/inc/functions.inc.php b/data/web/inc/functions.inc.php index 94eada4f..f915d5d0 100644 --- a/data/web/inc/functions.inc.php +++ b/data/web/inc/functions.inc.php @@ -18,6 +18,17 @@ function last_login($user) { return false; } } +function flush_memcached() { + try { + $m = new Memcached(); + $m->addServer('memcached', 11211); + $m->flush(); + } + catch ( Exception $e ) { + // Dunno + } +} + function logger($_data = false) { /* logger() will be called as last function @@ -510,6 +521,7 @@ function update_sogo_static_view() { $stmt = $pdo->query("REPLACE INTO _sogo_static_view SELECT * from sogo_view"); $stmt = $pdo->query("DELETE FROM _sogo_static_view WHERE `c_uid` NOT IN (SELECT `username` FROM `mailbox` WHERE `active` = '1');"); } + flush_memcached(); } function edit_user_account($_data) { global $lang; diff --git a/data/web/inc/functions.mailbox.inc.php b/data/web/inc/functions.mailbox.inc.php index 8393c5f6..e06ac397 100644 --- a/data/web/inc/functions.mailbox.inc.php +++ b/data/web/inc/functions.mailbox.inc.php @@ -2776,6 +2776,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) { `mailbox`.`active` AS `active_int`, CASE `mailbox`.`active` WHEN 1 THEN '".$lang['mailbox']['yes']."' ELSE '".$lang['mailbox']['no']."' END AS `active`, `mailbox`.`domain`, + `mailbox`.`maildir`, `mailbox`.`quota`, `quota2`.`bytes`, `attributes`, @@ -2806,6 +2807,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) { $mailboxdata['active'] = $row['active']; $mailboxdata['active_int'] = $row['active_int']; $mailboxdata['domain'] = $row['domain']; + $mailboxdata['maildir'] = $row['maildir']; $mailboxdata['quota'] = $row['quota']; $mailboxdata['attributes'] = json_decode($row['attributes'], true); $mailboxdata['quota_used'] = intval($row['bytes']); @@ -3054,6 +3056,16 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) { ); continue; } + $exec_fields = array('cmd' => 'maildir_cleanup', 'maildir' => $domain); + $maildir_gc = json_decode(docker('post', 'dovecot-mailcow', 'exec', $exec_fields), true); + if ($maildir_gc['type'] != 'success') { + $_SESSION['return'][] = array( + 'type' => 'warning', + 'log' => array(__FUNCTION__, $_action, $_type, $_data_log, $_attr), + 'msg' => 'Could not move maildir to garbage collector: ' . $maildir_gc['msg'] + ); + } + return false; $stmt = $pdo->prepare("DELETE FROM `domain` WHERE `domain` = :domain"); $stmt->execute(array( ':domain' => $domain, @@ -3078,17 +3090,17 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) { $stmt->execute(array( ':domain' => '%@'.$domain, )); - $stmt = $pdo->prepare("DELETE FROM `quota2` WHERE `username` = :domain"); + $stmt = $pdo->prepare("DELETE FROM `quota2` WHERE `username` LIKE :domain"); $stmt->execute(array( ':domain' => '%@'.$domain, )); - $stmt = $pdo->prepare("DELETE FROM `spamalias` WHERE `address` = :domain"); + $stmt = $pdo->prepare("DELETE FROM `spamalias` WHERE `address` LIKE :domain"); $stmt->execute(array( ':domain' => '%@'.$domain, )); $stmt = $pdo->prepare("DELETE FROM `filterconf` WHERE `object` = :domain"); $stmt->execute(array( - ':domain' => '%@'.$domain, + ':domain' => $domain, )); $stmt = $pdo->prepare("DELETE FROM `bcc_maps` WHERE `local_dest` = :domain"); $stmt->execute(array( @@ -3227,6 +3239,16 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) { ); continue; } + $maildir = mailbox('get', 'mailbox_details', $username)['maildir']; + $exec_fields = array('cmd' => 'maildir_cleanup', 'maildir' => $maildir); + $maildir_gc = json_decode(docker('post', 'dovecot-mailcow', 'exec', $exec_fields), true); + if ($maildir_gc['type'] != 'success') { + $_SESSION['return'][] = array( + 'type' => 'warning', + 'log' => array(__FUNCTION__, $_action, $_type, $_data_log, $_attr), + 'msg' => 'Could not move maildir to garbage collector: ' . $maildir_gc['msg'] + ); + } $stmt = $pdo->prepare("DELETE FROM `alias` WHERE `goto` = :username"); $stmt->execute(array( ':username' => $username diff --git a/data/web/inc/init_db.inc.php b/data/web/inc/init_db.inc.php index 58566ab7..571713be 100644 --- a/data/web/inc/init_db.inc.php +++ b/data/web/inc/init_db.inc.php @@ -3,7 +3,7 @@ function init_db_schema() { try { global $pdo; - $db_version = "01092018_1902"; + $db_version = "21092018_1902"; $stmt = $pdo->query("SHOW TABLES LIKE 'versions'"); $num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC)); diff --git a/data/web/inc/prerequisites.inc.php b/data/web/inc/prerequisites.inc.php index aedda083..209c7184 100644 --- a/data/web/inc/prerequisites.inc.php +++ b/data/web/inc/prerequisites.inc.php @@ -35,7 +35,7 @@ $hrs = floor($mins / 60); $mins -= $hrs * 60; $offset = sprintf('%+d:%02d', $hrs*$sgn, $mins); -$dsn = $database_type . ":host=" . $database_host . ";dbname=" . $database_name; +$dsn = $database_type . ":unix_socket=" . $database_sock . ";dbname=" . $database_name; $opt = [ PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC, @@ -46,11 +46,20 @@ try { $pdo = new PDO($dsn, $database_user, $database_pass, $opt); } catch (PDOException $e) { +// Stop when SQL connection fails ?> -
Connection to database failed.

The following error was reported:
getMessage();?>
+
Connection to database failed.

The following error was reported:
getMessage();?>
+
Connection to dockerapi container failed.

The following error was reported:
-
+' + ' Test' + ' ' + lang.edit + '' + - ' ' + lang.remove + '' + + ' ' + lang.remove + '' + ''; item.chkbox = ''; }); } else if (table == 'forwardinghoststable') { $.each(data, function (i, item) { item.action = '
' + - ' ' + lang.remove + '' + + ' ' + lang.remove + '' + '
'; if (item.keep_spam == "yes") { item.keep_spam = lang.no; @@ -145,7 +145,7 @@ jQuery(function($){ item.chkbox = ''; item.action = '
' + ' ' + lang.edit + '' + - ' ' + lang.remove + '' + + ' ' + lang.remove + '' + ' Login' + '
'; }); diff --git a/data/web/js/api.js b/data/web/js/api.js index a573d7f4..e8293dbc 100644 --- a/data/web/js/api.js +++ b/data/web/js/api.js @@ -71,7 +71,7 @@ $(document).ready(function() { }); // General API edit actions - $(document).on('click', '#edit_selected', function(e) { + $(document).on('click', "[data-action='edit_selected']", function(e) { e.preventDefault(); var id = $(this).data('id'); var api_url = $(this).data('api-url'); @@ -159,7 +159,7 @@ $(document).ready(function() { }); // General API add actions - $(document).on('click', '#add_item', function(e) { + $(document).on('click', "[data-action='add_item']", function(e) { e.preventDefault(); var id = $(this).data('id'); var api_url = $(this).data('api-url'); @@ -252,7 +252,7 @@ $(document).ready(function() { }); // General API delete actions - $(document).on('click', '#delete_selected', function(e) { + $(document).on('click', "[data-action='delete_selected']", function(e) { e.preventDefault(); var id = $(this).data('id'); // If clicked element #delete_selected has data-item attribute, it is added to "items" @@ -283,6 +283,7 @@ $(document).ready(function() { keyboard: false }) .one('click', '#IsConfirmed', function(e) { + if (is_active($('#IsConfirmed'))) { return false; } $.ajax({ type: "POST", dataType: "json", diff --git a/data/web/js/edit.js b/data/web/js/edit.js index f91f6b70..45690710 100644 --- a/data/web/js/edit.js +++ b/data/web/js/edit.js @@ -10,37 +10,43 @@ $(document).ready(function() { }); $("#disable_sender_check").click(function( event ) { if ($("form[data-id='editmailbox'] #disable_sender_check:checked").length > 0) { - $('#sender_acl').prop('disabled', true); - $('#sender_acl').selectpicker('refresh'); + $('#editSelectSenderACL').prop('disabled', true); + $('#editSelectSenderACL').selectpicker('refresh'); } else { - $('#sender_acl').prop('disabled', false); - $('#sender_acl').selectpicker('refresh'); + $('#editSelectSenderACL').prop('disabled', false); + $('#editSelectSenderACL').selectpicker('refresh'); } }); if ($("form[data-id='editalias'] .goto_checkbox:checked").length > 0) { $('#textarea_alias_goto').prop('disabled', true); } + $("#script_data").numberedtextarea({allowTabChar: true}); + + $("#mailbox-password-warning-close").click(function( event ) { + $('#mailbox-passwd-hidden-info').addClass('hidden'); + $('#mailbox-passwd-form-groups').removeClass('hidden'); + }); }); -if ($("#multiple_bookings_select").val() == "custom") { +if ($("#editSelectMultipleBookings").val() == "custom") { $("#multiple_bookings_custom_div").show(); - $("#multiple_bookings").val($("#multiple_bookings_custom").val()); + $('input[name=multiple_bookings]').val($("#multiple_bookings_custom").val()); } -$("#multiple_bookings_select").change(function() { - $("#multiple_bookings").val($("#multiple_bookings_select").val()); - if ($("#multiple_bookings").val() == "custom") { +$("#editSelectMultipleBookings").change(function() { + $('input[name=multiple_bookings]').val($("#editSelectMultipleBookings").val()); + if ($('input[name=multiple_bookings]').val() == "custom") { $("#multiple_bookings_custom_div").show(); } else { $("#multiple_bookings_custom_div").hide(); } }); -if ($("#sender_acl option[value='\*']:selected").length > 0){ +if ($("#editSelectSenderACL option[value='\*']:selected").length > 0){ $("#sender_acl_disabled").show(); } -$('#sender_acl').change(function() { - if ($("#sender_acl option[value='\*']:selected").length > 0){ +$('#editSelectSenderACL').change(function() { + if ($("#editSelectSenderACL option[value='\*']:selected").length > 0){ $("#sender_acl_disabled").show(); } else { @@ -48,7 +54,7 @@ $('#sender_acl').change(function() { } }); $("#multiple_bookings_custom").bind("change keypress keyup blur", function() { - $("#multiple_bookings").val($("#multiple_bookings_custom").val()); + $('input[name=multiple_bookings]').val($("#multiple_bookings_custom").val()); }); jQuery(function($){ // http://stackoverflow.com/questions/46155/validate-email-address-in-javascript diff --git a/data/web/js/mailbox.js b/data/web/js/mailbox.js index 34f3ec20..836ec872 100644 --- a/data/web/js/mailbox.js +++ b/data/web/js/mailbox.js @@ -6,7 +6,6 @@ $(document).ready(function() { var domain_list = []; $.ajax({ dataType: 'json', - 'async': false, url: '/api/v1/get/domain/all', jsonp: false, error: function () { @@ -85,10 +84,10 @@ $(document).ready(function() { event.preventDefault(); $('[data-hibp]').trigger('input'); var random_passwd = Math.random().toString(36).slice(-8) - $('#password').prop('type', 'text'); - $('#password').val(random_passwd); - $('#password2').prop('type', 'text'); - $('#password2').val(random_passwd); + $(this).closest("form").find("input[name='password']").prop('type', 'text'); + $(this).closest("form").find("input[name='password2']").prop('type', 'text'); + $(this).closest("form").find("input[name='password']").val(random_passwd); + $(this).closest("form").find("input[name='password2']").val(random_passwd); }); $(".goto_checkbox").click(function( event ) { @@ -302,7 +301,7 @@ jQuery(function($){ item.action = '
'; if (role == "admin") { item.action += ' ' + lang.edit + '' + - ' ' + lang.remove + ''; + ' ' + lang.remove + ''; } else { item.action += ' ' + lang.edit + ''; @@ -386,14 +385,14 @@ jQuery(function($){ if (acl_data.login_as === 1) { item.action = '
' + ' ' + lang.edit + '' + - ' ' + lang.remove + '' + + ' ' + lang.remove + '' + '' + '
'; } else { item.action = '
' + ' ' + lang.edit + '' + - ' ' + lang.remove + '' + + ' ' + lang.remove + '' + '
'; } item.in_use = '
' + @@ -461,7 +460,7 @@ jQuery(function($){ } item.action = '
' + ' ' + lang.edit + '' + - ' ' + lang.remove + '' + + ' ' + lang.remove + '' + '
'; item.chkbox = ''; item.name = escapeHtml(item.name); @@ -520,7 +519,7 @@ jQuery(function($){ $.each(data, function (i, item) { item.action = '
' + ' ' + lang.edit + '' + - ' ' + lang.remove + '' + + ' ' + lang.remove + '' + '
'; item.chkbox = ''; item.local_dest = escapeHtml(item.local_dest); @@ -583,7 +582,7 @@ jQuery(function($){ item.recipient_map_new = escapeHtml(item.recipient_map_new); item.action = '
' + ' ' + lang.edit + '' + - ' ' + lang.remove + '' + + ' ' + lang.remove + '' + '
'; item.chkbox = ''; }); @@ -638,7 +637,7 @@ jQuery(function($){ $.each(data, function (i, item) { item.action = '
' + ' ' + lang.edit + '' + - ' ' + lang.remove + '' + + ' ' + lang.remove + '' + '
'; item.chkbox = ''; item.goto = escapeHtml(item.goto.replace(/,/g, " ")); @@ -713,7 +712,7 @@ jQuery(function($){ $.each(data, function (i, item) { item.action = '
' + ' ' + lang.edit + '' + - ' ' + lang.remove + '' + + ' ' + lang.remove + '' + ' DNS
' + '
'; item.chkbox = ''; @@ -781,7 +780,7 @@ jQuery(function($){ item.server_w_port = escapeHtml(item.user1) + '@' + item.host1 + ':' + item.port1; item.action = '
' + ' ' + lang.edit + '' + - ' ' + lang.remove + '' + + ' ' + lang.remove + '' + '
'; item.chkbox = ''; if (item.is_running == 1) { @@ -852,7 +851,7 @@ jQuery(function($){ item.filter_type = '
' + item.filter_type.charAt(0).toUpperCase() + item.filter_type.slice(1).toLowerCase() + '
' item.action = '
' + ' ' + lang.edit + '' + - ' ' + lang.remove + '' + + ' ' + lang.remove + '' + '
'; item.chkbox = '' }); diff --git a/data/web/js/mailcow.js b/data/web/js/mailcow.js index d9019c23..89cfabf5 100644 --- a/data/web/js/mailcow.js +++ b/data/web/js/mailcow.js @@ -110,7 +110,7 @@ $(document).ready(function() { // Disable disallowed inputs $('[data-acl="0"]').each(function(){ - if ($(this).attr('class') == 'btn-group') { + if ($(this).hasClass('btn-group')) { $(this).find('a').each(function(){ $(this).removeClass('dropdown-toggle') .removeAttr('data-toggle') @@ -124,7 +124,7 @@ $(document).ready(function() { $(this).find('button').each(function() { $(this).attr("disabled", true); }); - } else if ($(this).attr('class') == 'input-group') { + } else if ($(this).hasClass('input-group')) { $(this).find('input').each(function() { $(this).removeClass('dropdown-toggle') .removeAttr('data-toggle') diff --git a/data/web/js/quarantine.js b/data/web/js/quarantine.js index 21ec9ddc..f8438099 100644 --- a/data/web/js/quarantine.js +++ b/data/web/js/quarantine.js @@ -28,7 +28,7 @@ jQuery(function($){ $.each(data, function (i, item) { item.action = '
' + ' ' + lang.show_item + '' + - ' ' + lang.remove + '' + + ' ' + lang.remove + '' + '
'; item.chkbox = ''; }); diff --git a/data/web/js/user.js b/data/web/js/user.js index 226d039a..5649d6c6 100644 --- a/data/web/js/user.js +++ b/data/web/js/user.js @@ -64,7 +64,7 @@ jQuery(function($){ $.each(data, function (i, item) { if (acl_data.spam_alias === 1) { item.action = '
' + - ' ' + lang.remove + '' + + ' ' + lang.remove + '' + '
'; item.chkbox = ''; item.address = escapeHtml(item.address); @@ -123,7 +123,7 @@ jQuery(function($){ if (acl_data.syncjobs === 1) { item.action = '
' + ' ' + lang.edit + '' + - ' ' + lang.remove + '' + + ' ' + lang.remove + '' + '
'; item.chkbox = ''; } diff --git a/data/web/mailbox.php b/data/web/mailbox.php index 7e865fbb..70d8dbb6 100644 --- a/data/web/mailbox.php +++ b/data/web/mailbox.php @@ -44,10 +44,10 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
    -
    • -
    • +
    • +
    • -
    • +
@@ -74,10 +74,10 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
    -
    • -
    • +
    • +
    • -
    • +
@@ -101,10 +101,10 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
    -
    • -
    • +
    • +
    • -
    • +
@@ -134,10 +134,10 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
    -
    • -
    • +
    • +
    • -
    • +
@@ -161,10 +161,10 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
    -
    • -
    • +
    • +
    • -
    • +
@@ -188,12 +188,12 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
    -
    • +
    • -
    • -
    • +
    • +
    • -
    • +
@@ -218,13 +218,13 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
    -
    • -
    • +
    • +
    • -
    • -
    • +
    • +
    • -
    • +
@@ -249,13 +249,13 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
    -
    • -
    • +
    • +
    • -
    • -
    • +
    • +
    • -
    • +
@@ -277,10 +277,10 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
    -
    • -
    • +
    • +
    • -
    • +
diff --git a/data/web/modals/admin.php b/data/web/modals/admin.php index 8bca0d87..2cce623e 100644 --- a/data/web/modals/admin.php +++ b/data/web/modals/admin.php @@ -17,13 +17,13 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
- +
@@ -35,7 +35,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -60,7 +60,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- + ↳ a-z A-Z - _ .
@@ -79,13 +79,13 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
- +
@@ -97,7 +97,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -115,11 +115,11 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
- +
diff --git a/data/web/modals/footer.php b/data/web/modals/footer.php index e861ab4e..b5e49b15 100644 --- a/data/web/modals/footer.php +++ b/data/web/modals/footer.php @@ -8,19 +8,19 @@ if (isset($_SESSION['mailcow_cc_role']) && ($_SESSION['mailcow_cc_role'] == "adm
- +

- +
- +
- +
@@ -43,10 +43,10 @@ if (isset($_SESSION['mailcow_cc_role']) && ($_SESSION['mailcow_cc_role'] == "adm
- +
- +

@@ -67,16 +67,16 @@ if (isset($_SESSION['mailcow_cc_role']) && ($_SESSION['mailcow_cc_role'] == "adm
- +
- +
createSecret(); ?> - +
  1. @@ -88,7 +88,7 @@ if (isset($_SESSION['mailcow_cc_role']) && ($_SESSION['mailcow_cc_role'] == "adm

  2. :

    -

    +

@@ -105,7 +105,7 @@ if (isset($_SESSION['mailcow_cc_role']) && ($_SESSION['mailcow_cc_role'] == "adm
- + @@ -135,7 +135,7 @@ if (isset($_SESSION['pending_tfa_method'])):
Yubicon Icon - +
@@ -160,7 +160,7 @@ if (isset($_SESSION['pending_tfa_method'])):
- +
diff --git a/data/web/modals/mailbox.php b/data/web/modals/mailbox.php index 160ab178..fe99bc6d 100644 --- a/data/web/modals/mailbox.php +++ b/data/web/modals/mailbox.php @@ -17,13 +17,13 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
- ".htmlspecialchars($domain).""; @@ -35,7 +35,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -50,13 +50,13 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
- +
@@ -68,7 +68,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -89,37 +89,37 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
- +
- +
- +
- +
- +
@@ -133,10 +133,10 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
- @@ -158,8 +158,8 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- - + +

@@ -181,13 +181,13 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
- ".htmlspecialchars($domain).""; @@ -199,7 +199,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- @@ -230,7 +230,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -262,13 +262,13 @@ if (!isset($_SESSION['mailcow_cc_role'])) {

- +
- +
- +
@@ -281,7 +281,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -310,7 +310,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- ".htmlspecialchars($domain).""; @@ -328,7 +328,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -350,7 +350,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
-
- +
- + 1-65535
- +
- +
- @@ -410,47 +410,47 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
- + 0-32000
- + 0-125000000
- + 1-32000
- + 1-32000
- +
- +
@@ -504,7 +504,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -525,7 +525,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
-
- @@ -552,7 +552,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -572,7 +572,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -593,7 +593,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
-
- @@ -631,7 +631,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -643,7 +643,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -664,14 +664,14 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
- +
@@ -684,7 +684,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
diff --git a/data/web/modals/user.php b/data/web/modals/user.php index 5e0849e2..228670bd 100644 --- a/data/web/modals/user.php +++ b/data/web/modals/user.php @@ -18,32 +18,32 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
- + 1-65535
- +
- +
- @@ -60,27 +60,27 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
- + 0-32000
- + 0-125000000
- +
@@ -127,7 +127,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -155,13 +155,13 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
- +

@@ -169,12 +169,12 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- +
- +
@@ -195,4 +195,4 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
-
\ No newline at end of file +
diff --git a/data/web/quarantine.php b/data/web/quarantine.php index 3e193586..7658611c 100644 --- a/data/web/quarantine.php +++ b/data/web/quarantine.php @@ -22,11 +22,11 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
    -
    • +
    • -
    • +
    • -
    • +
diff --git a/data/web/user.php b/data/web/user.php index dd75e360..02845813 100644 --- a/data/web/user.php +++ b/data/web/user.php @@ -10,6 +10,7 @@ if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == 'doma $_SESSION['return_to'] = $_SERVER['REQUEST_URI']; $tfa_data = get_tfa(); $username = $_SESSION['mailcow_cc_username']; + ?>

@@ -28,6 +29,7 @@ if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == 'doma else: echo "Last login: -"; endif; ?>

+

@@ -102,6 +104,7 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == '

[]

[]

+

[]

-
-
-
-

[]

-
-
-
diff --git a/docker-compose.yml b/docker-compose.yml index f539854e..0eff3b00 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,6 +20,7 @@ services: image: mariadb:10.2 volumes: - mysql-vol-1:/var/lib/mysql/ + - mysql-socket-vol-1:/var/run/mysqld/ - ./data/conf/mysql/:/etc/mysql/conf.d/:ro environment: - TZ=${TZ} @@ -71,7 +72,7 @@ services: - clamd rspamd-mailcow: - image: mailcow/rspamd:1.24 + image: mailcow/rspamd:1.27 build: ./data/Dockerfiles/rspamd stop_grace_period: 30s depends_on: @@ -79,9 +80,9 @@ services: environment: - TZ=${TZ} volumes: - - ./data/conf/rspamd/custom/:/etc/rspamd/custom:ro - - ./data/conf/rspamd/override.d/:/etc/rspamd/override.d:rw - - ./data/conf/rspamd/local.d/:/etc/rspamd/local.d:ro + - ./data/conf/rspamd/custom/:/etc/rspamd/custom + - ./data/conf/rspamd/override.d/:/etc/rspamd/override.d + - ./data/conf/rspamd/local.d/:/etc/rspamd/local.d - ./data/conf/rspamd/lua/:/etc/rspamd/lua/:ro - rspamd-sock:/rspamd-sock - rspamd-vol-1:/var/lib/rspamd @@ -95,7 +96,7 @@ services: - rspamd php-fpm-mailcow: - image: mailcow/phpfpm:1.18 + image: mailcow/phpfpm:1.21 build: ./data/Dockerfiles/phpfpm command: "php-fpm -d date.timezone=${TZ} -d expose_php=0" depends_on: @@ -104,6 +105,7 @@ services: - ./data/web:/web:rw - ./data/conf/rspamd/dynmaps:/dynmaps:ro - rspamd-sock:/rspamd-sock + - mysql-socket-vol-1:/var/run/mysqld/ - ./data/conf/rspamd/meta_exporter:/meta_exporter:ro - ./data/conf/phpfpm/php-fpm.d/pools.conf:/usr/local/etc/php-fpm.d/z-pools.conf - ./data/conf/phpfpm/php-conf.d/opcache-recommended.ini:/usr/local/etc/php/conf.d/opcache-recommended.ini @@ -136,7 +138,7 @@ services: - phpfpm sogo-mailcow: - image: mailcow/sogo:1.36 + image: mailcow/sogo:1.38 build: ./data/Dockerfiles/sogo environment: - DBNAME=${DBNAME} @@ -147,6 +149,7 @@ services: - MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME} volumes: - ./data/conf/sogo/:/etc/sogo/ + - mysql-socket-vol-1:/var/run/mysqld/ restart: always dns: - ${IPV4_NETWORK:-172.22.1}.254 @@ -157,7 +160,7 @@ services: - sogo dovecot-mailcow: - image: mailcow/dovecot:1.33 + image: mailcow/dovecot:1.36 build: ./data/Dockerfiles/dovecot cap_add: - NET_BIND_SERVICE @@ -167,13 +170,16 @@ services: - ./data/conf/sogo/:/etc/sogo/ - vmail-vol-1:/var/vmail - crypt-vol-1:/mail_crypt/ + - ./data/conf/rspamd/custom/:/etc/rspamd/custom - rspamd-sock:/rspamd-sock + - mysql-socket-vol-1:/var/run/mysqld/ environment: - LOG_LINES=${LOG_LINES:-9999} - DBNAME=${DBNAME} - DBUSER=${DBUSER} - DBPASS=${DBPASS} - TZ=${TZ} + - MAILDIR_GC_TIME=${MAILDIR_GC_TIME:-1440} ports: - "${DOVEADM_PORT:-127.0.0.1:19991}:12345" - "${IMAP_PORT:-143}:143" @@ -196,7 +202,7 @@ services: - dovecot postfix-mailcow: - image: mailcow/postfix:1.21 + image: mailcow/postfix:1.22 build: ./data/Dockerfiles/postfix volumes: - ./data/conf/postfix:/opt/postfix/conf @@ -204,6 +210,7 @@ services: - postfix-vol-1:/var/spool/postfix - crypt-vol-1:/var/lib/zeyple - rspamd-sock:/rspamd-sock + - mysql-socket-vol-1:/var/run/mysqld/ environment: - LOG_LINES=${LOG_LINES:-9999} - TZ=${TZ} @@ -280,8 +287,7 @@ services: acme-mailcow: depends_on: - nginx-mailcow - - mysql-mailcow - image: mailcow/acme:1.37 + image: mailcow/acme:1.38 build: ./data/Dockerfiles/acme dns: - ${IPV4_NETWORK:-172.22.1}.254 @@ -299,6 +305,7 @@ services: - ./data/web/.well-known/acme-challenge:/var/www/acme:rw - ./data/assets/ssl:/var/lib/acme/:rw - ./data/assets/ssl-example:/var/lib/ssl-example/:ro + - mysql-socket-vol-1:/var/run/mysqld/ restart: always networks: mailcow-network: @@ -330,13 +337,14 @@ services: - /lib/modules:/lib/modules:ro watchdog-mailcow: - image: mailcow/watchdog:1.22 + image: mailcow/watchdog:1.24 # Debug #command: /watchdog.sh build: ./data/Dockerfiles/watchdog oom_kill_disable: true volumes: - rspamd-sock:/rspamd-sock + - mysql-socket-vol-1:/var/run/mysqld/ restart: always environment: - LOG_LINES=${LOG_LINES:-9999} @@ -356,7 +364,7 @@ services: - watchdog dockerapi-mailcow: - image: mailcow/dockerapi:1.14 + image: mailcow/dockerapi:1.17 restart: always build: ./data/Dockerfiles/dockerapi oom_kill_disable: true @@ -365,6 +373,7 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro - ./data/conf/rspamd/override.d/worker-controller-password.inc:/access.inc:rw + - vmail-vol-1:/var/vmail:ro networks: mailcow-network: aliases: @@ -392,6 +401,7 @@ networks: volumes: vmail-vol-1: mysql-vol-1: + mysql-socket-vol-1: redis-vol-1: rspamd-vol-1: postfix-vol-1: diff --git a/generate_config.sh b/generate_config.sh index 7e4ae01c..5e8fbf37 100755 --- a/generate_config.sh +++ b/generate_config.sh @@ -104,6 +104,11 @@ TZ=${MAILCOW_TZ} # Fixed project name COMPOSE_PROJECT_NAME=mailcowdockerized +# Garbage collector cleanup +# Deleted domains and mailboxes are moved to /var/vmail/_garbage/timestamp_sanitizedstring +# How long should objects remain in the garbage until they are being deleted? (value in minutes) +MAILDIR_GC_TIME=1440 + # Additional SAN for the certificate ADDITIONAL_SAN= diff --git a/helper-scripts/backup_and_restore.sh b/helper-scripts/backup_and_restore.sh index 838da1f2..60516944 100755 --- a/helper-scripts/backup_and_restore.sh +++ b/helper-scripts/backup_and_restore.sh @@ -5,8 +5,8 @@ if [[ ! ${1} =~ (backup|restore) ]]; then exit 1 fi -if [[ ${1} == "backup" && ! ${2} =~ (vmail|redis|rspamd|postfix|mysql|all) ]]; then - echo "Second parameter needs to be 'vmail', 'redis', 'rspamd', 'postfix', 'mysql' or 'all'" +if [[ ${1} == "backup" && ! ${2} =~ (crypt|vmail|redis|rspamd|postfix|mysql|all) ]]; then + echo "Second parameter needs to be 'vmail', 'crypt', 'redis', 'rspamd', 'postfix', 'mysql' or 'all'" exit 1 fi @@ -62,6 +62,12 @@ function backup() { -v $(docker volume ls -qf name=${CMPS_PRJ}_vmail-vol-1):/vmail \ debian:stretch-slim /bin/tar --warning='no-file-ignored' -Pcvpzf /backup/backup_vmail.tar.gz /vmail ;;& + crypt|all) + docker run --rm \ + -v ${BACKUP_LOCATION}/mailcow-${DATE}:/backup \ + -v $(docker volume ls -qf name=${CMPS_PRJ}_crypt-vol-1):/crypt \ + debian:stretch-slim /bin/tar --warning='no-file-ignored' -Pcvpzf /backup/backup_crypt.tar.gz /crypt + ;;& redis|all) docker exec $(docker ps -qf name=redis-mailcow) redis-cli save docker run --rm \ @@ -128,6 +134,14 @@ function restore() { debian:stretch-slim /bin/tar -Pxvzf /backup/backup_redis.tar.gz docker start $(docker ps -aqf name=redis-mailcow) ;; + crypt) + docker stop $(docker ps -qf name=dovecot-mailcow) + docker run -it --rm \ + -v ${RESTORE_LOCATION}:/backup \ + -v $(docker volume ls -qf name=${CMPS_PRJ}_crypt-vol-1):/crypt \ + debian:stretch-slim /bin/tar -Pxvzf /backup/backup_crypt.tar.gz + docker start $(docker ps -aqf name=dovecot-mailcow) + ;; rspamd) docker stop $(docker ps -qf name=rspamd-mailcow) docker run -it --rm \ @@ -189,7 +203,7 @@ elif [[ ${1} == "restore" ]]; then echo declare -A FILE_SELECTION RESTORE_POINT="${FOLDER_SELECTION[${input_sel}]}" - if [[ -z $(find "${FOLDER_SELECTION[${input_sel}]}" -maxdepth 1 -type f -regex ".*\(redis\|rspamd\|mysql\|vmail\|postfix\).*") ]]; then + if [[ -z $(find "${FOLDER_SELECTION[${input_sel}]}" -maxdepth 1 -type f -regex ".*\(redis\|rspamd\|mysql\|crypt\|vmail\|postfix\).*") ]]; then echo "No datasets found" exit 1 fi @@ -198,6 +212,10 @@ elif [[ ${1} == "restore" ]]; then echo "[ ${i} ] - Mail directory (/var/vmail)" FILE_SELECTION[${i}]="vmail" ((i++)) + elif [[ ${file} =~ crypt ]]; then + echo "[ ${i} ] - Crypt data" + FILE_SELECTION[${i}]="crypt" + ((i++)) elif [[ ${file} =~ redis ]]; then echo "[ ${i} ] - Redis DB" FILE_SELECTION[${i}]="redis" diff --git a/helper-scripts/ext_sql_sock.docker-compose.override.yml b/helper-scripts/ext_sql_sock.docker-compose.override.yml new file mode 100644 index 00000000..1f052f08 --- /dev/null +++ b/helper-scripts/ext_sql_sock.docker-compose.override.yml @@ -0,0 +1,31 @@ +version: '2.1' +services: + + php-fpm-mailcow: + volumes: + - /var/run/mysqld/mysqld.sock:/var/run/mysqld/mysqld.sock + + sogo-mailcow: + volumes: + - /var/run/mysqld/mysqld.sock:/var/run/mysqld/mysqld.sock + + dovecot-mailcow: + volumes: + - /var/run/mysqld/mysqld.sock:/var/run/mysqld/mysqld.sock + + postfix-mailcow: + volumes: + - /var/run/mysqld/mysqld.sock:/var/run/mysqld/mysqld.sock + + acme-mailcow: + volumes: + - /var/run/mysqld/mysqld.sock:/var/run/mysqld/mysqld.sock + + watchdog-mailcow: + volumes: + - /var/run/mysqld/mysqld.sock:/var/run/mysqld/mysqld.sock + + mysql-mailcow: + image: alpine:3.8 + command: /bin/true + restart: "no" From 73b10350d00f549c7abde98c490cb27236d7f3cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sat, 29 Sep 2018 22:03:48 +0200 Subject: [PATCH 23/56] [Rspamd] Ignore sa-rules-heinlein file, remove from index --- .gitignore | 1 + data/conf/rspamd/custom/sa-rules-heinlein | 10561 -------------------- 2 files changed, 1 insertion(+), 10561 deletions(-) delete mode 100644 data/conf/rspamd/custom/sa-rules-heinlein diff --git a/.gitignore b/.gitignore index e535c710..907da76b 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ data/conf/nginx/*.conf data/conf/nginx/*.custom data/conf/nginx/*.bak data/conf/dovecot/extra.conf +data/conf/rspamd/custom/sa-rules-heinlein diff --git a/data/conf/rspamd/custom/sa-rules-heinlein b/data/conf/rspamd/custom/sa-rules-heinlein deleted file mode 100644 index 9e3646c6..00000000 --- a/data/conf/rspamd/custom/sa-rules-heinlein +++ /dev/null @@ -1,10561 +0,0 @@ -header __HS_XM_BLAT_311_WIN32 X-Mailer =~ /^Blat v3\.1\.1, a Win32 SMTP\/NNTP mailer http:\/\/www.blat.net/ -header __HS_XOLE_BLAT_311 X-MimeOLE =~ /Produced by Blat v3\.1\.1/ -meta HS_HEADER_SPAM_70 (__HS_XM_BLAT_311_WIN32 && __HS_XOLE_BLAT_311) -score HS_HEADER_SPAM_70 3.5 -# -# Heinlein Support -- SpamAssassin Regelsätze -# Use it as it is. -# -# -body HS_BODY_2 /Unser ING-DIBA Sicherheits Bereich investiert sehr viel Zeit/ -describe HS_BODY_2 Heinlein Support Spamschutz Body-2 -score HS_BODY_2 5 - -body HS_BODY_4 /We are the department of Asian Domain Registration Service in China. Here I have something/ -describe HS_BODY_4 Heinlein Support Spamschutz Body-4 -score HS_BODY_4 5 - -body HS_BODY_5 /schicken Sie bitte einen Brief auf Violet\@arbeitdeutschland\.com/ -describe HS_BODY_5 Heinlein Support Spamschutz Body-5 -score HS_BODY_5 5 - -body HS_BODY_6 /Dear RandomForename_/ -describe HS_BODY_6 Heinlein Support Spamschutz Body-6 -score HS_BODY_6 5 - -body HS_BODY_7 /http:\/\/defiteq\.com\/qms\/upload/ -describe HS_BODY_7 Heinlein Support Spamschutz Body-7 -score HS_BODY_7 5 - -body HS_BODY_8 /mail\.iphone\.mn/ -describe HS_BODY_8 Heinlein Support Spamschutz Body-8 -score HS_BODY_8 5 - -body HS_BODY_9 /http:\/\/www\.safe\-slh\.com/ -describe HS_BODY_9 Heinlein Support Spamschutz Body-9 -score HS_BODY_9 5 - -body HS_BODY_10 /Sie konnen Ihre Postsendung in unserer Postabteilung personlich kriegen/ -describe HS_BODY_10 Heinlein Support Spamschutz Body-10 -score HS_BODY_10 5 - -body HS_BODY_11 /Sie sollen dieses Postetikett drucken lassen/ -describe HS_BODY_11 Heinlein Support Spamschutz Body-11 -score HS_BODY_11 5 - -body HS_BODY_12 /Wenn dies nicht sofort machen Sie Ihre E-Mail-Adresse deaktiviert von unserem Server./ -describe HS_BODY_12 Heinlein Support Spamschutz Body-12 -score HS_BODY_12 5 - -body HS_BODY_13 /^Message\-ID:\*\@vps332995\.netsons\.net/ -describe HS_BODY_13 Heinlein Support Spamschutz Body-13 -score HS_BODY_13 5 - -body HS_BODY_14 /dildodaddy/ -describe HS_BODY_14 Heinlein Support Spamschutz Body-14 -score HS_BODY_14 5 - -body HS_BODY_15 /mehreren fehlgeschlagenen TAN\-Eingeben/ -describe HS_BODY_15 Heinlein Support Spamschutz Body-15 -score HS_BODY_15 5 - -body HS_BODY_16 /filename="c\.g\.euromilion\.pdf"/ -describe HS_BODY_16 Heinlein Support Spamschutz Body-16 -score HS_BODY_16 5 - -body HS_BODY_17 /^Bei Interesse bitten wir um folgende$/ -describe HS_BODY_17 Heinlein Support Spamschutz Body-17 -score HS_BODY_17 5 - -body HS_BODY_18 /palmandmore\.de/ -describe HS_BODY_18 Heinlein Support Spamschutz Body-18 -score HS_BODY_18 5 - -body HS_BODY_19 /co\.cc\/aff\/item\.php\?usn=(aeb1|dap1|dvg1)&i=it\_ep&e=admin\@groupon\.de/ -describe HS_BODY_19 Heinlein Support Spamschutz Body-19 -score HS_BODY_19 5 - -body HS_BODY_20 /You Are Guaranteed To Get Paid Instantly For Each Email You Process!/ -describe HS_BODY_20 Heinlein Support Spamschutz Body-20 -score HS_BODY_20 5 - -body HS_BODY_21 /I (talk|speak) 2 'languages'\. Now i'm 24\. I/ -describe HS_BODY_21 Heinlein Support Spamschutz Body-21 -score HS_BODY_21 5 - -body HS_BODY_22 /My nickname \"Kuma\"! :\)/ -describe HS_BODY_22 Heinlein Support Spamschutz Body-22 -score HS_BODY_22 5 - -body HS_BODY_23 /http:\/\/free\.fr\/support\/verification\/compte\// -describe HS_BODY_23 Heinlein Support Spamschutz Body-23 -score HS_BODY_23 5 - -body HS_BODY_24 /http:\/\/sonofages\.free\.fr\/images\/LogoCreditMutuel\.png/ -describe HS_BODY_24 Heinlein Support Spamschutz Body-24 -score HS_BODY_24 5 - -body HS_BODY_25 /ucc\.edu\.ni/ -describe HS_BODY_25 Heinlein Support Spamschutz Body-25 -score HS_BODY_25 5 - -body HS_BODY_26 /7figureincome\.php/ -describe HS_BODY_26 Heinlein Support Spamschutz Body-26 -score HS_BODY_26 5 - -body HS_BODY_27 /Cher Client Verified by Visa/ -describe HS_BODY_27 Heinlein Support Spamschutz Body-27 -score HS_BODY_27 5 - -body HS_BODY_28 /^From: "Topillen Apotheke" / -describe HS_BODY_28 Heinlein Support Spamschutz Body-28 -score HS_BODY_28 5 - -body HS_BODY_29 /^Aufgrund mehrerer Phishing Versuche, unsere Visa und Mastercard/ -describe HS_BODY_29 Heinlein Support Spamschutz Body-29 -score HS_BODY_29 5 - -body HS_BODY_30 /^ Phishing Departament/ -describe HS_BODY_30 Heinlein Support Spamschutz Body-30 -score HS_BODY_30 5 - -body HS_BODY_31 /We wish to invest between \$5Million\-\$100Million in any viable projects/ -describe HS_BODY_31 Heinlein Support Spamschutz Body-31 -score HS_BODY_31 5 - -body HS_BODY_32 /God bless you as you get back to me/ -describe HS_BODY_32 Heinlein Support Spamschutz Body-32 -score HS_BODY_32 5 - -body HS_BODY_33 /www\.(b|B)ien(e|E)tremag\.com/ -describe HS_BODY_33 Heinlein Support Spamschutz Body-33 -score HS_BODY_33 5 - -body HS_BODY_34 /Sehr geehrte Sparkasse Card/ -describe HS_BODY_34 Heinlein Support Spamschutz Body-34 -score HS_BODY_34 5 - -body HS_BODY_35 /zigaretten\-discount\.info/ -describe HS_BODY_35 Heinlein Support Spamschutz Body-35 -score HS_BODY_35 5 - -body HS_BODY_36 /zigaretten\-discount[punkt]info/ -describe HS_BODY_36 Heinlein Support Spamschutz Body-36 -score HS_BODY_36 5 - -body HS_BODY_37 /Guten Tag Mitglied [0-9]{5}/ -describe HS_BODY_37 Heinlein Support Spamschutz Body-37 -score HS_BODY_37 5 - -body HS_BODY_38 /elenx\.innovacon\.com\/\.e\/e\.php/ -describe HS_BODY_38 Heinlein Support Spamschutz Body-38 -score HS_BODY_38 5 - -body HS_BODY_39 /www\.sniperrs\.de\/modules\/Forums\/admin/ -describe HS_BODY_39 Heinlein Support Spamschutz Body-39 -score HS_BODY_39 5 - -body HS_BODY_40 /boxneufnet\.com\/id\/oragne\.fr\/Identifiant/ -describe HS_BODY_40 Heinlein Support Spamschutz Body-40 -score HS_BODY_40 5 - -body HS_BODY_41 /www\.colellsa\.com\/img\/quienes\/pabo\/paypal\-fr/ -describe HS_BODY_41 Heinlein Support Spamschutz Body-41 -score HS_BODY_41 5 - -body HS_BODY_42 /dekmor\.cmu\.ac\.th\/sticker\/upload\/Logs\/Login\/webscrcmd/ -describe HS_BODY_42 Heinlein Support Spamschutz Body-42 -score HS_BODY_42 5 - -body HS_BODY_43 /ektoschronou\.com/ -describe HS_BODY_43 Heinlein Support Spamschutz Body-43 -score HS_BODY_43 5 - -body HS_BODY_44 /ulouwaio\.com/ -describe HS_BODY_44 Heinlein Support Spamschutz Body-44 -score HS_BODY_44 5 - -body HS_BODY_45 /logonature\.com\.nu/ -describe HS_BODY_45 Heinlein Support Spamschutz Body-45 -score HS_BODY_45 5 - -body HS_BODY_46 /suinlop\.com/ -describe HS_BODY_46 Heinlein Support Spamschutz Body-46 -score HS_BODY_46 5 - -body HS_BODY_47 /soudoorpo\.com/ -describe HS_BODY_47 Heinlein Support Spamschutz Body-47 -score HS_BODY_47 5 - -body HS_BODY_48 /GOOGLE AUSSTATTUNGSFONDS 20.?.? GEWINNER ANMELDEFORMULAR FUER ZAHLUNG/ -describe HS_BODY_48 Heinlein Support Spamschutz Body-48 -score HS_BODY_48 5 - -body HS_BODY_49 /Anbieter: Privacy GG Limited, 99 Albert Street, Belize City, CA/ -describe HS_BODY_49 Heinlein Support Spamschutz Body-49 -score HS_BODY_49 5 - -body HS_BODY_50 /^Die Nachricht wurde durch Interads 24 Ltd/ -describe HS_BODY_50 Heinlein Support Spamschutz Body-50 -score HS_BODY_50 5 - -body HS_BODY_51 /www\.sommer\-mit\-kollegen\.de/ -describe HS_BODY_51 Heinlein Support Spamschutz Body-51 -score HS_BODY_51 5 - -body HS_BODY_52 /^www.*\/ausa$/ -describe HS_BODY_52 Heinlein Support Spamschutz Body-52 -score HS_BODY_52 5 - -body HS_BODY_53 /KlickTel Telefonbuch OEM/ -describe HS_BODY_53 Heinlein Support Spamschutz Body-53 -score HS_BODY_53 5 - -body HS_BODY_54 /www\.klicktel24\.org/ -describe HS_BODY_54 Heinlein Support Spamschutz Body-54 -score HS_BODY_54 5 - -body HS_BODY_56 /maryjanemax\@yahoo\.co\.uk/ -describe HS_BODY_56 Heinlein Support Spamschutz Body-56 -score HS_BODY_56 5 - -body HS_BODY_57 /http\.*muqugeh\.cn/ -describe HS_BODY_57 Heinlein Support Spamschutz Body-57 -score HS_BODY_57 5 - -body HS_BODY_59 /INTERNATIONAL LOTTERIE PROMOTION SPIELGEMEINSCHAFT/ -describe HS_BODY_59 Heinlein Support Spamschutz Body-59 -score HS_BODY_59 5 - -body HS_BODY_60 /Leider st=F6ren Sie.=20/ -describe HS_BODY_60 Heinlein Support Spamschutz Body-60 -score HS_BODY_60 5 - -body HS_BODY_61 /Sie haben dieses Email erhalten, weil Sie im Newsletter von Promohouse Ltd eingetragen sind/ -describe HS_BODY_61 Heinlein Support Spamschutz Body-61 -score HS_BODY_61 5 - -body HS_BODY_62 /ATTN: Beneficiar/ -describe HS_BODY_62 Heinlein Support Spamschutz Body-62 -score HS_BODY_62 5 - -body HS_BODY_63 /www\.hedonismails\.de/ -describe HS_BODY_63 Heinlein Support Spamschutz Body-63 -score HS_BODY_63 5 - -body HS_BODY_64 /www\.globadressen\.(com|net|org|info)/ -describe HS_BODY_64 Heinlein Support Spamschutz Body-64 -score HS_BODY_64 5 - -body HS_BODY_65 /elegalal\.nextmail\.ru/ -describe HS_BODY_65 Heinlein Support Spamschutz Body-65 -score HS_BODY_65 5 - -body HS_BODY_66 /www\.switzerlandpussy\.eu/ -describe HS_BODY_66 Heinlein Support Spamschutz Body-66 -score HS_BODY_66 5 - -body HS_BODY_67 /Die jungen Girls fliegen nur so auf die langen/ -describe HS_BODY_67 Heinlein Support Spamschutz Body-67 -score HS_BODY_67 5 - -body HS_BODY_68 /\*\*\*\* Commercial use of this software is prohibited \*\*\*\*/ -describe HS_BODY_68 Heinlein Support Spamschutz Body-68 -score HS_BODY_68 5 - -body HS_BODY_69 /I finded your email in internet and I decide to ask you for help/ -describe HS_BODY_69 Heinlein Support Spamschutz Body-69 -score HS_BODY_69 5 - -body HS_BODY_70 /Details und moegliche Schritte zur Entsperrung finden Sie/ -describe HS_BODY_70 Heinlein Support Spamschutz Body-70 -score HS_BODY_70 5 - -body HS_BODY_71 /^Amount Won:/ -describe HS_BODY_71 Heinlein Support Spamschutz Body-71 -score HS_BODY_71 5 - -body HS_BODY_72 /AWARD WINNING NOTICE/ -describe HS_BODY_72 Heinlein Support Spamschutz Body-72 -score HS_BODY_72 5 - -body HS_BODY_73 /mixvarejo\.com/ -describe HS_BODY_73 Heinlein Support Spamschutz Body-73 -score HS_BODY_73 5 - -body HS_BODY_74 /www\.global\-db\.(com|net|org)/ -describe HS_BODY_74 Heinlein Support Spamschutz Body-74 -score HS_BODY_74 5 - -body HS_BODY_75 /^I am Barrister/ -describe HS_BODY_75 Heinlein Support Spamschutz Body-75 -score HS_BODY_75 5 - -body HS_BODY_76 /respublica\@gaucherepublicaine\.org/ -describe HS_BODY_76 Heinlein Support Spamschutz Body-76 -score HS_BODY_76 5 - -body HS_BODY_77 /NEU - Vi Super Active/ -describe HS_BODY_77 Heinlein Support Spamschutz Body-77 -score HS_BODY_77 5 - -body HS_BODY_78 /anhaltende Versagensangste und wiederholte peinliche Situationen/ -describe HS_BODY_78 Heinlein Support Spamschutz Body-78 -score HS_BODY_78 5 - -body HS_BODY_79 /Schulfreunde Vermittlungs Service AG/ -describe HS_BODY_79 Heinlein Support Spamschutz Body-79 -score HS_BODY_79 5 - -body HS_BODY_80 /Multimedia Telegramm/ -describe HS_BODY_80 Heinlein Support Spamschutz Body-80 -score HS_BODY_80 5 - -body HS_BODY_81 /http.*\.fdub\.biz/ -describe HS_BODY_81 Heinlein Support Spamschutz Body-81 -score HS_BODY_81 5 - -body HS_BODY_82 /TanjaGuenther/ -describe HS_BODY_82 Heinlein Support Spamschutz Body-82 -score HS_BODY_82 5 - -body HS_BODY_83 /www\.bestnetz24\.de\/letter\/ausgabe\.php/ -describe HS_BODY_83 Heinlein Support Spamschutz Body-83 -score HS_BODY_83 5 - -body HS_BODY_84 /www\.db\.?adressen\.(com|net|org|info)/ -describe HS_BODY_84 Heinlein Support Spamschutz Body-84 -score HS_BODY_84 5 - -body HS_BODY_85 /thomas\@jthomas\.es/ -describe HS_BODY_85 Heinlein Support Spamschutz Body-85 -score HS_BODY_85 5 - -body HS_BODY_86 /Ihre Marketing Agentur Espa/ -describe HS_BODY_86 Heinlein Support Spamschutz Body-86 -score HS_BODY_86 5 - -body HS_BODY_87 /www\.pakandu\.com/ -describe HS_BODY_87 Heinlein Support Spamschutz Body-87 -score HS_BODY_87 5 - -body HS_BODY_88 /Glob.?.?.?(C|K)ontact.?.?.?Team/ -describe HS_BODY_88 Heinlein Support Spamschutz Body-88 -score HS_BODY_88 5 - -body HS_BODY_89 /www.gc.?datenbaken.(com|net|org|info)/ -describe HS_BODY_89 Heinlein Support Spamschutz Body-89 -score HS_BODY_89 5 - -body HS_BODY_90 /www.glc-?data.(com|net|org|info)/ -describe HS_BODY_90 Heinlein Support Spamschutz Body-90 -score HS_BODY_90 5 - -body HS_BODY_91 /Global.?(C|K)ontact/ -describe HS_BODY_91 Heinlein Support Spamschutz Body-91 -score HS_BODY_91 5 - -body HS_BODY_92 /www\.imarketing\.com\.br\.remove/ -describe HS_BODY_92 Heinlein Support Spamschutz Body-92 -score HS_BODY_92 5 - -body HS_BODY_93 /Bestellen Sie jetzt und vergessen Sie Ihre Enttauschungen/ -describe HS_BODY_93 Heinlein Support Spamschutz Body-93 -score HS_BODY_93 5 - -body HS_BODY_94 /Online Apotheke - original Qualitaet/ -describe HS_BODY_94 Heinlein Support Spamschutz Body-94 -score HS_BODY_94 5 - -body HS_BODY_95 /Wir wissen was Frauen wollern/ -describe HS_BODY_95 Heinlein Support Spamschutz Body-95 -score HS_BODY_95 5 - -body HS_BODY_96 /Viiiiaaaaaagra/ -describe HS_BODY_96 Heinlein Support Spamschutz Body-96 -score HS_BODY_96 5 - -body HS_BODY_97 /Web: www\.eurasianpages\. com/ -describe HS_BODY_97 Heinlein Support Spamschutz Body-97 -score HS_BODY_97 5 - -body HS_BODY_98 /^Firma Global Contact bietet Ihnen/ -describe HS_BODY_98 Heinlein Support Spamschutz Body-98 -score HS_BODY_98 5 - -body HS_BODY_99 /www\.g\-adressen\.net/ -describe HS_BODY_99 Heinlein Support Spamschutz Body-99 -score HS_BODY_99 5 - -body HS_BODY_100 /NIEMALS geben Sie Ihre Passw.rter an niemanden NUR und melden Sie sich/ -describe HS_BODY_100 Heinlein Support Spamschutz Body-100 -score HS_BODY_100 5 - -body HS_BODY_101 /www\.loteria\.es/ -describe HS_BODY_101 Heinlein Support Spamschutz Body-101 -score HS_BODY_101 5 - -body HS_BODY_106 /^Ein Dienst der IT4YOU AG, Friedrichstrasse 171, Berlin - Mitte als/ -describe HS_BODY_106 Heinlein Support Spamschutz Body-106 -score HS_BODY_106 5 - -body HS_BODY_107 /^www\.cdtophit\.org/ -describe HS_BODY_107 Heinlein Support Spamschutz Body-107 -score HS_BODY_107 5 - -body HS_BODY_108 /http:\/\/www\.doenertreff\.de/ -describe HS_BODY_108 Heinlein Support Spamschutz Body-108 -score HS_BODY_108 5 - -body HS_BODY_109 /Brauchen Sie noch einen Grund um zu Vegas VIP Casino/ -describe HS_BODY_109 Heinlein Support Spamschutz Body-109 -score HS_BODY_109 5 - -body HS_BODY_110 /glob\-contact\.net$/ -describe HS_BODY_110 Heinlein Support Spamschutz Body-110 -score HS_BODY_110 5 - -body HS_BODY_111 /^Ihr Glob\-Kontakt\-Team$/ -describe HS_BODY_111 Heinlein Support Spamschutz Body-111 -score HS_BODY_111 5 - -body HS_BODY_112 /www\.feilervision\.de/ -describe HS_BODY_112 Heinlein Support Spamschutz Body-112 -score HS_BODY_112 5 - -body HS_BODY_113 /DER INVESTORALARM!/ -describe HS_BODY_113 Heinlein Support Spamschutz Body-113 -score HS_BODY_113 5 - -body HS_BODY_114 /ES IST EIN UNGLAUBLICHES PROFITPOTENTIAL! VERLIERE DIESE CHANCE NICHT!/ -describe HS_BODY_114 Heinlein Support Spamschutz Body-114 -score HS_BODY_114 5 - -body HS_BODY_115 /I work very hard every day to be able to buy necessities for my mother/ -describe HS_BODY_115 Heinlein Support Spamschutz Body-115 -score HS_BODY_115 5 - -body HS_BODY_116 /THE FREELOTTO COMPANY/ -describe HS_BODY_116 Heinlein Support Spamschutz Body-116 -score HS_BODY_116 5 - -body HS_BODY_117 /BreakingMrktNews/ -describe HS_BODY_117 Heinlein Support Spamschutz Body-117 -score HS_BODY_117 5 - -body HS_BODY_118 /China Media Crop OTC\.BB CHMD/ -describe HS_BODY_118 Heinlein Support Spamschutz Body-118 -score HS_BODY_118 5 - -body HS_BODY_119 /Weltweit gilt das nummerierte TAN\-Verfahren als eines der sicherste/ -describe HS_BODY_119 Heinlein Support Spamschutz Body-119 -score HS_BODY_119 5 - -body HS_BODY_120 /^Marion Beckera/ -describe HS_BODY_120 Heinlein Support Spamschutz Body-120 -score HS_BODY_120 5 - -body HS_BODY_121 /Zwecks abschließende Zustimmung für deine Verhandlung zur/ -describe HS_BODY_121 Heinlein Support Spamschutz Body-121 -score HS_BODY_121 5 - -body HS_BODY_122 /annullieren deine on\-line Übertragung® Dienstleistungen\./ -describe HS_BODY_122 Heinlein Support Spamschutz Body-122 -score HS_BODY_122 5 - -body HS_BODY_123 /www\.internetloginuser\.info/ -describe HS_BODY_123 Heinlein Support Spamschutz Body-123 -score HS_BODY_123 5 - -body HS_BODY_124 /realsevgi\.com/ -describe HS_BODY_124 Heinlein Support Spamschutz Body-124 -score HS_BODY_124 5 - -body HS_BODY_126 /Oder Ihr Provider hat die Mail falsch weiter geleitet!?/ -describe HS_BODY_126 Heinlein Support Spamschutz Body-126 -score HS_BODY_126 5 - -body HS_BODY_127 /Versatel\-Attachment\-Warning\.txt/ -describe HS_BODY_127 Heinlein Support Spamschutz Body-127 -score HS_BODY_127 5 - -body HS_BODY_128 /www=2Eanaforturizm=2Ecom/ -describe HS_BODY_128 Heinlein Support Spamschutz Body-128 -score HS_BODY_128 5 - -body HS_BODY_129 /www\.anaforturizm\.com/ -describe HS_BODY_129 Heinlein Support Spamschutz Body-129 -score HS_BODY_129 5 - -body HS_BODY_131 /^jpberlin\.de support team\./ -describe HS_BODY_131 Heinlein Support Spamschutz Body-131 -score HS_BODY_131 5 - -body HS_BODY_132 /You have successfully updated the password of your Jpberlin account/ -describe HS_BODY_132 Heinlein Support Spamschutz Body-132 -score HS_BODY_132 5 - -body HS_BODY_133 /www\.ru4mailnow\.com/ -describe HS_BODY_133 Heinlein Support Spamschutz Body-133 -score HS_BODY_133 5 - -body HS_BODY_134 /EXPLOSIVE PICK FOR OUR MEMBERS/ -describe HS_BODY_134 Heinlein Support Spamschutz Body-134 -score HS_BODY_134 5 - -body HS_BODY_135 /AntiVirus-System: Kein Virus erkannt/ -describe HS_BODY_135 Heinlein Support Spamschutz Body-135 -score HS_BODY_135 5 - -body HS_BODY_136 /\-\-\- FIFA Fussball\-Weltmeisterschaft 2006/ -describe HS_BODY_136 Heinlein Support Spamschutz Body-136 -score HS_BODY_136 5 - -body HS_BODY_137 /ankara\@ankararentacar\.de/ -describe HS_BODY_137 Heinlein Support Spamschutz Body-137 -score HS_BODY_137 5 - -body HS_BODY_138 /Replica Watch Models/ -describe HS_BODY_138 Heinlein Support Spamschutz Body-138 -score HS_BODY_138 5 - -body HS_BODY_139 /Diadem Travel/ -describe HS_BODY_139 Heinlein Support Spamschutz Body-139 -score HS_BODY_139 5 - -body HS_BODY_140 /Let the search engine experts compete/ -describe HS_BODY_140 Heinlein Support Spamschutz Body-140 -score HS_BODY_140 5 - -body HS_BODY_141 /http:\/\/www\.ehmig\.net\/web_mailer/ -describe HS_BODY_141 Heinlein Support Spamschutz Body-141 -score HS_BODY_141 5 - -body HS_BODY_142 /http:\/\/real\.slon\.biz/ -describe HS_BODY_142 Heinlein Support Spamschutz Body-142 -score HS_BODY_142 5 - -body HS_BODY_144 /www\.inverz\.net/ -describe HS_BODY_144 Heinlein Support Spamschutz Body-144 -score HS_BODY_144 5 - -body HS_BODY_145 /We recommend you to follow the instructions in order to keep your computer safe./ -describe HS_BODY_145 Heinlein Support Spamschutz Body-145 -score HS_BODY_145 5 - -body HS_BODY_146 /Sieh Dir einfach mal ein Video an und mach dann gleich ein Treffen/ -describe HS_BODY_146 Heinlein Support Spamschutz Body-146 -score HS_BODY_146 5 - -body HS_BODY_147 / CIALIS / -describe HS_BODY_147 Heinlein Support Spamschutz Body-147 -score HS_BODY_147 5 - -body HS_BODY_148 /www\.galamed\.biz/ -describe HS_BODY_148 Heinlein Support Spamschutz Body-148 -score HS_BODY_148 5 - -body HS_BODY_149 /Starts working in less than 15 min\./ -describe HS_BODY_149 Heinlein Support Spamschutz Body-149 -score HS_BODY_149 5 - -body HS_BODY_150 /Adipren720/ -describe HS_BODY_150 Heinlein Support Spamschutz Body-150 -score HS_BODY_150 5 - -body HS_BODY_151 /www\.lending\-home\.com/ -describe HS_BODY_151 Heinlein Support Spamschutz Body-151 -score HS_BODY_151 5 - -body HS_BODY_152 /bigbonus\-casino\.com/ -describe HS_BODY_152 Heinlein Support Spamschutz Body-152 -score HS_BODY_152 5 - -body HS_BODY_153 /Ich hab die ultimative Seite.*dich, klick doch mal an!/ -describe HS_BODY_153 Heinlein Support Spamschutz Body-153 -score HS_BODY_153 5 - -body HS_BODY_154 /www\.server42\.com/ -describe HS_BODY_154 Heinlein Support Spamschutz Body-154 -score HS_BODY_154 5 - -body HS_BODY_155 /seo\-profits\.com/ -describe HS_BODY_155 Heinlein Support Spamschutz Body-155 -score HS_BODY_155 5 - -body HS_BODY_156 /Have a great web site, but no one knows it even/ -describe HS_BODY_156 Heinlein Support Spamschutz Body-156 -score HS_BODY_156 5 - -body HS_BODY_157 /REVERZ.*D\-INFO/ -describe HS_BODY_157 Heinlein Support Spamschutz Body-157 -score HS_BODY_157 5 - -body HS_BODY_158 /D\-INFO.*REVERZ/ -describe HS_BODY_158 Heinlein Support Spamschutz Body-158 -score HS_BODY_158 5 - -body HS_BODY_159 /greatmaleenhancement\.biz/ -describe HS_BODY_159 Heinlein Support Spamschutz Body-159 -score HS_BODY_159 5 - -body HS_BODY_161 / Vic(o|0)din / -describe HS_BODY_161 Heinlein Support Spamschutz Body-161 -score HS_BODY_161 5 - -body HS_BODY_162 / Hydr(o|0)c(o|0)d(o|0)ne / -describe HS_BODY_162 Heinlein Support Spamschutz Body-162 -score HS_BODY_162 5 - -body HS_BODY_163 / V1agra / -describe HS_BODY_163 Heinlein Support Spamschutz Body-163 -score HS_BODY_163 5 - -body HS_BODY_164 /warehousefull\.com/ -describe HS_BODY_164 Heinlein Support Spamschutz Body-164 -score HS_BODY_164 5 - -body HS_BODY_165 /No doctor visit needed/ -describe HS_BODY_165 Heinlein Support Spamschutz Body-165 -score HS_BODY_165 5 - -body HS_BODY_166 /KLICKTEL KENNT SIE!/ -describe HS_BODY_166 Heinlein Support Spamschutz Body-166 -score HS_BODY_166 5 - -body HS_BODY_167 /^www\.femo\-online\.de/ -describe HS_BODY_167 Heinlein Support Spamschutz Body-167 -score HS_BODY_167 5 - -body HS_BODY_168 /www\.land\-ua\.com/ -describe HS_BODY_168 Heinlein Support Spamschutz Body-168 -score HS_BODY_168 5 - -body HS_BODY_169 /Come to Loqozine/ -describe HS_BODY_169 Heinlein Support Spamschutz Body-169 -score HS_BODY_169 5 - -body HS_BODY_170 /www\.gord\.us/ -describe HS_BODY_170 Heinlein Support Spamschutz Body-170 -score HS_BODY_170 5 - -body HS_BODY_171 /www\.reverz\.org/ -describe HS_BODY_171 Heinlein Support Spamschutz Body-171 -score HS_BODY_171 5 - -body HS_BODY_172 /wonderfulaction\.com/ -describe HS_BODY_172 Heinlein Support Spamschutz Body-172 -score HS_BODY_172 5 - -body HS_BODY_173 /At our pharmacy we offer/ -describe HS_BODY_173 Heinlein Support Spamschutz Body-173 -score HS_BODY_173 5 - -body HS_BODY_174 /Was ist besser als eine fette Ladung Sahne/ -describe HS_BODY_174 Heinlein Support Spamschutz Body-174 -score HS_BODY_174 5 - -body HS_BODY_175 /www\.surerxmed\.com/ -describe HS_BODY_175 Heinlein Support Spamschutz Body-175 -score HS_BODY_175 5 - -body HS_BODY_176 /www\.surerxpills\.com/ -describe HS_BODY_176 Heinlein Support Spamschutz Body-176 -score HS_BODY_176 5 - -body HS_BODY_177 /www\.stifyems\.com/ -describe HS_BODY_177 Heinlein Support Spamschutz Body-177 -score HS_BODY_177 5 - -body HS_BODY_178 /www\.diatrus\.com/ -describe HS_BODY_178 Heinlein Support Spamschutz Body-178 -score HS_BODY_178 5 - -body HS_BODY_179 /CITYNETT\-NEWSLETTER/ -describe HS_BODY_179 Heinlein Support Spamschutz Body-179 -score HS_BODY_179 5 - -body HS_BODY_180 /Note: *Use *password/ -describe HS_BODY_180 Heinlein Support Spamschutz Body-180 -score HS_BODY_180 5 - -body HS_BODY_181 / will be disabled because of improper using/ -describe HS_BODY_181 Heinlein Support Spamschutz Body-181 -score HS_BODY_181 5 - -body HS_BODY_182 /i.*don.*like.*the*.plaintext/ -describe HS_BODY_182 Heinlein Support Spamschutz Body-182 -score HS_BODY_182 5 - -body HS_BODY_183 /archive *password/ -describe HS_BODY_183 Heinlein Support Spamschutz Body-183 -score HS_BODY_183 5 - -body HS_BODY_184 /The *Attac\.org *team/ -describe HS_BODY_184 Heinlein Support Spamschutz Body-184 -score HS_BODY_184 5 - -body HS_BODY_185 /The *Attac\.de *team/ -describe HS_BODY_185 Heinlein Support Spamschutz Body-185 -score HS_BODY_185 5 - -body HS_BODY_186 /The *Attac\-netzwerk\.de *team/ -describe HS_BODY_186 Heinlein Support Spamschutz Body-186 -score HS_BODY_186 5 - -body HS_BODY_187 /The *Jpberlin\.de *team/ -describe HS_BODY_187 Heinlein Support Spamschutz Body-187 -score HS_BODY_187 5 - -body HS_BODY_188 /Our main mailing server/ -describe HS_BODY_188 Heinlein Support Spamschutz Body-188 -score HS_BODY_188 5 - -body HS_BODY_189 /please update your profile at Billing Center/ -describe HS_BODY_189 Heinlein Support Spamschutz Body-189 -score HS_BODY_189 5 - -body HS_BODY_190 /WSEAS will reply to you/ -describe HS_BODY_190 Heinlein Support Spamschutz Body-190 -score HS_BODY_190 5 - -body HS_BODY_191 /de\.componentsengine\.net/ -describe HS_BODY_191 Heinlein Support Spamschutz Body-191 -score HS_BODY_191 5 - -body HS_BODY_192 /List von Components Engine eingetragen/ -describe HS_BODY_192 Heinlein Support Spamschutz Body-192 -score HS_BODY_192 5 - -body HS_BODY_193 /Muzenda der ?teste Sohn von Paul Muzenda bin , einem Farmer in Simba/ -describe HS_BODY_193 Heinlein Support Spamschutz Body-193 -score HS_BODY_193 5 - -body HS_BODY_194 /Alles fr die Autorennbahn/ -describe HS_BODY_194 Heinlein Support Spamschutz Body-194 -score HS_BODY_194 5 - -body HS_BODY_195 /Der Wurm nennt sich selbst "ODIN" und konnte sich bist jetzt/ -describe HS_BODY_195 Heinlein Support Spamschutz Body-195 -score HS_BODY_195 5 - -body HS_BODY_196 /Der Meister unter den Druckprogrammen: PRINTMASTER 8 GOLD/ -describe HS_BODY_196 Heinlein Support Spamschutz Body-196 -score HS_BODY_196 5 - -body HS_BODY_197 /Stellen Sie sich vor, Sie kaufen ein Produkt oder eine Dienstleistung im/ -describe HS_BODY_197 Heinlein Support Spamschutz Body-197 -score HS_BODY_197 5 - -body HS_BODY_198 /So finden Sie blitzschnell den NAMEN und ADRESS-EINTRAG zu jeder/ -describe HS_BODY_198 Heinlein Support Spamschutz Body-198 -score HS_BODY_198 5 - -body HS_BODY_199 /eptember 2003, Cumulative Patch/ -describe HS_BODY_199 Heinlein Support Spamschutz Body-199 -score HS_BODY_199 5 - -body HS_BODY_200 /Ich bin gerade vor einem neuen.*sehr gef?rlichen V.rus gewarnt/ -describe HS_BODY_200 Heinlein Support Spamschutz Body-200 -score HS_BODY_200 5 - -body HS_BODY_201 /exklusives virtuelles Gratis-Rubbellos welches Sie gleich jetzt live mit/ -describe HS_BODY_201 Heinlein Support Spamschutz Body-201 -score HS_BODY_201 5 - -body HS_BODY_202 /Willkommen beim Lucky7Casino/ -describe HS_BODY_202 Heinlein Support Spamschutz Body-202 -score HS_BODY_202 5 - -body HS_BODY_203 /heutzutage spielen Kontakte und Adressdaten eine immer wichtigere Rolle./ -describe HS_BODY_203 Heinlein Support Spamschutz Body-203 -score HS_BODY_203 5 - -body HS_BODY_204 /REVERZ anhand des Datenbestands der D-Info den gesuchten/ -describe HS_BODY_204 Heinlein Support Spamschutz Body-204 -score HS_BODY_204 5 - -body HS_BODY_205 /www\.privatseitennetz\.com/ -describe HS_BODY_205 Heinlein Support Spamschutz Body-205 -score HS_BODY_205 5 - -body HS_BODY_206 /Outlook and Outlook Express as well as five newly/ -describe HS_BODY_206 Heinlein Support Spamschutz Body-206 -score HS_BODY_206 5 - -body HS_BODY_207 /delog\@cip\.informatik\.uni\-wuerzburg\.de/ -describe HS_BODY_207 Heinlein Support Spamschutz Body-207 -score HS_BODY_207 5 - -body HS_BODY_208 /credit\.hostfree2003\.com/ -describe HS_BODY_208 Heinlein Support Spamschutz Body-208 -score HS_BODY_208 5 - -body HS_BODY_209 /www\.mediabiz\.de\.ewmail/ -describe HS_BODY_209 Heinlein Support Spamschutz Body-209 -score HS_BODY_209 5 - -body HS_BODY_210 /Want to boost your sales with Internet/ -describe HS_BODY_210 Heinlein Support Spamschutz Body-210 -score HS_BODY_210 5 - -body HS_BODY_211 /talente\.tripod\.com\.br/ -describe HS_BODY_211 Heinlein Support Spamschutz Body-211 -score HS_BODY_211 5 - -body HS_BODY_212 /schlechte Schufa-Auskunft? Bonit?sprobleme? Dann w?len Sie doch/ -describe HS_BODY_212 Heinlein Support Spamschutz Body-212 -score HS_BODY_212 5 - -body HS_BODY_213 /Diese Liste von Banken, Sparkassen Volks- und Raiffeisenbanken OHNE Schufa-Anschluss finden Sie nicht/ -describe HS_BODY_213 Heinlein Support Spamschutz Body-213 -score HS_BODY_213 5 - -body HS_BODY_214 /Gute Nachrichten\. Gerade habe ich die geile "FickShow" gefunden:/ -describe HS_BODY_214 Heinlein Support Spamschutz Body-214 -score HS_BODY_214 5 - -body HS_BODY_216 /Create Professional 3D Page\-Tuning/ -describe HS_BODY_216 Heinlein Support Spamschutz Body-216 -score HS_BODY_216 5 - -body HS_BODY_217 /SEXKONTAKTE ONLINE/ -describe HS_BODY_217 Heinlein Support Spamschutz Body-217 -score HS_BODY_217 5 - -body HS_BODY_218 /FREE Access to.*adult.*sites/ -describe HS_BODY_218 Heinlein Support Spamschutz Body-218 -score HS_BODY_218 5 - -body HS_BODY_219 /web\-supermarket\.com/ -describe HS_BODY_219 Heinlein Support Spamschutz Body-219 -score HS_BODY_219 5 - -body HS_BODY_220 /Wir haben ihre Adresse durch eines unserer Partnerunternehmen/ -describe HS_BODY_220 Heinlein Support Spamschutz Body-220 -score HS_BODY_220 5 - -body HS_BODY_221 /herbal\-place\.com/ -describe HS_BODY_221 Heinlein Support Spamschutz Body-221 -score HS_BODY_221 5 - -body HS_BODY_222 /GIO DIET\-CAPS greifen hier ein durch:/ -describe HS_BODY_222 Heinlein Support Spamschutz Body-222 -score HS_BODY_222 5 - -body HS_BODY_223 /These are Free Cash Grants That you NEVER have to repay/ -describe HS_BODY_223 Heinlein Support Spamschutz Body-223 -score HS_BODY_223 5 - -body HS_BODY_224 /Wir haben unseren Zugang neu upgedadet/ -describe HS_BODY_224 Heinlein Support Spamschutz Body-224 -score HS_BODY_224 5 - -body HS_BODY_225 /Jemand der Dich sehr gut kennt wuerde gern ein Treffen mit Dir/ -describe HS_BODY_225 Heinlein Support Spamschutz Body-225 -score HS_BODY_225 5 - -body HS_BODY_226 /Wenn Du wissen willst wer Dich treffen moechte/ -describe HS_BODY_226 Heinlein Support Spamschutz Body-226 -score HS_BODY_226 5 - -body HS_BODY_227 /You Have Won a FREEE/ -describe HS_BODY_227 Heinlein Support Spamschutz Body-227 -score HS_BODY_227 5 - -body HS_BODY_228 /Click Here For All Your Favorite Pornstars/ -describe HS_BODY_228 Heinlein Support Spamschutz Body-228 -score HS_BODY_228 5 - -body HS_BODY_229 /Year the U\.S\. Government Gives away BILLIONS in cash grants/ -describe HS_BODY_229 Heinlein Support Spamschutz Body-229 -score HS_BODY_229 5 - -body HS_BODY_230 /Banken ohne Schufa\-Auskunft/ -describe HS_BODY_230 Heinlein Support Spamschutz Body-230 -score HS_BODY_230 5 - -body HS_BODY_231 /Probleme mit der Schufa/ -describe HS_BODY_231 Heinlein Support Spamschutz Body-231 -score HS_BODY_231 5 - -body HS_BODY_232 /Laden Sie sich jetzt unsere kostenlose Zugangssoftware runter/ -describe HS_BODY_232 Heinlein Support Spamschutz Body-232 -score HS_BODY_232 5 - -body HS_BODY_233 /Genocide Is A Black\-And\-White Concept/ -describe HS_BODY_233 Heinlein Support Spamschutz Body-233 -score HS_BODY_233 5 - -body HS_BODY_234 /So viele Wuensche auf einmal/ -describe HS_BODY_234 Heinlein Support Spamschutz Body-234 -score HS_BODY_234 5 - -body HS_BODY_235 /diese Mail ist kein SPAM/ -describe HS_BODY_235 Heinlein Support Spamschutz Body-235 -score HS_BODY_235 5 - -body HS_BODY_236 /Sch.*ne Gr.*e von Lucky Casino/ -describe HS_BODY_236 Heinlein Support Spamschutz Body-236 -score HS_BODY_236 5 - -body HS_BODY_237 /Weil Sie oder ein anderer bei Lucky Casino/ -describe HS_BODY_237 Heinlein Support Spamschutz Body-237 -score HS_BODY_237 5 - -body HS_BODY_238 /Endlich habe ich Deine E-Mail Adresse wieder gefunden, das hat aber/ -describe HS_BODY_238 Heinlein Support Spamschutz Body-238 -score HS_BODY_238 5 - -body HS_BODY_239 /.*www\.removeyou\.com.*/ -describe HS_BODY_239 Heinlein Support Spamschutz Body-239 -score HS_BODY_239 5 - -body HS_BODY_240 /.*waterforge\.com.*/ -describe HS_BODY_240 Heinlein Support Spamschutz Body-240 -score HS_BODY_240 5 - -body HS_BODY_241 /.*capitalwave\.com\?subject=Please*/ -describe HS_BODY_241 Heinlein Support Spamschutz Body-241 -score HS_BODY_241 5 - -body HS_BODY_242 /\.virtmundo\.com/ -describe HS_BODY_242 Heinlein Support Spamschutz Body-242 -score HS_BODY_242 5 - -body HS_BODY_243 /Nude Celebrities/ -describe HS_BODY_243 Heinlein Support Spamschutz Body-243 -score HS_BODY_243 5 - -body HS_BODY_244 /PRODUCT or SERVICE/ -describe HS_BODY_244 Heinlein Support Spamschutz Body-244 -score HS_BODY_244 5 - -body HS_BODY_245 /Amateur Girls/ -describe HS_BODY_245 Heinlein Support Spamschutz Body-245 -score HS_BODY_245 5 - -body HS_BODY_246 /