mirror of
https://github.com/mailcow/mailcow-dockerized.git
synced 2026-09-08 14:57:58 +00:00
Compare commits
21
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
21e1cc0e2c | ||
|
|
2ff659aa86 | ||
|
|
c4d0ca56d2 | ||
|
|
7ec61fde8a | ||
|
|
d80b15b06c | ||
|
|
ed4fe41d7a | ||
|
|
6b9d875773 | ||
|
|
4d5b9d1c80 | ||
|
|
8abf453e1c | ||
|
|
c665d430de | ||
|
|
2195a674ff | ||
|
|
089c44aee1 | ||
|
|
9cd16f0001 | ||
|
|
90ca1bf25a | ||
|
|
e5d0ed8c4c | ||
|
|
4cba448671 | ||
|
|
5408bc809d | ||
|
|
bd5c18b145 | ||
|
|
0f06c8e563 | ||
|
|
fffe1aec3d | ||
|
|
ddcce811c1 |
@@ -1,17 +1,17 @@
|
|||||||
FROM golang:1.25-bookworm AS builder
|
FROM golang:1.26-trixie AS builder
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
|
|
||||||
ENV CGO_ENABLED=0 \
|
ENV CGO_ENABLED=0 \
|
||||||
GO111MODULE=on \
|
GO111MODULE=on \
|
||||||
NOOPT=1 \
|
NOOPT=1 \
|
||||||
VERSION=1.8.22
|
VERSION=1.11.0
|
||||||
|
|
||||||
RUN git clone --branch v${VERSION} https://github.com/Zuplu/postfix-tlspol && \
|
RUN git clone --branch v${VERSION} https://github.com/Zuplu/postfix-tlspol && \
|
||||||
cd /src/postfix-tlspol && \
|
cd /src/postfix-tlspol && \
|
||||||
scripts/build.sh build-only
|
scripts/build.sh build-only
|
||||||
|
|
||||||
|
|
||||||
FROM debian:bookworm-slim
|
FROM debian:trixie-slim
|
||||||
LABEL maintainer="The Infrastructure Company GmbH <info@servercow.de>"
|
LABEL maintainer="The Infrastructure Company GmbH <info@servercow.de>"
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
@version: 3.38
|
@version: 4.8
|
||||||
@include "scl.conf"
|
@include "scl.conf"
|
||||||
options {
|
options {
|
||||||
chain_hostnames(off);
|
chain_hostnames(off);
|
||||||
@@ -7,7 +7,7 @@ options {
|
|||||||
dns_cache(no);
|
dns_cache(no);
|
||||||
use_fqdn(no);
|
use_fqdn(no);
|
||||||
owner("root"); group("adm"); perm(0640);
|
owner("root"); group("adm"); perm(0640);
|
||||||
stats_freq(0);
|
stats(freq(0));
|
||||||
bad_hostname("^gconfd$");
|
bad_hostname("^gconfd$");
|
||||||
};
|
};
|
||||||
source s_src {
|
source s_src {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
@version: 3.38
|
@version: 4.8
|
||||||
@include "scl.conf"
|
@include "scl.conf"
|
||||||
options {
|
options {
|
||||||
chain_hostnames(off);
|
chain_hostnames(off);
|
||||||
@@ -7,7 +7,7 @@ options {
|
|||||||
dns_cache(no);
|
dns_cache(no);
|
||||||
use_fqdn(no);
|
use_fqdn(no);
|
||||||
owner("root"); group("adm"); perm(0640);
|
owner("root"); group("adm"); perm(0640);
|
||||||
stats_freq(0);
|
stats(freq(0));
|
||||||
bad_hostname("^gconfd$");
|
bad_hostname("^gconfd$");
|
||||||
};
|
};
|
||||||
source s_src {
|
source s_src {
|
||||||
|
|||||||
@@ -32,8 +32,17 @@ function auth_password_verify(request, password)
|
|||||||
-- Returning PASSDB_RESULT_PASSWORD_MISMATCH will reset the user's auth cache entry.
|
-- Returning PASSDB_RESULT_PASSWORD_MISMATCH will reset the user's auth cache entry.
|
||||||
-- Returning PASSDB_RESULT_INTERNAL_FAILURE keeps the existing cache entry,
|
-- Returning PASSDB_RESULT_INTERNAL_FAILURE keeps the existing cache entry,
|
||||||
-- even if the TTL has expired. Useful to avoid cache eviction during backend issues.
|
-- even if the TTL has expired. Useful to avoid cache eviction during backend issues.
|
||||||
|
|
||||||
|
-- On a network-level failure (nginx unreachable, DNS failure, timeout) https.request
|
||||||
|
-- returns nil plus an error string, so c is not a numeric HTTP status code. Treat this
|
||||||
|
-- as a backend outage and keep the cache entry, rather than wiping it as a mismatch.
|
||||||
|
if type(c) ~= "number" then
|
||||||
|
dovecot.i_info("HTTP request to auth backend failed with " .. tostring(c) .. " for user " .. request.user)
|
||||||
|
return dovecot.auth.PASSDB_RESULT_INTERNAL_FAILURE, "Upstream unreachable"
|
||||||
|
end
|
||||||
|
|
||||||
if c ~= 200 and c ~= 401 then
|
if c ~= 200 and c ~= 401 then
|
||||||
dovecot.i_info("HTTP request failed with " .. c .. " for user " .. request.user)
|
dovecot.i_info("HTTP request failed with " .. tostring(c) .. " for user " .. request.user)
|
||||||
return dovecot.auth.PASSDB_RESULT_PASSWORD_MISMATCH, "Upstream error"
|
return dovecot.auth.PASSDB_RESULT_PASSWORD_MISMATCH, "Upstream error"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -150,7 +150,7 @@ smtp_sasl_auth_enable = yes
|
|||||||
smtp_sasl_password_maps = proxy:mysql:/opt/postfix/conf/sql/mysql_sasl_passwd_maps_sender_dependent.cf
|
smtp_sasl_password_maps = proxy:mysql:/opt/postfix/conf/sql/mysql_sasl_passwd_maps_sender_dependent.cf
|
||||||
smtp_sasl_security_options =
|
smtp_sasl_security_options =
|
||||||
smtp_sasl_mechanism_filter = plain, login
|
smtp_sasl_mechanism_filter = plain, login
|
||||||
smtp_tls_policy_maps = proxy:mysql:/opt/postfix/conf/sql/mysql_tls_policy_override_maps.cf socketmap:inet:postfix-tlspol:8642:QUERY
|
smtp_tls_policy_maps = proxy:mysql:/opt/postfix/conf/sql/mysql_tls_policy_override_maps.cf socketmap:inet:postfix-tlspol:8642:QUERYwithTLSRPT
|
||||||
smtp_header_checks = pcre:/opt/postfix/conf/anonymize_headers.pcre
|
smtp_header_checks = pcre:/opt/postfix/conf/anonymize_headers.pcre
|
||||||
mail_name = Postcow
|
mail_name = Postcow
|
||||||
# local_transport map catches local destinations and prevents routing local dests when the next map would route "*"
|
# local_transport map catches local destinations and prevents routing local dests when the next map would route "*"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# Whitelist generated by Postwhite v3.4 on Sat Aug 1 00:35:20 UTC 2026
|
# Whitelist generated by Postwhite v3.4 on Tue Sep 1 00:34:07 UTC 2026
|
||||||
# https://github.com/stevejenkins/postwhite/
|
# https://github.com/stevejenkins/postwhite/
|
||||||
# 2256 total rules
|
# 2243 total rules
|
||||||
2a00:1450:4000::/36 permit
|
2a00:1450:4000::/36 permit
|
||||||
2a00:1450:4864::/56 permit
|
2a00:1450:4864::/56 permit
|
||||||
2a01:111:f400::/48 permit
|
2a01:111:f400::/48 permit
|
||||||
@@ -125,7 +125,6 @@
|
|||||||
23.249.208.0/20 permit
|
23.249.208.0/20 permit
|
||||||
23.251.224.0/19 permit
|
23.251.224.0/19 permit
|
||||||
23.253.141.0/24 permit
|
23.253.141.0/24 permit
|
||||||
23.253.182.0/23 permit
|
|
||||||
23.253.182.103 permit
|
23.253.182.103 permit
|
||||||
23.253.183.145 permit
|
23.253.183.145 permit
|
||||||
23.253.183.146 permit
|
23.253.183.146 permit
|
||||||
@@ -147,24 +146,7 @@
|
|||||||
27.123.206.80/28 permit
|
27.123.206.80/28 permit
|
||||||
31.47.251.17 permit
|
31.47.251.17 permit
|
||||||
31.186.239.0/24 permit
|
31.186.239.0/24 permit
|
||||||
34.2.64.0/22 permit
|
34.2.64.0/19 permit
|
||||||
34.2.68.0/23 permit
|
|
||||||
34.2.70.0/23 permit
|
|
||||||
34.2.71.64/26 permit
|
|
||||||
34.2.72.0/22 permit
|
|
||||||
34.2.75.0/26 permit
|
|
||||||
34.2.78.0/23 permit
|
|
||||||
34.2.80.0/23 permit
|
|
||||||
34.2.82.0/23 permit
|
|
||||||
34.2.84.0/24 permit
|
|
||||||
34.2.84.64/26 permit
|
|
||||||
34.2.85.0/24 permit
|
|
||||||
34.2.85.64/26 permit
|
|
||||||
34.2.86.0/23 permit
|
|
||||||
34.2.88.0/23 permit
|
|
||||||
34.2.90.0/23 permit
|
|
||||||
34.2.92.0/23 permit
|
|
||||||
34.2.94.0/23 permit
|
|
||||||
34.70.158.162 permit
|
34.70.158.162 permit
|
||||||
34.74.74.140 permit
|
34.74.74.140 permit
|
||||||
34.83.159.189 permit
|
34.83.159.189 permit
|
||||||
@@ -191,6 +173,7 @@
|
|||||||
35.205.92.9 permit
|
35.205.92.9 permit
|
||||||
35.228.216.85 permit
|
35.228.216.85 permit
|
||||||
35.242.169.159 permit
|
35.242.169.159 permit
|
||||||
|
37.187.220.204 permit
|
||||||
37.188.97.188 permit
|
37.188.97.188 permit
|
||||||
37.218.248.47 permit
|
37.218.248.47 permit
|
||||||
37.218.249.47 permit
|
37.218.249.47 permit
|
||||||
@@ -264,8 +247,8 @@
|
|||||||
46.228.39.112/31 permit
|
46.228.39.112/31 permit
|
||||||
46.243.88.174 permit
|
46.243.88.174 permit
|
||||||
46.243.88.175 permit
|
46.243.88.175 permit
|
||||||
46.243.88.176 permit
|
46.243.88.176/30 permit
|
||||||
46.243.88.177 permit
|
46.243.95.96/27 permit
|
||||||
46.243.95.179 permit
|
46.243.95.179 permit
|
||||||
46.243.95.180 permit
|
46.243.95.180 permit
|
||||||
50.16.246.183 permit
|
50.16.246.183 permit
|
||||||
@@ -283,6 +266,7 @@
|
|||||||
50.56.130.221 permit
|
50.56.130.221 permit
|
||||||
50.56.130.222 permit
|
50.56.130.222 permit
|
||||||
50.112.246.219 permit
|
50.112.246.219 permit
|
||||||
|
50.152.146.25 permit
|
||||||
51.83.17.38 permit
|
51.83.17.38 permit
|
||||||
52.1.14.157 permit
|
52.1.14.157 permit
|
||||||
52.5.230.59 permit
|
52.5.230.59 permit
|
||||||
@@ -654,6 +638,7 @@
|
|||||||
79.135.106.0/24 permit
|
79.135.106.0/24 permit
|
||||||
79.135.107.0/24 permit
|
79.135.107.0/24 permit
|
||||||
80.225.160.128/25 permit
|
80.225.160.128/25 permit
|
||||||
|
81.88.38.0/23 permit
|
||||||
81.169.146.243 permit
|
81.169.146.243 permit
|
||||||
81.169.146.245 permit
|
81.169.146.245 permit
|
||||||
81.169.146.246 permit
|
81.169.146.246 permit
|
||||||
@@ -738,6 +723,7 @@
|
|||||||
96.43.148.64/28 permit
|
96.43.148.64/28 permit
|
||||||
96.43.148.64/31 permit
|
96.43.148.64/31 permit
|
||||||
96.43.151.64/28 permit
|
96.43.151.64/28 permit
|
||||||
|
98.77.0.0/16 permit
|
||||||
98.97.248.0/21 permit
|
98.97.248.0/21 permit
|
||||||
98.136.44.181 permit
|
98.136.44.181 permit
|
||||||
98.136.44.182/31 permit
|
98.136.44.182/31 permit
|
||||||
@@ -1233,8 +1219,6 @@
|
|||||||
104.43.243.237 permit
|
104.43.243.237 permit
|
||||||
104.44.112.128/25 permit
|
104.44.112.128/25 permit
|
||||||
104.47.0.0/17 permit
|
104.47.0.0/17 permit
|
||||||
104.130.96.0/28 permit
|
|
||||||
104.130.122.0/23 permit
|
|
||||||
106.10.144.64/27 permit
|
106.10.144.64/27 permit
|
||||||
106.10.144.100/31 permit
|
106.10.144.100/31 permit
|
||||||
106.10.144.103 permit
|
106.10.144.103 permit
|
||||||
@@ -1456,6 +1440,7 @@
|
|||||||
130.35.116.0/25 permit
|
130.35.116.0/25 permit
|
||||||
130.61.9.72 permit
|
130.61.9.72 permit
|
||||||
130.162.39.83 permit
|
130.162.39.83 permit
|
||||||
|
130.162.194.23 permit
|
||||||
130.248.172.0/24 permit
|
130.248.172.0/24 permit
|
||||||
130.248.173.0/24 permit
|
130.248.173.0/24 permit
|
||||||
131.186.12.0/25 permit
|
131.186.12.0/25 permit
|
||||||
@@ -1539,9 +1524,6 @@
|
|||||||
146.20.14.105 permit
|
146.20.14.105 permit
|
||||||
146.20.14.106 permit
|
146.20.14.106 permit
|
||||||
146.20.14.107 permit
|
146.20.14.107 permit
|
||||||
146.20.112.0/26 permit
|
|
||||||
146.20.113.0/24 permit
|
|
||||||
146.20.191.0/24 permit
|
|
||||||
146.20.215.0/24 permit
|
146.20.215.0/24 permit
|
||||||
146.20.215.182 permit
|
146.20.215.182 permit
|
||||||
146.88.28.0/24 permit
|
146.88.28.0/24 permit
|
||||||
@@ -1564,10 +1546,11 @@
|
|||||||
149.97.173.180 permit
|
149.97.173.180 permit
|
||||||
149.118.160.128/25 permit
|
149.118.160.128/25 permit
|
||||||
150.136.21.199 permit
|
150.136.21.199 permit
|
||||||
150.171.109.72 permit
|
150.171.109.183 permit
|
||||||
150.230.98.160 permit
|
150.230.98.160 permit
|
||||||
151.145.38.14 permit
|
151.145.38.14 permit
|
||||||
152.67.105.195 permit
|
152.67.105.195 permit
|
||||||
|
152.69.165.251 permit
|
||||||
152.69.200.236 permit
|
152.69.200.236 permit
|
||||||
152.70.155.126 permit
|
152.70.155.126 permit
|
||||||
155.248.135.128/25 permit
|
155.248.135.128/25 permit
|
||||||
@@ -1589,6 +1572,7 @@
|
|||||||
158.247.16.0/20 permit
|
158.247.16.0/20 permit
|
||||||
158.247.100.0/25 permit
|
158.247.100.0/25 permit
|
||||||
159.13.4.0/25 permit
|
159.13.4.0/25 permit
|
||||||
|
159.13.33.181 permit
|
||||||
159.92.154.0/24 permit
|
159.92.154.0/24 permit
|
||||||
159.92.155.0/24 permit
|
159.92.155.0/24 permit
|
||||||
159.92.157.0/24 permit
|
159.92.157.0/24 permit
|
||||||
@@ -1616,6 +1600,8 @@
|
|||||||
159.183.121.182 permit
|
159.183.121.182 permit
|
||||||
159.183.129.172 permit
|
159.183.129.172 permit
|
||||||
160.1.62.192 permit
|
160.1.62.192 permit
|
||||||
|
161.33.94.110 permit
|
||||||
|
161.33.228.244 permit
|
||||||
161.38.192.0/20 permit
|
161.38.192.0/20 permit
|
||||||
161.38.204.0/22 permit
|
161.38.204.0/22 permit
|
||||||
161.71.32.0/19 permit
|
161.71.32.0/19 permit
|
||||||
@@ -1647,7 +1633,6 @@
|
|||||||
165.173.182.0/24 permit
|
165.173.182.0/24 permit
|
||||||
165.173.182.250/31 permit
|
165.173.182.250/31 permit
|
||||||
165.173.189.205 permit
|
165.173.189.205 permit
|
||||||
166.78.68.0/22 permit
|
|
||||||
166.78.68.221 permit
|
166.78.68.221 permit
|
||||||
166.78.69.169 permit
|
166.78.69.169 permit
|
||||||
166.78.69.170 permit
|
166.78.69.170 permit
|
||||||
@@ -1802,9 +1787,9 @@
|
|||||||
188.125.85.234/31 permit
|
188.125.85.234/31 permit
|
||||||
188.125.85.236/31 permit
|
188.125.85.236/31 permit
|
||||||
188.125.85.238 permit
|
188.125.85.238 permit
|
||||||
188.165.51.139 permit
|
|
||||||
188.172.128.0/20 permit
|
188.172.128.0/20 permit
|
||||||
192.0.64.0/18 permit
|
192.0.64.0/18 permit
|
||||||
|
192.9.166.184 permit
|
||||||
192.18.139.154 permit
|
192.18.139.154 permit
|
||||||
192.18.145.36 permit
|
192.18.145.36 permit
|
||||||
192.18.152.58 permit
|
192.18.152.58 permit
|
||||||
@@ -1829,7 +1814,6 @@
|
|||||||
192.30.252.0/22 permit
|
192.30.252.0/22 permit
|
||||||
192.161.144.0/20 permit
|
192.161.144.0/20 permit
|
||||||
192.162.87.0/24 permit
|
192.162.87.0/24 permit
|
||||||
192.237.158.0/23 permit
|
|
||||||
192.237.159.42 permit
|
192.237.159.42 permit
|
||||||
192.237.159.43 permit
|
192.237.159.43 permit
|
||||||
192.254.112.0/20 permit
|
192.254.112.0/20 permit
|
||||||
@@ -1872,7 +1856,6 @@
|
|||||||
198.21.0.0/21 permit
|
198.21.0.0/21 permit
|
||||||
198.37.144.0/20 permit
|
198.37.144.0/20 permit
|
||||||
198.37.152.186 permit
|
198.37.152.186 permit
|
||||||
198.61.254.0/23 permit
|
|
||||||
198.61.254.21 permit
|
198.61.254.21 permit
|
||||||
198.61.254.231 permit
|
198.61.254.231 permit
|
||||||
198.178.234.57 permit
|
198.178.234.57 permit
|
||||||
@@ -1959,6 +1942,7 @@
|
|||||||
204.14.232.0/21 permit
|
204.14.232.0/21 permit
|
||||||
204.14.232.64/28 permit
|
204.14.232.64/28 permit
|
||||||
204.14.234.64/28 permit
|
204.14.234.64/28 permit
|
||||||
|
204.75.18.128/27 permit
|
||||||
204.75.142.0/24 permit
|
204.75.142.0/24 permit
|
||||||
204.92.114.187 permit
|
204.92.114.187 permit
|
||||||
204.92.114.203 permit
|
204.92.114.203 permit
|
||||||
@@ -1966,7 +1950,9 @@
|
|||||||
204.141.32.0/23 permit
|
204.141.32.0/23 permit
|
||||||
204.141.42.0/23 permit
|
204.141.42.0/23 permit
|
||||||
204.216.164.202 permit
|
204.216.164.202 permit
|
||||||
204.220.160.0/21 permit
|
204.220.90.0/23 permit
|
||||||
|
204.220.92.0/22 permit
|
||||||
|
204.220.160.0/20 permit
|
||||||
204.220.168.0/21 permit
|
204.220.168.0/21 permit
|
||||||
204.220.176.0/20 permit
|
204.220.176.0/20 permit
|
||||||
204.220.181.105 permit
|
204.220.181.105 permit
|
||||||
@@ -2002,6 +1988,8 @@
|
|||||||
207.211.31.0/25 permit
|
207.211.31.0/25 permit
|
||||||
207.211.41.113 permit
|
207.211.41.113 permit
|
||||||
207.211.132.0/25 permit
|
207.211.132.0/25 permit
|
||||||
|
207.211.147.87 permit
|
||||||
|
207.211.159.110 permit
|
||||||
207.218.90.0/24 permit
|
207.218.90.0/24 permit
|
||||||
207.218.90.122 permit
|
207.218.90.122 permit
|
||||||
207.250.68.0/24 permit
|
207.250.68.0/24 permit
|
||||||
@@ -2051,7 +2039,6 @@
|
|||||||
209.43.22.0/28 permit
|
209.43.22.0/28 permit
|
||||||
209.46.117.168 permit
|
209.46.117.168 permit
|
||||||
209.46.117.179 permit
|
209.46.117.179 permit
|
||||||
209.61.151.0/24 permit
|
|
||||||
209.61.151.236 permit
|
209.61.151.236 permit
|
||||||
209.61.151.249 permit
|
209.61.151.249 permit
|
||||||
209.61.151.251 permit
|
209.61.151.251 permit
|
||||||
@@ -2238,7 +2225,7 @@
|
|||||||
2001:748:400:3301::4 permit
|
2001:748:400:3301::4 permit
|
||||||
2404:6800:4000::/36 permit
|
2404:6800:4000::/36 permit
|
||||||
2404:6800:4864::/56 permit
|
2404:6800:4864::/56 permit
|
||||||
2603:1061:14:75::1 permit
|
2603:1061:14:102::1 permit
|
||||||
2607:13c0:0001:0000:0000:0000:0000:7000/116 permit
|
2607:13c0:0001:0000:0000:0000:0000:7000/116 permit
|
||||||
2607:13c0:0002:0000:0000:0000:0000:1000/116 permit
|
2607:13c0:0002:0000:0000:0000:0000:1000/116 permit
|
||||||
2607:13c0:0004:0000:0000:0000:0000:0000/116 permit
|
2607:13c0:0004:0000:0000:0000:0000:0000/116 permit
|
||||||
|
|||||||
@@ -442,6 +442,16 @@ if (isset($_SESSION['mailcow_cc_role']) && ($_SESSION['mailcow_cc_role'] == "adm
|
|||||||
|
|
||||||
unset($record);
|
unset($record);
|
||||||
|
|
||||||
|
// Make a hostname RHS absolute so it is not read relative to $ORIGIN.
|
||||||
|
// Already-absolute names, the SRV root target "." and IP addresses are left alone.
|
||||||
|
$absolutize = function($host) {
|
||||||
|
$host = trim($host);
|
||||||
|
if ($host === '' || $host === '.' || substr($host, -1) === '.' || filter_var($host, FILTER_VALIDATE_IP)) {
|
||||||
|
return $host;
|
||||||
|
}
|
||||||
|
return $host . '.';
|
||||||
|
};
|
||||||
|
|
||||||
$dns_data = sprintf("\$ORIGIN %s.\n", $domain);
|
$dns_data = sprintf("\$ORIGIN %s.\n", $domain);
|
||||||
foreach ($records as $record) {
|
foreach ($records as $record) {
|
||||||
if ($domain == substr($record[0], -strlen($domain))) {
|
if ($domain == substr($record[0], -strlen($domain))) {
|
||||||
@@ -462,16 +472,26 @@ if (isset($_SESSION['mailcow_cc_role']) && ($_SESSION['mailcow_cc_role'] == "adm
|
|||||||
$val = str_replace(state_optional, '', $val);
|
$val = str_replace(state_optional, '', $val);
|
||||||
$val = str_replace(state_good, '', $val);
|
$val = str_replace(state_good, '', $val);
|
||||||
if (strlen($val) > 0) {
|
if (strlen($val) > 0) {
|
||||||
|
// these are all TXT values, their RHS is a character string, not a name
|
||||||
$vals[] = sprintf("%s\tIN\t%s\t%s\n", $label, $record[1], $val);
|
$vals[] = sprintf("%s\tIN\t%s\t%s\n", $label, $record[1], $val);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
if ($record[1] == 'MX' || $record[1] == 'CNAME') {
|
||||||
|
$val = $absolutize($val);
|
||||||
|
}
|
||||||
|
elseif ($record[1] == 'SRV') {
|
||||||
|
// format here is "target port"; only the target is a name
|
||||||
|
$parts = explode(' ', $val, 2);
|
||||||
|
$parts[0] = $absolutize($parts[0]);
|
||||||
|
$val = implode(' ', $parts);
|
||||||
|
}
|
||||||
$vals[] = sprintf("%s\tIN\t%s\t%s\n", $label, $record[1], $val);
|
$vals[] = sprintf("%s\tIN\t%s\t%s\n", $label, $record[1], $val);
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($vals as $val) {
|
foreach ($vals as $val) {
|
||||||
$dns_data .= str_replace($domain, $domain . '.', $val);
|
$dns_data .= $val;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3563,7 +3563,16 @@ function protect_route($allowed_roles = ['admin', 'domainadmin', 'user'], $redir
|
|||||||
if (isset($redirects['unauthenticated'])) {
|
if (isset($redirects['unauthenticated'])) {
|
||||||
header('Location: ' . $redirects['unauthenticated']);
|
header('Location: ' . $redirects['unauthenticated']);
|
||||||
} else {
|
} else {
|
||||||
header('Location: /');
|
// Send a deep link to the login page for its area instead of the user login at /,
|
||||||
|
// e.g. /admin/dashboard -> /admin rather than /
|
||||||
|
$request_uri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/';
|
||||||
|
if (strpos($request_uri, '/admin/') === 0) {
|
||||||
|
header('Location: /admin');
|
||||||
|
} elseif (strpos($request_uri, '/domainadmin/') === 0) {
|
||||||
|
header('Location: /domainadmin');
|
||||||
|
} else {
|
||||||
|
header('Location: /');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -131,7 +131,7 @@
|
|||||||
"additional_rows": " righe aggiuntive inserite",
|
"additional_rows": " righe aggiuntive inserite",
|
||||||
"admin": "Amministratore",
|
"admin": "Amministratore",
|
||||||
"admin_details": "Modifica impostazioni amministratore",
|
"admin_details": "Modifica impostazioni amministratore",
|
||||||
"admin_domains": "Assengazioni di dominio",
|
"admin_domains": "Assegnazioni di dominio",
|
||||||
"admins": "Amministratori",
|
"admins": "Amministratori",
|
||||||
"admins_ldap": "Amministratori LDAP",
|
"admins_ldap": "Amministratori LDAP",
|
||||||
"advanced_settings": "Impostazioni avanzate",
|
"advanced_settings": "Impostazioni avanzate",
|
||||||
|
|||||||
@@ -29,7 +29,8 @@
|
|||||||
"extend_sender_acl": "Dovoli razširitev pošiljateljevega ACL z zunanjimi e-poštnimi naslovi",
|
"extend_sender_acl": "Dovoli razširitev pošiljateljevega ACL z zunanjimi e-poštnimi naslovi",
|
||||||
"quarantine_category": "Spremeni kategorijo obvestil o karanteni",
|
"quarantine_category": "Spremeni kategorijo obvestil o karanteni",
|
||||||
"syncjobs": "Sinhronizacijska opravila",
|
"syncjobs": "Sinhronizacijska opravila",
|
||||||
"pw_reset": "Dovoli ponastavitev uporabniškega gesla mailcow"
|
"pw_reset": "Dovoli ponastavitev uporabniškega gesla mailcow",
|
||||||
|
"alias_external_goto": "Dovoli vzdevke z zunanjimi domenami goto"
|
||||||
},
|
},
|
||||||
"add": {
|
"add": {
|
||||||
"active": "Aktivno",
|
"active": "Aktivno",
|
||||||
@@ -559,7 +560,8 @@
|
|||||||
"mx_invalid": "Zapis MX %s je neveljaven",
|
"mx_invalid": "Zapis MX %s je neveljaven",
|
||||||
"version_invalid": "Različica %s je neveljavna",
|
"version_invalid": "Različica %s je neveljavna",
|
||||||
"tfa_removal_blocked": "Dvofaktorske avtentikacije ni mogoče odstraniti, ker je obvezna za vaš račun.",
|
"tfa_removal_blocked": "Dvofaktorske avtentikacije ni mogoče odstraniti, ker je obvezna za vaš račun.",
|
||||||
"quarantine_category_invalid": "Kategorija karantene mora biti ena od: add_header, reject, all"
|
"quarantine_category_invalid": "Kategorija karantene mora biti ena od: add_header, reject, all",
|
||||||
|
"external_goto_denied": "Zunanji naslov goto %s ni dovoljen"
|
||||||
},
|
},
|
||||||
"debug": {
|
"debug": {
|
||||||
"containers_info": "Informacije o zabojniku",
|
"containers_info": "Informacije o zabojniku",
|
||||||
@@ -785,7 +787,8 @@
|
|||||||
"internal": "Notranje",
|
"internal": "Notranje",
|
||||||
"internal_info": "Notranji vzdevki so dostopni samo iz lastne domene ali vzdevkov domen.",
|
"internal_info": "Notranji vzdevki so dostopni samo iz lastne domene ali vzdevkov domen.",
|
||||||
"sender_allowed": "Dovoli pošiljanje kot ta vzdevek",
|
"sender_allowed": "Dovoli pošiljanje kot ta vzdevek",
|
||||||
"sender_allowed_info": "Če je onemogočeno, lahko ta vzdevek samo prejema pošto. Za preglasitev in dodelitev dovoljenja za pošiljanje določenim poštnim predalom uporabite seznam za nadzor dostopa pošiljatelja."
|
"sender_allowed_info": "Če je onemogočeno, lahko ta vzdevek samo prejema pošto. Za preglasitev in dodelitev dovoljenja za pošiljanje določenim poštnim predalom uporabite seznam za nadzor dostopa pošiljatelja.",
|
||||||
|
"mta_sts_active_info": "Če ni označeno, pravilnik MTA-STS ne bo objavljen in za poddomeno mta-sts ne bo zahtevano nobeno potrdilo prek ACME."
|
||||||
},
|
},
|
||||||
"footer": {
|
"footer": {
|
||||||
"restart_container_info": "<b>Pomembno:</b> Eleganten ponovni zagon lahko traja nekaj časa, zato počakajte, da se konča.",
|
"restart_container_info": "<b>Pomembno:</b> Eleganten ponovni zagon lahko traja nekaj časa, zato počakajte, da se konča.",
|
||||||
|
|||||||
@@ -29,7 +29,8 @@
|
|||||||
"syncjobs": "同步任务",
|
"syncjobs": "同步任务",
|
||||||
"tls_policy": "TLS 策略",
|
"tls_policy": "TLS 策略",
|
||||||
"unlimited_quota": "无限邮箱容量配额",
|
"unlimited_quota": "无限邮箱容量配额",
|
||||||
"pw_reset": "允许重置mailcow使用者密码"
|
"pw_reset": "允许重置mailcow使用者密码",
|
||||||
|
"alias_external_goto": "允许带有外部目标地址的别名"
|
||||||
},
|
},
|
||||||
"add": {
|
"add": {
|
||||||
"activate_filter_warn": "当“启用”选项被勾选后,其它所有的过滤器都会被禁用。",
|
"activate_filter_warn": "当“启用”选项被勾选后,其它所有的过滤器都会被禁用。",
|
||||||
@@ -111,7 +112,8 @@
|
|||||||
"validation_success": "验证成功",
|
"validation_success": "验证成功",
|
||||||
"dry": "模拟同步(Dry run)",
|
"dry": "模拟同步(Dry run)",
|
||||||
"internal_info": "内部的别名只能在域内部或者别名域内部访问。",
|
"internal_info": "内部的别名只能在域内部或者别名域内部访问。",
|
||||||
"internal": "内部的"
|
"internal": "内部的",
|
||||||
|
"sender_allowed": "允许以该别名发送"
|
||||||
},
|
},
|
||||||
"admin": {
|
"admin": {
|
||||||
"access": "权限管理",
|
"access": "权限管理",
|
||||||
@@ -555,7 +557,10 @@
|
|||||||
"max_age_invalid": "最大有效时间 %s 无效",
|
"max_age_invalid": "最大有效时间 %s 无效",
|
||||||
"mode_invalid": "模式 %s 无效",
|
"mode_invalid": "模式 %s 无效",
|
||||||
"mx_invalid": "MX 记录 %s 无效",
|
"mx_invalid": "MX 记录 %s 无效",
|
||||||
"version_invalid": "版本 %s 无效"
|
"version_invalid": "版本 %s 无效",
|
||||||
|
"tfa_removal_blocked": "无法移除两步验证,你的账户必须使用两步验证。",
|
||||||
|
"external_goto_denied": "不允许使用外部目标地址 %s",
|
||||||
|
"quarantine_category_invalid": "隔离分类必须是 add_header, reject, all 的其中一个"
|
||||||
},
|
},
|
||||||
"debug": {
|
"debug": {
|
||||||
"chart_this_server": "图表 (此服务器)",
|
"chart_this_server": "图表 (此服务器)",
|
||||||
@@ -754,7 +759,10 @@
|
|||||||
"mta_sts_max_age_info": "接收方邮件服务器可缓存该策略的时长(秒),超出后需重新获取策略。",
|
"mta_sts_max_age_info": "接收方邮件服务器可缓存该策略的时长(秒),超出后需重新获取策略。",
|
||||||
"mta_sts_mx": "MX 服务器",
|
"mta_sts_mx": "MX 服务器",
|
||||||
"mta_sts_mx_info": "仅允许向明确列出的邮件服务器发送邮件;发送方 MTA 会验证 DNS MX 记录的主机名是否与策略列表匹配,并仅允许携带有效 TLS 证书的投递(可防范中间人攻击)。",
|
"mta_sts_mx_info": "仅允许向明确列出的邮件服务器发送邮件;发送方 MTA 会验证 DNS MX 记录的主机名是否与策略列表匹配,并仅允许携带有效 TLS 证书的投递(可防范中间人攻击)。",
|
||||||
"mta_sts_mx_notice": "可配置多个 MX 服务器(以逗号分隔)。"
|
"mta_sts_mx_notice": "可配置多个 MX 服务器(以逗号分隔)。",
|
||||||
|
"sender_allowed": "允许以此别名发送",
|
||||||
|
"sender_allowed_info": "如果禁用了,此别名只能接收邮件。使用发件者 ACL 来覆盖此选项并赋予指定的邮箱发送权限。",
|
||||||
|
"mta_sts_active_info": "如果未选中,MTA-STS 策略不会被公布并且不会通过 ACME 为 MTA-STS 子域名请求证书。"
|
||||||
},
|
},
|
||||||
"fido2": {
|
"fido2": {
|
||||||
"confirm": "确认",
|
"confirm": "确认",
|
||||||
@@ -1002,7 +1010,8 @@
|
|||||||
"templates": "模板",
|
"templates": "模板",
|
||||||
"template": "模板",
|
"template": "模板",
|
||||||
"iam": "身份提供者(IDP)",
|
"iam": "身份提供者(IDP)",
|
||||||
"internal": "内部的"
|
"internal": "内部的",
|
||||||
|
"force_tfa": "两步验证"
|
||||||
},
|
},
|
||||||
"oauth2": {
|
"oauth2": {
|
||||||
"access_denied": "请作为邮箱所有者登录以使用 OAuth2 授权。",
|
"access_denied": "请作为邮箱所有者登录以使用 OAuth2 授权。",
|
||||||
@@ -1210,7 +1219,12 @@
|
|||||||
"waiting_usb_auth": "<i>等待 USB 设备中...</i><br><br>现在请触碰你的 WebAuthn USB 设备上的按钮。",
|
"waiting_usb_auth": "<i>等待 USB 设备中...</i><br><br>现在请触碰你的 WebAuthn USB 设备上的按钮。",
|
||||||
"waiting_usb_register": "<i>等待 USB 设备中...</i><br><br>请在上方输入你的密码并请触碰你的 WebAuthn USB 设备上的按钮以确认注册该 WebAuthn 设备。",
|
"waiting_usb_register": "<i>等待 USB 设备中...</i><br><br>请在上方输入你的密码并请触碰你的 WebAuthn USB 设备上的按钮以确认注册该 WebAuthn 设备。",
|
||||||
"yubi_otp": "Yubico OTP 认证",
|
"yubi_otp": "Yubico OTP 认证",
|
||||||
"authenticators": "验证器(Authenticators)"
|
"authenticators": "验证器(Authenticators)",
|
||||||
|
"force_tfa": "在登录时强制启用 2FA",
|
||||||
|
"force_tfa_info": "在访问面板前用户会被要求设置两步验证。",
|
||||||
|
"setup_title": "需要设置两步验证",
|
||||||
|
"setup_required": "你的账户需要设置两步验证。请添加一个两步验证方法以继续。",
|
||||||
|
"cancel_setup": "取消并注销"
|
||||||
},
|
},
|
||||||
"user": {
|
"user": {
|
||||||
"action": "操作",
|
"action": "操作",
|
||||||
@@ -1384,7 +1398,8 @@
|
|||||||
"overview": "概览",
|
"overview": "概览",
|
||||||
"expire_never": "永不过期",
|
"expire_never": "永不过期",
|
||||||
"forever": "永久",
|
"forever": "永久",
|
||||||
"spam_aliases_info": "垃圾邮件别名是一种临时电子邮件地址,可用于保护真实电子邮件地址。<br>还可以选择设置过期时间,以便在设定的时间后自动停用别名,从而有效地销毁被滥用或泄露的地址。"
|
"spam_aliases_info": "垃圾邮件别名是一种临时电子邮件地址,可用于保护真实电子邮件地址。<br>还可以选择设置过期时间,以便在设定的时间后自动停用别名,从而有效地销毁被滥用或泄露的地址。",
|
||||||
|
"pw_update_required": "你的账户需要修改一次密码。请设置一个新密码以继续。"
|
||||||
},
|
},
|
||||||
"warning": {
|
"warning": {
|
||||||
"cannot_delete_self": "不能删除已登录的用户",
|
"cannot_delete_self": "不能删除已登录的用户",
|
||||||
|
|||||||
@@ -49,6 +49,7 @@
|
|||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<div class="input-group-text"><i class="bi bi-lock-fill"></i></div>
|
<div class="input-group-text"><i class="bi bi-lock-fill"></i></div>
|
||||||
<input name="pass_user" type="password" id="pass_user" class="form-control" placeholder="{{ lang.login.password }}" required="" autocomplete="current-password">
|
<input name="pass_user" type="password" id="pass_user" class="form-control" placeholder="{{ lang.login.password }}" required="" autocomplete="current-password">
|
||||||
|
<button type="button" class="input-group-text" style="cursor:pointer;" onclick="var i=document.getElementById('pass_user'),ic=this.querySelector('i');if(i.type==='password'){i.type='text';ic.className='bi bi-eye-slash';}else{i.type='password';ic.className='bi bi-eye';}" tabindex="-1" aria-label="Toggle password visibility"><i class="bi bi-eye"></i></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="d-flex justify-content-between mt-4" style="position: relative">
|
<div class="d-flex justify-content-between mt-4" style="position: relative">
|
||||||
|
|||||||
@@ -473,6 +473,10 @@ function recursiveBase64StrToArrayBuffer(obj) {
|
|||||||
window.location.reload();
|
window.location.reload();
|
||||||
} else {
|
} else {
|
||||||
var msg = (data && data[0] && data[0].msg) ? data[0].msg : 'Password change failed.';
|
var msg = (data && data[0] && data[0].msg) ? data[0].msg : 'Password change failed.';
|
||||||
|
// the API returns raw language keys, resolve them like the alert box does
|
||||||
|
if (Object.prototype.hasOwnProperty.call(lang_danger, msg)) {
|
||||||
|
msg = lang_danger[msg];
|
||||||
|
}
|
||||||
$('#changePWAlert').show().text(msg);
|
$('#changePWAlert').show().text(msg);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -49,6 +49,7 @@
|
|||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<div class="input-group-text"><i class="bi bi-lock-fill"></i></div>
|
<div class="input-group-text"><i class="bi bi-lock-fill"></i></div>
|
||||||
<input name="pass_user" type="password" id="pass_user" class="form-control" placeholder="{{ lang.login.password }}" required="" autocomplete="current-password">
|
<input name="pass_user" type="password" id="pass_user" class="form-control" placeholder="{{ lang.login.password }}" required="" autocomplete="current-password">
|
||||||
|
<button type="button" class="input-group-text" style="cursor:pointer;" onclick="var i=document.getElementById('pass_user'),ic=this.querySelector('i');if(i.type==='password'){i.type='text';ic.className='bi bi-eye-slash';}else{i.type='password';ic.className='bi bi-eye';}" tabindex="-1" aria-label="Toggle password visibility"><i class="bi bi-eye"></i></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="d-flex justify-content-between mt-4" style="position: relative">
|
<div class="d-flex justify-content-between mt-4" style="position: relative">
|
||||||
|
|||||||
@@ -267,6 +267,7 @@
|
|||||||
<small class="text-muted">{{ lang.admin.password_reset_info }}</small>
|
<small class="text-muted">{{ lang.admin.password_reset_info }}</small>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{% endif %}
|
||||||
<div data-acl="{{ acl.extend_sender_acl }}" class="row mb-4">
|
<div data-acl="{{ acl.extend_sender_acl }}" class="row mb-4">
|
||||||
<label class="control-label col-sm-2" for="extended_sender_acl">{{ lang.edit.extended_sender_acl }}</label>
|
<label class="control-label col-sm-2" for="extended_sender_acl">{{ lang.edit.extended_sender_acl }}</label>
|
||||||
<div class="col-sm-10">
|
<div class="col-sm-10">
|
||||||
@@ -279,7 +280,6 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<label class="control-label col-sm-2" for="protocol_access">{{ lang.edit.allowed_protocols }}</label>
|
<label class="control-label col-sm-2" for="protocol_access">{{ lang.edit.allowed_protocols }}</label>
|
||||||
<div class="col-sm-10">
|
<div class="col-sm-10">
|
||||||
|
|||||||
@@ -56,6 +56,7 @@
|
|||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<div class="input-group-text"><i class="bi bi-lock-fill"></i></div>
|
<div class="input-group-text"><i class="bi bi-lock-fill"></i></div>
|
||||||
<input name="pass_user" type="password" id="pass_user" class="form-control" placeholder="{{ lang.login.password }}" required="" autocomplete="current-password">
|
<input name="pass_user" type="password" id="pass_user" class="form-control" placeholder="{{ lang.login.password }}" required="" autocomplete="current-password">
|
||||||
|
<button type="button" class="input-group-text" style="cursor:pointer;" onclick="var i=document.getElementById('pass_user'),ic=this.querySelector('i');if(i.type==='password'){i.type='text';ic.className='bi bi-eye-slash';}else{i.type='password';ic.className='bi bi-eye';}" tabindex="-1" aria-label="Toggle password visibility"><i class="bi bi-eye"></i></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="mt-2 text-muted" style="font-size: 0.9rem;">
|
<div class="mt-2 text-muted" style="font-size: 0.9rem;">
|
||||||
|
|||||||
+1
-1
@@ -382,7 +382,7 @@ services:
|
|||||||
- postfix
|
- postfix
|
||||||
|
|
||||||
postfix-tlspol-mailcow:
|
postfix-tlspol-mailcow:
|
||||||
image: ghcr.io/mailcow/postfix-tlspol:1.8.23
|
image: ghcr.io/mailcow/postfix-tlspol:1.11.0
|
||||||
depends_on:
|
depends_on:
|
||||||
unbound-mailcow:
|
unbound-mailcow:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|||||||
Reference in New Issue
Block a user