Commits April 2014

commits@gajim.org

2 participants
33 discussions

python-nbxmpp: fix comparing str and int
by Python-nbxmpp 09 Apr '14

09 Apr '14

changeset 482579a7fdc3 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=482579a7fdc3 description: fix comparing str and int diffstat: nbxmpp/transports_nb.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r eb393b576751 -r 482579a7fdc3 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Wed Apr 09 17:34:26 2014 +0200 +++ b/nbxmpp/transports_nb.py Wed Apr 09 18:17:56 2014 +0200 @@ -639,7 +639,7 @@ except UnicodeDecodeError: for i in range(-1, -4, -1): char = received[i] - if char & 0xc0 == 0xc0: + if ord(char) & 0xc0 == 0xc0: self.received_bytes_buff = received[i:] received = received[:i] break

1 0

gajim: don't print twice nbxmpp version error message. Fixes #7720
by Gajim 09 Apr '14

09 Apr '14

changeset 46f319807a21 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=46f319807a21 description: don't print twice nbxmpp version error message. Fixes #7720 diffstat: src/gajim.py | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diffs (34 lines): diff -r 7293a6cd2a39 -r 46f319807a21 src/gajim.py --- a/src/gajim.py Wed Apr 09 17:56:09 2014 +0200 +++ b/src/gajim.py Wed Apr 09 18:02:30 2014 +0200 @@ -68,19 +68,26 @@ except ImportError: pass +HAS_NBXMPP=True +MIN_NBXMPP_VER = "0.3.3" try: import nbxmpp except ImportError: + HAS_NBXMPP=False + +if not HAS_NBXMPP: print 'Gajim needs python-nbxmpp to run. Quiting...' sys.exit() try: from distutils.version import LooseVersion as V - if V(nbxmpp.__version__) < V("0.3.3"): - print 'Gajim needs python-nbxmpp > 0.3.3 to run. Quiting...' - sys.exit() + if V(nbxmpp.__version__) < V(MIN_NBXMPP_VER): + HAS_NBXMPP=False except: - print 'Gajim needs python-nbxmpp > 0.3.3 to run. Quiting...' + HAS_NBXMPP=False + +if not HAS_NBXMPP: + print 'Gajim needs python-nbxmpp >= %s to run. Quiting...' % MIN_NBXMPP_VER sys.exit() from common import demandimport

1 0

gajim: don't traceback when we try to open a remembered chat win...
by Gajim 09 Apr '14

09 Apr '14

changeset 7293a6cd2a39 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=7293a6cd2a39 description: don't traceback when we try to open a remembered chat window from a contact not in roster diffstat: src/roster_window.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r c6392d5f5c43 -r 7293a6cd2a39 src/roster_window.py --- a/src/roster_window.py Wed Apr 09 17:37:56 2014 +0200 +++ b/src/roster_window.py Wed Apr 09 17:56:09 2014 +0200 @@ -2639,6 +2639,9 @@ contact = \ gajim.contacts.get_contact_with_highest_priority( account, jid) + if not contact: + contact = self.add_to_not_in_the_roster(account, + jid) gajim.interface.on_open_chat_window(None, contact, account) gajim.config.set_per('accounts', account,

1 0

gajim: Added tag gajim-0.16-rc1 for changeset f4acdfbbe30b
by Gajim 09 Apr '14

09 Apr '14

changeset c6392d5f5c43 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=c6392d5f5c43 description: Added tag gajim-0.16-rc1 for changeset f4acdfbbe30b diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r b3debc7bde94 -r c6392d5f5c43 .hgtags --- a/.hgtags Wed Apr 09 17:04:03 2014 +0200 +++ b/.hgtags Wed Apr 09 17:37:56 2014 +0200 @@ -10,3 +10,4 @@ e2731a8cd582d3541bc8383e12a4775c8f229d65 gajim-0.16-alpha2 a0b59d4aadced51b902783d75d64461aa41bf7a3 gajim-0.16-beta1 9931beb5eec2c6fce4d7c9d1094375d05ac321de gajim-0.16-beta2 +f4acdfbbe30bd29b832a34c14bd18ade9be9845d gajim-0.16-rc1

1 0

python-nbxmpp: merge from python3 branch
by Python-nbxmpp 09 Apr '14

09 Apr '14

