mirror/docker-mailserver.docker-mailserver
1
0
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver.git synced 2025-07-10 09:24:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Rspamd: improve DKIM key generation (#3876)

Browse source 
* correct removal of old files with `--force`

`rm` would fail when one of the files is not present, which is quite
undesirable log (not harmful until `set -e` is introduced).

* use tmp log file

ref: https://github.com/docker-mailserver/docker-mailserver/issues/3873#issuecomment-1926736020

* correct indentation
This commit is contained in:
Georg Lauterbach 2024-02-06 00:30:22 +01:00 • committed by GitHub
parent 51a3915257
commit 4f222fe256
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 55 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

46
target/scripts/helpers/rspamd.sh
View file

@ -5,9 +5,51 @@
# Perform a specific command as the Rspamd user (`_rspamd`). This is useful
# in case you want to have correct permissions on newly created files or if
# you want to check whether Rspamd can perform a specific action.
#
# @flag ${1} = '--quiet' to indicate whether log should be disabled [OPTIONAL]
function __do_as_rspamd_user() {
_log 'trace' "Running '${*}' as user '_rspamd'"
su _rspamd -s /bin/bash -c "${*}"
if [[ ${1:-} != '--quiet' ]]; then
_log 'trace' "Running '${*}' as user '_rspamd'"
else
shift 1
fi
su _rspamd -s /bin/bash -c "${*} 2>${__RSPAMD_ERR_LOG_FILE:-/dev/null}"
}
# Create a temporary log file (with `mktemp`) that one can filter to search
# for error messages. This is required as `rspamadm` sometimes prints an error
# but does not exit with an error.
#
# The file created is managed in the ENV `__RSPAMD_ERR_LOG_FILE`. This ENV is
# meant for internal usage; do not use it on your scripts. The log file is cleaned
# up when the script exits.
function __create_rspamd_err_log() {
_log 'trace' "Creating Rspamd error log"
trap 'rm -f "${__RSPAMD_ERR_LOG_FILE}"' EXIT # cleanup when we exit
__RSPAMD_ERR_LOG_FILE=$(__do_as_rspamd_user --quiet mktemp)
}
# Print the Rspamd temporary error log. This will succeed only when the log has been
# created before.
function __print_rspamd_err_log() {
[[ -v __RSPAMD_ERR_LOG_FILE ]] && __do_as_rspamd_user cat "${__RSPAMD_ERR_LOG_FILE}"
}
# Print the Rspamd temporary error log. We use `grep` but with "fixed strings", which
# means the message you provide is evaluated as-is, not as a regular expression. This
# will succeed only when the log has been created before.
#
# @param ${1} = message to filter by
function __filter_rspamd_err_log() {
if [[ -v __RSPAMD_ERR_LOG_FILE ]]; then
__do_as_rspamd_user grep \
--quiet \
--ignore-case \
--fixed-strings \
"${1:?A message for filtering is required}" \
"${__RSPAMD_ERR_LOG_FILE}"
fi
}
# Calling this function brings common Rspamd-related environment variables