Patch smtps develop

.github/check_version.py

@@ -10,10 +10,10 @@
 VERSION_FILE = 'medusa/common.py'
 VERSION_LINE_REGEXP = re.compile(r"VERSION = '([0-9.]+)'")
 
-GH_PULL_REQUEST = os.environ['GITHUB_EVENT_NAME']
-GH_PR_TARGET_BRANCH = os.environ['GITHUB_BASE_REF']
-GH_PR_SOURCE_BRANCH = os.environ['GITHUB_HEAD_REF']
-GH_BUILD_DIR = os.environ['GITHUB_WORKSPACE']
+GH_PULL_REQUEST = os.getenv('GITHUB_EVENT_NAME','push')
+GH_PR_TARGET_BRANCH = os.getenv('GITHUB_BASE_REF','master')
+GH_PR_SOURCE_BRANCH = os.getenv('GITHUB_HEAD_REF','master')
+GH_BUILD_DIR = os.getenv('GITHUB_WORKSPACE','./')
 
 GH_PR_TARGET_BRANCH = GH_PR_TARGET_BRANCH.lower()
 GH_PR_SOURCE_BRANCH = GH_PR_SOURCE_BRANCH.lower()

medusa/__main__.py

@@ -912,7 +912,6 @@ def initialize(self, console_logging=True):
  app.EMAIL_NOTIFY_ONSUBTITLEDOWNLOAD = bool(check_setting_int(app.CFG, 'Email', 'email_notify_onsubtitledownload', 0))
  app.EMAIL_HOST = check_setting_str(app.CFG, 'Email', 'email_host', '')
  app.EMAIL_PORT = check_setting_int(app.CFG, 'Email', 'email_port', 25)
- app.EMAIL_TLS = bool(check_setting_int(app.CFG, 'Email', 'email_tls', 0))
  app.EMAIL_USER = check_setting_str(app.CFG, 'Email', 'email_user', '', censor_log='normal')
  app.EMAIL_PASSWORD = check_setting_str(app.CFG, 'Email', 'email_password', '', censor_log='low')
  app.EMAIL_FROM = check_setting_str(app.CFG, 'Email', 'email_from', '')
@@ -1943,7 +1942,6 @@ def save_config():
  new_config['Email']['email_notify_onsubtitledownload'] = int(app.EMAIL_NOTIFY_ONSUBTITLEDOWNLOAD)
  new_config['Email']['email_host'] = app.EMAIL_HOST
  new_config['Email']['email_port'] = int(app.EMAIL_PORT)
- new_config['Email']['email_tls'] = int(app.EMAIL_TLS)
  new_config['Email']['email_user'] = app.EMAIL_USER
  new_config['Email']['email_password'] = helpers.encrypt(app.EMAIL_PASSWORD, app.ENCRYPTION_VERSION)
  new_config['Email']['email_from'] = app.EMAIL_FROM

medusa/app.py

@@ -543,7 +543,6 @@ def __init__(self):
  self.EMAIL_NOTIFY_ONSUBTITLEDOWNLOAD = False
  self.EMAIL_HOST = None
  self.EMAIL_PORT = 25
- self.EMAIL_TLS = False
  self.EMAIL_USER = None
  self.EMAIL_PASSWORD = None
  self.EMAIL_FROM = None

medusa/notifiers/emailnotify.py

@@ -49,7 +49,7 @@ class Notifier(object):
  def __init__(self):
  self.last_err = None
 
- def test_notify(self, host, port, smtp_from, use_tls, user, pwd, to):
+ def test_notify(self, host, port, smtp_from, user, pwd, to):
  """
  Send a test notification.
 
@@ -63,7 +63,7 @@ def test_notify(self, host, port, smtp_from, use_tls, user, pwd, to):
  msg['From'] = smtp_from
  msg['To'] = to
  msg['Date'] = formatdate(localtime=True)
- return self._sendmail(host, port, smtp_from, use_tls, user, pwd, [to], msg, True)
+ return self._sendmail(host, port, smtp_from, user, pwd, [to], msg, True)
 
  def notify_snatch(self, title, message):
  """