changeset eb393b576751 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=eb393b576751 description: merge from python3 branch diffstat: nbxmpp/__init__.py | 12 ++-- nbxmpp/auth_nb.py | 107 ++++++++++++++++++++++++++------------------ nbxmpp/bosh.py | 28 +++++----- nbxmpp/c14n.py | 4 +- nbxmpp/client_nb.py | 31 ++++++------ nbxmpp/dispatcher_nb.py | 59 ++++++++++++++---------- nbxmpp/features_nb.py | 2 +- nbxmpp/idlequeue.py | 80 +++++++++++++++++++++----------- nbxmpp/protocol.py | 20 +++---- nbxmpp/proxy_connectors.py | 44 +++++++++-------- nbxmpp/rndg.py | 2 +- nbxmpp/roster_nb.py | 28 +++++----- nbxmpp/simplexml.py | 64 +++++++++++++++++--------- nbxmpp/smacks.py | 4 +- nbxmpp/stringprepare.py | 32 ++++++------ nbxmpp/tls_nb.py | 109 ++++++++++++++++++++++++++------------------ nbxmpp/transports_nb.py | 99 ++++++++++++++++++++++++++++------------ 17 files changed, 426 insertions(+), 299 deletions(-) diffs (truncated from 1859 to 300 lines): diff -r fa6cb8f12391 -r eb393b576751 nbxmpp/__init__.py --- a/nbxmpp/__init__.py Mon Mar 31 16:54:20 2014 +0200 +++ b/nbxmpp/__init__.py Wed Apr 09 17:34:26 2014 +0200 @@ -10,11 +10,11 @@ Thanks and credits to the xmpppy developers. See: http://xmpppy.sourceforge.net/ """ -from protocol import * -import simplexml, protocol, auth_nb, transports_nb, roster_nb -import dispatcher_nb, features_nb, idlequeue, bosh, tls_nb, proxy_connectors -from client_nb import NonBlockingClient -from plugin import PlugIn -from smacks import Smacks +from .protocol import * +from . import simplexml, protocol, auth_nb, transports_nb, roster_nb +from . import dispatcher_nb, features_nb, idlequeue, bosh, tls_nb, proxy_connectors +from .client_nb import NonBlockingClient +from .plugin import PlugIn +from .smacks import Smacks __version__ = "0.3.3" diff -r fa6cb8f12391 -r eb393b576751 nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Mon Mar 31 16:54:20 2014 +0200 +++ b/nbxmpp/auth_nb.py Wed Apr 09 17:34:26 2014 +0200 @@ -21,24 +21,27 @@ See client_nb.py """ -from protocol import NS_SASL, NS_SESSION, NS_STREAMS, NS_BIND, NS_AUTH -from protocol import NS_STREAM_MGMT -from protocol import Node, NodeProcessed, isResultNode, Iq, Protocol, JID -from plugin import PlugIn +from __future__ import unicode_literals + +from .protocol import NS_SASL, NS_SESSION, NS_STREAMS, NS_BIND, NS_AUTH +from .protocol import NS_STREAM_MGMT +from .protocol import Node, NodeProcessed, isResultNode, Iq, Protocol, JID +from .plugin import PlugIn +import sys import re import base64 -import dispatcher_nb +from . import dispatcher_nb import hmac import hashlib import logging log = logging.getLogger('nbxmpp.auth_nb') -import rndg +from . import rndg def HH(some): return hashlib.md5(some).hexdigest() def H(some): return hashlib.md5(some).digest() -def C(some): return ':'.join(some) +def C(some): return b':'.join(some) try: kerberos = __import__('kerberos') @@ -215,9 +218,9 @@ raise NodeProcessed if "EXTERNAL" in self.mecs: self.mecs.remove('EXTERNAL') - sasl_data = u'%s@%s' % (self.username, self._owner.Server) - sasl_data = sasl_data.encode('utf-8').encode('base64').replace( - '\n', '') + sasl_data = '%s@%s' % (self.username, self._owner.Server) + sasl_data = base64.b64encode(sasl_data.encode('utf-8')).decode( + 'utf-8').replace('\n', '') node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'EXTERNAL'}, payload=[sasl_data]) self.mechanism = 'EXTERNAL' @@ -238,7 +241,7 @@ self.startsasl = SASL_IN_PROCESS self._owner.send(str(node)) raise NodeProcessed - except kerberos.GSSError, e: + except kerberos.GSSError as e: log.info('GSSAPI authentication failed: %s' % str(e)) if 'SCRAM-SHA-1-PLUS' in self.mecs and self.channel_binding != None: self.mecs.remove('SCRAM-SHA-1-PLUS') @@ -290,10 +293,15 @@ return def scram_base64(s): - return ''.join(s.encode('base64').split('\n')) + try: + s = s.encode('utf-8') + except: + pass + return ''.join(base64.b64encode(s).decode('utf-8').\ + split('\n')) incoming_data = challenge.getData() - data=base64.decodestring(incoming_data) + data=base64.b64decode(incoming_data.encode('utf-8')).decode('utf-8') ### Handle Auth result def on_auth_fail(reason): log.info('Failed SASL authentification: %s' % reason) @@ -366,11 +374,16 @@ hashfn = hashlib.sha1 def HMAC(k, s): - return hmac.HMAC(key=k, msg=s, digestmod=hashfn).digest() + return hmac.new(key=k, msg=s, digestmod=hashfn).digest() - def XOR(x, y): - r = (chr(ord(px) ^ ord(py)) for px, py in zip(x, y)) - return ''.join(r) + if sys.version_info[0] == 2: + def XOR(x, y): + r = (chr(ord(px) ^ ord(py)) for px, py in zip(x, y)) + return bytes(b''.join(r)) + else: + def XOR(x, y): + r = [px ^ py for px, py in zip(x, y)] + return bytes(r) def Hi(s, salt, iters): ii = 1 @@ -378,7 +391,7 @@ s = s.encode('utf-8') except: pass - ui_1 = HMAC(s, salt + '\0\0\0\01') + ui_1 = HMAC(s, salt + b'\0\0\0\01') ui = ui_1 for i in range(iters - 1): ii += 1 @@ -406,16 +419,17 @@ + self.channel_binding) r += ',r=' + data['r'] self.scram_soup += r - salt = data['s'].decode('base64') + self.scram_soup = self.scram_soup.encode('utf-8') + salt = base64.b64decode(data['s'].encode('utf-8')) iter = int(data['i']) SaltedPassword = Hi(self.password, salt, iter) # TODO: Could cache this, along with salt+iter. - ClientKey = HMAC(SaltedPassword, 'Client Key') + ClientKey = HMAC(SaltedPassword, b'Client Key') StoredKey = scram_H(ClientKey) ClientSignature = HMAC(StoredKey, self.scram_soup) ClientProof = XOR(ClientKey, ClientSignature) r += ',p=' + scram_base64(ClientProof) - ServerKey = HMAC(SaltedPassword, 'Server Key') + ServerKey = HMAC(SaltedPassword, b'Server Key') self.scram_ServerSignature = HMAC(ServerKey, self.scram_soup) sasl_data = scram_base64(r) node = Node('response', attrs={'xmlns': NS_SASL}, @@ -425,7 +439,8 @@ if self.scram_step == 1: data = _scram_parse(data) - if data['v'].decode('base64') != self.scram_ServerSignature: + if base64.b64decode(data['v'].encode('utf-8')).decode('utf-8') \ + != self.scram_ServerSignature: # TODO: Not clear what to do here - need to abort. raise Exception node = Node('response', attrs={'xmlns': NS_SASL}); @@ -469,7 +484,7 @@ @staticmethod def _convert_to_iso88591(string): try: - string = string.decode('utf-8').encode('iso-8859-1') + string = string.encode('iso-8859-1') except UnicodeEncodeError: pass return string @@ -482,14 +497,14 @@ if self.mechanism == 'SCRAM-SHA-1': if self.channel_binding == None: # Client doesn't support Channel Binding - self.scram_gs2 = 'n,,' + self.scram_gs2 = 'n,,' # No CB yet. else: # Client supports CB, but server doesn't support CB - self.scram_gs2 = 'y,,' + self.scram_gs2 = 'y,,' else: self.scram_gs2 = 'p=tls-unique,,' - sasl_data = (self.scram_gs2 + self.scram_soup).encode('base64').\ - replace('\n', '') + sasl_data = base64.b64encode((self.scram_gs2 + self.scram_soup).\ + encode('utf-8')).decode('utf-8').replace('\n', '') node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': self.mechanism}, payload=[sasl_data]) elif self.mechanism == 'DIGEST-MD5': @@ -497,30 +512,34 @@ hash_realm = self._convert_to_iso88591(self.resp['realm']) hash_password = self._convert_to_iso88591(self.password) A1 = C([H(C([hash_username, hash_realm, hash_password])), - self.resp['nonce'], self.resp['cnonce']]) - A2 = C(['AUTHENTICATE', self.resp['digest-uri']]) - response = HH(C([HH(A1), self.resp['nonce'], self.resp['nc'], - self.resp['cnonce'], self.resp['qop'], HH(A2)])) - A2 = C(['', self.resp['digest-uri']]) - self.digest_rspauth = HH(C([HH(A1), self.resp['nonce'], - self.resp['nc'], self.resp['cnonce'], self.resp['qop'], - HH(A2)])) + self.resp['nonce'].encode('utf-8'), self.resp['cnonce'].encode( + 'utf-8')]) + A2 = C([b'AUTHENTICATE', self.resp['digest-uri'].encode('utf-8')]) + response = HH(C([HH(A1).encode('utf-8'), self.resp['nonce'].encode( + 'utf-8'), self.resp['nc'].encode('utf-8'), self.resp['cnonce'].\ + encode('utf-8'), self.resp['qop'].encode('utf-8'), HH(A2).\ + encode('utf-8')])) + A2 = C([b'', self.resp['digest-uri'].encode('utf-8')]) + self.digest_rspauth = HH(C([HH(A1).encode('utf-8'), self.resp[ + 'nonce'].encode('utf-8'), self.resp['nc'].encode('utf-8'), + self.resp['cnonce'].encode('utf-8'), self.resp['qop'].encode( + 'utf-8'), HH(A2).encode('utf-8')])) self.resp['response'] = response - sasl_data = u'' + sasl_data = '' for key in ('charset', 'username', 'realm', 'nonce', 'nc', 'cnonce', 'digest-uri', 'response', 'qop'): if key in ('nc', 'qop', 'response', 'charset'): - sasl_data += u"%s=%s," % (key, self.resp[key]) + sasl_data += "%s=%s," % (key, self.resp[key]) else: - sasl_data += u'%s="%s",' % (key, self.resp[key]) - sasl_data = sasl_data[:-1].encode('utf-8').encode('base64').replace( - '\r', '').replace('\n', '') + sasl_data += '%s="%s",' % (key, self.resp[key]) + sasl_data = base64.b64encode(sasl_data[:-1].encode('utf-8')).\ + decode('utf-8').replace('\r', '').replace('\n', '') node = Node('response', attrs={'xmlns': NS_SASL}, payload=[sasl_data]) elif self.mechanism == 'PLAIN': - sasl_data = u'\x00%s\x00%s' % (self.username, self.password) - sasl_data = sasl_data.encode('utf-8').encode('base64').replace( - '\n', '') + sasl_data = '\x00%s\x00%s' % (self.username, self.password) + sasl_data = base64.b64encode(sasl_data.encode('utf-8')).decode( + 'utf-8').replace('\n', '') node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'PLAIN'}, payload=[sasl_data]) elif self.mechanism == 'X-MESSENGER-OAUTH2': @@ -595,7 +614,7 @@ query.setTagData('hash', hash_) self._method='0k' else: - log.warn("Secure methods unsupported, performing plain text \ + log.warning("Secure methods unsupported, performing plain text \ authentication") self._method = 'plain' self._owner._caller.get_password(self._on_password, self._method) diff -r fa6cb8f12391 -r eb393b576751 nbxmpp/bosh.py --- a/nbxmpp/bosh.py Mon Mar 31 16:54:20 2014 +0200 +++ b/nbxmpp/bosh.py Wed Apr 09 17:34:26 2014 +0200 @@ -20,16 +20,16 @@ import locale from hashlib import sha1 -from transports_nb import NonBlockingTransport, NonBlockingHTTPBOSH,\ +from .transports_nb import NonBlockingTransport, NonBlockingHTTPBOSH,\ CONNECTED, CONNECTING, DISCONNECTED, DISCONNECTING,\ urisplit, DISCONNECT_TIMEOUT_SECONDS -from protocol import BOSHBody, Protocol, NS_CLIENT -from simplexml import Node +from .protocol import BOSHBody, Protocol, NS_CLIENT +from .simplexml import Node import logging log = logging.getLogger('nbxmpp.bosh') -import rndg +from . import rndg KEY_COUNT = 10 @@ -94,7 +94,7 @@ # ssl variables self.ssl_certificate = None - self.ssl_errnum = None + self.ssl_errnum = 0 def connect(self, conn_5tuple, on_connect, on_connect_failure): @@ -130,7 +130,7 @@ if self.get_state() != DISCONNECTED and self.fd != -1: NonBlockingTransport.set_timeout(self, timeout) else: - log.warn('set_timeout: TIMEOUT NOT SET: state is %s, fd is %s' % (self.get_state(), self.fd)) + log.warning('set_timeout: TIMEOUT NOT SET: state is %s, fd is %s' % (self.get_state(), self.fd)) def on_http_request_possible(self): """ @@ -217,7 +217,7 @@ # sent after HTTP response from CM, exception is when we're disconnecting - then we # send anyway if total_pending_reqs >= self.bosh_requests and self.get_state()!=DISCONNECTING: - log.warn('attemp to make more requests than allowed by Connection Manager:\n%s' % + log.warning('attemp to make more requests than allowed by Connection Manager:\n%s' % self.get_current_state()) return @@ -310,7 +310,7 @@

