From b0fde40d8f6b4de25ea14fafda3694b4216da673 Mon Sep 17 00:00:00 2001 From: turboaaa Date: Sun, 17 Mar 2019 17:17:51 -0400 Subject: [PATCH 1/2] Update run.sh Add trusted networks option --- run.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/run.sh b/run.sh index b672c67..247971e 100644 --- a/run.sh +++ b/run.sh @@ -51,5 +51,19 @@ if [ ! -z "${SMTP_HEADER_TAG}" ]; then echo "Setting configuration option SMTP_HEADER_TAG with value: ${SMTP_HEADER_TAG}" fi +#Check for subnet restrictions +nets='10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16' +if [ ! -z "${SMTP_NETWORKS}" ]; then + for i in $(sed 's/,/\ /g' <<<$SMTP_NETWORKS); do + if grep -Eq "[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/[0-9]{1,2}" <<<$i ; then + nets+=", $i" + else + echo "$i is not in proper IPv4 subnet format. Ignoring." + fi + done +fi +add_config_value "mynetworks" "${nets}" + + #Start services supervisord From 67e68970d04c412ef8a89c40aceac4db0ac08d07 Mon Sep 17 00:00:00 2001 From: turboaaa Date: Sun, 17 Mar 2019 17:19:22 -0400 Subject: [PATCH 2/2] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index b9a015f..a175365 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,9 @@ The following env variables need to be passed to the container: The following env variable(s) are optional. * `SMTP_HEADER_TAG` This will add a header for tracking messages upstream. Helpful for spam filters. Will appear as "RelayTag: ${SMTP_HEADER_TAG}" in the email headers. +* `SMTP_NETWORKS` Setting this will allow you to add additional, comma seperated, subnets to use the relay. Used like + -e SMTP_NETWORKS='xxx.xxx.xxx.xxx/xx,xxx.xxx.xxx.xxx/xx' + To use this container from anywhere, the 25 port or the one specified by `SMTP_PORT` needs to be exposed to the docker host server: docker run -d --name postfix -p "25:25" \