Compare commits

..
Author SHA1 Message Date
FreddleSpl0it 88fbaa459a Merge pull request #7594 from mailcow/staging
Update 2026-11
2026-11-05 11:02:42 +01:00
FreddleSpl0it 55982ac74b Merge pull request #7537 from mailcow/staging
Update 2026-10
2026-10-21 19:36:04 +02:00
FreddleSpl0it 81f6f7b002 Merge pull request #7506 from mailcow/staging
Update 2026-09a
2026-10-06 12:28:36 +02:00
FreddleSpl0it ca07d8d333 Merge pull request #7477 from mailcow/staging
Update 2026-09
2026-09-21 10:30:34 +02:00
FreddleSpl0it 02552ffefd Merge pull request #7427 from mailcow/staging
Update 2026-07b
2026-08-18 09:29:10 +02:00
FreddleSpl0it 06424670fa Merge pull request #7393 from mailcow/staging
update README.md sponsors
2026-08-05 09:00:52 +02:00
FreddleSpl0it 489db90512 Merge pull request #7391 from mailcow/staging
Update 2026-07a
2026-07-30 11:17:15 +02:00
FreddleSpl0it 641ed63782 Merge pull request #7353 from mailcow/staging
update README.md sponsors
2026-07-15 08:31:16 +02:00
FreddleSpl0it 96a70652c3 Merge pull request #7328 from mailcow/staging
Update 2026-07
2026-07-13 10:42:55 +02:00
FreddleSpl0it 2ac4b1deae Merge pull request #7260 from mailcow/staging
Update 2026-05c
2026-05-26 10:50:58 +02:00
FreddleSpl0it 1eb6d2e26c Merge pull request #7243 from mailcow/staging
Update 2025-05b
2026-05-21 08:33:36 +02:00
FreddleSpl0it 384e2f6ac1 Merge pull request #7227 from mailcow/staging
Update 2026-05a
2026-05-13 10:42:14 +02:00
FreddleSpl0it 32156a337a Merge pull request #7221 from mailcow/staging
Update 2026-05
2026-05-12 08:46:25 +02:00
FreddleSpl0it 281cf93db3 Merge pull request #7174 from mailcow/staging
Update 2026-03b
2026-03-31 09:57:16 +02:00
FreddleSpl0it f399c07c85 Merge pull request #7137 from mailcow/staging
Hotfix 2026-03a
2026-03-13 14:15:04 +01:00
FreddleSpl0it a693325fe6 Merge pull request #7135 from mailcow/staging
Update 2026-03a
2026-03-13 13:16:32 +01:00
FreddleSpl0it 9ad84eee92 Merge pull request #7113 from mailcow/staging
Hotfix 2026-03
2026-03-10 13:50:33 +01:00
FreddleSpl0it b59869b720 Merge pull request #7109 from mailcow/staging
Hotfix 2026-03
2026-03-10 10:39:43 +01:00
FreddleSpl0it 7515bef66c Merge pull request #7104 from mailcow/staging
Hotfix 2026-03
2026-03-10 10:05:39 +01:00
FreddleSpl0it b84ba8ded1 Merge pull request #7101 from mailcow/staging
Update 2026-03
2026-03-10 08:08:29 +01:00
FreddleSpl0it 4845928e7a Merge pull request #7027 from mailcow/staging
[Hotfix] Update 2026-01
2026-01-29 10:31:23 +01:00
FreddleSpl0it 4ccfedd6b3 Merge pull request #7024 from mailcow/staging
🐄🛡️ January 2026 Update | Limited EAS/DAV Access and Restricted Alias Sending
2026-01-29 07:25:09 +01:00
Ashitaka e8d9315d4a Merge pull request #6905 from Ashitaka57/6646-pbkdf2-sha512-verify-hash
Support for PBKDF2-SHA512 hash algorithm in verify_hash() (FreeIPA compatibility) (issue 6646)
2025-12-12 14:08:21 +01:00
DerLinkman d977ddb501 backup: add image prefetch function to verify latest image is used 2025-12-12 14:07:57 +01:00
DerLinkman e76f5237ed ofelia: revert fixed cron syntax for sa-rules download 2025-12-12 14:07:47 +01:00
CopilotandDerLinkman c11ed5dd1e Prevent duplicate/plaintext login announcement rendering (#6963)
* Initial plan

* Fix duplicate login announcement display

Co-authored-by: DerLinkman <62480600+DerLinkman@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: DerLinkman <62480600+DerLinkman@users.noreply.github.com>
2025-12-12 14:07:36 +01:00
DerLinkman 4ef65fc382 Merge pull request #6948 from mailcow/staging
2025-12
2025-12-09 13:29:15 +01:00
36 changed files with 157 additions and 807 deletions

No files matched your search

+21 -46
View File
@@ -3,11 +3,6 @@
# THIS SCRIPT IS DESIGNED TO BE RUNNING BY MAILCOW SCRIPTS ONLY!
# DO NOT, AGAIN, NOT TRY TO RUN THIS SCRIPT STANDALONE!!!!!!
# Global IPv6 address that is no unique local address (fc00::/7, e.g. Docker bridges)
_has_public_ipv6() {
ip -6 -o addr show scope global 2>/dev/null | awk '{print $4}' | grep -qviE '^f[cd]'
}
# 1) Check if the host supports IPv6
get_ipv6_support() {
# ---- helper: probe external IPv6 connectivity without DNS ----
@@ -42,9 +37,6 @@ get_ipv6_support() {
if _probe_ipv6_connectivity; then
DETECTED_IPV6=true
echo -e "IPv6 detected on host – ${LIGHT_GREEN}leaving IPv6 support enabled${YELLOW}.${NC}"
elif _has_public_ipv6; then
DETECTED_IPV6=true
echo -e "${YELLOW}External IPv6 connectivity test failed, but the host has a public IPv6 address – ${LIGHT_GREEN}leaving IPv6 support enabled${YELLOW}.${NC}"
else
DETECTED_IPV6=false
echo -e "${YELLOW}Default IPv6 route present but external IPv6 connectivity failed – ${LIGHT_RED}disabling IPv6 support${YELLOW}.${NC}"
@@ -200,31 +192,9 @@ EOF
fi
}
_set_enable_ipv6() {
if [[ -n "$MAILCOW_CONF" && -f "$MAILCOW_CONF" ]]; then
if grep -q '^ENABLE_IPV6=' "$MAILCOW_CONF"; then
sed -i "s/^ENABLE_IPV6=.*/ENABLE_IPV6=$1/" "$MAILCOW_CONF"
else
echo "ENABLE_IPV6=$1" >> "$MAILCOW_CONF"
fi
else
export IPV6_BOOL=$1
fi
}
_warn_ipv6_disabled() {
_has_public_ipv6 || return 0
ip -6 route show default 2>/dev/null | grep -qE '^default' || return 0
grep -Eq '"userland-proxy"[[:space:]]*:[[:space:]]*false' /etc/docker/daemon.json 2>/dev/null && return 0
echo -e "${LIGHT_RED}WARNING: ENABLE_IPV6=false, but this host has a public IPv6 address.${NC}"
echo -e "${YELLOW}Docker forwards IPv6 connections to mailcow with an internal source address, which Postfix trusts. This can make your server an open relay over IPv6.${NC}"
echo -e "${YELLOW}Set ENABLE_IPV6=true in mailcow.conf, or set \"userland-proxy\": false in /etc/docker/daemon.json and restart Docker.${NC}"
echo -e "${YELLOW}See https://docs.mailcow.email/post_installation/firststeps-disable_ipv6/${NC}"
sleep 5
}
# 3) Main wrapper for generate_config.sh and update.sh
configure_ipv6() {
# detect manual override if mailcow.conf is present
if [[ -n "$MAILCOW_CONF" && -f "$MAILCOW_CONF" ]] && grep -q '^ENABLE_IPV6=' "$MAILCOW_CONF"; then
MANUAL_SETTING=$(grep '^ENABLE_IPV6=' "$MAILCOW_CONF" | cut -d= -f2)
elif [[ -z "$MAILCOW_CONF" ]] && [[ -n "${ENABLE_IPV6:-}" ]]; then
@@ -233,23 +203,19 @@ configure_ipv6() {
MANUAL_SETTING=""
fi
if [[ "${MANUAL_SETTING,,}" == "false" ]]; then
_set_enable_ipv6 false
echo "ENABLE_IPV6=false is set, skipping Docker IPv6 configuration."
_warn_ipv6_disabled
echo "IPv6 configuration complete: ENABLE_IPV6=false"
return
fi
get_ipv6_support
if [[ "$DETECTED_IPV6" != "true" && "${MANUAL_SETTING,,}" == "true" ]] && _has_public_ipv6; then
echo -e "${YELLOW}Keeping ENABLE_IPV6=true, the host has a public IPv6 address.${NC}"
DETECTED_IPV6=true
fi
# if user manually set it, check for mismatch
if [[ "$DETECTED_IPV6" != "true" ]]; then
_set_enable_ipv6 false
if [[ -n "$MAILCOW_CONF" && -f "$MAILCOW_CONF" ]]; then
if grep -q '^ENABLE_IPV6=' "$MAILCOW_CONF"; then
sed -i 's/^ENABLE_IPV6=.*/ENABLE_IPV6=false/' "$MAILCOW_CONF"
else
echo "ENABLE_IPV6=false" >> "$MAILCOW_CONF"
fi
else
export IPV6_BOOL=false
fi
echo "Skipping Docker IPv6 configuration because host does not support IPv6."
echo "Make sure to check if your docker daemon.json does not include \"enable_ipv6\": true if you do not want IPv6."
echo "IPv6 configuration complete: ENABLE_IPV6=false"
@@ -258,7 +224,16 @@ configure_ipv6() {
fi
docker_daemon_edit
_set_enable_ipv6 true
if [[ -n "$MAILCOW_CONF" && -f "$MAILCOW_CONF" ]]; then
if grep -q '^ENABLE_IPV6=' "$MAILCOW_CONF"; then
sed -i 's/^ENABLE_IPV6=.*/ENABLE_IPV6=true/' "$MAILCOW_CONF"
else
echo "ENABLE_IPV6=true" >> "$MAILCOW_CONF"
fi
else
export IPV6_BOOL=true
fi
echo "IPv6 configuration complete: ENABLE_IPV6=true"
}
@@ -586,8 +586,8 @@ class DockerApi:
if not user or id in ('user=', 'group='):
return Response(content=json.dumps({ 'type': 'danger', 'msg': 'user and id required' }, indent=4), media_type="application/json")
action = 'doveadm acl set -u "$ACL_USER" -- "$folder" "$ACL_ID" $ACL_RIGHTS' if rights else 'doveadm acl delete -u "$ACL_USER" -- "$folder" "$ACL_ID"'
script = ('set -o pipefail; doveadm -f tab mailbox status -u "$ACL_USER" guid "*" | tail -n +2 | cut -f1 | while IFS= read -r folder; do '
'case "$folder" in Shared|Shared/*) continue;; esac; ' + action + ' || exit 1; done && doveadm acl recalc -u "$ACL_USER"')
script = ('set -o pipefail; doveadm mailbox list -u "$ACL_USER" | while IFS= read -r folder; do '
'case "$folder" in Shared/*) continue;; esac; ' + action + ' || exit 1; done && doveadm acl recalc -u "$ACL_USER"')
acl_return = container.exec_run(["/bin/bash", "-c", script],
environment={ 'ACL_USER': user, 'ACL_ID': id, 'ACL_RIGHTS': ' '.join(rights) })
return self.exec_run_handler('generic', acl_return)
+1 -1
View File
@@ -4,7 +4,7 @@ catch_non_zero() {
${CMD} > /dev/null
EC=$?
if [ ${EC} -ne 0 ]; then
echo "Command ${CMD//${REDISPASS}/***} failed to execute, exit code was ${EC}"
echo "Command ${CMD} failed to execute, exit code was ${EC}"
fi
}
source /source_env.sh
+1 -2
View File
@@ -3,8 +3,7 @@ LABEL maintainer "The Infrastructure Company GmbH <info@servercow.de>"
ENV PIP_BREAK_SYSTEM_PACKAGES=1
RUN apk upgrade --no-cache && \
apk add --no-cache nginx \
RUN apk add --no-cache nginx \
python3 \
py3-pip && \
pip install --upgrade pip && \
+1 -1
View File
@@ -4,7 +4,7 @@ WORKDIR /src
ENV CGO_ENABLED=0 \
GO111MODULE=on \
NOOPT=1 \
VERSION=1.14.5
VERSION=1.14.0
RUN git clone --branch v${VERSION} https://github.com/Zuplu/postfix-tlspol && \
cd /src/postfix-tlspol && \
+1 -26
View File
@@ -277,34 +277,9 @@ if [[ ! -z ${SPAMHAUS_DQS_KEY} ]]; then
}
}
"DBL" {
# full copy of the DBL rule from modules.d/rbl.conf, pointed at DQS:
# the override include replaces the stock rule instead of merging into it
# override the defaults for DBL defined in modules.d/rbl.conf
rbl = "${SPAMHAUS_DQS_KEY}.dbl.dq.spamhaus.net";
disable_monitoring = true;
checks = ["emails", "dkim", "helo", "rdns", "replyto", "urls", "content_urls"];
no_ip = true;
ignore_defaults = true;
exclude_users = false;
emails_domainonly = true;
selector = {
from_smtp = "from('smtp'):domain";
from_mime = "from('mime'):domain";
mid = "header(Message-Id).regexp('@([^\.]+\.[^>]+)').last";
}
returncodes = {
DBL_SPAM = "127.0.1.2";
DBL_PHISH = "127.0.1.4";
DBL_MALWARE = "127.0.1.5";
DBL_BOTNET = "127.0.1.6";
DBL_ABUSE = "127.0.1.102";
DBL_ABUSE_REDIR = "127.0.1.103";
DBL_ABUSE_PHISH = "127.0.1.104";
DBL_ABUSE_MALWARE = "127.0.1.105";
DBL_ABUSE_BOTNET = "127.0.1.106";
DBL_PROHIBIT = "127.0.1.255";
DBL_BLOCKED_OPENRESOLVER = "127.255.255.254";
DBL_BLOCKED = "127.255.255.255";
}
}
"ZRD" {
ignore_defaults = true;
+2 -2
View File
@@ -116,8 +116,8 @@ if ($result === false){
exit;
}
if ($result) {
error_log('MAILCOWAUTH: User auth for user ' . $post['username'] . " with service " . $service . " from IP " . $client_ip);
set_sasl_log($post['username'], $client_ip, $service);
error_log('MAILCOWAUTH: User auth for user ' . $post['username'] . " with service " . $post['service'] . " from IP " . $client_ip);
set_sasl_log($post['username'], $client_ip, $post['service']);
}
}
@@ -94,11 +94,11 @@ location / {
}
location /qhandler {
rewrite ^/qhandler/([^/]+)/(.+?)/?$ /qhandler.php?action=$1&hash=$2;
rewrite ^/qhandler/(.*)/(.*) /qhandler.php?action=$1&hash=$2;
}
location /edit {
rewrite ^/edit/([^/]+)/(.+?)/?$ /edit.php?$1=$2;
rewrite ^/edit/(.*)/(.*) /edit.php?$1=$2;
}
location ~ ^/api/v1/(.*)$ {
@@ -187,12 +187,6 @@ location /sogo-auth-verify {
}
location ^~ /Microsoft-Server-ActiveSync {
# Outlook for iOS/Android (Microsoft's sync service) sends EAS commands without credentials
# and only authenticates after a 401 Basic challenge. SOGo answers those with 403, so challenge here.
if ($http_authorization = "") {
add_header WWW-Authenticate 'Basic realm="SOGo"' always;
return 401;
}
auth_request /sogo-auth-verify;
auth_request_set $user $upstream_http_x_user;
auth_request_set $auth $upstream_http_x_auth;
+4
View File
@@ -1,3 +1,7 @@
MX_IMPLICIT {
expression = "MX_GOOD & MX_MISSING";
score = -0.01;
}
VIRUS_FOUND {
expression = "CLAM_VIRUS & !MAILCOW_WHITE";
score = 2000.0;
+18
View File
@@ -23,6 +23,24 @@ symbols {
}
}
group "MX" {
"MX_INVALID" {
score = 0.5;
description = "No connectable MX";
one_shot = true;
}
"MX_MISSING" {
score = 2.0;
description = "No MX record";
one_shot = true;
}
"MX_GOOD" {
score = -0.01;
description = "MX was ok";
one_shot = true;
}
}
group "reputation" {
symbols = {
"IP_REPUTATION_HAM" {
+20
View File
@@ -5,6 +5,12 @@ RCPT_MAILCOW_DOMAIN {
symbols_set = ["RCPT_MAILCOW_DOMAIN"];
}
WHITELISTED_FWD_HOST {
type = "ip";
map = "redis://WHITELISTED_FWD_HOST";
symbols_set = ["WHITELISTED_FWD_HOST"];
}
BULK_HEADER {
type = "content";
map = "${LOCAL_CONFDIR}/custom/bulk_header.map";
@@ -145,6 +151,20 @@ BAD_LANG {
score = 5.0;
}
BAZAAR_ABUSE_CH {
type = "selector";
selector = "attachments(hex,md5)";
map = "https://bazaar.abuse.ch/export/txt/md5/recent/";
score = 10.0;
}
URLHAUS_ABUSE_CH {
type = "selector";
selector = "urls";
map = "https://urlhaus.abuse.ch/downloads/text_online/";
score = 10.0;
}
SMTP_LIMITED_ACCESS {
type = "user";
map = "redis://SMTP_LIMITED_ACCESS";
+1
View File
@@ -1,5 +1,6 @@
timeout = 8.0;
symbol_bad_mx = "MX_INVALID";
symbol_no_mx = "MX_MISSING";
symbol_good_mx = "MX_GOOD";
expire = 86400;
key_prefix = "rmx";
-2
View File
@@ -9,5 +9,3 @@ disable_monitoring = true;
# instead of silently accepting the message without further processing.
soft_reject_on_timeout = true;
local_addrs = /etc/rspamd/custom/mailcow_networks.map;
# Must not be lower than message_size_limit in postfix main.cf
max_message = 134217728;
+6 -63
View File
@@ -362,61 +362,6 @@ rspamd_config:register_symbol({
priority = 19
})
rspamd_config:register_symbol({
name = 'WHITELISTED_FWD_HOST',
type = 'prefilter',
score = 0.0,
callback = function(task)
local rspamd_logger = require "rspamd_logger"
local redis_params = rspamd_parse_redis_server('fwd_host')
local ip = task:get_from_ip()
if ip == nil or not ip:is_valid() then
return false
end
local from_ip_string = tostring(ip)
local ip_check_table = {'WHITELISTED_FWD_HOST', from_ip_string}
local maxbits = 128
local minbits = 7
if ip:get_version() == 4 then
maxbits = 32
minbits = 8
end
for i=maxbits,minbits,-1 do
table.insert(ip_check_table, ip:apply_mask(i):to_string() .. "/" .. i)
end
local function fwd_host_cb(err, data)
if err or type(data) ~= 'table' then
rspamd_logger.infox(rspamd_config, "fwd_host query request for ip %s returned invalid or empty data (\"%s\") or error (\"%s\")", ip, data, err)
return
end
for _,v in pairs(data) do
if type(v) == 'string' then
task:insert_result('WHITELISTED_FWD_HOST', 1.0, from_ip_string)
task:set_flag('pass_all')
return
end
end
end
local redis_ret = rspamd_redis_make_request(task,
redis_params, -- connect params
'WHITELISTED_FWD_HOST', -- hash key
false, -- is write
fwd_host_cb, --callback
'HMGET', -- command
ip_check_table -- arguments
)
if not redis_ret then
rspamd_logger.infox(rspamd_config, "cannot check fwd_host redis map")
end
end,
priority = 18
})
rspamd_config:register_symbol({
name = 'TLS_HEADER',
type = 'postfilter',
@@ -445,8 +390,9 @@ rspamd_config:register_symbol({
local rspamd_logger = require "rspamd_logger"
local redis_params = rspamd_parse_redis_server('taghandler')
local rspamd_http = require "rspamd_http"
local rcpts = task:get_recipients({'smtp', 'orig'})
local rcpts = task:get_recipients('smtp')
local lua_util = require "lua_util"
local tagged_rcpt = task:get_symbol("TAGGED_RCPT")
local function remove_moo_tag()
local moo_tag_header = task:get_header('X-Moo-Tag', false)
@@ -471,9 +417,8 @@ rspamd_config:register_symbol({
-- Check if recipient has a tag (contains '+')
local tag = nil
local base_user, tag_part = rcpt_user:match('^([^%+]+)%+(.+)$')
if base_user and tag_part then
tag = tag_part
if tagged_rcpt ~= nil then
tag = tagged_rcpt
rspamd_logger.infox("TAG_MOO: found tag in recipient: %s (base: %s, tag: %s)", rcpt_addr, base_user, tag)
end
@@ -553,7 +498,8 @@ rspamd_config:register_symbol({
else
rspamd_logger.infox("TAG_MOO: user wants subject modified for tagged mail")
local sbj = task:get_header('Subject') or ''
new_sbj = '=?UTF-8?B?' .. tostring(util.encode_base64('[' .. tag .. '] ' .. sbj)) .. '?='
local tag_value = tag[1] and tag[1].options and tag[1].options[1] or ''
new_sbj = '=?UTF-8?B?' .. tostring(util.encode_base64('[' .. tag_value .. '] ' .. sbj)) .. '?='
task:set_milter_reply({
remove_headers = {
['Subject'] = 1,
@@ -961,9 +907,6 @@ rspamd_config:register_symbol({
if not seen_cte and rewrite.need_rewrite_ct then
out[#out + 1] = string.format('%s: %s', 'Content-Transfer-Encoding', new_cte)
task:set_milter_reply({
add_headers = {['Content-Transfer-Encoding'] = new_cte}
})
end
-- End of headers
+1 -1
View File
@@ -109,7 +109,7 @@ foreach ($rcpts as $rcpt) {
}
// Skip if domain is excluded
if (is_array($exclude_domains) && in_array($parsed_rcpt['domain'], $exclude_domains)) {
if (in_array($parsed_rcpt['domain'], $exclude_domains)) {
error_log(sprintf("QUARANTINE: Skipped domain %s", $parsed_rcpt['domain']) . PHP_EOL);
continue;
}
+1 -1
View File
@@ -8,7 +8,7 @@ if(file_exists('inc/vars.local.inc.php')) {
$autodiscover_config = array_merge($default_autodiscover_config, $autodiscover_config);
header('Content-type: application/json');
if (strtolower($_GET['Protocol']) == 'activesync' && $autodiscover_config['autodiscoverType'] == 'activesync' && getenv('SKIP_SOGO') != "y") {
if (strtolower($_GET['Protocol']) == 'activesync' && getenv('SKIP_SOGO') != "y") {
echo '{"Protocol":"ActiveSync","Url":"' . $autodiscover_config['activesync']['url'] . '"}';
}
elseif (strtolower($_GET['Protocol']) == 'autodiscoverv1') {
+1 -1
View File
@@ -31,7 +31,7 @@ error_reporting(0);
$data = trim(file_get_contents("php://input"));
if (strpos($data, 'autodiscover/outlook/responseschema') !== false && $autodiscover_config['autodiscoverType'] == 'activesync') {
if (strpos($data, 'autodiscover/outlook/responseschema') !== false) {
$autodiscover_config['autodiscoverType'] = 'imap';
if ($autodiscover_config['useEASforOutlook'] == 'yes' &&
// Office for macOS does not support EAS
+2 -25
View File
@@ -15,10 +15,6 @@ table.dataTable>tbody>tr.child ul.dtr-details>li {
border-bottom: 1px solid rgba(0, 0, 0, 0.129);
padding: 0.5em 0;
}
/* like the first entry has no top padding, the last one needs no bottom padding */
table.dataTable>tbody>tr.child ul.dtr-details>li:last-child {
padding-bottom: 0;
}
table.dataTable.dtr-inline.collapsed>tbody>tr>td.dtr-control:before:hover,
table.dataTable.dtr-inline.collapsed>tbody>tr>th.dtr-control:before:hover {
background-color: var(--mc-dtr-hover-bg);
@@ -32,8 +28,7 @@ table.dataTable td.dt-control:before {
color: var(--mc-dtr-color);
height: 1em;
width: 1em;
line-height: 1em;
margin-top: calc(-0.5em - 1.5px);
line-height: 1.25em;
border-radius: 0px;
box-shadow: none;
font-size: 14px;
@@ -44,29 +39,11 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>th.dtr-control:before,
table.dataTable td.dt-control:before {
background-color: var(--mc-dtr-active-bg) !important;
}
/* The default initial order targets column 0, which is usually the non-orderable expand column */
table.dataTable thead > tr > th.sorting_disabled.sorting_asc,
table.dataTable thead > tr > th.sorting_disabled.sorting_desc {
padding-right: 0.5rem;
cursor: auto;
}
table.dataTable thead > tr > th.sorting_disabled.sorting_asc:before,
table.dataTable thead > tr > th.sorting_disabled.sorting_asc:after,
table.dataTable thead > tr > th.sorting_disabled.sorting_desc:before,
table.dataTable thead > tr > th.sorting_disabled.sorting_desc:after {
display: none;
}
table.dataTable.table-striped>tbody>tr>td {
vertical-align: middle;
}
table.dataTable.table-striped>tbody>tr>td>input[type="checkbox"] {
/* centers the 1em checkbox in the 1.5em line, level with the expand control */
margin-top: 0.25em;
}
/* the vertical margin is meant for the tag editor in edit forms, in tables it only adds height */
table.dataTable .tag-badge {
margin-top: 0;
margin-bottom: 0;
margin-top: 7px;
}
td.dtr-col-lg {
min-width: 350px;
-8
View File
@@ -139,13 +139,6 @@ body {
display: inline-block;
font-size: inherit;
}
.badge .bi {
font-size: inherit;
}
/* keeps icons from making a badge taller than one with text only */
.badge .bi::before {
line-height: 0;
}
.btn-group-xs > .btn, .btn-xs {
padding: .25rem .4rem;
font-size: .875rem;
@@ -350,7 +343,6 @@ code {
}
.tag-badge .bi {
font-size: 12px;
line-height: 0;
}
.tag-badge.btn-badge:hover {
filter: brightness(0.9);
+1 -1
View File
@@ -191,7 +191,7 @@
height: 2rem;
width: 2rem;
line-height: 2rem;
margin-top: calc(-1rem - 1.5px);
margin-top: -15px;
}
li .dtr-data {
+2 -9
View File
@@ -500,10 +500,10 @@ function apppass_login($user, $pass, $extra = null, &$denied = false){
$key = strtolower($extra['service']) . '_access';
$mailbox_attributes = json_decode($row['mailbox_attributes'], true);
// the protocols of the mailbox only limit direct user access, app passwords have their own
// app passwords never grant a protocol the mailbox itself is denied
if ($row['active'] != '1' || $row['mailbox_active'] != '1' || $row['domain_active'] != '1'
|| ($mailbox_attributes['shared'] ?? '0') == '1'
|| ($extra['service'] != 'NONE' && $row[$key] != '1')) {
|| ($extra['service'] != 'NONE' && ($row[$key] != '1' || (isset($mailbox_attributes[$key]) && $mailbox_attributes[$key] != '1')))) {
// right password, but the app password does not allow this login
$denied = true;
continue;
@@ -601,13 +601,6 @@ function keycloak_mbox_login_rest($user, $pass, $extra = null){
// validate mailcow_password
$mailcow_password = $user_res['attributes']['mailcow_password'][0];
// Keycloak returns binary LDAP attributes like userPassword Base64 encoded
if (substr($mailcow_password, 0, 1) != '{') {
$decoded_password = base64_decode($mailcow_password, true);
if ($decoded_password !== false && substr($decoded_password, 0, 1) == '{') {
$mailcow_password = $decoded_password;
}
}
if (!verify_hash($mailcow_password, $pass)) {
return false;
}
-7
View File
@@ -35,13 +35,6 @@ function fwdhost($_action, $_data = null) {
);
return false;
}
$hosts = array_unique(array_map(function ($host) {
$net = explode('/', $host, 2);
if (filter_var($net[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
$net[0] = inet_ntop(inet_pton($net[0]));
}
return implode('/', $net);
}, $hosts));
foreach ($hosts as $host) {
try {
$redis->hSet('WHITELISTED_FWD_HOST', $host, $source);
+7 -31
View File
@@ -1394,18 +1394,6 @@ function set_tfa($_data) {
case "webauthn":
$key_id = (!isset($_data["key_id"])) ? 'unidentified' : $_data["key_id"];
// Refuse incomplete WebAuthn registrations. Without this guard a request
// that does not contain the parsed credential data (e.g. a plain form
// POST) would silently insert an empty keyHandle while reporting success.
if (empty($_data['registration']) || empty($_data['registration']->credentialId)) {
$_SESSION['return'][] = array(
'type' => 'danger',
'log' => array(__FUNCTION__, $_data_log),
'msg' => 'webauthn_registration_failed'
);
return false;
}
$stmt = $pdo->prepare("INSERT INTO `tfa` (`username`, `key_id`, `authmech`, `keyHandle`, `publicKey`, `certificate`, `counter`, `active`)
VALUES (?, ?, 'webauthn', ?, ?, ?, ?, '1')");
$stmt->execute(array(
@@ -1428,11 +1416,11 @@ function set_tfa($_data) {
// Block TFA removal if force_tfa policy is active
$is_forced_tfa = false;
if ($_SESSION['mailcow_cc_role'] === 'user') {
$stmt_check = $pdo->prepare("SELECT JSON_VALUE(`attributes`, '$.force_tfa') FROM `mailbox` WHERE `username` = ?");
$stmt_check = $pdo->prepare("SELECT JSON_EXTRACT(`attributes`, '$.force_tfa') FROM `mailbox` WHERE `username` = ?");
$stmt_check->execute(array($username));
$is_forced_tfa = ($stmt_check->fetchColumn() == '1');
} else {
$stmt_check = $pdo->prepare("SELECT JSON_VALUE(`attributes`, '$.force_tfa') FROM `admin` WHERE `username` = ?");
$stmt_check = $pdo->prepare("SELECT JSON_EXTRACT(`attributes`, '$.force_tfa') FROM `admin` WHERE `username` = ?");
$stmt_check->execute(array($username));
$is_forced_tfa = ($stmt_check->fetchColumn() == '1');
}
@@ -1699,11 +1687,11 @@ function unset_tfa_key($_data) {
// Block key removal if force_tfa policy is active
$is_forced_tfa = false;
if ($_SESSION['mailcow_cc_role'] === 'user') {
$stmt_check = $pdo->prepare("SELECT JSON_VALUE(`attributes`, '$.force_tfa') FROM `mailbox` WHERE `username` = ?");
$stmt_check = $pdo->prepare("SELECT JSON_EXTRACT(`attributes`, '$.force_tfa') FROM `mailbox` WHERE `username` = ?");
$stmt_check->execute(array($username));
$is_forced_tfa = ($stmt_check->fetchColumn() == '1');
} else {
$stmt_check = $pdo->prepare("SELECT JSON_VALUE(`attributes`, '$.force_tfa') FROM `admin` WHERE `username` = ?");
$stmt_check = $pdo->prepare("SELECT JSON_EXTRACT(`attributes`, '$.force_tfa') FROM `admin` WHERE `username` = ?");
$stmt_check->execute(array($username));
$is_forced_tfa = ($stmt_check->fetchColumn() == '1');
}
@@ -2432,7 +2420,7 @@ function identity_provider($_action = null, $_data = null, $_extra = null) {
case "use_ssl":
case "use_tls":
case "login_provisioning":
case "ignore_ssl_error":
case "ignore_ssl_errors":
$settings[$row["key"]] = boolval($row["value"]);
break;
default:
@@ -2456,7 +2444,7 @@ function identity_provider($_action = null, $_data = null, $_extra = null) {
if ($settings["authsource"] == "ldap"){
$settings['use_ssl'] = !isset($settings['use_ssl']) ? false : $settings['use_ssl'];
$settings['use_tls'] = !isset($settings['use_tls']) ? false : $settings['use_tls'];
$settings['ignore_ssl_error'] = !isset($settings['ignore_ssl_error']) ? false : $settings['ignore_ssl_error'];
$settings['ignore_ssl_errors'] = !isset($settings['ignore_ssl_errors']) ? false : $settings['ignore_ssl_errors'];
}
return $settings;
break;
@@ -3118,17 +3106,7 @@ function identity_provider($_action = null, $_data = null, $_extra = null) {
case "get-keycloak-admin-token":
// get access_token for service account of mailcow client
if ($iam_settings['authsource'] !== 'keycloak') return false;
// only introspect a cached access_token that is not (about to be) expired,
// introspecting an expired token makes Keycloak log INTROSPECT_TOKEN_ERROR
$token_not_expired = false;
if (!empty($iam_settings['access_token'])) {
$token_parts = explode('.', $iam_settings['access_token']);
if (count($token_parts) === 3) {
$token_payload = json_decode(base64_decode(strtr($token_parts[1], '-_', '+/')), true);
$token_not_expired = is_array($token_payload) && isset($token_payload['exp']) && intval($token_payload['exp']) > time() + 30;
}
}
if ($token_not_expired) {
if (isset($iam_settings['access_token'])) {
// check if access_token is valid
$url = "{$iam_settings['server_url']}/realms/{$iam_settings['realm']}/protocol/openid-connect/token/introspect";
$req = http_build_query(array(
@@ -3179,8 +3157,6 @@ function identity_provider($_action = null, $_data = null, $_extra = null) {
':key' => 'access_token',
':value' => $res['access_token']
));
// keep the cached token in sync, so subsequent calls in the same run reuse it
$iam_settings['access_token'] = $res['access_token'];
return $res['access_token'];
break;
}
+1 -44
View File
@@ -2524,10 +2524,6 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
':domain' => $domain,
':tag_name' => $tag,
));
$stmt = $pdo->prepare("UPDATE `domain` SET `modified` = NOW() WHERE `domain` = :domain");
$stmt->execute(array(
':domain' => $domain,
));
}
$_SESSION['return'][] = array(
@@ -2696,10 +2692,6 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
':domain' => $domain,
':tag_name' => $tag,
));
$stmt = $pdo->prepare("UPDATE `domain` SET `modified` = NOW() WHERE `domain` = :domain");
$stmt->execute(array(
':domain' => $domain,
));
}
$_SESSION['return'][] = array(
@@ -3178,10 +3170,6 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
':username' => $username,
':tag_name' => $tag,
));
$stmt = $pdo->prepare("UPDATE `mailbox` SET `modified` = NOW() WHERE `username` = :username");
$stmt->execute(array(
':username' => $username,
));
} catch (Exception $e) {
}
}
@@ -4000,9 +3988,6 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
$stmt->execute(array(':goto' => '(^|,)'.preg_quote($_data, '/').'($|,)'));
$rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
while ($row = array_shift($rows)) {
if (!hasAliasObjectAccess($_SESSION['mailcow_cc_username'], $_SESSION['mailcow_cc_role'], $row['address'])) {
continue;
}
// Keep old array for backward compatibility
$data['fixed_sender_aliases'][] = $row['address'];
// Split into allowed/blocked for proper display
@@ -4938,9 +4923,6 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
else if ($SaslLogs['service'] == 'SSO') {
$last_sso_login = strtotime($SaslLogs['datetime']);
}
else if ($SaslLogs['service'] == 'SOGO') {
$last_sogo_login = strtotime($SaslLogs['datetime']);
}
}
if (!isset($last_imap_login) || $GLOBALS['SHOW_LAST_LOGIN'] === false) {
$last_imap_login = 0;
@@ -4954,14 +4936,10 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
if (!isset($last_sso_login) || $GLOBALS['SHOW_LAST_LOGIN'] === false) {
$last_sso_login = 0;
}
if (!isset($last_sogo_login) || $GLOBALS['SHOW_LAST_LOGIN'] === false) {
$last_sogo_login = 0;
}
$mailboxdata['last_imap_login'] = $last_imap_login;
$mailboxdata['last_smtp_login'] = $last_smtp_login;
$mailboxdata['last_pop3_login'] = $last_pop3_login;
$mailboxdata['last_sso_login'] = $last_sso_login;
$mailboxdata['last_sogo_login'] = $last_sogo_login;
if (!isset($_extra) || $_extra != 'reduced') {
$rl = ratelimit('get', 'mailbox', $_data);
@@ -4999,16 +4977,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
$stmt->execute(array(':username' => $_data));
$sender_acl_rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
foreach ($sender_acl_rows as $sender_acl_row) {
$send_as = $sender_acl_row['send_as'];
if ($_SESSION['mailcow_cc_role'] == 'domainadmin' && $send_as != '*') {
$in_scope = (substr($send_as, 0, 1) == '@')
? hasDomainAccess($_SESSION['mailcow_cc_username'], $_SESSION['mailcow_cc_role'], substr($send_as, 1))
: hasAliasObjectAccess($_SESSION['mailcow_cc_username'], $_SESSION['mailcow_cc_role'], $send_as);
if (!$in_scope) {
continue;
}
}
$mailboxdata['sender_acl'][] = $send_as;
$mailboxdata['sender_acl'][] = $sender_acl_row['send_as'];
}
}
$stmt = $pdo->prepare("SELECT `tag_name`
@@ -5947,12 +5916,6 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
':domain' => $domain,
':tag_name' => $tag,
));
if ($stmt->rowCount() > 0) {
$stmt = $pdo->prepare("UPDATE `domain` SET `modified` = NOW() WHERE `domain` = :domain");
$stmt->execute(array(
':domain' => $domain,
));
}
}
}
@@ -6005,12 +5968,6 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
':username' => $username,
':tag_name' => $tag,
));
if ($stmt->rowCount() > 0) {
$stmt = $pdo->prepare("UPDATE `mailbox` SET `modified` = NOW() WHERE `username` = :username");
$stmt->execute(array(
':username' => $username,
));
}
}
}
+7 -14
View File
@@ -614,7 +614,7 @@ jQuery(function($){
defaultContent: ''
},
{
title: lang_edit.ratelimit,
title: 'RL',
data: 'rl',
searchable: false,
orderable: false,
@@ -715,6 +715,10 @@ jQuery(function($){
$.each(json, function (i, item) {
item.chkbox = '<input type="checkbox" class="form-check-input" data-id="domain_template" name="multi_select" value="' + encodeURIComponent(item.id) + '" />';
item.attributes.def_quota_for_mbox = humanFileSize(item.attributes.def_quota_for_mbox);
item.attributes.max_quota_for_mbox = humanFileSize(item.attributes.max_quota_for_mbox);
item.attributes.max_quota_for_domain = humanFileSize(item.attributes.max_quota_for_domain);
item.template = escapeHtml(item.template);
if (item.attributes.rl_frame === "s"){
item.attributes.rl_frame = lang_rl.second;
@@ -797,25 +801,16 @@ jQuery(function($){
title: lang.mailbox_defquota,
data: 'attributes.def_quota_for_mbox',
defaultContent: '',
render: function (data, type) {
return type === 'sort' || type === 'type' ? data : humanFileSize(data);
}
},
{
title: lang.max_quota,
data: 'attributes.max_quota_for_mbox',
defaultContent: '',
render: function (data, type) {
return type === 'sort' || type === 'type' ? data : humanFileSize(data);
}
},
{
title: lang.domain_quota_total,
data: 'attributes.max_quota_for_domain',
defaultContent: '',
render: function (data, type) {
return type === 'sort' || type === 'type' ? data : humanFileSize(data);
}
},
{
title: lang.gal,
@@ -937,7 +932,6 @@ jQuery(function($){
item.last_mail_login = (item.attributes.imap_access == 1 ? '<div class="text-start badge bg-info mb-2" style="min-width: 70px;">IMAP @ ' + unix_time_format(Number(item.last_imap_login)) + '</div><br>' : '') +
(item.attributes.pop3_access == 1 ? '<div class="text-start badge bg-info mb-2" style="min-width: 70px;">POP3 @ ' + unix_time_format(Number(item.last_pop3_login)) + '</div><br>' : '') +
(item.attributes.smtp_access == 1 ? '<div class="text-start badge bg-info mb-2" style="min-width: 70px;">SMTP @ ' + unix_time_format(Number(item.last_smtp_login)) + '</div><br>' : '') +
'<div class="text-start badge bg-info mb-2" style="min-width: 70px;">SOGO @ ' + unix_time_format(Number(item.last_sogo_login)) + '</div><br>' +
'<div class="text-start badge bg-info" style="min-width: 70px;">SSO @ ' + unix_time_format(Number(item.last_sso_login)) + '</div>';
/*
if (!item.rl) {
@@ -1250,6 +1244,8 @@ jQuery(function($){
item.attributes.rl_value = (!item.attributes.rl_value) ? "∞" : escapeHtml(item.attributes.rl_value);
item.attributes.ratelimit = item.attributes.rl_value + " " + item.attributes.rl_frame;
item.attributes.quota = humanFileSize(item.attributes.quota);
item.attributes.tls_enforce_in = '<i class="text-' + (item.attributes.tls_enforce_in == 1 ? 'success bi bi-lock-fill' : 'danger bi bi-unlock-fill') + '"><span class="sorting-value">' + (item.attributes.tls_enforce_in == 1 ? '1' : '0') + '</span></i>';
item.attributes.tls_enforce_out = '<i class="text-' + (item.attributes.tls_enforce_out == 1 ? 'success bi bi-lock-fill' : 'danger bi bi-unlock-fill') + '"><span class="sorting-value">' + (item.attributes.tls_enforce_out == 1 ? '1' : '0') + '</span></i>';
item.attributes.pop3_access = '<i class="text-' + (item.attributes.pop3_access == 1 ? 'success' : 'danger') + ' bi bi-' + (item.attributes.pop3_access == 1 ? 'check-lg' : 'x-lg') + '"><span class="sorting-value">' + (item.attributes.pop3_access == 1 ? '1' : '0') + '</span></i>';
@@ -1336,9 +1332,6 @@ jQuery(function($){
title: lang.domain_quota,
data: 'attributes.quota',
defaultContent: '',
render: function (data, type) {
return type === 'sort' || type === 'type' ? data : humanFileSize(data);
}
},
{
title: lang.tls_enforce_in,
+2 -6
View File
@@ -1087,14 +1087,10 @@ if (isset($_GET['query'])) {
$data['mailboxes'][$mailbox][] = $mailbox;
$user_alias_details = user_get_alias_details($mailbox);
foreach ($user_alias_details['direct_aliases'] as $k => $v) {
if (hasDomainAccess($_SESSION['mailcow_cc_username'], $_SESSION['mailcow_cc_role'], substr(strrchr($k, '@'), 1))) {
$data['mailboxes'][$mailbox][] = $k;
}
$data['mailboxes'][$mailbox][] = $k;
}
foreach ($user_alias_details['shared_aliases'] as $k => $v) {
if (hasDomainAccess($_SESSION['mailcow_cc_username'], $_SESSION['mailcow_cc_role'], substr(strrchr($k, '@'), 1))) {
$data['mailboxes'][$mailbox][] = $k;
}
$data['mailboxes'][$mailbox][] = $k;
}
}
}
+1 -2
View File
@@ -1127,7 +1127,7 @@
"mailbox_defaults_info": "Define default settings for new mailboxes.",
"mailbox_defquota": "Default mailbox size",
"mailbox_templates": "Mailbox Templates",
"mailbox_quota": "Max. mailbox size",
"mailbox_quota": "Max. size of a mailbox",
"mailboxes": "Mailboxes",
"max_aliases": "Max. aliases",
"max_mailboxes": "Max. possible mailboxes",
@@ -1429,7 +1429,6 @@
"u2f_deprecated": "It seems that your Key was registered using the deprecated U2F method. We will deactivate Two-Factor-Authenticaiton for you and delete your Key.",
"u2f_deprecated_important": "Please register your Key in the admin panel with the new WebAuthn method.",
"webauthn": "WebAuthn authentication",
"webauthn_registration_failed": "WebAuthn registration failed. The credential could not be verified, please try again.",
"waiting_usb_auth": "<i>Waiting for USB device...</i><br><br>Please tap the button on your USB device now.",
"waiting_usb_register": "<i>Waiting for USB device...</i><br><br>Please enter your password above and confirm your registration by tapping the button on your USB device.",
"yubi_otp": "Yubico OTP authentication"
+5
View File
@@ -1074,6 +1074,7 @@
"verified_webauthn_login": "Inicio de sesión WebAuthn verificado",
"verified_yotp_login": "Inicio de sesión Yubico OTP verificado",
"admin_added": "Se agregó el administrador %s",
"admin_api_modified": "Se guardaron los cambios en la API",
"admin_removed": "Se eliminó el administrador %s",
"app_links": "Se guardaron los cambios en los enlaces de aplicaciones",
"app_passwd_added": "Se agregó una nueva contraseña de aplicación",
@@ -1332,6 +1333,10 @@
"sogo_profile_reset_help": "Esto destruirá el perfil de SOGo del usuario y <b>eliminará de forma irrecuperable todos sus contactos y datos de calendario</b>.",
"spam_score_reset": "Restablecer al valor predeterminado del servidor",
"spamfilter_table_domain_policy": "n/d (política del dominio)",
"syncjob_check_log": "Revisar registro",
"syncjob_EX_OK": "Correcto",
"syncjob_EXIT_OVERQUOTA": "El buzón de destino superó su cuota",
"syncjob_EXIT_AUTHENTICATION_FAILURE_USER1": "Usuario o contraseña incorrectos",
"tfa_info": "La autenticación de dos factores ayuda a proteger su cuenta. Si la activa, necesitará contraseñas de aplicación para iniciar sesión en aplicaciones o servicios que no admiten la autenticación de dos factores (p. ej., clientes de correo)."
},
"warning": {
+1
View File
@@ -95,6 +95,7 @@
"bcc_dest_format": "Il destinatario in copia nascosta deve essere un singolo indirizzo email.<br>Se si vuole spedire una copia del messaggio a più destinatari, bisogna creare un alias ed utilizzarlo per questa opzione.",
"app_passwd_protocols": "Protocolli consentiti per la password dell'app",
"tags": "Tag",
"dry": "Simula sincronizzazione",
"internal": "Interno",
"internal_info": "Gli alias interni sono accessibili solo dal proprio dominio o dai domini alias.",
"sender_allowed": "Consenti l'invio con questo alias"
+11 -327
View File
@@ -30,8 +30,7 @@
"quarantine_category": "Spremeni kategorijo obvestil o karanteni",
"syncjobs": "Sinhronizacijska opravila",
"pw_reset": "Dovoli ponastavitev uporabniškega gesla mailcow",
"alias_external_goto": "Dovoli vzdevke z zunanjimi domenami goto",
"mailbox_groups": "Skupine"
"alias_external_goto": "Dovoli vzdevke z zunanjimi domenami goto"
},
"add": {
"active": "Aktivno",
@@ -362,7 +361,7 @@
"iam_default_template": "Privzeta predloga",
"iam_default_template_description": "Če uporabniku ni dodeljena nobena predloga, bo privzeta predloga uporabljena za ustvarjanje nabiralnika, ne pa za posodabljanje nabiralnika.",
"iam_description": "Konfigurirajte zunanjega ponudnika za preverjanje pristnosti<br>Uporabnikovi poštni nabiralniki bodo samodejno ustvarjeni ob prvi prijavi, če je nastavljeno preslikavanje atributov.",
"iam_extra_permission": "Da bi spodnje nastavitve delovale, odjemalec mailcow v sistemu Keycloak potrebuje <code>servisni račun</code> (service account) in dovoljenje za <code>view-users</code> (pri sinhronizaciji skupin tudi <code>query-groups</code>).",
"iam_extra_permission": "Za delovanje naslednjih nastavitev potrebuje odjemalec mailcow v Keycloaku <code>Servisni račun</code> in dovoljenje za <code>ogled uporabnikov</code>.",
"iam_host": "Gostitelj",
"iam_host_info": "Vnesite enega ali več gostiteljev LDAP, ločenih z vejicami.",
"iam_import_users": "Uvozi uporabnike",
@@ -402,104 +401,7 @@
"ui_theme_dark": "Vključuje različico s temnim načinom",
"ui_theme_default": "Privzeto",
"ui_theme_info": "Teme so mape v <code>data/web/css/themes/&lt;name&gt;/</code>, ki vsebujejo naslednje datoteke:<ul class=\"mb-0\"><li><code>theme.css</code> (obvezna)</li><li><code>dark.css</code> (neobvezna, temni način)</li><li><code>bootstrap.css</code> (neobvezna, nadomesti osnovno temo Bootstrap)</li><li><code>theme.json</code> (neobvezna, <code>name</code> in <code>description</code>)</li></ul>",
"ui_theme_none": "Tem ni bilo mogoče najti.",
"api_key_add": "Dodaj API ključ",
"api_keys": "API ključi",
"api_networks": "Dovoljeni naslovi IP/omrežja",
"api_service_key": "Ključ storitve iz datoteke mailcow.conf; spremeniti ga je mogoče le tam.",
"api_service_key_info": "Ta ključ API je določen v datoteki mailcow.conf (API_KEY, API_KEY_READ_ONLY, API_ALLOW_FROM) in ga je mogoče spremeniti le tam.",
"iam_attribute_field_info": "Neobvezno. Atribut LDAP, katerega vrednost izbere predlogo v spodnjem preslikovanju.",
"iam_disabled_filter": "Onemogočen filter",
"iam_disabled_filter_info": "Filter LDAP za onemogočene uporabnike. Računi v imeniku Active Directory, ki imajo v atributu userAccountControl nastavljeno vrednost ACCOUNTDISABLE, se vedno štejejo za onemogočene.",
"iam_encryption": "Šifriranje",
"iam_encryption_info": "StartTLS uporablja običajna vrata (389). SSL (LDAPS) uporablja vrata 636, pri čemer se vrata 389 samodejno spremenijo.",
"iam_encryption_none": "Nič",
"iam_filter_info": "LDAP-filter za uporabnike, ki se lahko prijavijo in so sinhronizirani, npr. <code>(objectClass=person)</code>.",
"iam_group_autocreate": "Ustvari skupine",
"iam_group_autocreate_info": "Za vsako skupino IdP, ki še nima poštnega predala, ustvari skupino s poštnim predalom. Če je naslov skupine prost, postane ta naslov njen naslov.",
"iam_group_basedn": "DN osnove za skupine",
"iam_group_default_domain": "Privzeta domena skupine",
"iam_group_default_domain_info": "Domena novih skupin, katerih e-pošta ni v domeni mailcow.",
"iam_group_filter": "Filter skupin",
"iam_group_member_attribute": "Atribut člana",
"iam_group_member_attribute_info": "Samo za \"Atribut članstva v skupinah\", npr. member ali uniqueMember.",
"iam_group_member_mode": "Članstva",
"iam_group_member_mode_ad_chain": "Active Directory, vključno z ugnezdenimi skupinami",
"iam_group_member_mode_member": "Atribut članstva v skupinah",
"iam_group_member_mode_memberof": "memberOf uporabnikov",
"iam_group_name_attribute": "Atribut imena skupine",
"iam_group_paths": "Pot skupine",
"iam_group_paths_info": "Z vejicami ločene poti do skupin v Keycloaku: <code>/Sales</code> ali <code>/mailcow/*</code> za vse skupine pod <code>/mailcow</code>. Odjemalec mailcow potrebuje dovoljenje <code>query-groups</code>.",
"iam_group_sync": "Sinhronizacija skupin",
"iam_group_sync_info": "Sinhronizira člane skupin iz ponudnika identitete (IdP) s skupinami poštnih predalov (Poštni predali → Skupine). Člani, dodani v sistemu mailcow, ostanejo.",
"iam_id_attribute": "ID atribut",
"iam_id_attribute_info": "Stalen ID uporabnika. Prazno = objectGUID, entryUUID, nsUniqueId ali ipaUniqueID. Sprememba povzroči ponovno povezovanje vseh poštnih predalov na podlagi e-poštnega naslova.",
"iam_import_users_info": "Ustvari poštne predale za vse uporabnike ponudnika identitete (IdP) na podlagi ustrezne predloge, ne da bi bilo treba čakati na njihovo prvo prijavo.",
"iam_login_provisioning_info": "Ob prvi prijavi uporabnika ustvari poštni predal z ustrezno ali privzeto predlogo.",
"iam_mapping_add": "Dodaj preslikavo",
"iam_mapping_info": "Vrednost uporabniškega atributa določa predlogo (Keycloak in OIDC: <code>mailcow_template</code>). Predloge skupin imajo prednost.",
"iam_offboarding": "Zaključek sodelovanja",
"iam_offboarding_info": "Uporabniki, ki so onemogočeni v IdP ali pa so manjkali v dveh popolnih sinhronizacijah, se ne morejo več prijaviti. Njihov poštni nabiralnik še vedno prejema pošto. Ponovno so omogočeni samo poštni nabiralniki, ki jih je sinhronizacija onemogočila.",
"iam_offboarding_limit": "Sprememba meje (%)",
"iam_offboarding_limit_info": "Sinhronizacijski postopki, ki bi onemogočili več nabiralnikov ali odstranili več članstev v skupinah, kot je določeno s to omejitvijo (vsaj 5), so blokirani.",
"iam_periodic_full_sync_info": "Posodobi ime in predlogo obstoječih poštnih predalov na podlagi podatkov iz ponudnika identitete (IdP).",
"iam_redirect_url_add": "Dodaj URL za preusmeritev",
"iam_section_connection": "Povezava",
"iam_section_groups": "Skupine",
"iam_section_login": "Prijava",
"iam_section_sync": "Sinhronizacija",
"iam_section_templates": "Predloge za poštne predale",
"iam_section_users": "Uporabniki",
"iam_sync_accounts": "Poštni predali IdP",
"iam_sync_changes": "Spremembe",
"iam_sync_count_conflicts": "Konflikti",
"iam_sync_count_creates": "Ustvarjeno",
"iam_sync_count_deactivate": "Prijava onemogočena",
"iam_sync_count_errors": "Napake",
"iam_sync_count_found": "Ponovno najdeno",
"iam_sync_count_group_creates": "Ustvarjene skupine",
"iam_sync_count_group_renames": "Skupine preimenovane",
"iam_sync_count_links": "Povezano",
"iam_sync_count_membership_removals": "Članstva odstranjena",
"iam_sync_count_memberships": "Skupine z novimi člani",
"iam_sync_count_missing": "Manjka",
"iam_sync_count_orphaned_groups": "Skupine, ki niso v IdP",
"iam_sync_count_release": "Sproščeno",
"iam_sync_count_restore": "Prijava omogočena",
"iam_sync_count_skipped": "Preskočeno",
"iam_sync_count_updates": "Posodobljeno",
"iam_sync_details": "Podrobnosti",
"iam_sync_force": "Zaženi brez omejitev",
"iam_sync_force_confirm": "Želite zagnati sinhronizacijo brez omejitve števila sprememb? Nabiralniki so lahko onemogočeni, članstva v skupinah pa odstranjena.",
"iam_sync_idp_disabled": "Onemogočeno s strani IdP",
"iam_sync_linked": "Povezano",
"iam_sync_missing": "Manjka v IdP",
"iam_sync_mode": "Način",
"iam_sync_mode_force": "Brez omejitev",
"iam_sync_mode_preview": "Predogled",
"iam_sync_mode_run": "Zaženi",
"iam_sync_no_changes": "Ni sprememb",
"iam_sync_none": "Ni še bilo izvedenih sinhronizacij.",
"iam_sync_off": "Sinhronizacija ni aktivna. Omogočite uvoz, periodično sinhronizacijo, postopek ob zaključku sodelovanja (offboarding) ali sinhronizacijo skupin.",
"iam_sync_preview": "Predogled",
"iam_sync_result": "Rezultat",
"iam_sync_run": "Zaženi zdaj",
"iam_sync_started": "Začeto",
"iam_sync_status": "Stanje sinhronizacije",
"iam_sync_status_blocked": "Blokirano",
"iam_sync_status_error": "Napaka",
"iam_sync_status_info": "Izvajanje se začne v eni minuti. Predogled prikaže spremembe, ne da bi jih uveljavil.",
"iam_sync_status_ok": "OK",
"iam_sync_status_pending": "V čakalni vrsti",
"iam_sync_status_running": "V teku",
"iam_username_field_info": "Atribut z e-poštnim naslovom postane ime poštnega predala. Privzeto: mail.",
"description": "Opis",
"unban_all": "Odblokiraj vse",
"syncjobs": "Opravila sinhronizacije",
"syncjob_max_parallel": "Največje število vzporednih sinhronizacijskih procesov",
"syncjob_max_parallel_info": "Koliko opravil sinhronizacije lahko poteka hkrati (1–32).",
"syncjob_max_kb_per_second": "Omejitev pasovne širine na proces (KB/s)",
"syncjob_max_kb_per_second_info": "0 = neomejeno. Omejuje vsak postopek sinhronizacije (v KB/s); omejitev za posamezno opravilo (v bajtih/s) je navzgor omejena s to vrednostjo. Skupna vrednost ≈ ta vrednost × največje število vzporednih postopkov."
"ui_theme_none": "Tem ni bilo mogoče najti."
},
"danger": {
"alias_goto_identical": "Vzdevek in ciljni naslov se ne smeta ujemati",
@@ -648,50 +550,7 @@
"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",
"external_goto_denied": "Zunanji naslov goto %s ni dovoljen",
"ui_theme_invalid": "Tema ni najdena",
"alias_group_managed": "Vzdevek %s pripada skupini in ga je mogoče spremeniti le tam.",
"api_key_access_invalid": "Neveljavna vrsta dostopa do API-ja; dovoljene vrednosti so ro in rw",
"api_key_description_invalid": "Opis ključa API ne sme presegati 255 znakov",
"api_key_network_invalid": "Neveljaven naslov IP ali omrežje: %s",
"api_key_service_locked": "Ključ API %s je določen v datoteki mailcow.conf in ga je mogoče spremeniti le tam",
"group_address_invalid": "Skupinski naslov %s je neveljaven ali pa ni v domeni skupine",
"group_description_invalid": "Opis skupine ne sme presegati 255 znakov.",
"group_grant_invalid": "Neveljavna delitev za poštni predal %s",
"group_member_idp": "%s je član prek ponudnika identitete in ga je mogoče odstraniti le tam",
"group_member_invalid": "%s ni poštni predal in ne more biti član skupine",
"group_name_invalid": "Ime skupine ni veljavno (1–100 znakov)",
"group_priority_invalid": "Prednostna naloga mora biti številka",
"group_send_as_invalid": "Naslov za pošiljanje »%s« je neveljaven ali neznan",
"iam_sync_mode_invalid": "Neveljaven način sinhronizacije",
"iam_sync_unavailable": "Ponudnika identitete ni mogoče sinhronizirati (samo Keycloak in LDAP)",
"tfa_login_locked": "Preveč neuspešnih poskusov prijave z dvostopenjskim preverjanjem; poskusite znova pozneje",
"iam_unavailable": "Ponudnik identitete ni dosegljiv; poskusite znova pozneje.",
"refresh_login_failed": "Seje ni bilo mogoče osvežiti. Prosimo, prijavite se znova.",
"imapsync_source_in_use": "Vir sinhronizacije %s še vedno uporablja opravilo sinhronizacije in ga ni mogoče izbrisati",
"imapsync_source_used_by_others": "Strežnika vira sinhronizacije %s ni mogoče spremeniti, saj ga uporabljajo opravila sinhronizacije drugih poštnih predalov",
"imapsync_source_token_refresh_failed": "Osvežitev žetona OAuth za %s ni uspela",
"imapsync_source_scope_empty": "Izberite vsaj eno domeno za izbrano vidnost",
"imapsync_source_unavailable": "Izbrani vir sinhronizacije ni na voljo",
"imapsync_source_oauth_connect_required": "Pred shranjevanjem tega opravila sinhronizacije se prijavite pri ponudniku.",
"imapsync_source_name_invalid": "Neveljavno ime vira sinhronizacije",
"imapsync_source_host_invalid": "Neveljavno ime gostitelja ali naslov IP",
"imapsync_source_port_invalid": "Neveljavna vrata",
"imapsync_source_enc_invalid": "Neveljaven način šifriranja",
"imapsync_source_auth_invalid": "Neveljaven način preverjanja pristnosti",
"imapsync_custom_param_invalid": "Parametri po meri vsebujejo nedovoljeno možnost za imapsync: %s",
"imapsync_source_oauth_required": "OAuth2 zahteva končno točko za žetone, ID odjemalca, skrivnost odjemalca in obseg.",
"imapsync_source_oauth_endpoint_invalid": "Neveljavna končna točka OAuth2: zahtevan je naslov URL s protokolom https:// in veljavnim imenom gostitelja (viri, ki jih ni ustvaril skrbnik, potrebujejo javno dostopnega gostitelja)",
"imapsync_source_oauth_extra_invalid": "Dodatni parametri OAuth2 morajo biti objekt JSON s preprostimi vrednostmi, npr. {\"vir\": \"https://example.com\"}",
"imapsync_source_tenant_missing": "Vnesite najemnika Microsoft 365",
"imapsync_source_oauth_invalid": "Neveljavna konfiguracija OAuth2",
"imapsync_max_parallel_invalid": "Število vzporednih procesov mora biti med 1 in 32",
"imapsync_source_description_invalid": "Opis ne sme presegati 255 znakov.",
"imapsync_source_refresh_unsupported": "Ročno osveževanje žetonov je na voljo samo za vire poverilnic odjemalcev",
"imapsync_custom_params_format": "Prilagojene parametre je treba poslati kot seznam parov možnost/vrednost",
"imapsync_custom_param_value": "Neveljavna vrednost za možnost %s programa imapsync (manjkajoča vrednost, vrednost, podana pri zastavici, ali nedovoljena vrednost)",
"imapsync_job_running": "Opravilo sinhronizacije %s se trenutno izvaja, zato ga ni mogoče načrtovati za naslednji izvedbeni termin",
"imapsync_user1_invalid": "Neveljavno oddaljeno uporabniško ime",
"imapsync_max_kb_per_second_invalid": "Omejitev pasovne širine mora biti med 0 in 10485760 KB/s"
"ui_theme_invalid": "Tema ni najdena"
},
"debug": {
"containers_info": "Informacije o zabojniku",
@@ -905,13 +764,7 @@
"internal_info": "Notranji vzdevki so dostopni samo iz lastne domene ali vzdevkov domen.",
"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.",
"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.",
"iam_idp_disabled": "Prijava onemogočena zaradi sinhronizacije z IdP",
"iam_link": "Povezava do IdP",
"iam_link_info": "Poštni predal je povezan s tem uporabnikom IdP. Če je bil naslov dodeljen drugemu uporabniku IdP, povezavo odstranite; ponovna povezava se vzpostavi prek e-pošte.",
"iam_missing_since": "Manjka v IdP od",
"iam_not_linked": "Še ni povezano",
"iam_unlink": "Odstrani povezavo"
"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": {
"restart_container_info": "<b>Pomembno:</b> Eleganten ponovni zagon lahko traja nekaj časa, zato počakajte, da se konča.",
@@ -1043,7 +896,7 @@
"mailbox_defaults": "Privzete nastavitve",
"mailbox_defquota": "Privzeta velikost poštnega nabiralnika",
"mailbox_templates": "Predloge poštnih nabiralnikov",
"mailbox_quota": "Največja velikost poštnega predala",
"mailbox_quota": "Največja velikost poštnega nabiralnika",
"mailboxes": "Poštni nabiralniki",
"max_aliases": "Največje število vzdevkov",
"max_mailboxes": "Največje možno število poštnih predalov",
@@ -1118,9 +971,7 @@
"sieve_info": "Na uporabnika lahko shranite več filtrov, vendar je lahko hkrati aktiven le en predfilter in en postfilter.<br>\nVsak filter bo obdelan v opisanem vrstnem redu. Niti neuspešen skript niti izdan ukaz »keep;« ne bosta ustavila obdelave nadaljnjih skript. Spremembe globalnih skriptov sita bodo sprožile ponovni zagon Dovecota.<br><br>Globalni predfilter sita &#8226; Predfilter &#8226; Uporabniški skripti &#8226; Postfilter &#8226; Globalni postfilter sita",
"tls_policy_maps_info": "Ta preslikava pravilnikov preglasi pravila odhodnega prenosa TLS neodvisno od uporabnikovih nastavitev pravilnikov TLS.<br>\n Za več informacij preverite <a href=\"http://www.postfix.org/postconf.5.html#smtp_tls_policy_maps\" target=\"_blank\">dokumentacijo »smtp_tls_policy_maps«</a>.",
"internal": "Notranje",
"force_tfa": "TFA",
"shared_mailbox": "Skupni poštni predal",
"shared_mailbox_info": "Nima lastne prijave (IMAP, SMTP, SOGo, ActiveSync, gesla za aplikacije, uporabniški vmesnik mailcow). Prejema e-pošto, člani skupin pa do nje dostopajo prek deljenih map. Geslo ni potrebno."
"force_tfa": "TFA"
},
"fido2": {
"known_ids": "Znani ID-ji",
@@ -1321,21 +1172,7 @@
"item_released": "Izdan je bil element %s",
"saved_settings": "Shranjene nastavitve",
"learned_ham": "Uspešno naučen ID %s kot zaželjen",
"ui_theme_modified": "Tema je bila uspešno shranjena",
"api_key_added": "Ključ API %s je bil dodan",
"api_key_deleted": "Ključ API %s je bil izbrisan",
"api_key_modified": "Spremembe ključa API %s so bile shranjene",
"group_added": "Skupina %s je bila dodana",
"group_modified": "Spremembe skupine %s so bile shranjene",
"group_removed": "Skupina %s je bila odstranjena",
"iam_link_removed": "Povezava IdP za %s je bila odstranjena",
"iam_sync_requested": "Postopek sinhronizacije je v čakalni vrsti; začel se bo v eni minuti.",
"imapsync_source_added": "Vir sinhronizacije %s je bil dodan",
"imapsync_source_modified": "Vir sinhronizacije %s je bil shranjen",
"imapsync_source_deleted": "Vir sinhronizacije %s je bil izbrisan",
"imapsync_source_token_refreshed": "Žeton OAuth za %s je bil osvežen",
"max_parallel_saved": "Nastavitve opravila sinhronizacije so shranjene",
"imapsync_run_next_done": "%s opravilo(-a) za sinhronizacijo premaknjeno(-a) na začetek čakalne vrste"
"ui_theme_modified": "Tema je bila uspešno shranjena"
},
"start": {
"imap_smtp_server_auth_info": "Prosimo, uporabite svoj celoten e-poštni naslov in mehanizem za preverjanje pristnosti PLAIN.<br>\nVaši podatki za prijavo bodo šifrirani z obveznim šifriranjem na strani strežnika.",
@@ -1372,8 +1209,7 @@
"force_tfa_info": "Uporabnik bo moral pred dostopom do nadzorne plošče nastaviti dvofaktorsko overjanje.",
"setup_title": "Zahtevana je dvofaktorska avtentikacija",
"setup_required": "Vaš račun zahteva dvofaktorsko overjanje. Za nadaljevanje nastavite metodo dvofaktorske overitve.",
"cancel_setup": "Prekliči in se odjavi",
"webauthn_registration_failed": "Registracija WebAuthn ni uspela. Verodajnice ni bilo mogoče preveriti; poskusite znova."
"cancel_setup": "Prekliči in se odjavi"
},
"ratelimit": {
"disabled": "Onemogočeno",
@@ -1411,103 +1247,7 @@
"timeout1": "Časovna omejitev za povezavo do oddaljenega gostitelja",
"timeout2": "Časovna omejitev za povezavo do lokalnega gostitelja",
"maxbytespersecond": "Največ bajtov na sekundo <br><small>(0 = neomejeno)</small>",
"custom_params": "Parametri po meri",
"sources_panel": "Viri za sinhronizacijo",
"sources_hint": "Viri sinhronizacije določajo strežnike IMAP (in način njihove overitve), ki jih je mogoče ponovno uporabiti pri opravilih sinhronizacije. Vsak vir določite enkrat, nato pa ga pri ustvarjanju opravil sinhronizacije izberite s spustnega seznama.",
"source_add": "Dodaj vir",
"source": "Vir",
"source_name": "Ime",
"source_description": "Opis",
"source_scope": "Vidljivost",
"source_scope_all": "Vsi uporabniki",
"source_scope_domain": "Specifične domene",
"source_scope_user": "Specifični uporabniki",
"source_domains": "Domene",
"source_users": "Uporabniki",
"source_select": "Izberi vir",
"source_auth_type": "Overjanje",
"source_oauth_block": "Konfiguracija OAuth2",
"source_token_status": "Žeton veljaven do",
"source_token_error": "Napaka pri zadnji osvežitvi",
"source_refresh_now": "Osveži žeton zdaj",
"source_secret_unchanged_hint": "Pustite prazno, da ohranite shranjeno skrivnost.",
"source_oauth_flow": "Postopek OAuth2",
"source_oauth_flow_app": "Aplikacija (poverilnice odjemalca)",
"source_oauth_flow_user": "Prijava uporabnika (koda za avtorizacijo)",
"source_flow_badge_app": "Poverilnice stranke",
"source_flow_badge_user": "Prijava uporabnika",
"token_state_issued": "Žeton izdan",
"token_state_pending": "Žeton v čakanju",
"token_state_failed": "Žeton ni uspel",
"source_authorize_endpoint": "Avtorizacija končne točke",
"source_userinfo_endpoint": "Končna točka za podatke o uporabniku",
"source_redirect_uri": "URI za preusmeritev",
"source_redirect_uri_hint": "Registrirajte ta URI v aplikaciji ponudnika (npr. Azure). Prijava prek ponudnika deluje le, če se mailcow odpre prek tega imena gostitelja.",
"syncjob_oauth_connect": "Prijavite se s ponudnikom",
"syncjob_oauth_connected": "Povezano",
"syncjob_OAUTH_TOKEN_NOT_READY": "Žeton OAuth ni pripravljen (znova se prijavite ali počakajte na osvežitev žetona)",
"custom_params_hint": "V vsako vrstico vnesite eno možnost za imapsync. Sprejete so le možnosti s seznama dovoljenih; vrednost lahko vsebuje poljubne znake (presledke, regularne izraze itd.) in se posreduje kot en sam argument.",
"custom_param_option": "Možnost",
"custom_param_value": "Vrednost",
"custom_param_no_value": "vrednost ni potrebna",
"custom_param_add": "Dodaj parameter",
"prio": "Prednostna naloga",
"prio_hint": "Opravila z višjo prioriteto se izvedejo prva. Znotraj iste prioritete imajo prednost opravila, ki še nikoli niso bila izvedena, sledijo jim tista, ki so bila izvedena najmanj nedavno (0 = običajno).",
"oauth_popup_title": "Prijavite se s ponudnikom",
"oauth_popup_success": "Povezano. To okno lahko zaprete.",
"oauth_popup_failed": "Prijava ni uspela. To okno lahko zaprete.",
"oauth_error_access_denied": "Nimate dovoljenja za upravljanje opravil sinhronizacije",
"oauth_error_mailbox_denied": "Ni dostopa do izbranega lokalnega poštnega predala",
"oauth_error_source_unavailable": "Vir sinhronizacije ni na voljo ali pa ni konfiguriran za prijavo prek ponudnika",
"oauth_error_provider_denied": "Ponudnik je zavrnil prijavo",
"oauth_error_invalid_state": "Seja za prijavo je potekla ali pa ni veljavna; poskusite znova",
"oauth_error_token_failed": "Ponudnik ni izdal žetona (preverite ID odjemalca, skrivnost in URI za preusmeritev)",
"oauth_error_no_identity": "Ponudnik ni vrnil e-poštnega naslova za prijavljeni račun",
"user2_label": "Lokalni poštni predal (cilj)",
"user1_label": "Uporabniško ime na oddaljeni strani (vir)",
"password1_label": "Geslo za oddaljeni dostop (vir)",
"no_sources": "Na voljo ni vira za sinhronizacijo. Najprej dodajte vir za sinhronizacijo.",
"source_list_error": "Virov za sinhronizacijo ni bilo mogoče naložiti",
"source_not_visible": "(ni vidno)",
"oauth_waiting": "Čakanje na ponudnika…",
"oauth_popup_blocked": "Okno za prijavo je bilo blokirano. Za to spletno mesto omogočite pojavna okna in poskusite znova.",
"oauth_select_mailbox": "Najprej izberite lokalni poštni predal",
"oauth_error_unknown": "Prijava ni uspela",
"oauth_hint": "Oddaljeno uporabniško ime se pridobi iz računa, ki je bil uporabljen za prijavo pri ponudniku.",
"token_state_none": "Žeton v čakanju",
"custom_params_legacy": "Podedovani parametri (niso bili preneseni)",
"custom_params_legacy_hint": "Te parametre po meri iz prvotnega opravila sinhronizacije ni bilo mogoče pretvoriti, zato so prezrti. Možnosti, ki jih še vedno potrebujete, dodajte z zgornjim urejevalnikom parametrov.",
"custom_params_legacy_badge": "Podedovani parametri",
"custom_param_remove": "Odstrani parameter",
"never_run": "Nikoli",
"status_inactive": "Neaktivno",
"source_server": "Izvorni strežnik",
"id": "ID",
"source_created_by": "Ustvaril/a",
"source_oauth_token_endpoint": "Končna točka za žetone",
"source_oauth_client_id": "ID odjemalca",
"source_oauth_client_secret": "Skrivnost odjemalca",
"source_oauth_scope": "Obseg",
"source_oauth_extra_params": "Dodatni parametri (JSON)",
"source_oauth_extra_params_hint": "Izbirni objekt JSON. Parametri prompt, access_type, login_hint, domain_hint in hd se pošljejo ob prijavi pri ponudniku, vsi ostali pa ob zahtevku za žeton, npr. {\"vir\": \"https://provider.example.com\"}",
"source_presets": "Prednastavitve",
"source_presets_hint": "Izpolni nastavitve strežnika ponudnika. Številni ponudniki (npr. Gmail, iCloud, Yahoo) zahtevajo uporabo gesla za aplikacijo ali omogočanje dostopa prek protokola IMAP v nastavitvah poštnega predala.",
"source_tenant": "Najemnik Microsoft 365",
"source_tenant_hint": "ID imenika (najemnika) ali domena najemnika, npr. contoso.onmicrosoft.com. Vstavi se v končne točke.",
"source_scope_cc_hint": "Viri, ki uporabljajo tok poverilnic odjemalca, so vedno zasebni za svojega ustvarjalca.",
"source_readonly_hint": "Ta vir sinhronizacije je v skupni rabi z vami in ga je mogoče le ogledati.",
"source_verify_cert": "Preverite potrdilo strežnika",
"source_verify_cert_hint": "Za SSL in STARTTLS. Izklopite za strežnike s samopodpisanim ali poteklim potrdilom oziroma s potrdilom, ki se ne ujema z gostiteljem.",
"source_verify_cert_off": "Potrdilo strežnika ni preverjeno",
"copy": "Kopiraj",
"copied": "Kopirano v odložišče",
"source_view": "Prikaži",
"custom_params_options_error": "Seznama dovoljenih možnosti za imapsync ni bilo mogoče naložiti",
"source_missing": "Temu opravilu ni dodeljen vir za sinhronizacijo. Prosimo, izberite vir.",
"oauth_window_closed": "Okno za prijavo se je zaprlo, še preden je prispel rezultat. Če ste postopek prijave zaključili, ponovno naložite stran ali poskusite znova.",
"custom_params_legacy_badge_title": "Stare parametre po meri, ki jih ni bilo mogoče pretvoriti, se prezre. Za podrobnosti odprite stran za urejanje.",
"status_waiting": "Čakanje",
"status_running": "V teku"
"custom_params": "Parametri po meri"
},
"user": {
"open_webmail_sso": "Spletna pošta",
@@ -1684,62 +1424,6 @@
"no_active_admin": "Zadnjega aktivnega skrbnika ni mogoče deaktivirati",
"quota_exceeded_scope": "Kvota domene presežena: V tem obsegu domene je mogoče ustvariti le neomejeno število poštnih predalov.",
"session_token": "Neveljaven žeton obrazca: Neujemanje žetonov",
"session_ua": "Neveljaven žeton obrazca: Napaka pri preverjanju uporabniškega agenta",
"group_imap_grant_failed": "Dostopa do poštnega predala %s v sistemu Dovecot še ni bilo mogoče nastaviti; ponovni poskus bo izveden vsakih 15 minut",
"group_sogo_init_failed": "Map SOGo za %s še ni bilo mogoče ustvariti; ponovni poskus bo izveden vsakih 15 minut",
"group_subscription_failed": "Naročnina za %s ni uspela; poskus se samodejno se ponovi",
"group_template_failed": "Predloge %s ni bilo mogoče uporabiti na %s",
"group_too_many_members": "Skupina %s ima več kot %s članov. Postfix dostavi pošto na naslov, ki ima največ toliko prejemnikov."
},
"groups": {
"active": "Aktivno",
"add": "Dodaj skupino",
"address": "Skupinski naslov",
"address_hint": "Neobvezno. Pošta na ta naslov se dostavi vsem članom.",
"description": "Opis",
"domain": "Domena",
"effective_template": "Predloga iz skupin",
"grant_add": "Dodaj",
"grant_folder": "ID mape v SOGo, osebna = privzeta mapa",
"grant_owner": "Poštni nabiralnik",
"grant_state_applied": "Aktivno",
"grant_state_failed": "Neuspešno",
"grant_state_pending": "V čakanju",
"grant_subscribe": "Naroči se",
"grant_subscribe_imap_hint": "V roku ene minute naroči mape poštnega predala za vsakega člana, tako da so te vidne v e-poštnih odjemalcih. Pomembno: če se član odjavi, to stanje ostane nespremenjeno",
"grant_subscribe_sogo_hint": "Mapa se v roku ene minute doda v SOGo vsakega člana – vendar le enkrat: če jo član odstrani, ostane odstranjena.",
"group": "Skupina",
"groups": "Skupine",
"idp": "IdP",
"idp_member": "Sinhronizirano iz ponudnika identitet; spremeniti je mogoče le tam",
"idp_ref": "Skupina IdP",
"imap_grants": "Dostop do poštnega predala",
"imap_grants_hint": "Člani odprejo te poštne nabiralnike v svojem poštnem odjemalcu (mapa V skupni rabi/<poštni nabiralnik>). Branje: branje in označevanje kot prebrano. Pisanje: tudi shranjevanje, premikanje in brisanje e-pošte. Polni dostop: tudi brisanje map. Za poštne nabiralnike ekipe brez lastne prijave označite nabiralnik kot skupni nabiralnik.",
"info": "Skupine združujejo nabiralnike. Skupina ima lahko svoj naslov: vzdevek, ki samodejno dostavlja vsem članom. Člani lahko pošiljajo kot drugi naslovi, dostopajo do skupnih nabiralnikov, koledarjev in imenikov ter dobijo predlogo nabiralnika. Člani, sinhronizirani s ponudnikom identitete, so označeni z IdP.",
"internal": "Sprejemaj pošto samo od pošiljateljev iz domene",
"list_error": "Skupin ni bilo mogoče naložiti",
"managed_alias": "Upravlja skupina %s",
"members": "Člani",
"memberships": "Članstva v skupinah",
"name": "Ime",
"no_memberships": "Ni član nobene skupine",
"priority": "Prednostna naloga",
"reapply_template": "Ponovno uporabite predlogo za vse člane",
"rights_full": "Popoln dostop",
"rights_read": "Beri",
"rights_write": "Piši",
"send_as": "Pošlji kot",
"send_as_groups": "Lahko pošlje kot (prek skupin)",
"send_as_hint": "Naslovi (poštni predal ali vzdevek) ali @domena, v imenu katerih lahko člani pošiljajo sporočila – en naslov v vsaki vrstici.",
"sender_allowed": "Člani lahko pošiljajo prek naslova skupine",
"sogo_grants": "Koledarji in imeniki",
"sogo_grants_hint": "Člani dobijo dostop do mape SOGo v poštnem predalu. Z izbiro možnosti »Naroči se« (Subscribe) se mapa samodejno prikaže v njihovem vmesniku SOGo; v nasprotnem primeru se morajo nanjo naročiti sami. Na čakanju: poštni predal še ni odprl vmesnika SOGo.",
"sogo_visible": "Prikaži naslov skupine kot identiteto v SOGo",
"template": "Predloga poštnega predala",
"template_hint": "Velja za vse člane. Če je poštni predal vključen v več skupin, prevzame predlogo skupine z najvišjo prioriteto.",
"template_none": "Brez predloge",
"type_calendar": "Koledar",
"type_contacts": "Imenik",
"view": "Pogled"
"session_ua": "Neveljaven žeton obrazca: Napaka pri preverjanju uporabniškega agenta"
}
}
+11 -17
View File
@@ -416,24 +416,18 @@ function recursiveBase64StrToArrayBuffer(obj) {
return navigator.credentials.create(json);
}).then(function(cred) {
return {
clientDataJSON: arrayBufferToBase64(cred.response.clientDataJSON),
attestationObject: arrayBufferToBase64(cred.response.attestationObject),
key_id: keyId,
tfa_method: 'webauthn',
confirm_password: ''
id: cred.id,
rawId: arrayBufferToBase64(cred.rawId),
response: {
attestationObject: arrayBufferToBase64(cred.response.attestationObject),
clientDataJSON: arrayBufferToBase64(cred.response.clientDataJSON)
},
type: cred.type
};
}).then(JSON.stringify).then(function(credentialData) {
// send the attestation to the JSON API, like the regular WebAuthn modal does,
// so that the credential is parsed and stored correctly
return window.fetch('/api/v1/add/webauthn-tfa-registration', {method: 'POST', body: credentialData, cache: 'no-cache'});
}).then(function(response) {
return response.json();
}).then(function(json) {
if (json.success) {
window.location = window.location.href.split('#')[0];
} else {
throw new Error(json.msg);
}
}).then(function(credData) {
$('#setup_webauthn_register_data').val(JSON.stringify(credData));
$('#setup_webauthn_reg_form input[name=set_tfa]').val('1');
$('#setup_webauthn_reg_form').submit();
}).catch(function(err) {
$('#setup_webauthn_return_code').show().text(err.message || 'Registration failed');
});
+3 -5
View File
@@ -97,11 +97,9 @@
<div class="col-sm-10">
<select data-live-search="true" data-width="100%" style="width:100%" id="editSelectSenderACL" name="sender_acl" size="10" multiple>
{% for domain in sender_acl_handles.sender_acl_domains.ro %}
{% if domain == '*' or mailcow_cc_role == 'admin' %}
<option data-subtext="Admin" value="{{ domain }}" disabled selected>
{{ lang.edit.dont_check_sender_acl|format(domain) }}
</option>
{% endif %}
<option data-subtext="Admin" value="{{ domain }}" disabled selected>
{{ lang.edit.dont_check_sender_acl|format(domain) }}
</option>
{% endfor %}
{% for domain in sender_acl_handles.sender_acl_domains.rw %}
<option value="{{ domain }}" selected>
+5 -5
View File
@@ -68,7 +68,7 @@ services:
- redis
clamd-mailcow:
image: ghcr.io/mailcow/clamd:1.4.6-2
image: ghcr.io/mailcow/clamd:1.4.6-1
restart: always
depends_on:
unbound-mailcow:
@@ -348,7 +348,7 @@ services:
- dovecot
postfix-mailcow:
image: ghcr.io/mailcow/postfix:3.10.13-1
image: ghcr.io/mailcow/postfix:3.10.12-1
depends_on:
mysql-mailcow:
condition: service_started
@@ -391,7 +391,7 @@ services:
- postfix
postfix-tlspol-mailcow:
image: ghcr.io/mailcow/postfix-tlspol:1.14.5
image: ghcr.io/mailcow/postfix-tlspol:1.14.0
depends_on:
unbound-mailcow:
condition: service_healthy
@@ -428,7 +428,7 @@ services:
- php-fpm-mailcow
- sogo-mailcow
- rspamd-mailcow
image: ghcr.io/mailcow/nginx:1.30.6-3
image: ghcr.io/mailcow/nginx:1.30.6-2
dns:
- ${IPV4_NETWORK:-172.22.1}.254
environment:
@@ -612,7 +612,7 @@ services:
- watchdog
dockerapi-mailcow:
image: ghcr.io/mailcow/dockerapi:2.16
image: ghcr.io/mailcow/dockerapi:2.15
security_opt:
- label=disable
restart: always
-113
View File
@@ -1,113 +0,0 @@
<?php
declare(strict_types=1);
namespace Mailcow\Tests\Auth;
use PDO;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
require_once __DIR__ . '/../Support/legacy_auth_functions.php';
require_once __DIR__ . '/../../../data/web/inc/functions.auth.inc.php';
// Legacy apppass_login() with its own query, on an in-memory SQLite database
class AppPasswordLoginTest extends TestCase
{
private const PROTOCOLS = ['imap_access', 'smtp_access', 'pop3_access', 'sieve_access', 'eas_access', 'dav_access'];
private PDO $pdo;
protected function setUp(): void
{
$this->pdo = new PDO('sqlite::memory:');
$this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$this->pdo->sqliteCreateFunction('regexp', fn ($pattern, $value) => preg_match('/' . $pattern . '/', (string)$value) === 1, 2);
$this->pdo->exec("CREATE TABLE `domain` (`domain` TEXT PRIMARY KEY, `active` INTEGER NOT NULL DEFAULT 1)");
$this->pdo->exec("CREATE TABLE `mailbox` (`username` TEXT PRIMARY KEY, `domain` TEXT, `kind` TEXT NOT NULL DEFAULT '',
`active` INTEGER NOT NULL DEFAULT 1, `attributes` TEXT)");
$this->pdo->exec("CREATE TABLE `app_passwd` (`id` INTEGER PRIMARY KEY, `name` TEXT, `mailbox` TEXT, `password` TEXT,
`active` INTEGER NOT NULL DEFAULT 1, " . implode(', ', array_map(fn ($p) => "`$p` INTEGER NOT NULL DEFAULT 0", self::PROTOCOLS)) . ")");
$GLOBALS['pdo'] = $this->pdo;
$_SESSION = [];
}
protected function tearDown(): void
{
unset($GLOBALS['pdo']);
$_SESSION = [];
}
public static function logins(): array
{
$off = array_fill_keys(self::PROTOCOLS, '0');
return [
// [mailbox, domain active, app password, service, password, result, denied]
'imap' => [[], 1, ['imap_access' => 1], 'imap', 'app-secret', 'user', false],
'imap, mailbox imap off' => [['attributes' => $off], 1, ['imap_access' => 1, 'smtp_access' => 1], 'imap', 'app-secret', 'user', false],
'smtp, mailbox smtp off' => [['attributes' => $off], 1, ['imap_access' => 1, 'smtp_access' => 1], 'smtp', 'app-secret', 'user', false],
'eas, mailbox eas off' => [['attributes' => $off], 1, ['eas_access' => 1], 'EAS', 'app-secret', 'user', false],
'dav, mailbox dav off' => [['attributes' => $off], 1, ['dav_access' => 1], 'DAV', 'app-secret', 'user', false],
// denied: right password, login not allowed
'protocol not in app password' => [[], 1, ['imap_access' => 1, 'smtp_access' => 1], 'pop3', 'app-secret', false, true],
'app password inactive' => [[], 1, ['imap_access' => 1, 'active' => 0], 'imap', 'app-secret', false, true],
'mailbox inactive' => [['active' => 0], 1, ['imap_access' => 1], 'imap', 'app-secret', false, true],
'mailbox login disabled' => [['active' => 2], 1, ['imap_access' => 1], 'imap', 'app-secret', false, true],
'domain inactive' => [[], 0, ['imap_access' => 1], 'imap', 'app-secret', false, true],
'shared mailbox' => [['attributes' => ['shared' => '1']], 1, ['imap_access' => 1], 'imap', 'app-secret', false, true],
// failed: counted by netfilter
'wrong password' => [[], 1, ['imap_access' => 1], 'imap', 'wrong', false, false],
'resource mailbox' => [['kind' => 'location'], 1, ['imap_access' => 1], 'imap', 'app-secret', false, false],
];
}
#[DataProvider('logins')]
public function testLogin(array $mailbox, int $domainActive, array $appPasswd, string $service, string $password, string|false $result, bool $denied): void
{
$this->addMailbox($mailbox, $domainActive);
$id = $this->addAppPasswd($appPasswd);
$isDenied = false;
$this->assertSame($result, apppass_login('user@example.org', $password, ['service' => $service, 'is_internal' => true], $isDenied));
$this->assertSame($denied, $isDenied);
if ($result !== false) {
$this->assertEquals($id, $_SESSION['app_passwd_id']);
}
}
public function testUiLoginWithoutServiceIsRefused(): void
{
$this->addMailbox([], 1);
$this->addAppPasswd(array_fill_keys(self::PROTOCOLS, 1));
$this->assertFalse(apppass_login('user@example.org', 'app-secret', ['is_internal' => false]));
}
public function testOtherAppPasswordOfTheMailboxIsTried(): void
{
$this->addMailbox(['attributes' => array_fill_keys(self::PROTOCOLS, '0')], 1);
$this->addAppPasswd(['eas_access' => 1], 'other-secret');
$id = $this->addAppPasswd(['imap_access' => 1]);
$this->assertSame('user', apppass_login('user@example.org', 'app-secret', ['service' => 'imap', 'is_internal' => true]));
$this->assertEquals($id, $_SESSION['app_passwd_id']);
}
private function addMailbox(array $mailbox, int $domainActive): void
{
$attributes = array_merge(array_fill_keys(self::PROTOCOLS, '1'), ['shared' => '0'], $mailbox['attributes'] ?? []);
$this->pdo->prepare("INSERT INTO `domain` (`domain`, `active`) VALUES ('example.org', ?)")->execute([$domainActive]);
$this->pdo->prepare("INSERT INTO `mailbox` (`username`, `domain`, `kind`, `active`, `attributes`) VALUES ('user@example.org', 'example.org', ?, ?, ?)")
->execute([$mailbox['kind'] ?? '', $mailbox['active'] ?? 1, json_encode($attributes)]);
}
private function addAppPasswd(array $appPasswd, string $password = 'app-secret'): int
{
$row = array_merge(array_fill_keys(self::PROTOCOLS, 0), ['active' => 1], $appPasswd);
$hash = '{BLF-CRYPT}' . password_hash($password, PASSWORD_BCRYPT, ['cost' => 4]);
$this->pdo->prepare("INSERT INTO `app_passwd` (`name`, `mailbox`, `password`, " . implode(', ', array_map(fn ($c) => "`$c`", array_keys($row))) . ")
VALUES ('test', 'user@example.org', ?, " . implode(', ', array_fill(0, count($row), '?')) . ")")
->execute(array_merge([$hash], array_values($row)));
return (int)$this->pdo->lastInsertId();
}
}
@@ -1,11 +0,0 @@
<?php
// Stand-in for verify_hash() of data/web/inc/functions.inc.php, used by AppPasswordLoginTest only:
// app passwords are stored as {BLF-CRYPT} (bcrypt), the default scheme of hash_password().
if (!function_exists('verify_hash')) {
function verify_hash($hash, $password)
{
return str_starts_with($hash, '{BLF-CRYPT}') && password_verify($password, substr($hash, strlen('{BLF-CRYPT}')));
}
}
+15 -26
View File
@@ -18,18 +18,6 @@ if [ ! -f "${PWD}/mailcow.conf" ]; then
fi
fi
BRANCH="$(cd "${SCRIPT_DIR}" && git rev-parse --abbrev-ref HEAD)"
UPDATE_ARGS=("$@")
SCRIPT_HASH="$(sha256sum "${SCRIPT_DIR}/update.sh" | awk '{print $1}')"
restart_update_script() {
if [[ "${MAILCOW_UPDATE_RESTARTS:-0}" -ge 3 ]]; then
echo -e "\e[31mupdate.sh keeps changing, please run it again.\e[0m"
exit 2
fi
export MAILCOW_UPDATE_RESTARTS=$(( ${MAILCOW_UPDATE_RESTARTS:-0} + 1 ))
echo -e "\e[33m$1, restarting the update script...\e[0m"
exec "${SCRIPT_DIR}/update.sh" "${UPDATE_ARGS[@]}"
}
# Check for --dev flag early to skip _modules update
for arg in "$@"; do
@@ -50,9 +38,9 @@ if [ ! "$DEV" ]; then
MODULES_HASH_BEFORE="EMPTY"
fi
echo -e "\e[33mFetching latest _modules and update.sh from origin/${BRANCH}…\e[0m"
echo -e "\e[33mFetching latest _modules from origin/${BRANCH}…\e[0m"
git fetch origin "${BRANCH}"
git checkout "origin/${BRANCH}" -- _modules update.sh
git checkout "origin/${BRANCH}" -- _modules
if [[ ! -d "${MODULE_DIR}" || -z "$(ls -A "${MODULE_DIR}")" ]]; then
echo -e "\e[31mError: _modules is still missing or empty after fetch!\e[0m"
@@ -62,10 +50,10 @@ if [ ! "$DEV" ]; then
# Calculate hash after fetch
MODULES_HASH_AFTER=$(find "${MODULE_DIR}" -type f -exec sha256sum {} \; 2>/dev/null | sort | sha256sum | awk '{print $1}')
# Check if modules or the script changed
if [[ "${MODULES_HASH_BEFORE}" != "${MODULES_HASH_AFTER}" || "$(sha256sum "${SCRIPT_DIR}/update.sh" | awk '{print $1}')" != "${SCRIPT_HASH}" ]]; then
chmod +x "${SCRIPT_DIR}/update.sh"
restart_update_script "update.sh or _modules have been updated"
# Check if modules changed
if [[ "${MODULES_HASH_BEFORE}" != "${MODULES_HASH_AFTER}" ]]; then
echo -e "\e[33m_modules have been updated. Please restart the update script.\e[0m"
exit 2
fi
else
echo -e "\e[33mDeveloper mode: Skipping _modules update from git\e[0m"
@@ -356,12 +344,15 @@ elif [ "$NEW_BRANCH" == "legacy" ] && [ "$CURRENT_BRANCH" != "legacy" ]; then
fi
if [ ! "$DEV" ]; then
EXIT_COUNT=0
echo -e "\e[32mChecking for newer update script...\e[0m"
SHA1_1="$(sha1sum update.sh)"
git fetch origin
git checkout "origin/${BRANCH}" -- update.sh
if [[ "$(sha256sum update.sh | awk '{print $1}')" != "${SCRIPT_HASH}" ]]; then
SHA1_2="$(sha1sum update.sh)"
if [[ "${SHA1_1}" != "${SHA1_2}" ]]; then
chmod +x update.sh
restart_update_script "update.sh has been updated"
EXIT_COUNT+=1
fi
fi
@@ -383,12 +374,10 @@ if ! $COMPOSE_COMMAND config -q; then
fi
echo -e "\e[32mChecking for conflicting bridges...\e[0m"
MAILCOW_BRIDGE=$($COMPOSE_COMMAND config | grep -i com.docker.network.bridge.name | cut -d':' -f2 | tr -d "[:space:]\"'")
if [[ -n "${MAILCOW_BRIDGE}" ]]; then
while read NAT_ID; do
iptables -t nat -D POSTROUTING "$NAT_ID"
done < <(iptables -L -vn -t nat --line-numbers | grep "$IPV4_NETWORK" | grep -E 'MASQUERADE.*all' | grep -vE "[[:space:]]!?${MAILCOW_BRIDGE}[[:space:]]" | cut -d' ' -f1)
fi
MAILCOW_BRIDGE=$($COMPOSE_COMMAND config | grep -i com.docker.network.bridge.name | cut -d':' -f2)
while read NAT_ID; do
iptables -t nat -D POSTROUTING "$NAT_ID"
done < <(iptables -L -vn -t nat --line-numbers | grep "$IPV4_NETWORK" | grep -E 'MASQUERADE.*all' | grep -v "${MAILCOW_BRIDGE}" | cut -d' ' -f1)
DIFF_DIRECTORY=update_diffs
DIFF_FILE=${DIFF_DIRECTORY}/diff_before_update_$(date +"%Y-%m-%d-%H-%M-%S")