From 63c95d7ac05e18dd24e2a06fc50b12eeaef2ba82 Mon Sep 17 00:00:00 2001
From: Chronial <git@chronial.de>
Date: Wed, 24 Jan 2018 23:13:53 +0100
Subject: [PATCH] Add SMTP TLS support

---
 README.md                    | 1 +
 snapraid-runner.conf.example | 1 +
 snapraid-runner.py           | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/README.md b/README.md
index d54e7c9..5173a91 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ scheduler.
 ## Changelog
 ### Unreleased
 * Add support for running `snapraid touch` (by ShoGinn, PR-11)
+* Add SMTP TLS support
 
 ### v0.3 (20 Jul 2017)
 * Limit size of sent emails
diff --git a/snapraid-runner.conf.example b/snapraid-runner.conf.example
index dce416f..ed64810 100644
--- a/snapraid-runner.conf.example
+++ b/snapraid-runner.conf.example
@@ -31,6 +31,7 @@ host =
 port =
 ; set to "true" to activate
 ssl = false
+tls = false
 user =
 password =
 
diff --git a/snapraid-runner.py b/snapraid-runner.py
index 5ea96b5..4151806 100644
--- a/snapraid-runner.py
+++ b/snapraid-runner.py
@@ -106,6 +106,8 @@ def send_email(success):
         server = smtplib.SMTP_SSL(**smtp)
     else:
         server = smtplib.SMTP(**smtp)
+        if config["smtp"]["tls"]:
+            server.starttls()
     if config["smtp"]["user"]:
         server.login(config["smtp"]["user"], config["smtp"]["password"])
     server.sendmail(
@@ -149,6 +151,7 @@ def load_config(args):
             config[section][option] = 0
 
     config["smtp"]["ssl"] = (config["smtp"]["ssl"].lower() == "true")
+    config["smtp"]["tls"] = (config["smtp"]["tls"].lower() == "true")
     config["scrub"]["enabled"] = (config["scrub"]["enabled"].lower() == "true")
     config["email"]["short"] = (config["email"]["short"].lower() == "true")
     config["snapraid"]["touch"] = (config["snapraid"]["touch"].lower() == "true")