mirror of
https://github.com/tomav/docker-mailserver.git
synced 2024-06-22 07:26:59 +02:00
c862e1451d
* chore: Extract change-detection method to it's own helper This doesn't really belong in `helpers/ssl.sh`. Moving to it's own helper script. * chore: Co-locate related change-detection method from container startup It seems relevant to migrate the related support during startup for the change detection feature into this helper. I opted to move the call from `start-mailserver.sh` into the `_setup` call at the end for a more explicit/visible location. * chore: Move `CHKSUM_FILE` into `helpers/change-detection.sh` It belongs there, not in `helpers/index.sh`. * chore: Revise inline documentation * tests(fix): Ensure correct functionality Presently `test/test_helper.bats` is using it's own `CHKSUM_FILE` instead of sourcing the var for the filepath. `test_helper/common.bash` was calling a method to check for changes, but this helper may not correctly detect letsencrypt related changes as these are not ENV rely on, but global vars handled by `helpers/dns.sh`, so that should be run first like it is for `check-for-changes.sh`. * tests(chore): Use `CHKSUM_FILE` var from helper * chore: `addmailuser` should use `CHKSUM_FILE` var * chore: Update `check-for-changes.sh` log message with correct path
75 lines
2.2 KiB
Bash
Executable File
75 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='/tmp/docker-mailserver/postfix-accounts.cf'
|
|
|
|
function __usage
|
|
{
|
|
printf '%s' "${PURPLE}ADDMAILUSER${RED}(${YELLOW}8${RED})
|
|
|
|
${ORANGE}NAME${RESET}
|
|
addmailuser - add an email address (i.e. a user)
|
|
|
|
${ORANGE}SYNOPSIS${RESET}
|
|
./setup.sh email add <EMAIL ADDRESS> [<PASSWORD>]
|
|
|
|
${ORANGE}OPTIONS${RESET}
|
|
${BLUE}Generic Program Information${RESET}
|
|
help Print the usage information.
|
|
|
|
${ORANGE}EXAMPLES${RESET}
|
|
${LWHITE}./setup.sh email add test@domain.tld${RESET}
|
|
Add the email account test@domain.tld. You will be prompted
|
|
to input a password afterwards since no password was supplied.
|
|
|
|
${ORANGE}EXIT STATUS${RESET}
|
|
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)
|
|
# 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"
|
|
if [[ -e ${CHKSUM_FILE} ]]
|
|
then
|
|
while [[ ! -d "/var/mail/${DOMAIN}/${USER}" ]]
|
|
do
|
|
_log 'info' "Waiting for dovecot to create '/var/mail/${DOMAIN}/${USER}/'"
|
|
sleep 1
|
|
done
|
|
fi
|