AaronFiore/electrum
1
0
Fork 0
Code Activity

email plugin: SSL was using insecure defaults

Browse Source
This commit is contained in:
SomberNight
2022-05-23 19:04:51 +02:00
parent 7e77a7e1cc
commit cac4b6f92c
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
electrum/plugins/email_requests/qt.py
View File

@@ -30,7 +30,7 @@ from functools import partial
import traceback import traceback
import sys import sys
from typing import Set from typing import Set
import ssl
import smtplib import smtplib
import imaplib import imaplib
import email import email
@@ -41,6 +41,7 @@ from email.encoders import encode_base64
from PyQt5.QtCore import QObject, pyqtSignal, QThread from PyQt5.QtCore import QObject, pyqtSignal, QThread
from PyQt5.QtWidgets import (QVBoxLayout, QLabel, QGridLayout, QLineEdit, from PyQt5.QtWidgets import (QVBoxLayout, QLabel, QGridLayout, QLineEdit,
QInputDialog) QInputDialog)
import certifi
from electrum.gui.qt.util import (EnterButton, Buttons, CloseButton, OkButton, from electrum.gui.qt.util import (EnterButton, Buttons, CloseButton, OkButton,
WindowModalDialog) WindowModalDialog)
@@ -54,6 +55,10 @@ from electrum.wallet import Abstract_Wallet
from electrum.invoices import Invoice from electrum.invoices import Invoice
ca_path = certifi.where()
ssl_context = ssl.create_default_context(purpose=ssl.Purpose.SERVER_AUTH, cafile=ca_path)
class Processor(threading.Thread, Logger): class Processor(threading.Thread, Logger):
polling_interval = 5*60 polling_interval = 5*60
@@ -93,7 +98,7 @@ class Processor(threading.Thread, Logger):
def run(self): def run(self):
while True: while True:
try: try:
self.M = imaplib.IMAP4_SSL(self.imap_server) self.M = imaplib.IMAP4_SSL(self.imap_server, ssl_context=ssl_context)
self.M.login(self.username, self.password) self.M.login(self.username, self.password)
except BaseException as e: except BaseException as e:
self.logger.info(f'connecting failed: {repr(e)}') self.logger.info(f'connecting failed: {repr(e)}')
@@ -121,7 +126,7 @@ class Processor(threading.Thread, Logger):
part.add_header('Content-Disposition', 'attachment; filename="payreq.btc"') part.add_header('Content-Disposition', 'attachment; filename="payreq.btc"')
msg.attach(part) msg.attach(part)
try: try:
s = smtplib.SMTP_SSL(self.imap_server, timeout=2) s = smtplib.SMTP_SSL(self.imap_server, timeout=2, context=ssl_context)
s.login(self.username, self.password) s.login(self.username, self.password)
s.sendmail(self.username, [recipient], msg.as_string()) s.sendmail(self.username, [recipient], msg.as_string())
s.quit() s.quit()
@@ -271,7 +276,7 @@ class CheckConnectionThread(QThread):
def run(self): def run(self):
try: try:
conn = imaplib.IMAP4_SSL(self.server) conn = imaplib.IMAP4_SSL(self.server, ssl_context=ssl_context)
conn.login(self.username, self.password) conn.login(self.username, self.password)
except BaseException as e: except BaseException as e:
self.connection_error_signal.emit(repr(e)) self.connection_error_signal.emit(repr(e))