From 415552f355fd46e7f26a211af6a7da2c288691cd Mon Sep 17 00:00:00 2001
From: kiba <zombie32@gmail.com>
Date: Wed, 13 Jun 2018 11:18:14 +1100
Subject: [PATCH] set correct utf8 email subject headers (RFC1342)

---
 etc/icinga2/scripts/mail-host-notification.sh    | 7 ++++---
 etc/icinga2/scripts/mail-service-notification.sh | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/etc/icinga2/scripts/mail-host-notification.sh b/etc/icinga2/scripts/mail-host-notification.sh
index cecb2d754..6401ce5a0 100755
--- a/etc/icinga2/scripts/mail-host-notification.sh
+++ b/etc/icinga2/scripts/mail-host-notification.sh
@@ -101,6 +101,7 @@ done
 
 ## Build the message's subject
 SUBJECT="[$NOTIFICATIONTYPE] Host $HOSTDISPLAYNAME is $HOSTSTATE!"
+ENCODED_SUBJECT="=?utf-8?B?$(base64 --wrap=0 <<< "$SUBJECT")?="
 
 ## Build the notification message
 NOTIFICATION_MESSAGE=`cat << EOF
@@ -155,13 +156,13 @@ if [ -n "$MAILFROM" ] ; then
 
   ## Debian/Ubuntu use mailutils which requires `-a` to append the header
   if [ -f /etc/debian_version ]; then
-    /usr/bin/printf "%b" "$NOTIFICATION_MESSAGE" | $MAILBIN -a "From: $MAILFROM" -s "$SUBJECT" $USEREMAIL
+    /usr/bin/printf "%b" "$NOTIFICATION_MESSAGE" | $MAILBIN -a "From: $MAILFROM" -s "$ENCODED_SUBJECT" $USEREMAIL
   ## Other distributions (RHEL/SUSE/etc.) prefer mailx which sets a sender address with `-r`
   else
-    /usr/bin/printf "%b" "$NOTIFICATION_MESSAGE" | $MAILBIN -r "$MAILFROM" -s "$SUBJECT" $USEREMAIL
+    /usr/bin/printf "%b" "$NOTIFICATION_MESSAGE" | $MAILBIN -r "$MAILFROM" -s "$ENCODED_SUBJECT" $USEREMAIL
   fi
 
 else
   /usr/bin/printf "%b" "$NOTIFICATION_MESSAGE" \
-  | $MAILBIN -s "$SUBJECT" $USEREMAIL
+  | $MAILBIN -s "$ENCODED_SUBJECT" $USEREMAIL
 fi
diff --git a/etc/icinga2/scripts/mail-service-notification.sh b/etc/icinga2/scripts/mail-service-notification.sh
index c53d4d022..a0c34a129 100755
--- a/etc/icinga2/scripts/mail-service-notification.sh
+++ b/etc/icinga2/scripts/mail-service-notification.sh
@@ -105,6 +105,7 @@ done
 
 ## Build the message's subject
 SUBJECT="[$NOTIFICATIONTYPE] $SERVICEDISPLAYNAME on $HOSTDISPLAYNAME is $SERVICESTATE!"
+ENCODED_SUBJECT="=?utf-8?B?$(base64 --wrap=0 <<< "$SUBJECT")?="
 
 ## Build the notification message
 NOTIFICATION_MESSAGE=`cat << EOF
@@ -160,13 +161,13 @@ if [ -n "$MAILFROM" ] ; then
 
   ## Debian/Ubuntu use mailutils which requires `-a` to append the header
   if [ -f /etc/debian_version ]; then
-    /usr/bin/printf "%b" "$NOTIFICATION_MESSAGE" | $MAILBIN -a "From: $MAILFROM" -s "$SUBJECT" $USEREMAIL
+    /usr/bin/printf "%b" "$NOTIFICATION_MESSAGE" | $MAILBIN -a "From: $MAILFROM" -s "$ENCODED_SUBJECT" $USEREMAIL
   ## Other distributions (RHEL/SUSE/etc.) prefer mailx which sets a sender address with `-r`
   else
-    /usr/bin/printf "%b" "$NOTIFICATION_MESSAGE" | $MAILBIN -r "$MAILFROM" -s "$SUBJECT" $USEREMAIL
+    /usr/bin/printf "%b" "$NOTIFICATION_MESSAGE" | $MAILBIN -r "$MAILFROM" -s "$ENCODED_SUBJECT" $USEREMAIL
   fi
 
 else
   /usr/bin/printf "%b" "$NOTIFICATION_MESSAGE" \
-  | $MAILBIN -s "$SUBJECT" $USEREMAIL
+  | $MAILBIN -s "$ENCODED_SUBJECT" $USEREMAIL
 fi