mirror of
https://github.com/docker-mailserver/docker-mailserver.git
synced 2024-01-19 02:48:50 +00:00
b9dbec3276
* refactored scripts located under `target/bin/` The scripts under `target/bin/` now use the new log and I replaced some `""` with `''` on the way. The functionality stays the same, this mostly style and log. * corrected fail2ban (script and tests) * corrected OpenDKIM log output in tests * reverted (some) changes to `sedfile` Moreover, a few messages for BATS were streamlined and a regression in the linting script reverted. * apple PR feedback * improve log output from `fail2ban` script The new output has a single, clear message with the '[ ERROR ] ' prefix, and then output that explains the error afterwards. This is coherent with the logging style which should be used while providing more information than just a single line about IPTables not functioning. * simplified `setquota` script * consistently named the `__usage` function Before, scripts located under `target/bin/` were using `usage` or `__usage`. Now, they're using `__usage` as they should. * improved `sedfile` With `sedfile`, we cannot use the helper functions in a nice way because it is used early in the Dockerfile at a stage where the helper scripts are not yet copied. The script has been adjusted to be canonical with all the other scripts under `target/bin/`. * fixed tests * removed `__usage` from places where it does not belong `__usage` is to be used on wrong user input, not on other failures as well. This was fixed in `delquota` and `setquota`. * apply PR review feedback
74 lines
2.2 KiB
Bash
Executable file
74 lines
2.2 KiB
Bash
Executable file
#! /bin/bash
|
|
|
|
# shellcheck disable=SC2094
|
|
|
|
# shellcheck source=../scripts/helpers/index.sh
|
|
source /usr/local/bin/helpers/index.sh
|
|
|
|
DATABASE=${DATABASE:-/tmp/docker-mailserver/postfix-accounts.cf}
|
|
|
|
function __usage
|
|
{
|
|
printf "\e[35mADDMAILUSER\e[31m(\e[93m8\e[31m)
|
|
|
|
\e[38;5;214mNAME\e[39m
|
|
addmailuser - add an email address (i.e. a user)
|
|
|
|
\e[38;5;214mSYNOPSIS\e[39m
|
|
./setup.sh email add <EMAIL ADDRESS> [<PASSWORD>]
|
|
|
|
\e[38;5;214mOPTIONS\e[39m
|
|
\e[94mGeneric Program Information\e[39m
|
|
help Print the usage information.
|
|
|
|
\e[38;5;214mEXAMPLES\e[39m
|
|
\e[37m./setup.sh email add test@domain.tld\e[39m
|
|
Add the email account test@domain.tld. You will be prompted
|
|
to input a password afterwards since no password was supplied.
|
|
|
|
\e[38;5;214mEXIT STATUS\e[39m
|
|
Exit status is 0 if command was successful. If wrong arguments are provided
|
|
or arguments contain errors, the script will exit early with exit status 1.
|
|
|
|
"
|
|
}
|
|
|
|
[[ ${1:-} == 'help' ]] && { __usage ; exit 0 ; }
|
|
|
|
FULL_EMAIL="${1}"
|
|
shift
|
|
PASSWD="${*}"
|
|
|
|
[[ -z ${FULL_EMAIL} ]] && { __usage ; _exit_with_error 'No username specified' ; }
|
|
[[ ${FULL_EMAIL} =~ .*\@.* ]] || { __usage ; _exit_with_error 'Username must include the domain' ; }
|
|
|
|
touch "${DATABASE}"
|
|
_create_lock # Protect config file with lock to avoid race conditions
|
|
if grep -qi "^$(_escape "${FULL_EMAIL}")|" "${DATABASE}"
|
|
then
|
|
_exit_with_error "User '${FULL_EMAIL}' already exists"
|
|
fi
|
|
|
|
if [[ -z ${PASSWD} ]]
|
|
then
|
|
read -r -s -p "Enter Password: " PASSWD
|
|
echo
|
|
[[ -z ${PASSWD} ]] && _exit_with_error "Password must not be empty"
|
|
fi
|
|
|
|
HASH="$(doveadm pw -s SHA512-CRYPT -u "${FULL_EMAIL}" -p "${PASSWD}")"
|
|
echo "${FULL_EMAIL}|${HASH}" >> "${DATABASE}"
|
|
|
|
USER="${FULL_EMAIL%@*}"
|
|
DOMAIN="${FULL_EMAIL#*@}"
|
|
|
|
# Tests fail if the creation of /var/mail/${DOMAIN}/${USER} doesn't happen fast enough after addmailuser executes (check-for-changes.sh race-condition)
|
|
if [[ -e /tmp/docker-mailserver-config-chksum ]] # Prevent infinite loop in tests like "checking accounts: user3 should have been added to /tmp/docker-mailserver/postfix-accounts.cf even when that file does not exist"
|
|
then
|
|
while [[ ! -d "/var/mail/${DOMAIN}/${USER}" ]]
|
|
do
|
|
_log 'info' "Waiting for dovecot to create '/var/mail/${DOMAIN}/${USER}/'"
|
|
sleep 1
|
|
done
|
|
fi
|