jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #382 from sangeeths/initialize_certificate

Browse Source 
Initialize certfile, keyfile and ca_certs in XMLStream. Added **kwargs to ClientXMPP, BaseXMPP and XMLStream.
This commit is contained in:
Mike Taylor 2015-07-03 15:07:35 -04:00
commit c024ac8f0b
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sleekxmpp/basexmpp.py
View File

@ -55,8 +55,8 @@ class BaseXMPP(XMLStream):
is used during initialization. is used during initialization.
""" """
def __init__(self, jid='', default_ns='jabber:client'): def __init__(self, jid='', default_ns='jabber:client', **kwargs):
XMLStream.__init__(self) XMLStream.__init__(self, **kwargs)
self.default_ns = default_ns self.default_ns = default_ns
self.stream_ns = 'http://etherx.jabber.org/streams' self.stream_ns = 'http://etherx.jabber.org/streams'

7
sleekxmpp/clientxmpp.py
View File

@ -59,14 +59,15 @@ class ClientXMPP(BaseXMPP):
:param escape_quotes: **Deprecated.** :param escape_quotes: **Deprecated.**
""" """
def __init__(self, jid, password, plugin_config=None, plugin_whitelist=None, escape_quotes=True, sasl_mech=None, def __init__(self, jid, password, plugin_config=None,
lang='en'): plugin_whitelist=None, escape_quotes=True, sasl_mech=None,
lang='en', **kwargs):
if not plugin_whitelist: if not plugin_whitelist:
plugin_whitelist = [] plugin_whitelist = []
if not plugin_config: if not plugin_config:
plugin_config = {} plugin_config = {}
BaseXMPP.__init__(self, jid, 'jabber:client') BaseXMPP.__init__(self, jid, 'jabber:client', **kwargs)
self.escape_quotes = escape_quotes self.escape_quotes = escape_quotes
self.plugin_config = plugin_config self.plugin_config = plugin_config

2
sleekxmpp/xmlstream/cert.py
View File

@ -181,4 +181,4 @@ def verify(expected, raw_cert):
return True return True
raise CertificateError( raise CertificateError(
'Could not match certficate against hostname: %s' % expected) 'Could not match certificate against hostname: %s' % expected)

9
sleekxmpp/xmlstream/xmlstream.py
View File

@ -114,7 +114,8 @@ class XMLStream(object):
:param int port: The port to use for the connection. Defaults to 0. :param int port: The port to use for the connection. Defaults to 0.
""" """
def __init__(self, socket=None, host='', port=0): def __init__(self, socket=None, host='', port=0, certfile=None,
keyfile=None, ca_certs=None, **kwargs):
#: Most XMPP servers support TLSv1, but OpenFire in particular #: Most XMPP servers support TLSv1, but OpenFire in particular
#: does not work well with it. For OpenFire, set #: does not work well with it. For OpenFire, set
#: :attr:`ssl_version` to use ``SSLv23``:: #: :attr:`ssl_version` to use ``SSLv23``::
@ -136,16 +137,16 @@ class XMLStream(object):
#: #:
#: On Mac OS X, certificates in the system keyring will #: On Mac OS X, certificates in the system keyring will
#: be consulted, even if they are not in the provided file. #: be consulted, even if they are not in the provided file.
self.ca_certs = None self.ca_certs = ca_certs
#: Path to a file containing a client certificate to use for #: Path to a file containing a client certificate to use for
#: authenticating via SASL EXTERNAL. If set, there must also #: authenticating via SASL EXTERNAL. If set, there must also
#: be a corresponding `:attr:keyfile` value. #: be a corresponding `:attr:keyfile` value.
self.certfile = None self.certfile = certfile
#: Path to a file containing the private key for the selected #: Path to a file containing the private key for the selected
#: client certificate to use for authenticating via SASL EXTERNAL. #: client certificate to use for authenticating via SASL EXTERNAL.
self.keyfile = None self.keyfile = keyfile
self._der_cert = None self._der_cert = None