From a3acaed8512c16fc1d53141d288d60eacc6ef94e Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Tue, 25 Nov 2014 11:55:49 -0200
Subject: Move SMTP gateway str assertion to inside OutgoingMail.

---
 src/leap/mail/service.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/leap/mail/service.py')

diff --git a/src/leap/mail/service.py b/src/leap/mail/service.py
index d595067..f6e4d11 100644
--- a/src/leap/mail/service.py
+++ b/src/leap/mail/service.py
@@ -81,8 +81,9 @@ class OutgoingMail:
         :type port: int
         """
 
-        # XXX: should we keep these checks?
         # assert params
+        leap_assert_type(from_address, str)
+        leap_assert('@' in from_address)
         leap_assert_type(keymanager, KeyManager)
         leap_assert_type(host, str)
         leap_assert(host != '')
-- 
cgit v1.2.3