1 0

python-nbxmpp: always store certificate of server, even if there...
by Python-nbxmpp 09 Apr '14

09 Apr '14

changeset d6b80a7947ff in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=d6b80a7947ff description: always store certificate of server, even if there is no error diffstat: nbxmpp/tls_nb.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (16 lines): diff -r bfaed5452b52 -r d6b80a7947ff nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Wed Apr 09 17:18:57 2014 +0200 +++ b/nbxmpp/tls_nb.py Sat Mar 29 18:28:28 2014 +0100 @@ -493,9 +493,10 @@ def _ssl_verify_callback(self, sslconn, cert, errnum, depth, ok): # Exceptions can't propagate up through this callback, so print them here. try: - if not ok and depth == 0: + if depth == 0: self._owner.ssl_certificate = cert - self._owner.ssl_errnum = errnum + if not ok: + self._owner.ssl_errnum = errnum return True except: log.error("Exception caught in _ssl_info_callback:", exc_info=True)

1 0

python-nbxmpp: BOSH doesn't support channel binding.
by Python-nbxmpp 09 Apr '14

09 Apr '14

changeset d99441bf920a in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=d99441bf920a description: BOSH doesn't support channel binding. BOSH (XEP-0124) uses short lived HTTPS connections for encryption. Channel binding requires long lived TLS connection, therefor doesn't work with XMPP over BOSH. Fixes #22 diffstat: nbxmpp/client_nb.py | 7 ++++--- nbxmpp/tls_nb.py | 7 +++++-- nbxmpp/transports_nb.py | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diffs (45 lines): diff -r d6b80a7947ff -r d99441bf920a nbxmpp/client_nb.py --- a/nbxmpp/client_nb.py Sat Mar 29 18:28:28 2014 +0100 +++ b/nbxmpp/client_nb.py Mon Mar 31 16:54:20 2014 +0200 @@ -495,9 +495,10 @@ self._channel_binding = None if self.connected in ('ssl', 'tls'): try: - self._channel_binding = self.Connection.NonBlockingTLS.get_channel_binding() - # TLS handshake is finished so channel binding data muss exist - assert (self._channel_binding != None) + if self.protocol_type != 'BOSH': + self._channel_binding = self.Connection.NonBlockingTLS.get_channel_binding() + # TLS handshake is finished so channel binding data muss exist + assert (self._channel_binding != None) except NotImplementedError: pass if auth_mechs == None: diff -r d6b80a7947ff -r d99441bf920a nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Sat Mar 29 18:28:28 2014 +0100 +++ b/nbxmpp/tls_nb.py Mon Mar 31 16:54:20 2014 +0200 @@ -508,7 +508,10 @@ Get channel binding data. RFC 5929 """ sslObj = self._owner._sslObj - try: - return sslObj.get_channel_binding() + try: + if USE_PYOPENSSL: + return sslObj.get_finished() + else: + return sslObj.get_channel_binding() except AttributeError: raise NotImplementedError diff -r d6b80a7947ff -r d99441bf920a nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sat Mar 29 18:28:28 2014 +0100 +++ b/nbxmpp/transports_nb.py Mon Mar 31 16:54:20 2014 +0200 @@ -555,7 +555,7 @@ return None self.sendbuff = self.sendqueue.pop(0) try: - send_count = self._send(self.sendbuff) + send_count = self._send(self.sendbuff.encode("utf-8")) if send_count: sent_data = self.sendbuff[:send_count] self.sendbuff = self.sendbuff[send_count:]