@@ -107,7 +107,7 @@ def notify_snatch(self, title, message):
  msg['To'] = ','.join(to)
  msg['Date'] = formatdate(localtime=True)
 
- if self._sendmail(app.EMAIL_HOST, app.EMAIL_PORT, app.EMAIL_FROM, app.EMAIL_TLS,
+ if self._sendmail(app.EMAIL_HOST, app.EMAIL_PORT, app.EMAIL_FROM,
  app.EMAIL_USER, app.EMAIL_PASSWORD, to, msg):
  log.debug('Snatch notification sent to {recipient} for {episode}',
  {'recipient': to, 'episode': message})
@@ -160,7 +160,7 @@ def notify_download(self, ep_obj, title='Completed:'):
  msg['To'] = ','.join(to)
  msg['Date'] = formatdate(localtime=True)
 
- if self._sendmail(app.EMAIL_HOST, app.EMAIL_PORT, app.EMAIL_FROM, app.EMAIL_TLS,
+ if self._sendmail(app.EMAIL_HOST, app.EMAIL_PORT, app.EMAIL_FROM,
  app.EMAIL_USER, app.EMAIL_PASSWORD, to, msg):
  log.debug('Download notification sent to {recipient} for {episode}',
  {'recipient': to, 'episode': ep_name})
@@ -213,7 +213,7 @@ def notify_subtitle_download(self, ep_obj, lang):
  msg['From'] = app.EMAIL_FROM
  msg['To'] = ','.join(to)
 
- if self._sendmail(app.EMAIL_HOST, app.EMAIL_PORT, app.EMAIL_FROM, app.EMAIL_TLS,
+ if self._sendmail(app.EMAIL_HOST, app.EMAIL_PORT, app.EMAIL_FROM,
  app.EMAIL_USER, app.EMAIL_PASSWORD, to, msg):
  log.debug('Download notification sent to {recipient} for {episode}',
  {'recipient': to, 'episode': ep_name})
@@ -254,7 +254,7 @@ def notify_git_update(self, new_version='??'):
  msg['To'] = ','.join(to)
  msg['Date'] = formatdate(localtime=True)
 
- if self._sendmail(app.EMAIL_HOST, app.EMAIL_PORT, app.EMAIL_FROM, app.EMAIL_TLS,
+ if self._sendmail(app.EMAIL_HOST, app.EMAIL_PORT, app.EMAIL_FROM,
  app.EMAIL_USER, app.EMAIL_PASSWORD, to, msg):
  log.debug('Update notification sent to {recipient}',
  {'recipient': to})
@@ -295,7 +295,7 @@ def notify_login(self, ipaddress=''):
  msg['To'] = ','.join(to)
  msg['Date'] = formatdate(localtime=True)
 
- if self._sendmail(app.EMAIL_HOST, app.EMAIL_PORT, app.EMAIL_FROM, app.EMAIL_TLS,
+ if self._sendmail(app.EMAIL_HOST, app.EMAIL_PORT, app.EMAIL_FROM,
  app.EMAIL_USER, app.EMAIL_PASSWORD, to, msg):
  log.debug('Login notification sent to {recipient}', {'recipient': to})
  else:
@@ -340,45 +340,65 @@ def _generate_recipients(show):
  log.debug('Notification recipients: {0}', addrs)
  return addrs
 
- def _sendmail(self, host, port, smtp_from, use_tls, user, pwd, to, msg, smtp_debug=False):
+ def _sendmail(self, host, port, smtp_from, user, pwd, to, msg, smtp_debug=False):
  log.debug(
- 'HOST: {host}; PORT: {port}; FROM: {sender}, TLS: {tls},'
+ 'HOST: {host}; PORT: {port}; FROM: {sender},'
  ' USER: {user}, PWD: {password}, TO: {recipient}', {
  'host': host,
  'port': port,
  'sender': smtp_from,
- 'tls': use_tls,
  'user': user,
  'password': pwd,
  'recipient': to,
  }
  )
  try:
- srv = smtplib.SMTP(host, int(port))
+ srv = smtplib.SMTP_SSL(host, int(port))
+ log.debug("Connected to server %s:%s", host, port)
+ except:
+ # Non SSL mail server
+ log.debug("Non-SSL mail server detected reconnecting to server %s:%s", host, port)
+
+ try:
+ srv = smtplib.SMTP(host, int(port))
+ except Exception as error:
+ log.warning('Exception generated while sending e-mail: {0}', error)
+ # logger.log(traceback.format_exc(), logger.DEBUG)
+ self.last_err = '{0}'.format(error)
+ return False
+
+ try:
+ srv.ehlo()
  except Exception as error:
  log.warning('Exception generated while sending e-mail: {0}', error)
  # logger.log(traceback.format_exc(), logger.DEBUG)
  self.last_err = '{0}'.format(error)
  return False
 
+ if srv.ehlo_resp:
+ m = re.search(b"STARTTLS", srv.ehlo_resp, re.IGNORECASE)
+ if m:
+ log.debug("TLS mail server detected")
+ try:
+ srv.starttls()
+ srv.ehlo()
+ except Exception as error:
+ log.warning('Exception generated while sending e-mail: {0}', error)
+ # logger.log(traceback.format_exc(), logger.DEBUG)
+ self.last_err = '{0}'.format(error)
+ return False
+
  if smtp_debug:
  srv.set_debuglevel(1)
  try:
- if use_tls in ('1', True) or (user and pwd):
- log.debug('Sending initial EHLO command!')
- srv.ehlo()
- if use_tls in ('1', True):
- log.debug('Sending STARTTLS command!')
- srv.starttls()
- srv.ehlo()
  if user and pwd:
  log.debug('Sending LOGIN command!')
  srv.login(user, pwd)
-
  srv.sendmail(smtp_from, to, msg.as_string())
  srv.quit()
  return True
  except Exception as error:
+ log.warning('Exception generated while sending e-mail: {0}', error)
  self.last_err = '{0}'.format(error)
  return False
 

medusa/server/api/v2/config.py

@@ -433,7 +433,6 @@ class ConfigHandler(BaseRequestHandler):
  'notifiers.email.host': StringField(app, 'EMAIL_HOST'),
  'notifiers.email.port': IntegerField(app, 'EMAIL_PORT'),
  'notifiers.email.from': StringField(app, 'EMAIL_FROM'),
- 'notifiers.email.tls': BooleanField(app, 'EMAIL_TLS'),
  'notifiers.email.username': StringField(app, 'EMAIL_USER'),
  'notifiers.email.password': StringField(app, 'EMAIL_PASSWORD'),
  'notifiers.email.addressList': ListField(app, 'EMAIL_LIST'),
@@ -1017,7 +1016,6 @@ def data_notifiers():
  section_data['email']['host'] = app.EMAIL_HOST
  section_data['email']['port'] = app.EMAIL_PORT
  section_data['email']['from'] = app.EMAIL_FROM
- section_data['email']['tls'] = bool(app.EMAIL_TLS)
  section_data['email']['username'] = app.EMAIL_USER
  section_data['email']['password'] = app.EMAIL_PASSWORD
  section_data['email']['addressList'] = app.EMAIL_LIST

medusa/server/web/config/notifications.py

@@ -78,7 +78,7 @@ def saveNotifications(self, use_kodi=None, kodi_always_on=None, kodi_notify_onsn
  join_notify_onsubtitledownload=None, join_api=None, join_device=None,
  use_email=None, email_notify_onsnatch=None, email_notify_ondownload=None,
  email_notify_onsubtitledownload=None, email_host=None, email_port=25, email_from=None,
- email_tls=None, email_user=None, email_password=None, email_list=None, email_subject=None, email_show_list=None,
+ email_user=None, email_password=None, email_list=None, email_subject=None, email_show_list=None,
  email_show=None,
  use_slack=None, slack_notify_onsnatch=None, slack_notify_ondownload=None, slack_notify_onsubtitledownload=None,
  slack_webhook=None):
@@ -226,7 +226,6 @@ def saveNotifications(self, use_kodi=None, kodi_always_on=None, kodi_notify_onsn
  app.EMAIL_HOST = config.clean_host(email_host)
  app.EMAIL_PORT = try_int(email_port, 25)
  app.EMAIL_FROM = email_from
- app.EMAIL_TLS = config.checkbox_to_value(email_tls)
  app.EMAIL_USER = email_user
  app.EMAIL_PASSWORD = email_password
  app.EMAIL_LIST = [_.strip() for _ in email_list.split(',')]

medusa/server/web/home/handler.py

@@ -556,9 +556,9 @@ def saveShowNotifyList(show=None, emails=None, prowlAPIs=None):
  return 'OK'
 
  @staticmethod
- def testEmail(host=None, port=None, smtp_from=None, use_tls=None, user=None, pwd=None, to=None):
+ def testEmail(host=None, port=None, smtp_from=None, user=None, pwd=None, to=None):
  host = config.clean_host(host)
- if notifiers.email_notifier.test_notify(host, port, smtp_from, use_tls, user, pwd, to):
+ if notifiers.email_notifier.test_notify(host, port, smtp_from, user, pwd, to):
  return 'Test email sent successfully! Check inbox.'
  else:
  return 'ERROR: {error}'.format(error=notifiers.email_notifier.last_err)

tests/apiv2/test_config.py

@@ -691,7 +691,6 @@ def config_notifiers():
  section_data['email']['host'] = app.EMAIL_HOST
  section_data['email']['port'] = app.EMAIL_PORT
  section_data['email']['from'] = app.EMAIL_FROM
- section_data['email']['tls'] = bool(app.EMAIL_TLS)
  section_data['email']['username'] = app.EMAIL_USER
  section_data['email']['password'] = app.EMAIL_PASSWORD
  section_data['email']['addressList'] = app.EMAIL_LIST

themes-default/slim/src/components/config-notifications.vue

@@ -890,7 +890,6 @@
  <config-textbox v-model="notifiers.email.host" label="SMTP host" id="email_host" :explanations="['hostname of your SMTP email server.']" @change="save()" />
  <config-textbox-number :min="1" :step="1" v-model="notifiers.email.port" label="SMTP port" id="email_port" :explanations="['port number used to connect to your SMTP host.']" @change="save()" />
  <config-textbox v-model="notifiers.email.from" label="SMTP from" id="email_from" :explanations="['sender email address, some hosts require a real address.']" @change="save()" />
- <config-toggle-slider v-model="notifiers.email.tls" label="Use TLS" id="email_tls" :explanations="['check to use TLS encryption.']" @change="save()" />
  <config-textbox v-model="notifiers.email.username" label="SMTP username" id="email_username" :explanations="['(optional) your SMTP server username.']" @change="save()" />
  <config-textbox v-model="notifiers.email.password" type="password" label="SMTP password" id="email_password" :explanations="['(optional) your SMTP server password.']" @change="save()" />
 
@@ -1701,7 +1700,6 @@ export default {
  host = host.length > 0 ? host : null;
  let port = $('#email_port').val();
  port = port.length > 0 ? port : null;
- const tls = $('#email_tls').find('input').is(':checked') ? 1 : 0;
  let from = $('#email_from').val();
  from = from.length > 0 ? from : 'root@localhost';
  const user = $('#email_username').val().trim();
@@ -1727,7 +1725,6 @@ export default {
  host,
  port,
  smtp_from: from, // eslint-disable-line camelcase
- use_tls: tls, // eslint-disable-line camelcase
  user,
  pwd,
  to