[Astlinux-commits] SF.net SVN: astlinux:[7639] branches/1.0

[<abe...@us...>]

Revision: 7639
          http://sourceforge.net/p/astlinux/code/7639
Author:   abelbeck
Date:     2016-04-16 13:51:22 +0000 (Sat, 16 Apr 2016)
Log Message:
-----------
notifications, followup to r7597, sanity check for From: header format <a@b.tld>

Revision Links:
--------------
    http://sourceforge.net/p/astlinux/code/7597

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk-sip-monitor
    branches/1.0/package/asterisk/safe_asterisk
    branches/1.0/package/monit/monit.init
    branches/1.0/package/msmtp/testmail.sh
    branches/1.0/package/nut/upsnotify.sh
    branches/1.0/project/astlinux/target_skeleton/usr/sbin/wan-failover

Modified: branches/1.0/package/asterisk/asterisk-sip-monitor
===================================================================
--- branches/1.0/package/asterisk/asterisk-sip-monitor	2016-04-14 17:04:48 UTC (rev 7638)
+++ branches/1.0/package/asterisk/asterisk-sip-monitor	2016-04-16 13:51:22 UTC (rev 7639)
@@ -23,6 +23,10 @@
 NOTIFY="$SAFE_ASTERISK_NOTIFY"                # Who to notify with alerts, space separate
 NOTIFY_FROM="$SAFE_ASTERISK_NOTIFY_FROM"      # From email header (optional)
 
+# Extract from possible <a@b.tld> format
+NOTIFY_FROM="${NOTIFY_FROM##*<}"
+NOTIFY_FROM="${NOTIFY_FROM%%>*}"
+
 if [ -z "$NOTIFY_FROM" -a -n "$SMTP_DOMAIN" ]; then
   NOTIFY_FROM="asterisk@$SMTP_DOMAIN"
 fi

Modified: branches/1.0/package/asterisk/safe_asterisk
===================================================================
--- branches/1.0/package/asterisk/safe_asterisk	2016-04-14 17:04:48 UTC (rev 7638)
+++ branches/1.0/package/asterisk/safe_asterisk	2016-04-16 13:51:22 UTC (rev 7639)
@@ -20,6 +20,10 @@
   TTY=""
 fi
 
+# Extract from possible <a@b.tld> format
+NOTIFY_FROM="${NOTIFY_FROM##*<}"
+NOTIFY_FROM="${NOTIFY_FROM%%>*}"
+
 if [ -z "$NOTIFY_FROM" -a -n "$SMTP_DOMAIN" ]; then
   NOTIFY_FROM="asterisk@$SMTP_DOMAIN"
 fi

Modified: branches/1.0/package/monit/monit.init
===================================================================
--- branches/1.0/package/monit/monit.init	2016-04-14 17:04:48 UTC (rev 7638)
+++ branches/1.0/package/monit/monit.init	2016-04-16 13:51:22 UTC (rev 7639)
@@ -26,12 +26,20 @@
     echo "set alert $i not on { action, instance }"
   done
 
-  if [ -n "$MONIT_NOTIFY_FROM" ]; then
-    echo "set mail-format { from: \"Monit-$HOSTNAME\" <$MONIT_NOTIFY_FROM> }"
-  elif [ -n "$SMTP_DOMAIN" ]; then
-    echo "set mail-format { from: \"Monit-$HOSTNAME\" <monit@$SMTP_DOMAIN> }"
+  NOTIFY_FROM="$MONIT_NOTIFY_FROM"
+
+  # Extract from possible <a@b.tld> format
+  NOTIFY_FROM="${NOTIFY_FROM##*<}"
+  NOTIFY_FROM="${NOTIFY_FROM%%>*}"
+
+  if [ -z "$NOTIFY_FROM" -a -n "$SMTP_DOMAIN" ]; then
+    NOTIFY_FROM="monit@$SMTP_DOMAIN"
   fi
 
+  if [ -n "$NOTIFY_FROM" ]; then
+    echo "set mail-format { from: \"Monit-$HOSTNAME\" <$NOTIFY_FROM> }"
+  fi
+
   echo "
 include /etc/monit/monit.d/*.conf"
 }

Modified: branches/1.0/package/msmtp/testmail.sh
===================================================================
--- branches/1.0/package/msmtp/testmail.sh	2016-04-14 17:04:48 UTC (rev 7638)
+++ branches/1.0/package/msmtp/testmail.sh	2016-04-16 13:51:22 UTC (rev 7639)
@@ -35,6 +35,10 @@
   exit 1
 fi
 
+# Extract from possible <a@b.tld> format
+FROM="${FROM##*<}"
+FROM="${FROM%%>*}"
+
 if [ -z "$FROM" -a -n "$SMTP_DOMAIN" ]; then
   FROM="noreply@$SMTP_DOMAIN"
 fi

Modified: branches/1.0/package/nut/upsnotify.sh
===================================================================
--- branches/1.0/package/nut/upsnotify.sh	2016-04-14 17:04:48 UTC (rev 7638)
+++ branches/1.0/package/nut/upsnotify.sh	2016-04-16 13:51:22 UTC (rev 7639)
@@ -16,6 +16,10 @@
 NOTIFY="$UPS_NOTIFY"
 NOTIFY_FROM="$UPS_NOTIFY_FROM"
 
+# Extract from possible <a@b.tld> format
+NOTIFY_FROM="${NOTIFY_FROM##*<}"
+NOTIFY_FROM="${NOTIFY_FROM%%>*}"
+
 if [ -z "$NOTIFY_FROM" -a -n "$SMTP_DOMAIN" ]; then
   NOTIFY_FROM="noreply@$SMTP_DOMAIN"
 fi

Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/wan-failover
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/wan-failover	2016-04-14 17:04:48 UTC (rev 7638)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/wan-failover	2016-04-16 13:51:22 UTC (rev 7639)
@@ -27,6 +27,14 @@
 NOTIFY="$WAN_FAILOVER_NOTIFY"                # Who to notify with email alerts, space separate
 NOTIFY_FROM="$WAN_FAILOVER_NOTIFY_FROM"      # From email header (optional)
 
+# Extract from possible <a@b.tld> format
+NOTIFY_FROM="${NOTIFY_FROM##*<}"
+NOTIFY_FROM="${NOTIFY_FROM%%>*}"
+
+if [ -z "$NOTIFY_FROM" -a -n "$SMTP_DOMAIN" ]; then
+  NOTIFY_FROM="noreply@$SMTP_DOMAIN"
+fi
+
 TARGETS_FAILED=0
 TEST_INTERVAL=$INTERVAL
 NO_OF_TARGETS=0

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.