1 0

python-nbxmpp: merge python23 branch
by Python-nbxmpp 09 Apr '14

09 Apr '14

changeset bfaed5452b52 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=bfaed5452b52 description: merge python23 branch diffstat: nbxmpp/auth_nb.py | 14 +++++++++++--- nbxmpp/c14n.py | 2 +- nbxmpp/dispatcher_nb.py | 5 +++++ nbxmpp/idlequeue.py | 45 +++++++++++++++++++++++++++++++++++---------- nbxmpp/simplexml.py | 48 ++++++++++++++++++++++++++++++++++-------------- nbxmpp/tls_nb.py | 2 ++ nbxmpp/transports_nb.py | 8 +++++++- 7 files changed, 95 insertions(+), 29 deletions(-) diffs (261 lines): diff -r 3dec8187531c -r bfaed5452b52 nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Thu Mar 27 13:22:15 2014 +0100 +++ b/nbxmpp/auth_nb.py Wed Apr 09 17:18:57 2014 +0200 @@ -21,10 +21,13 @@ See client_nb.py """ +from __future__ import unicode_literals + from .protocol import NS_SASL, NS_SESSION, NS_STREAMS, NS_BIND, NS_AUTH from .protocol import NS_STREAM_MGMT from .protocol import Node, NodeProcessed, isResultNode, Iq, Protocol, JID from .plugin import PlugIn +import sys import re import base64 from . import dispatcher_nb @@ -373,9 +376,14 @@ def HMAC(k, s): return hmac.new(key=k, msg=s, digestmod=hashfn).digest() - def XOR(x, y): - r = [px ^ py for px, py in zip(x, y)] - return bytes(r) + if sys.version_info[0] == 2: + def XOR(x, y): + r = (chr(ord(px) ^ ord(py)) for px, py in zip(x, y)) + return bytes(b''.join(r)) + else: + def XOR(x, y): + r = [px ^ py for px, py in zip(x, y)] + return bytes(r) def Hi(s, salt, iters): ii = 1 diff -r 3dec8187531c -r bfaed5452b52 nbxmpp/c14n.py --- a/nbxmpp/c14n.py Thu Mar 27 13:22:15 2014 +0100 +++ b/nbxmpp/c14n.py Wed Apr 09 17:18:57 2014 +0200 @@ -50,7 +50,7 @@ s=s[:-1]+' />' else: s = s + "</" + node.name + ">" - return s.encode('utf-8') + return s def normalise_attr(val): return val.replace('&', '&').replace('<', '<').replace('"', '"').replace('\t', '	').replace('\n', '
').replace('\r', '') diff -r 3dec8187531c -r bfaed5452b52 nbxmpp/dispatcher_nb.py --- a/nbxmpp/dispatcher_nb.py Thu Mar 27 13:22:15 2014 +0100 +++ b/nbxmpp/dispatcher_nb.py Wed Apr 09 17:18:57 2014 +0200 @@ -20,6 +20,7 @@ different handlers to different XMPP stanzas and namespaces """ +from __future__ import unicode_literals from . import simplexml import sys import locale @@ -29,6 +30,10 @@ from .protocol import (NS_STREAMS, NS_XMPP_STREAMS, NS_HTTP_BIND, Iq, Presence, Message, Protocol, Node, Error, ERR_FEATURE_NOT_IMPLEMENTED, StreamError) import logging + +if sys.version_info[0] == 2: + chr = unichr + log = logging.getLogger('nbxmpp.dispatcher_nb') #: default timeout to wait for response for our id diff -r 3dec8187531c -r bfaed5452b52 nbxmpp/idlequeue.py --- a/nbxmpp/idlequeue.py Thu Mar 27 13:22:15 2014 +0100 +++ b/nbxmpp/idlequeue.py Wed Apr 09 17:18:57 2014 +0200 @@ -18,14 +18,20 @@ objects and be informed about possible IO """ +from __future__ import unicode_literals + import os +import sys import select import logging log = logging.getLogger('nbxmpp.idlequeue') # needed for get_idleqeue try: - from gi.repository import GLib + if sys.version_info[0] == 2: + import gobject + else: + from gi.repository import GLib HAVE_GLIB = True except ImportError: HAVE_GLIB = False @@ -36,11 +42,18 @@ elif os.name == 'posix': import fcntl -FLAG_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.HUP -FLAG_READ = GLib.IOCondition.IN | GLib.IOCondition.PRI | GLib.IOCondition.HUP -FLAG_READ_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.IN | \ - GLib.IOCondition.PRI | GLib.IOCondition.HUP -FLAG_CLOSE = GLib.IOCondition.HUP +if sys.version_info[0] == 2: + FLAG_WRITE = 20 # write only + FLAG_READ = 19 # read only + FLAG_READ_WRITE = 23 # read and write + FLAG_CLOSE = 16 # wait for close +else: + FLAG_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.HUP + FLAG_READ = GLib.IOCondition.IN | GLib.IOCondition.PRI | \ + GLib.IOCondition.HUP + FLAG_READ_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.IN | \ + GLib.IOCondition.PRI | GLib.IOCondition.HUP + FLAG_CLOSE = GLib.IOCondition.HUP PENDING_READ = 3 # waiting read event PENDING_WRITE = 4 # waiting write event @@ -516,15 +529,18 @@ Creates a dict, which maps file/pipe/sock descriptor to glib event id """ self.events = {} - self.current_time = GLib.get_real_time def _add_idle(self, fd, flags): """ This method is called when we plug a new idle object. Start listening for events from fd """ - res = GLib.io_add_watch(fd, GLib.PRIORITY_LOW, flags, - self._process_events) + if sys.version_info[0] == 2: + res = gobject.io_add_watch(fd, flags, self._process_events, + priority=gobject.PRIORITY_LOW) + else: + res = GLib.io_add_watch(fd, GLib.PRIORITY_LOW, flags, + self._process_events) # store the id of the watch, so that we can remove it on unplug self.events[fd] = res @@ -543,8 +559,17 @@ """ if not fd in self.events: return - GLib.source_remove(self.events[fd]) + if sys.version_info[0] == 2: + gobject.source_remove(self.events[fd]) + else: + GLib.source_remove(self.events[fd]) del(self.events[fd]) def process(self): self._check_time_events() + + if sys.version_info[0] == 2: + def current_time(self): + return gobject.get_current_time() * 1e6 + else: + current_time = GLib.get_real_time diff -r 3dec8187531c -r bfaed5452b52 nbxmpp/simplexml.py --- a/nbxmpp/simplexml.py Thu Mar 27 13:22:15 2014 +0100 +++ b/nbxmpp/simplexml.py Wed Apr 09 17:18:57 2014 +0200 @@ -20,6 +20,9 @@ projects. It is designed to be as standalone as possible """ +from __future__ import unicode_literals + +import sys import xml.parsers.expat import logging log = logging.getLogger('nbxmpp.simplexml') @@ -34,20 +37,37 @@ ENCODING='utf-8' -def ustr(what): - """ - Converts object "what" to unicode string using it's own __str__ method if - accessible or unicode method otherwise - """ - if isinstance(what, str): - return what - try: - r = what.__str__() - except AttributeError: - r = str(what) - if not isinstance(r, str): - return str(r, ENCODING) - return r +if sys.version_info[0] == 2: + def ustr(what): + """ + Converts object "what" to unicode string using it's own __str__ method if + accessible or unicode method otherwise + """ + if isinstance(what, unicode): + return what + try: + r = what.__str__() + except AttributeError: + r = unicode(what) + if not isinstance(r, unicode): + return unicode(r, ENCODING) + return r + +else: + def ustr(what): + """ + Converts object "what" to unicode string using it's own __str__ method if + accessible or unicode method otherwise + """ + if isinstance(what, str): + return what + try: + r = what.__str__() + except AttributeError: + r = str(what) + if not isinstance(r, str): + return str(r, ENCODING) + return r class Node(object): """ diff -r 3dec8187531c -r bfaed5452b52 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Thu Mar 27 13:22:15 2014 +0100 +++ b/nbxmpp/tls_nb.py Wed Apr 09 17:18:57 2014 +0200 @@ -15,6 +15,8 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +from __future__ import print_function + import socket import ssl from .plugin import PlugIn diff -r 3dec8187531c -r bfaed5452b52 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Thu Mar 27 13:22:15 2014 +0100 +++ b/nbxmpp/transports_nb.py Wed Apr 09 17:18:57 2014 +0200 @@ -24,6 +24,8 @@ connection handling. """ +from __future__ import unicode_literals + from .simplexml import ustr from .plugin import PlugIn from .idlequeue import IdleObject @@ -35,7 +37,11 @@ import time import traceback import base64 -from urllib.parse import urlparse + +try: + from urllib.parse import urlparse +except ImportError: + from urlparse import urlparse import logging log = logging.getLogger('nbxmpp.transports_nb')

