mirror of
https://github.com/docker-mailserver/docker-mailserver.git
synced 2024-01-19 02:48:50 +00:00
57aeb6db2a
See the associated PR for more detailed commentary on specific changes.
### Commands refactored:
- User (**All:** add / list / update / del + _dovecot-master variants_)
- Quota (**All:** set / del)
- Virtual Alias (**All:** add / list /del)
- Relay (**All:** add-relayhost / add-sasl / exclude-domain)
### Overall changes involve:
- **Fairly common structure:**
- `_main` method at the top provides an overview of logical steps:
- After all methods are declared beneath it (_and imported from the new `helpers/database/db.sh`_), the `_main` is called at the bottom of the file.
- `delmailuser` additionally processes option support for `-y` prior to calling `_main`.
- `__usage` is now consistent with each of these commands, along with the `help` command.
- Most logic delegated to new helper scripts. Some duplicate content remains on the basis that it's low-risk to maintenance and avoids less hassle to jump between files to check a single line, usually this is arg validation.
- Error handling should be more consistent, along with var names (_no more `USER`/`EMAIL`/`FULL_EMAIL` to refer to the same expected value_).
- **Three new management scripts** (in `helpers/database/manage/`) using a common structure for managing changes to their respective "Database" config file.
- `postfix-accounts.sh` unified not only add and update commands, but also all the dovecot-master versions, a single password call for all 4 of them, with a 5th consumer of the password prompt from the relay command `addsaslpassword`.
- These scripts delegate actual writes to `helpers/database/db.sh` which provides a common API to support the changes made.
- This is more verbose/complex vs the current inline operations each command currently has, as it provides generic support instead of slightly different variations being maintained, along with handling some edge cases that existed and would lead to bugs (notably substring matches).
- Centralizing changes here seems wiser than scattered about. I've tried to make it easy to grok, hopefully it's not worse than the current situation.
- List operations were kept in their respective commands, `db.sh` is only really managing writes. I didn't see a nice way for removing the code duplication for list commands as the duplication was fairly minimal, especially for `listalias` and `listdovecotmasteruser` which were quite simple in their differences in the loop body.
- `listmailuser` and `delmailuser` also retain methods exclusive to respective commands, I wasn't sure if there was any benefit to move those, but they were refactored.
48 lines
1.9 KiB
Bash
48 lines
1.9 KiB
Bash
#! /bin/bash
|
|
|
|
# Manage DB writes for: DATABASE_VIRTUAL
|
|
|
|
# A virtual alias may be any of `user@domain`, `user`, `@domain`.
|
|
# Recipients are local (internal services), hosted (managed accounts), remote (third-party MTA), or aliases themselves,
|
|
# An alias may redirect mail to one or more recipients. If a recipient is an alias Postfix will recursively resolve it.
|
|
#
|
|
# WARNING: Support for multiple and recursive recipients may not be well supported by this projects scripts/features.
|
|
# One of those features is Dovecot Quota support, which uses a naive workaround for supporting quota checks for inbound
|
|
# mail to an alias address.
|
|
|
|
# Logic to perform for requested operations handled here:
|
|
function _manage_virtual_aliases
|
|
{
|
|
local ACTION=${1}
|
|
local MAIL_ALIAS=${2}
|
|
local RECIPIENT=${3}
|
|
|
|
# Validation error handling expects that the caller has defined a '__usage' method:
|
|
[[ -z ${MAIL_ALIAS} ]] && { __usage ; _exit_with_error 'No alias specified' ; }
|
|
[[ -z ${RECIPIENT} ]] && { __usage ; _exit_with_error 'No recipient specified' ; }
|
|
|
|
local DATABASE_VIRTUAL='/tmp/docker-mailserver/postfix-virtual.cf'
|
|
case "${ACTION}" in
|
|
# Associate RECIPIENT to MAIL_ALIAS:
|
|
( 'update' )
|
|
_db_entry_add_or_append "${DATABASE_VIRTUAL}" "${MAIL_ALIAS}" "${RECIPIENT}"
|
|
;;
|
|
|
|
# Removes RECIPIENT from MAIL_ALIAS - or all aliases when MAIL_ALIAS='_':
|
|
# NOTE: If a matched alias has no additional recipients, it is also removed.
|
|
( 'delete' )
|
|
[[ ${MAIL_ALIAS} == '_' ]] && MAIL_ALIAS='\S\+'
|
|
_db_entry_remove "${DATABASE_VIRTUAL}" "${MAIL_ALIAS}" "${RECIPIENT}"
|
|
;;
|
|
|
|
( * ) # This should not happen if using convenience wrapper methods:
|
|
_exit_with_error "Unsupported Action: '${ACTION}'"
|
|
;;
|
|
|
|
esac
|
|
}
|
|
|
|
# Convenience wrappers:
|
|
function _manage_virtual_aliases_update { _manage_virtual_aliases 'update' "${@}" ; } # addalias
|
|
function _manage_virtual_aliases_delete { _manage_virtual_aliases 'delete' "${@}" ; } # delalias, delmailuser
|