Disable SSLv3 for mail client

domotika/mail/dmmail.py

@@ -23,8 +23,7 @@
 
 import sys
 
-from OpenSSL.SSL import SSLv3_METHOD
-
+from OpenSSL.SSL import OP_NO_SSLv3
 from twisted.mail.smtp import ESMTPSenderFactory
 from twisted.python.usage import Options, UsageError
 from twisted.internet.ssl import ClientContextFactory
@@ -38,6 +37,18 @@ import logging
 log = logging.getLogger( 'Mail' )
 
 
+class ContextFactory(ClientContextFactory):
+ 
+   """Context factory that disables SSLv3 (POODLE attack)."""
+ 
+   def getContext(self):
+      """Get the parent context but disable SSLv3."""
+      ctx = ClientContextFactory.getContext(self)
+      ctx.set_options(OP_NO_SSLv3)
+      return ctx
+ 
+
+
 class DMEmail(object):
 
    needauth=False
@@ -107,8 +118,8 @@ class DMEmail(object):
 
    def send(self, usemime=True):
       log.info("Sending email from "+str(self.sender)+" to "+str(self.to)+" with subject "+str(self.subject))
-      contextFactory = ClientContextFactory()
-      contextFactory.method = SSLv3_METHOD
+      contextFactory = ContextFactory()
+      #contextFactory.method = SSLv3_METHOD
          
       if usemime:
          msg = MIMEText(self.message)