Commit 7e3efccb authored by mathieui's avatar mathieui

Fix #2407 (unencrypted connections)

Add a force_encryption option set to true by default.
parent f43f0621
......@@ -50,6 +50,9 @@ certificate =
# the same certificate.
ignore_certificate = false
# Force TLS on by default
force_encryption = true
# The interval to send a whitespace keepalive to the server
# 300 should be fine, except for specific services, in that case, change the
# value to the services default.
......
......@@ -167,6 +167,14 @@ section of this documentation.
If set to true, notifications about the music your contacts listen to
will be displayed in the info buffer as 'Tune' messages.
force_encryption
**Default value:** ``true``
If set to true, all connections will use TLS by default. Only turn this to
false if you cannot connect to your server, and do not care about your password
or the pricacy of your communications.
display_mood_notifications
**Default value:** ``false``
......
......@@ -50,6 +50,13 @@ class Connection(sleekxmpp.ClientXMPP):
# TODO: use the system language
sleekxmpp.ClientXMPP.__init__(self, jid, password, lang=config.get('lang', 'en'))
force_encryption = config.get('force_encryption', 'true').lower() != 'false'
if force_encryption:
self['feature_mechanisms'].unencrypted_plain = False
self['feature_mechanisms'].unencrypted_digest = False
self['feature_mechanisms'].unencrypted_cram = False
self['feature_mechanisms'].unencrypted_scram = False
self.core = None
self.auto_reconnect = True if config.get('auto_reconnect', 'false').lower() in ('true', '1') else False
self.reconnect_max_attempts = 0
......
......@@ -236,7 +236,8 @@ class Core(object):
# Add handlers
self.xmpp.add_event_handler('connected', self.on_connected)
self.xmpp.add_event_handler('disconnected', self.on_disconnected)
self.xmpp.add_event_handler('no_auth', self.on_failed_auth)
self.xmpp.add_event_handler('failed_auth', self.on_failed_auth)
self.xmpp.add_event_handler('no_auth', self.on_no_auth)
self.xmpp.add_event_handler("session_start", self.on_session_start)
self.xmpp.add_event_handler("session_start", self.on_session_start_features)
self.xmpp.add_event_handler("groupchat_presence", self.on_groupchat_presence)
......@@ -3553,7 +3554,13 @@ class Core(object):
"""
Authentication failed
"""
self.information(_("Authentication failed."))
self.information(_("Authentication failed (bad credentials?)."))
def on_no_auth(self, event):
"""
Authentication failed (no mech)
"""
self.information(_("Authentication failed, no login method available."))
def on_connected(self, event):
"""
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment