Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expose "required" initializer argument of xmlstream.TLSInitiatingInitializer #29

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Expose "required" initializer argument of xmlstream.TLSInitiatingInitializer #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions wokkel/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,29 +55,30 @@ class HybridAuthenticator(xmlstream.ConnectAuthenticator):

namespace = 'jabber:client'

def __init__(self, jid, password):
def __init__(self, jid, password, requireTLS=True):
xmlstream.ConnectAuthenticator.__init__(self, jid.host)
self.jid = jid
self.password = password
self.requireTLS = requireTLS

def associateWithStream(self, xs):
xmlstream.ConnectAuthenticator.associateWithStream(self, xs)

tlsInit = xmlstream.TLSInitiatingInitializer(xs)
tlsInit = xmlstream.TLSInitiatingInitializer(xs, required=self.requireTLS)
xs.initializers = [client.CheckVersionInitializer(xs),
tlsInit,
CheckAuthInitializer(xs)]


def HybridClientFactory(jid, password):
def HybridClientFactory(jid, password, requireTLS=True):
"""
Client factory for XMPP 1.0.

This is similar to L{client.XMPPClientFactory} but also tries non-SASL
autentication.
"""

a = HybridAuthenticator(jid, password)
a = HybridAuthenticator(jid, password, requireTLS)
return xmlstream.XmlStreamFactory(a)


Expand All @@ -87,13 +88,13 @@ class XMPPClient(StreamManager, service.Service):
Service that initiates an XMPP client connection.
"""

def __init__(self, jid, password, host=None, port=5222):
def __init__(self, jid, password, host=None, port=5222, requireTLS=True):
self.jid = jid
self.domain = jid.host.encode('idna')
self.host = host
self.port = port

factory = HybridClientFactory(jid, password)
factory = HybridClientFactory(jid, password, requireTLS)

StreamManager.__init__(self, factory)

Expand Down