Skip to content

Commit fcf27d6

Browse files
FreddleSpl0itFreddleSpl0it
authored
Merge pull request #5979 from mailcow/staging
2024-07
2 parents 987a027 + cbca306 commit fcf27d6

File tree

6 files changed

+22
-52
lines changed

6 files changed

+22
-52
lines changed

‎data/conf/postfix/master.cf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ smtp inet n - n - 1 postscreen
44
-o postscreen_upstream_proxy_protocol=haproxy
55
-o syslog_name=haproxy
66
smtpd pass - - n - - smtpd
7-
-o smtpd_helo_restrictions=permit_mynetworks,reject_non_fqdn_helo_hostname
87
-o smtpd_sasl_auth_enable=no
98
-o smtpd_sender_restrictions=permit_mynetworks,reject_unlisted_sender,reject_unknown_sender_domain
109

‎data/conf/postfix/postscreen_access.cidr‎

Lines changed: 8 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Whitelist generated by Postwhite v3.4 on Mon Jul 1 00:16:55 UTC 2024
1+
# Whitelist generated by Postwhite v3.4 on Thu Aug 1 00:16:45 UTC 2024
22
# https://github.com/stevejenkins/postwhite/
3-
# 1993 total rules
3+
# 1954 total rules
44
2a00:1450:4000::/36 permit
55
2a01:111:f400::/48 permit
66
2a01:111:f403:8000::/50 permit
@@ -19,11 +19,8 @@
1919
8.20.114.31 permit
2020
8.25.194.0/23 permit
2121
8.25.196.0/23 permit
22-
8.39.54.0/23 permit
23-
8.40.222.0/23 permit
2422
10.162.0.0/16 permit
2523
12.130.86.238 permit
26-
13.72.50.45 permit
2724
13.110.208.0/21 permit
2825
13.110.209.0/24 permit
2926
13.110.216.0/22 permit
@@ -44,6 +41,7 @@
4441
18.198.96.88 permit
4542
18.208.124.128/25 permit
4643
18.216.232.154 permit
44+
18.235.27.253 permit
4745
18.236.40.242 permit
4846
18.236.56.161 permit
4947
20.51.6.32/30 permit
@@ -66,7 +64,6 @@
6664
20.112.250.133 permit
6765
20.118.139.208/30 permit
6866
20.141.10.196 permit
69-
20.185.213.0/24 permit
7067
20.185.214.0/27 permit
7168
20.185.214.32/27 permit
7269
20.185.214.64/27 permit
@@ -112,13 +109,13 @@
112109
37.218.249.47 permit
113110
37.218.251.62 permit
114111
39.156.163.64/29 permit
115-
40.71.187.0/24 permit
116112
40.92.0.0/15 permit
117113
40.92.0.0/16 permit
118114
40.107.0.0/16 permit
119115
40.112.65.63 permit
120116
43.228.184.0/22 permit
121117
44.206.138.57 permit
118+
44.217.45.156 permit
122119
44.236.56.93 permit
123120
44.238.220.251 permit
124121
46.19.170.16 permit
@@ -181,6 +178,7 @@
181178
50.18.125.237 permit
182179
50.18.126.162 permit
183180
50.31.32.0/19 permit
181+
50.31.36.205 permit
184182
50.56.130.220/30 permit
185183
52.1.14.157 permit
186184
52.5.230.59 permit
@@ -202,7 +200,6 @@
202200
52.96.91.34 permit
203201
52.96.111.82 permit
204202
52.96.172.98 permit
205-
52.96.214.50 permit
206203
52.96.222.194 permit
207204
52.96.222.226 permit
208205
52.96.223.2 permit
@@ -223,10 +220,6 @@
223220
52.234.172.96/28 permit
224221
52.235.253.128 permit
225222
52.236.28.240/28 permit
226-
52.244.206.214 permit
227-
52.247.53.144 permit
228-
52.250.107.196 permit
229-
52.250.126.174 permit
230223
54.90.148.255 permit
231224
54.165.19.38 permit
232225
54.172.97.247 permit
@@ -331,7 +324,6 @@
331324
65.110.161.77 permit
332325
65.123.29.213 permit
333326
65.123.29.220 permit
334-
65.154.166.0/24 permit
335327
65.212.180.36 permit
336328
66.102.0.0/20 permit
337329
66.119.150.192/26 permit
@@ -450,7 +442,6 @@
450442
69.171.232.0/24 permit
451443
69.171.244.0/23 permit
452444
70.37.151.128/25 permit
453-
70.42.149.0/24 permit
454445
70.42.149.35 permit
455446
72.14.192.0/18 permit
456447
72.21.192.0/19 permit
@@ -567,7 +558,6 @@
567558
77.238.189.142 permit
568559
77.238.189.146/31 permit
569560
77.238.189.148/30 permit
570-
81.7.169.128/25 permit
571561
81.223.46.0/27 permit
572562
82.165.159.2 permit
573563
82.165.159.3 permit
@@ -1257,6 +1247,7 @@
12571247
106.10.244.0/24 permit
12581248
106.39.212.64/29 permit
12591249
106.50.16.0/28 permit
1250+
107.20.18.111 permit
12601251
107.20.210.250 permit
12611252
108.174.0.0/24 permit
12621253
108.174.0.215 permit
@@ -1292,8 +1283,6 @@
12921283
117.120.16.0/21 permit
12931284
119.42.242.52/31 permit
12941285
119.42.242.156 permit
1295-
121.244.91.48 permit
1296-
122.15.156.182 permit
12971286
123.126.78.64/29 permit
12981287
124.108.96.24/31 permit
12991288
124.108.96.28/31 permit
@@ -1349,26 +1338,14 @@
13491338
134.170.141.64/26 permit
13501339
134.170.143.0/24 permit
13511340
134.170.174.0/24 permit
1352-
135.84.80.0/24 permit
1353-
135.84.81.0/24 permit
1354-
135.84.82.0/24 permit
1355-
135.84.83.0/24 permit
13561341
135.84.216.0/22 permit
1357-
136.143.160.0/24 permit
1358-
136.143.161.0/24 permit
1359-
136.143.178.49 permit
1360-
136.143.182.0/23 permit
1361-
136.143.184.0/24 permit
1362-
136.143.188.0/24 permit
1363-
136.143.190.0/23 permit
13641342
136.147.128.0/20 permit
13651343
136.147.135.0/24 permit
13661344
136.147.176.0/20 permit
13671345
136.147.176.0/24 permit
13681346
136.147.182.0/24 permit
13691347
136.147.224.0/20 permit
13701348
136.179.50.206 permit
1371-
138.91.172.26 permit
13721349
139.60.152.0/22 permit
13731350
139.138.35.44 permit
13741351
139.138.46.121 permit
@@ -1419,6 +1396,7 @@
14191396
150.230.98.160 permit
14201397
152.67.105.195 permit
14211398
152.69.200.236 permit
1399+
152.70.155.126 permit
14221400
155.248.208.51 permit
14231401
157.55.0.192/26 permit
14241402
157.55.1.128/26 permit
@@ -1475,7 +1453,6 @@
14751453
163.114.134.16 permit
14761454
163.114.135.16 permit
14771455
164.177.132.168/30 permit
1478-
165.173.128.0/24 permit
14791456
166.78.68.0/22 permit
14801457
166.78.68.221 permit
14811458
166.78.69.169 permit
@@ -1484,6 +1461,7 @@
14841461
167.89.0.0/17 permit
14851462
167.89.46.159 permit
14861463
167.89.54.103 permit
1464+
167.89.60.95 permit
14871465
167.89.64.9 permit
14881466
167.89.65.0 permit
14891467
167.89.65.53 permit
@@ -1502,11 +1480,6 @@
15021480
168.245.12.252 permit
15031481
168.245.46.9 permit
15041482
168.245.127.231 permit
1505-
169.148.129.0/24 permit
1506-
169.148.131.0/24 permit
1507-
169.148.142.10 permit
1508-
169.148.144.0/25 permit
1509-
169.148.144.10 permit
15101483
170.10.68.0/22 permit
15111484
170.10.128.0/24 permit
15121485
170.10.129.0/24 permit
@@ -1661,15 +1634,7 @@
16611634
199.16.156.0/22 permit
16621635
199.33.145.1 permit
16631636
199.33.145.32 permit
1664-
199.34.22.36 permit
16651637
199.59.148.0/22 permit
1666-
199.67.80.2 permit
1667-
199.67.80.20 permit
1668-
199.67.82.2 permit
1669-
199.67.82.20 permit
1670-
199.67.84.0/24 permit
1671-
199.67.86.0/24 permit
1672-
199.67.88.0/24 permit
16731638
199.101.161.130 permit
16741639
199.101.162.0/25 permit
16751640
199.122.120.0/21 permit
@@ -1726,8 +1691,6 @@
17261691
204.92.114.187 permit
17271692
204.92.114.203 permit
17281693
204.92.114.204/31 permit
1729-
204.141.32.0/23 permit
1730-
204.141.42.0/23 permit
17311694
204.220.160.0/20 permit
17321695
204.232.168.0/24 permit
17331696
205.139.110.0/24 permit
@@ -1979,8 +1942,6 @@
19791942
2603:1030:20e:3::23c permit
19801943
2603:1030:b:3::152 permit
19811944
2603:1030:c02:8::14 permit
1982-
2607:13c0:0001:0000:0000:0000:0000:7000/116 permit
1983-
2607:13c0:0002:0000:0000:0000:0000:1000/116 permit
19841945
2607:f8b0:4000::/36 permit
19851946
2620:109:c003:104::/64 permit
19861947
2620:109:c003:104::215 permit

‎data/conf/rspamd/local.d/composites.conf‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ FREEMAIL_TO_UNDISC_RCPT {
2121
SOGO_CONTACT_EXCLUDE {
2222
expression = "(-WHITELISTED_FWD_HOST | -g+:policies) & ^SOGO_CONTACT & !DMARC_POLICY_ALLOW";
2323
}
24+
# Remove MAILCOW_WHITE symbol for senders with broken policy recieved not from fwd hosts
25+
MAILCOW_WHITE_EXCLUDE {
26+
expression = "^MAILCOW_WHITE & (-DMARC_POLICY_REJECT | -DMARC_POLICY_QUARANTINE | -R_SPF_PERMFAIL) & !WHITELISTED_FWD_HOST";
27+
}
2428
# Spoofed header from and broken policy (excluding sieve host, rspamd host, whitelisted senders, authenticated senders and forward hosts)
2529
SPOOFED_UNAUTH {
2630
expression = "!MAILCOW_AUTH & !MAILCOW_WHITE & !RSPAMD_HOST & !SIEVE_HOST & MAILCOW_DOMAIN_HEADER_FROM & !WHITELISTED_FWD_HOST & -g+:policies";
@@ -103,4 +107,4 @@ CLAMD_JS_MALWARE {
103107
expression = "CLAM_SECI_JS & !MAILCOW_WHITE";
104108
description = "JS malware found, Securite JS malware Flag set through ClamAV";
105109
score = 8;
106-
}
110+
}

‎data/web/inc/functions.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1560,7 +1560,7 @@ function unset_tfa_key($_data) {
15601560
}
15611561
function get_tfa($username = null, $id = null) {
15621562
global $pdo;
1563-
if (isset($_SESSION['mailcow_cc_username'])) {
1563+
if (empty($username) && isset($_SESSION['mailcow_cc_username'])) {
15641564
$username = $_SESSION['mailcow_cc_username'];
15651565
}
15661566
elseif (empty($username)) {

‎data/web/js/site/admin.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,10 @@ jQuery(function($){
397397
{
398398
title: lang.host,
399399
data: 'hostname',
400-
defaultContent: ''
400+
defaultContent: '',
401+
render: function (data, type) {
402+
return escapeHtml(data);
403+
}
401404
},
402405
{
403406
title: lang.username,

‎data/web/js/site/debug.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,10 @@ jQuery(function($){
325325
title: 'URI',
326326
data: 'uri',
327327
defaultContent: '',
328-
className: 'dtr-col-md dtr-break-all'
328+
className: 'dtr-col-md dtr-break-all',
329+
render: function (data, type) {
330+
return escapeHtml(data);
331+
}
329332
},
330333
{
331334
title: 'Method',

0 commit comments

Comments
 (0)