1 0

python-nbxmpp: remove bad .encode()
by Python-nbxmpp 09 Apr '14

09 Apr '14

changeset 3d6e29ca2511 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=3d6e29ca2511 description: remove bad .encode() diffstat: nbxmpp/c14n.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r fb11bbe7c37a -r 3d6e29ca2511 nbxmpp/c14n.py --- a/nbxmpp/c14n.py Sun Apr 06 17:44:38 2014 +0200 +++ b/nbxmpp/c14n.py Wed Apr 09 17:18:14 2014 +0200 @@ -50,7 +50,7 @@ s=s[:-1]+' />' else: s = s + "</" + node.name + ">" - return s.encode('utf-8') + return s def normalise_attr(val): return val.replace('&', '&').replace('<', '<').replace('"', '"').replace('\t', '	').replace('\n', '
').replace('\r', '')

1 0

gajim: use host to resolve DNS if it's available.
by Gajim 09 Apr '14

09 Apr '14

changeset b3debc7bde94 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=b3debc7bde94 description: use host to resolve DNS if it's available. diffstat: src/common/resolver.py | 147 ++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 114 insertions(+), 33 deletions(-) diffs (236 lines): diff -r 21c576b271a2 -r b3debc7bde94 src/common/resolver.py --- a/src/common/resolver.py Wed Apr 09 16:55:59 2014 +0200 +++ b/src/common/resolver.py Wed Apr 09 17:04:03 2014 +0200 @@ -51,8 +51,13 @@ def get_resolver(idlequeue): if USE_LIBASYNCNS: + log.info('Using LibAsyncNSResolver') return LibAsyncNSResolver() else: + if helpers.is_in_path('host'): + log.info('Using HostResolver') + return HostResolver(idlequeue) + log.info('Using NSLookupResolver') return NSLookupResolver(idlequeue) class CommonResolver(): @@ -62,43 +67,43 @@ # dict {"host+type" : list of callbacks} self.handlers = {} - def resolve(self, host, on_ready, type='srv'): + def resolve(self, host, on_ready, type_='srv'): host = host.lower() - log.debug('resolve %s type=%s' % (host, type)) - assert(type in ['srv', 'txt']) + log.debug('resolve %s type=%s' % (host, type_)) + assert(type_ in ['srv', 'txt']) if not host: # empty host, return empty list of srv records on_ready([]) return - if self.resolved_hosts.has_key(host+type): + if self.resolved_hosts.has_key(host+type_): # host is already resolved, return cached values log.debug('%s already resolved: %s' % (host, - self.resolved_hosts[host+type])) - on_ready(host, self.resolved_hosts[host+type]) + self.resolved_hosts[host+type_])) + on_ready(host, self.resolved_hosts[host+type_]) return - if self.handlers.has_key(host+type): + if self.handlers.has_key(host+type_): # host is about to be resolved by another connection, # attach our callback log.debug('already resolving %s' % host) - self.handlers[host+type].append(on_ready) + self.handlers[host+type_].append(on_ready) else: # host has never been resolved, start now log.debug('Starting to resolve %s using %s' % (host, self)) - self.handlers[host+type] = [on_ready] - self.start_resolve(host, type) + self.handlers[host+type_] = [on_ready] + self.start_resolve(host, type_) - def _on_ready(self, host, type, result_list): + def _on_ready(self, host, type_, result_list): # practically it is impossible to be the opposite, but who knows :) host = host.lower() log.debug('Resolving result for %s: %s' % (host, result_list)) - if not self.resolved_hosts.has_key(host+type): - self.resolved_hosts[host+type] = result_list - if self.handlers.has_key(host+type): - for callback in self.handlers[host+type]: + if not self.resolved_hosts.has_key(host+type_): + self.resolved_hosts[host+type_] = result_list + if self.handlers.has_key(host+type_): + for callback in self.handlers[host+type_]: callback(host, result_list) - del(self.handlers[host+type]) + del(self.handlers[host+type_]) - def start_resolve(self, host, type): + def start_resolve(self, host, type_): pass # FIXME: API usage is not consistent! This one requires that process is called @@ -113,22 +118,22 @@ self.asyncns = libasyncns.Asyncns() CommonResolver.__init__(self) - def start_resolve(self, host, type): - type = libasyncns.ns_t_srv - if type == 'txt': type = libasyncns.ns_t_txt - resq = self.asyncns.res_query(host, libasyncns.ns_c_in, type) - resq.userdata = {'host':host, 'type':type} + def start_resolve(self, host, type_): + type_ = libasyncns.ns_t_srv + if type_ == 'txt': type_ = libasyncns.ns_t_txt + resq = self.asyncns.res_query(host, libasyncns.ns_c_in, type_) + resq.userdata = {'host':host, 'type':type_} # getaddrinfo to be done #def resolve_name(self, dname, callback): #resq = self.asyncns.getaddrinfo(dname) #resq.userdata = {'callback':callback, 'dname':dname} - def _on_ready(self, host, type, result_list): - if type == libasyncns.ns_t_srv: type = 'srv' - elif type == libasyncns.ns_t_txt: type = 'txt' + def _on_ready(self, host, type_, result_list): + if type_ == libasyncns.ns_t_srv: type_ = 'srv' + elif type_ == libasyncns.ns_t_txt: type_ = 'txt' - CommonResolver._on_ready(self, host, type, result_list) + CommonResolver._on_ready(self, host, type_, result_list) def process(self): try: @@ -153,7 +158,7 @@ continue r['prio'] = r['pref'] hosts.append(r) - self._on_ready(host=requested_host, type=requested_type, + self._on_ready(host=requested_host, type_=requested_type, result_list=hosts) try: resq = self.asyncns.get_next() @@ -277,27 +282,98 @@ 'prio': prio}) return hosts - def _on_ready(self, host, type, result): + def _on_ready(self, host, type_, result): # nslookup finished, parse the result and call the handlers result_list = self.parse_srv_result(host, result) - CommonResolver._on_ready(self, host, type, result_list) + CommonResolver._on_ready(self, host, type_, result_list) - def start_resolve(self, host, type): + def start_resolve(self, host, type_): """ Spawn new nslookup process and start waiting for results """ - ns = NsLookup(self._on_ready, host, type) + ns = NsLookup(self._on_ready, host, type_) ns.set_idlequeue(self.idlequeue) ns.commandtimeout = 20 ns.start() +class HostResolver(CommonResolver): + """ + Asynchronous DNS resolver calling host. Processing of pending requests + is invoked from idlequeue which is watching file descriptor of pipe of + stdout of host process. + """ + + def __init__(self, idlequeue): + self.idlequeue = idlequeue + self.process = False + CommonResolver.__init__(self) + + def parse_srv_result(self, fqdn, result): + """ + Parse the output of host command and return list of properties: + 'host', 'port','weight', 'priority' corresponding to the found srv hosts + """ + # typical output of host command: + # _xmpp-client._tcp.jabber.org has SRV record 30 30 5222 jabber.org. + if not result: + return [] + ufqdn = helpers.ascii_to_idn(fqdn) # Unicode domain name + hosts = [] + lines = result.split('\n') + for line in lines: + if line == '': + continue + domain = None + if line.startswith(fqdn): + domain = fqdn # For nslookup 9.5 + elif helpers.decode_string(line).startswith(ufqdn): + line = helpers.decode_string(line) + domain = ufqdn # For nslookup 9.6 + if domain: + # add 4 for ' has' after domain name + rest = line[len(domain)+4:].split('=') + if len(rest) != 2: + continue + answer_type, props_str = rest + if answer_type.strip() != 'SRV': + continue + props = props_str.strip().split(' ') + if len(props) < 4: + continue + prio, weight, port, host = props[-4:] + if host[-1] == '.': + host = host[:-1] + try: + prio = int(prio) + weight = int(weight) + port = int(port) + except ValueError: + continue + hosts.append({'host': host, 'port': port, 'weight': weight, + 'prio': prio}) + return hosts + + def _on_ready(self, host, type_, result): + # host finished, parse the result and call the handlers + result_list = self.parse_srv_result(host, result) + CommonResolver._on_ready(self, host, type_, result_list) + + def start_resolve(self, host, type_): + """ + Spawn new nslookup process and start waiting for results + """ + ns = Host(self._on_ready, host, type_) + ns.set_idlequeue(self.idlequeue) + ns.commandtimeout = 20 + ns.start() + class NsLookup(IdleCommand): - def __init__(self, on_result, host='_xmpp-client', type='srv'): + def __init__(self, on_result, host='_xmpp-client', type_='srv'): IdleCommand.__init__(self, on_result) self.commandtimeout = 10 self.host = host.lower() - self.type_ = type.lower() + self.type_ = type_.lower() if not host_pattern.match(self.host): # invalid host name log.error('Invalid host: %s' % self.host) @@ -316,6 +392,11 @@ self.result_handler(self.host, self.type_, self.result) self.result_handler = None + +class Host(NsLookup): + def _compose_command_args(self): + return ['host', '-t', self.type_, self.host] + # below lines is on how to use API and assist in testing if __name__ == '__main__': import gobject

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2014