Commits May 2011

commits@gajim.org

3 participants
119 discussions

gajim: merging
by Jefry Lagrange 31 May '11

31 May '11

changeset d8912f584584 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d8912f584584 description: merging diffstat: src/common/xmpp/auth_nb.py | 111 ++++++++++++++++++++++++-------------------- 1 files changed, 60 insertions(+), 51 deletions(-) diffs (truncated from 327 to 300 lines): diff -r 89e56f029296 -r d8912f584584 src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Tue May 31 18:03:28 2011 -0400 +++ b/src/common/xmpp/auth_nb.py Tue May 31 18:05:04 2011 -0400 @@ -21,9 +21,11 @@ See client_nb.py """ -from protocol import NS_SASL, NS_SESSION, NS_STREAMS, NS_BIND, NS_AUTH, NS_STREAM_MGMT +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 smacks import Smacks import base64 import random import itertools @@ -31,7 +33,7 @@ import hashlib import hmac import hashlib -from smacks import Smacks + import logging log = logging.getLogger('gajim.c.x.auth_nb') @@ -142,7 +144,7 @@ elif self._owner.Dispatcher.Stream.features: try: self.FeaturesHandler(self._owner.Dispatcher, - self._owner.Dispatcher.Stream.features) + self._owner.Dispatcher.Stream.features) except NodeProcessed: pass else: @@ -154,16 +156,16 @@ """ if 'features' in self._owner.__dict__: self._owner.UnregisterHandler('features', self.FeaturesHandler, - xmlns=NS_STREAMS) + xmlns=NS_STREAMS) if 'challenge' in self._owner.__dict__: self._owner.UnregisterHandler('challenge', self.SASLHandler, - xmlns=NS_SASL) + xmlns=NS_SASL) if 'failure' in self._owner.__dict__: self._owner.UnregisterHandler('failure', self.SASLHandler, - xmlns=NS_SASL) + xmlns=NS_SASL) if 'success' in self._owner.__dict__: self._owner.UnregisterHandler('success', self.SASLHandler, - xmlns=NS_SASL) + xmlns=NS_SASL) def auth(self): """ @@ -178,12 +180,12 @@ elif self._owner.Dispatcher.Stream.features: try: self.FeaturesHandler(self._owner.Dispatcher, - self._owner.Dispatcher.Stream.features) + self._owner.Dispatcher.Stream.features) except NodeProcessed: pass else: self._owner.RegisterHandler('features', - self.FeaturesHandler, xmlns=NS_STREAMS) + self.FeaturesHandler, xmlns=NS_STREAMS) def FeaturesHandler(self, conn, feats): """ @@ -198,7 +200,8 @@ 'mechanism'): self.mecs.append(mec.getData()) - self._owner.RegisterHandler('challenge', self.SASLHandler, xmlns=NS_SASL) + self._owner.RegisterHandler('challenge', self.SASLHandler, + xmlns=NS_SASL) self._owner.RegisterHandler('failure', self.SASLHandler, xmlns=NS_SASL) self._owner.RegisterHandler('success', self.SASLHandler, xmlns=NS_SASL) self.MechanismHandler() @@ -206,7 +209,8 @@ def MechanismHandler(self): if 'ANONYMOUS' in self.mecs and self.username is None: self.mecs.remove('ANONYMOUS') - node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'ANONYMOUS'}) + node = Node('auth', attrs={'xmlns': NS_SASL, + 'mechanism': 'ANONYMOUS'}) self.mechanism = 'ANONYMOUS' self.startsasl = SASL_IN_PROCESS self._owner.send(str(node)) @@ -226,11 +230,11 @@ self.mecs.remove('GSSAPI') try: self.gss_vc = kerberos.authGSSClientInit('xmpp@' + \ - self._owner.xmpp_hostname)[1] + self._owner.xmpp_hostname)[1] kerberos.authGSSClientStep(self.gss_vc, '') response = kerberos.authGSSClientResponse(self.gss_vc) - node=Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'GSSAPI'}, - payload=(response or '')) + node=Node('auth', attrs={'xmlns': NS_SASL, + 'mechanism': 'GSSAPI'}, payload=(response or '')) self.mechanism = 'GSSAPI' self.gss_step = GSS_STATE_STEP self.startsasl = SASL_IN_PROCESS @@ -247,7 +251,8 @@ raise NodeProcessed if 'DIGEST-MD5' in self.mecs: self.mecs.remove('DIGEST-MD5') - node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'DIGEST-MD5'}) + node = Node('auth', attrs={'xmlns': NS_SASL, + 'mechanism': 'DIGEST-MD5'}) self.mechanism = 'DIGEST-MD5' self.startsasl = SASL_IN_PROCESS self._owner.send(str(node)) @@ -294,13 +299,13 @@ handlers = self._owner.Dispatcher.dumpHandlers() # Bosh specific dispatcher replugging - # save old features. They will be used in case we won't get response on - # stream restart after SASL auth (happens with XMPP over BOSH with - # Openfire) + # save old features. They will be used in case we won't get response + # on stream restart after SASL auth (happens with XMPP over BOSH + # with Openfire) old_features = self._owner.Dispatcher.Stream.features self._owner.Dispatcher.PlugOut() dispatcher_nb.Dispatcher.get_instance().PlugIn(self._owner, - after_SASL=True, old_features=old_features) + after_SASL=True, old_features=old_features) self._owner.Dispatcher.restoreHandlers(handlers) self._owner.User = self.username @@ -322,12 +327,12 @@ rc = kerberos.authGSSClientUnwrap(self.gss_vc, incoming_data) response = kerberos.authGSSClientResponse(self.gss_vc) rc = kerberos.authGSSClientWrap(self.gss_vc, response, - kerberos.authGSSClientUserName(self.gss_vc)) + kerberos.authGSSClientUserName(self.gss_vc)) response = kerberos.authGSSClientResponse(self.gss_vc) if not response: response = '' self._owner.send(Node('response', attrs={'xmlns': NS_SASL}, - payload=response).__str__()) + payload=response).__str__()) raise NodeProcessed if self.mechanism == 'SCRAM-SHA-1': hashfn = hashlib.sha1 @@ -408,8 +413,8 @@ else: self.resp['realm'] = self._owner.Server self.resp['nonce'] = chal['nonce'] - self.resp['cnonce'] = ''.join("%x" % randint(0, 2**28) for randint in - itertools.repeat(random.randint, 7)) + self.resp['cnonce'] = ''.join("%x" % randint(0, 2**28) for randint \ + in itertools.repeat(random.randint, 7)) self.resp['nc'] = ('00000001') self.resp['qop'] = 'auth' self.resp['digest-uri'] = 'xmpp/' + self._owner.Server @@ -449,10 +454,10 @@ 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']]) + 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)])) + self.resp['cnonce'], self.resp['qop'], HH(A2)])) self.resp['response'] = response sasl_data = u'' for key in ('charset', 'username', 'realm', 'nonce', 'nc', 'cnonce', @@ -462,14 +467,15 @@ else: sasl_data += u'%s="%s",' % (key, self.resp[key]) sasl_data = sasl_data[:-1].encode('utf-8').encode('base64').replace( - '\r', '').replace('\n', '') - node = Node('response', attrs={'xmlns':NS_SASL}, payload=[sasl_data]) + '\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', '') + '\n', '') node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'PLAIN'}, - payload=[sasl_data]) + payload=[sasl_data]) self._owner.send(str(node)) @@ -491,8 +497,8 @@ self.password = password self.resource = resource self.on_auth = on_auth - - + + def plugin(self, owner): """ Determine the best auth method (digest/0k/plain) and use it for auth. @@ -502,8 +508,8 @@ self.owner = owner owner.Dispatcher.SendAndWaitForResponse( - Iq('get', NS_AUTH, payload=[Node('username', payload=[self.user])]), - func=self._on_username) + Iq('get', NS_AUTH, payload=[Node('username', payload=[self.user])]), + func=self._on_username) def _on_username(self, resp): if not isResultNode(resp): @@ -518,8 +524,8 @@ if query.getTag('digest'): log.info("Performing digest authentication") query.setTagData('digest', - hashlib.sha1(self.owner.Dispatcher.Stream._document_attrs['id'] - + self.password).hexdigest()) + hashlib.sha1(self.owner.Dispatcher.Stream._document_attrs['id'] + + self.password).hexdigest()) if query.getTag('password'): query.delChild('password') self._method = 'digest' @@ -534,23 +540,25 @@ def hash_n_times(s, count): return count and hasher(hash_n_times(s, count-1)) or s - hash_ = hash_n_times(hasher(hasher(self.password) + token), int(seq)) + hash_ = hash_n_times(hasher(hasher(self.password) + token), + int(seq)) query.setTagData('hash', hash_) self._method='0k' else: log.warn("Secure methods unsupported, performing plain text \ - authentication") + authentication") query.setTagData('password', self.password) self._method = 'plain' - resp = self.owner.Dispatcher.SendAndWaitForResponse(iq, func=self._on_auth) + resp = self.owner.Dispatcher.SendAndWaitForResponse(iq, + func=self._on_auth) def _on_auth(self, resp): if isResultNode(resp): log.info('Sucessfully authenticated with remote host.') self.owner.User = self.user self.owner.Resource = self.resource - self.owner._registered_name = self.owner.User+'@'+self.owner.Server+\ - '/'+self.owner.Resource + self.owner._registered_name = self.owner.User + '@' + \ + self.owner.Server+ '/' + self.owner.Resource return self.on_auth(self._method) log.info('Authentication failed!') return self.on_auth(None) @@ -572,24 +580,24 @@ if self._owner.Dispatcher.Stream.features: try: self.FeaturesHandler(self._owner.Dispatcher, - self._owner.Dispatcher.Stream.features) + self._owner.Dispatcher.Stream.features) except NodeProcessed: pass else: self._owner.RegisterHandler('features', self.FeaturesHandler, - xmlns=NS_STREAMS) + xmlns=NS_STREAMS) def FeaturesHandler(self, conn, feats): """ Determine if server supports resource binding and set some internal attributes accordingly. - + It also checks if server supports stream management """ - + if feats.getTag('sm', namespace=NS_STREAM_MGMT): self.supports_sm = True # server supports stream management - + if not feats.getTag('bind', namespace=NS_BIND): log.info('Server does not requested binding.') # we try to bind resource anyway @@ -607,7 +615,7 @@ Remove Bind handler from owner's dispatcher. Used internally """ self._owner.UnregisterHandler('features', self.FeaturesHandler, - xmlns=NS_STREAMS) + xmlns=NS_STREAMS) def NonBlockingBind(self, resource=None, on_bound=None): """ @@ -622,8 +630,9 @@ self._owner.onreceive(None) self._owner.Dispatcher.SendAndWaitForResponse( - Protocol('iq', typ='set', payload=[Node('bind', attrs={'xmlns':NS_BIND},

1 0

gajim: minor changes
by Jefry Lagrange 31 May '11

31 May '11

changeset 89e56f029296 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=89e56f029296 description: minor changes diffstat: src/common/xmpp/smacks.py | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diffs (42 lines): diff -r 7868d2ebc85f -r 89e56f029296 src/common/xmpp/smacks.py --- a/src/common/xmpp/smacks.py Tue May 31 17:09:49 2011 -0400 +++ b/src/common/xmpp/smacks.py Tue May 31 18:03:28 2011 -0400 @@ -18,6 +18,8 @@ self.out_h = 0 # Outgoing stanzas handled self.in_h = 0 # Incoming stanzas handled self.uqueue = [] # Unhandled stanzas queue + self.sesion_id = None + self.supports_resume = False # If server supports resume # Max number of stanzas in queue before making a request self.max_queue = 5 # Register handlers @@ -32,11 +34,15 @@ def negociate(self): stanza = Acks() - stanza.buildEnable() - self._owner.Connection.send(stanza, True) + stanza.buildEnable(resume=True) + self._owner.Connection.send(stanza, now=True) def _neg_response(self, disp, stanza): - pass + r = stanza.getAttr('resume') + if r == 'true': + self.supports_resume = True + self.sesion_id = stanza.getAttr(id) + def send_ack(self, disp, stanza): ack = Acks() @@ -49,6 +55,10 @@ self._owner.Connection.send(r, False) def check_ack(self, disp, stanza): + ''' Checks if the number of stanzas sent are the same as the + number of stanzas received by the server. Pops stanzas that were + handled by the server from the queue. + ''' h = int(stanza.getAttr('h')) diff = self.out_h - h

1 0

gajim: Checks for stanzas handled by server
by Jefry Lagrange 31 May '11

31 May '11

changeset 7868d2ebc85f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7868d2ebc85f description: Checks for stanzas handled by server diffstat: src/common/xmpp/dispatcher_nb.py | 7 +++++++ src/common/xmpp/smacks.py | 26 +++++++++++++++++++++++--- 2 files changed, 30 insertions(+), 3 deletions(-) diffs (69 lines): diff -r 76858b8db934 -r 7868d2ebc85f src/common/xmpp/dispatcher_nb.py --- a/src/common/xmpp/dispatcher_nb.py Mon May 30 20:14:26 2011 -0400 +++ b/src/common/xmpp/dispatcher_nb.py Tue May 31 17:09:49 2011 -0400 @@ -533,6 +533,13 @@ ID = stanza.getID() if self._owner._registered_name and not stanza.getAttr('from'): stanza.setAttr('from', self._owner._registered_name) + + if self.supports_sm: + self.sm.uqueue.append(stanza) + self.sm.out_h = self.sm.out_h + 1 + if len(self.sm.uqueue) > self.sm.max_queue: + self.sm.request_ack() + self._owner.Connection.send(stanza, now) return ID diff -r 76858b8db934 -r 7868d2ebc85f src/common/xmpp/smacks.py --- a/src/common/xmpp/smacks.py Mon May 30 20:14:26 2011 -0400 +++ b/src/common/xmpp/smacks.py Tue May 31 17:09:49 2011 -0400 @@ -1,5 +1,7 @@ from protocol import Acks from protocol import NS_STREAM_MGMT +import logging +log = logging.getLogger('gajim.c.x.smacks') class Smacks(): ''' @@ -16,13 +18,16 @@ self.out_h = 0 # Outgoing stanzas handled self.in_h = 0 # Incoming stanzas handled self.uqueue = [] # Unhandled stanzas queue - - #Register handlers + # Max number of stanzas in queue before making a request + self.max_queue = 5 + # Register handlers owner.Dispatcher.RegisterNamespace(NS_STREAM_MGMT) owner.Dispatcher.RegisterHandler('enabled', self._neg_response ,xmlns=NS_STREAM_MGMT) owner.Dispatcher.RegisterHandler('r', self.send_ack ,xmlns=NS_STREAM_MGMT) + owner.Dispatcher.RegisterHandler('a', self.check_ack + ,xmlns=NS_STREAM_MGMT) def negociate(self): @@ -41,4 +46,19 @@ def request_ack(self): r = Acks() r.buildRequest() - self._owner.Connection.send(r, False) \ No newline at end of file + self._owner.Connection.send(r, False) + + def check_ack(self, disp, stanza): + h = int(stanza.getAttr('h')) + diff = self.out_h - h + + + if len(self.uqueue) < diff or diff < 0: + log.error('Server and client number of stanzas handled mismatch ') + return + + while (len(self.uqueue) > diff): + self.uqueue.pop(0) + + +

1 0

gajim: prepare changelog for 0.14.2
by Yann Leboulanger 31 May '11

31 May '11

changeset edd370f95d28 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=edd370f95d28 description: prepare changelog for 0.14.2 diffstat: ChangeLog | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diffs (15 lines): diff -r 8ad8152fd299 -r edd370f95d28 ChangeLog --- a/ChangeLog Tue May 24 19:27:45 2011 +0200 +++ b/ChangeLog Tue May 31 18:01:08 2011 +0200 @@ -1,3 +1,11 @@ +Gajim 0.14.2 (XX June 2011) + + * Fix CPU usage when testing file transfer proxies + * Fix invalid XML char regex + * Fix subscription request window handling + * Fix URL display in chat message banner + * Other minor bugfixes + Gajim 0.14.1 (26 October 2010) * Fix changing account name

1 0

gajim: coding standards
by Yann Leboulanger 31 May '11

31 May '11

changeset 67ebe296c925 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=67ebe296c925 description: coding standards diffstat: src/common/connection.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diffs (19 lines): diff -r c5ca2af584d3 -r 67ebe296c925 src/common/connection.py --- a/src/common/connection.py Mon May 30 19:47:05 2011 +0200 +++ b/src/common/connection.py Tue May 31 17:46:49 2011 +0200 @@ -460,10 +460,11 @@ str(e))) except exceptions.DatabaseMalformed: pritext = _('Database Error') - sectext = _('The database file (%s) cannot be read. Try to ' - 'repair it (see http://trac.gajim.org/wiki/DatabaseBackup)' - ' or remove it (all history will be lost).') % \ - common.logger.LOG_DB_PATH + sectext = _('The database file (%s) cannot be read. Try' + ' to repair it (see ' + 'http://trac.gajim.org/wiki/DatabaseBackup)' + ' or remove it (all history will be lost).') % \ + common.logger.LOG_DB_PATH self.dispatch('DB_ERROR', (pritext, sectext)) def ack_subscribed(self, jid):

1 0

gajim: coding standards
by Yann Leboulanger 31 May '11

31 May '11

changeset 859bdc4a54ea in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=859bdc4a54ea description: coding standards diffstat: src/common/xmpp/auth_nb.py | 111 ++++++++++++++++++++++++-------------------- 1 files changed, 60 insertions(+), 51 deletions(-) diffs (truncated from 327 to 300 lines): diff -r 76858b8db934 -r 859bdc4a54ea src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Mon May 30 20:14:26 2011 -0400 +++ b/src/common/xmpp/auth_nb.py Tue May 31 09:15:41 2011 +0200 @@ -21,9 +21,11 @@ See client_nb.py """ -from protocol import NS_SASL, NS_SESSION, NS_STREAMS, NS_BIND, NS_AUTH, NS_STREAM_MGMT +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 smacks import Smacks import base64 import random import itertools @@ -31,7 +33,7 @@ import hashlib import hmac import hashlib -from smacks import Smacks + import logging log = logging.getLogger('gajim.c.x.auth_nb') @@ -142,7 +144,7 @@ elif self._owner.Dispatcher.Stream.features: try: self.FeaturesHandler(self._owner.Dispatcher, - self._owner.Dispatcher.Stream.features) + self._owner.Dispatcher.Stream.features) except NodeProcessed: pass else: @@ -154,16 +156,16 @@ """ if 'features' in self._owner.__dict__: self._owner.UnregisterHandler('features', self.FeaturesHandler, - xmlns=NS_STREAMS) + xmlns=NS_STREAMS) if 'challenge' in self._owner.__dict__: self._owner.UnregisterHandler('challenge', self.SASLHandler, - xmlns=NS_SASL) + xmlns=NS_SASL) if 'failure' in self._owner.__dict__: self._owner.UnregisterHandler('failure', self.SASLHandler, - xmlns=NS_SASL) + xmlns=NS_SASL) if 'success' in self._owner.__dict__: self._owner.UnregisterHandler('success', self.SASLHandler, - xmlns=NS_SASL) + xmlns=NS_SASL) def auth(self): """ @@ -178,12 +180,12 @@ elif self._owner.Dispatcher.Stream.features: try: self.FeaturesHandler(self._owner.Dispatcher, - self._owner.Dispatcher.Stream.features) + self._owner.Dispatcher.Stream.features) except NodeProcessed: pass else: self._owner.RegisterHandler('features', - self.FeaturesHandler, xmlns=NS_STREAMS) + self.FeaturesHandler, xmlns=NS_STREAMS) def FeaturesHandler(self, conn, feats): """ @@ -198,7 +200,8 @@ 'mechanism'): self.mecs.append(mec.getData()) - self._owner.RegisterHandler('challenge', self.SASLHandler, xmlns=NS_SASL) + self._owner.RegisterHandler('challenge', self.SASLHandler, + xmlns=NS_SASL) self._owner.RegisterHandler('failure', self.SASLHandler, xmlns=NS_SASL) self._owner.RegisterHandler('success', self.SASLHandler, xmlns=NS_SASL) self.MechanismHandler() @@ -206,7 +209,8 @@ def MechanismHandler(self): if 'ANONYMOUS' in self.mecs and self.username is None: self.mecs.remove('ANONYMOUS') - node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'ANONYMOUS'}) + node = Node('auth', attrs={'xmlns': NS_SASL, + 'mechanism': 'ANONYMOUS'}) self.mechanism = 'ANONYMOUS' self.startsasl = SASL_IN_PROCESS self._owner.send(str(node)) @@ -226,11 +230,11 @@ self.mecs.remove('GSSAPI') try: self.gss_vc = kerberos.authGSSClientInit('xmpp@' + \ - self._owner.xmpp_hostname)[1] + self._owner.xmpp_hostname)[1] kerberos.authGSSClientStep(self.gss_vc, '') response = kerberos.authGSSClientResponse(self.gss_vc) - node=Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'GSSAPI'}, - payload=(response or '')) + node=Node('auth', attrs={'xmlns': NS_SASL, + 'mechanism': 'GSSAPI'}, payload=(response or '')) self.mechanism = 'GSSAPI' self.gss_step = GSS_STATE_STEP self.startsasl = SASL_IN_PROCESS @@ -247,7 +251,8 @@ raise NodeProcessed if 'DIGEST-MD5' in self.mecs: self.mecs.remove('DIGEST-MD5') - node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'DIGEST-MD5'}) + node = Node('auth', attrs={'xmlns': NS_SASL, + 'mechanism': 'DIGEST-MD5'}) self.mechanism = 'DIGEST-MD5' self.startsasl = SASL_IN_PROCESS self._owner.send(str(node)) @@ -294,13 +299,13 @@ handlers = self._owner.Dispatcher.dumpHandlers() # Bosh specific dispatcher replugging - # save old features. They will be used in case we won't get response on - # stream restart after SASL auth (happens with XMPP over BOSH with - # Openfire) + # save old features. They will be used in case we won't get response + # on stream restart after SASL auth (happens with XMPP over BOSH + # with Openfire) old_features = self._owner.Dispatcher.Stream.features self._owner.Dispatcher.PlugOut() dispatcher_nb.Dispatcher.get_instance().PlugIn(self._owner, - after_SASL=True, old_features=old_features) + after_SASL=True, old_features=old_features) self._owner.Dispatcher.restoreHandlers(handlers) self._owner.User = self.username @@ -322,12 +327,12 @@ rc = kerberos.authGSSClientUnwrap(self.gss_vc, incoming_data) response = kerberos.authGSSClientResponse(self.gss_vc) rc = kerberos.authGSSClientWrap(self.gss_vc, response, - kerberos.authGSSClientUserName(self.gss_vc)) + kerberos.authGSSClientUserName(self.gss_vc)) response = kerberos.authGSSClientResponse(self.gss_vc) if not response: response = '' self._owner.send(Node('response', attrs={'xmlns': NS_SASL}, - payload=response).__str__()) + payload=response).__str__()) raise NodeProcessed if self.mechanism == 'SCRAM-SHA-1': hashfn = hashlib.sha1 @@ -408,8 +413,8 @@ else: self.resp['realm'] = self._owner.Server self.resp['nonce'] = chal['nonce'] - self.resp['cnonce'] = ''.join("%x" % randint(0, 2**28) for randint in - itertools.repeat(random.randint, 7)) + self.resp['cnonce'] = ''.join("%x" % randint(0, 2**28) for randint \ + in itertools.repeat(random.randint, 7)) self.resp['nc'] = ('00000001') self.resp['qop'] = 'auth' self.resp['digest-uri'] = 'xmpp/' + self._owner.Server @@ -449,10 +454,10 @@ 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']]) + 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)])) + self.resp['cnonce'], self.resp['qop'], HH(A2)])) self.resp['response'] = response sasl_data = u'' for key in ('charset', 'username', 'realm', 'nonce', 'nc', 'cnonce', @@ -462,14 +467,15 @@ else: sasl_data += u'%s="%s",' % (key, self.resp[key]) sasl_data = sasl_data[:-1].encode('utf-8').encode('base64').replace( - '\r', '').replace('\n', '') - node = Node('response', attrs={'xmlns':NS_SASL}, payload=[sasl_data]) + '\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', '') + '\n', '') node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'PLAIN'}, - payload=[sasl_data]) + payload=[sasl_data]) self._owner.send(str(node)) @@ -491,8 +497,8 @@ self.password = password self.resource = resource self.on_auth = on_auth - - + + def plugin(self, owner): """ Determine the best auth method (digest/0k/plain) and use it for auth. @@ -502,8 +508,8 @@ self.owner = owner owner.Dispatcher.SendAndWaitForResponse( - Iq('get', NS_AUTH, payload=[Node('username', payload=[self.user])]), - func=self._on_username) + Iq('get', NS_AUTH, payload=[Node('username', payload=[self.user])]), + func=self._on_username) def _on_username(self, resp): if not isResultNode(resp): @@ -518,8 +524,8 @@ if query.getTag('digest'): log.info("Performing digest authentication") query.setTagData('digest', - hashlib.sha1(self.owner.Dispatcher.Stream._document_attrs['id'] - + self.password).hexdigest()) + hashlib.sha1(self.owner.Dispatcher.Stream._document_attrs['id'] + + self.password).hexdigest()) if query.getTag('password'): query.delChild('password') self._method = 'digest' @@ -534,23 +540,25 @@ def hash_n_times(s, count): return count and hasher(hash_n_times(s, count-1)) or s - hash_ = hash_n_times(hasher(hasher(self.password) + token), int(seq)) + hash_ = hash_n_times(hasher(hasher(self.password) + token), + int(seq)) query.setTagData('hash', hash_) self._method='0k' else: log.warn("Secure methods unsupported, performing plain text \ - authentication") + authentication") query.setTagData('password', self.password) self._method = 'plain' - resp = self.owner.Dispatcher.SendAndWaitForResponse(iq, func=self._on_auth) + resp = self.owner.Dispatcher.SendAndWaitForResponse(iq, + func=self._on_auth) def _on_auth(self, resp): if isResultNode(resp): log.info('Sucessfully authenticated with remote host.') self.owner.User = self.user self.owner.Resource = self.resource - self.owner._registered_name = self.owner.User+'@'+self.owner.Server+\ - '/'+self.owner.Resource + self.owner._registered_name = self.owner.User + '@' + \ + self.owner.Server+ '/' + self.owner.Resource return self.on_auth(self._method) log.info('Authentication failed!') return self.on_auth(None) @@ -572,24 +580,24 @@ if self._owner.Dispatcher.Stream.features: try: self.FeaturesHandler(self._owner.Dispatcher, - self._owner.Dispatcher.Stream.features) + self._owner.Dispatcher.Stream.features) except NodeProcessed: pass else: self._owner.RegisterHandler('features', self.FeaturesHandler, - xmlns=NS_STREAMS) + xmlns=NS_STREAMS) def FeaturesHandler(self, conn, feats): """ Determine if server supports resource binding and set some internal attributes accordingly. - + It also checks if server supports stream management """ - + if feats.getTag('sm', namespace=NS_STREAM_MGMT): self.supports_sm = True # server supports stream management - + if not feats.getTag('bind', namespace=NS_BIND): log.info('Server does not requested binding.') # we try to bind resource anyway @@ -607,7 +615,7 @@ Remove Bind handler from owner's dispatcher. Used internally """ self._owner.UnregisterHandler('features', self.FeaturesHandler, - xmlns=NS_STREAMS) + xmlns=NS_STREAMS) def NonBlockingBind(self, resource=None, on_bound=None): """ @@ -622,8 +630,9 @@ self._owner.onreceive(None) self._owner.Dispatcher.SendAndWaitForResponse( - Protocol('iq', typ='set', payload=[Node('bind', attrs={'xmlns':NS_BIND},

1 0

gajim: Smacks class added, responds to ack requests
by Jefry Lagrange 31 May '11

31 May '11

changeset 76858b8db934 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=76858b8db934 description: Smacks class added, responds to ack requests diffstat: src/common/xmpp/auth_nb.py | 24 ++++++++++++++++++--- src/common/xmpp/dispatcher_nb.py | 14 ++++++++++-- src/common/xmpp/protocol.py | 2 +- src/common/xmpp/smacks.py | 44 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+), 8 deletions(-) diffs (183 lines): diff -r 1af66ebfae5e -r 76858b8db934 src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Wed May 25 21:24:01 2011 -0400 +++ b/src/common/xmpp/auth_nb.py Mon May 30 20:14:26 2011 -0400 @@ -21,7 +21,7 @@ See client_nb.py """ -from protocol import NS_SASL, NS_SESSION, NS_STREAMS, NS_BIND, NS_AUTH +from protocol import NS_SASL, NS_SESSION, NS_STREAMS, NS_BIND, NS_AUTH, NS_STREAM_MGMT from protocol import Node, NodeProcessed, isResultNode, Iq, Protocol, JID from plugin import PlugIn import base64 @@ -31,7 +31,7 @@ import hashlib import hmac import hashlib - +from smacks import Smacks import logging log = logging.getLogger('gajim.c.x.auth_nb') @@ -491,7 +491,8 @@ self.password = password self.resource = resource self.on_auth = on_auth - + + def plugin(self, owner): """ Determine the best auth method (digest/0k/plain) and use it for auth. @@ -564,6 +565,7 @@ def __init__(self): PlugIn.__init__(self) self.bound = None + self.supports_sm = False def plugin(self, owner): ''' Start resource binding, if allowed at this time. Used internally. ''' @@ -580,8 +582,14 @@ def FeaturesHandler(self, conn, feats): """ Determine if server supports resource binding and set some internal - attributes accordingly + attributes accordingly. + + It also checks if server supports stream management """ + + if feats.getTag('sm', namespace=NS_STREAM_MGMT): + self.supports_sm = True # server supports stream management + if not feats.getTag('bind', namespace=NS_BIND): log.info('Server does not requested binding.') # we try to bind resource anyway @@ -625,6 +633,14 @@ jid = JID(resp.getTag('bind').getTagData('jid')) self._owner.User = jid.getNode() self._owner.Resource = jid.getResource() + # Only negociate stream management after bounded + if self.supports_sm: + # starts negociation + sm = Smacks(self._owner) + self._owner.Dispatcher.supports_sm = True + self._owner.Dispatcher.sm = sm + sm.negociate() + if hasattr(self, 'session') and self.session == -1: # Server don't want us to initialize a session log.info('No session required.') diff -r 1af66ebfae5e -r 76858b8db934 src/common/xmpp/dispatcher_nb.py --- a/src/common/xmpp/dispatcher_nb.py Wed May 25 21:24:01 2011 -0400 +++ b/src/common/xmpp/dispatcher_nb.py Mon May 30 20:14:26 2011 -0400 @@ -75,7 +75,7 @@ stream headers (used by SASL f.e.). """ - def __init__(self): + def __init__(self): PlugIn.__init__(self) self.handlers = {} self._expected = {} @@ -89,6 +89,9 @@ self.UnregisterHandler, self.RegisterProtocol, self.SendAndWaitForResponse, self.SendAndCallForResponse, self.getAnID, self.Event, self.send] + + # Let the dispatcher know if there is support for stream management + self.supports_sm = False def getAnID(self): global outgoingID @@ -110,6 +113,7 @@ """ self.handlers = handlers + def _init(self): """ Register default namespaces/protocols/handlers. Used internally @@ -125,7 +129,7 @@ self.RegisterDefaultHandler(self.returnStanzaHandler) self.RegisterEventHandler(self._owner._caller._event_dispatcher) self.on_responses = {} - + def plugin(self, owner): """ Plug the Dispatcher instance into Client class instance and send initial @@ -416,7 +420,11 @@ typ = '' stanza.props = stanza.getProperties() ID = stanza.getID() - + if self.supports_sm and (stanza.getName() != 'r' and + stanza.getName() != 'a' and + stanza.getName() != 'enabled') : + # increments the number of stanzas that has been handled + self.sm.in_h = self.sm.in_h + 1 list_ = ['default'] # we will use all handlers: if typ in self.handlers[xmlns][name]: list_.append(typ) # from very common... diff -r 1af66ebfae5e -r 76858b8db934 src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Wed May 25 21:24:01 2011 -0400 +++ b/src/common/xmpp/protocol.py Mon May 30 20:14:26 2011 -0400 @@ -143,7 +143,7 @@ NS_DATA_VALIDATE = 'http://jabber.org/protocol/xdata-validate' # XEP-0122 NS_XMPP_STREAMS = 'urn:ietf:params:xml:ns:xmpp-streams' NS_RECEIPTS = 'urn:xmpp:receipts' -NS_STREAM_MGMT = 'urn:xmpp:sm:3' # XEP-198 +NS_STREAM_MGMT = 'urn:xmpp:sm:2' # XEP-198 xmpp_stream_error_conditions = ''' bad-format -- -- -- The entity has sent XML that cannot be processed. diff -r 1af66ebfae5e -r 76858b8db934 src/common/xmpp/smacks.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/common/xmpp/smacks.py Mon May 30 20:14:26 2011 -0400 @@ -0,0 +1,44 @@ +from protocol import Acks +from protocol import NS_STREAM_MGMT + +class Smacks(): + ''' + This is Smacks is the Stream Management class. It takes care of requesting + and sending acks. Also, it keeps track of the unhandled outgoing stanzas. + + The dispatcher has to be able to access this class to increment the + number of handled stanzas + ''' + + + def __init__(self, owner): + self._owner = owner + self.out_h = 0 # Outgoing stanzas handled + self.in_h = 0 # Incoming stanzas handled + self.uqueue = [] # Unhandled stanzas queue + + #Register handlers + owner.Dispatcher.RegisterNamespace(NS_STREAM_MGMT) + owner.Dispatcher.RegisterHandler('enabled', self._neg_response + ,xmlns=NS_STREAM_MGMT) + owner.Dispatcher.RegisterHandler('r', self.send_ack + ,xmlns=NS_STREAM_MGMT) + + + def negociate(self): + stanza = Acks() + stanza.buildEnable() + self._owner.Connection.send(stanza, True) + + def _neg_response(self, disp, stanza): + pass + + def send_ack(self, disp, stanza): + ack = Acks() + ack.buildAnswer(self.in_h) + self._owner.Connection.send(ack, False) + + def request_ack(self): + r = Acks() + r.buildRequest() + self._owner.Connection.send(r, False) \ No newline at end of file

1 0

gajim: ability to save xhtml messages. Fixes #5736
by Yann Leboulanger 30 May '11

30 May '11

changeset c5ca2af584d3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c5ca2af584d3 description: ability to save xhtml messages. Fixes #5736 diffstat: src/chat_control.py | 12 +++++++----- src/common/config.py | 1 + src/common/connection.py | 15 +++++++++------ src/history_window.py | 11 ++++++++--- src/session.py | 6 +++++- 5 files changed, 30 insertions(+), 15 deletions(-) diffs (136 lines): diff -r d75458337ba8 -r c5ca2af584d3 src/chat_control.py --- a/src/chat_control.py Sun May 29 20:45:18 2011 +0200 +++ b/src/chat_control.py Mon May 30 19:47:05 2011 +0200 @@ -2921,11 +2921,13 @@ small_attr = ['small'] else: small_attr = [] - ChatControlBase.print_conversation_line(self, row[2], kind, name, tim, - small_attr, - small_attr + ['restored_message'], - small_attr + ['restored_message'], - False, old_kind=local_old_kind) + xhtml = None + if row[2].startswith('<body '): + xhtml = row[2] + ChatControlBase.print_conversation_line(self, row[2], kind, name, + tim, small_attr, small_attr + ['restored_message'], + small_attr + ['restored_message'], False, + old_kind=local_old_kind, xhtml=xhtml) if row[2].startswith('/me ') or row[2].startswith('/me\n'): local_old_kind = None else: diff -r d75458337ba8 -r c5ca2af584d3 src/common/config.py --- a/src/common/config.py Sun May 29 20:45:18 2011 +0200 +++ b/src/common/config.py Mon May 30 19:47:05 2011 +0200 @@ -234,6 +234,7 @@ 'print_status_in_chats': [opt_bool, True, _('If False, Gajim will no longer print status line in chats when a contact changes his or her status and/or his or her status message.')], 'print_status_in_muc': [opt_str, 'in_and_out', _('can be "none", "all" or "in_and_out". If "none", Gajim will no longer print status line in groupchats when a member changes his or her status and/or his or her status message. If "all" Gajim will print all status messages. If "in_and_out", Gajim will only print FOO enters/leaves group chat.')], 'log_contact_status_changes': [opt_bool, False], + 'log_xhtml_messages': [opt_bool, False, _('Log XHTML messages instead of plain text messages.')], 'just_connected_bg_color': [opt_str, '#adc3c6', _('Background color of contacts when they just signed in.')], 'just_disconnected_bg_color': [opt_str, '#ab6161', _('Background color of contacts when they just signed out.')], 'restored_messages_color': [opt_color, '#555753'], diff -r d75458337ba8 -r c5ca2af584d3 src/common/connection.py --- a/src/common/connection.py Sun May 29 20:45:18 2011 +0200 +++ b/src/common/connection.py Mon May 30 19:47:05 2011 +0200 @@ -432,10 +432,10 @@ if callback: callback(jid, msg, keyID, forward_from, session, original_message, - subject, type_, msg_iq) + subject, type_, msg_iq, xhtml) def log_message(self, jid, msg, forward_from, session, original_message, - subject, type_): + subject, type_, xhtml=None): if not forward_from and session and session.is_loggable(): ji = gajim.get_jid_without_resource(jid) if gajim.config.should_log(self.name, ji): @@ -451,6 +451,9 @@ else: kind = 'single_msg_sent' try: + if xhtml and gajim.config.get('log_xhtml_messages'): + log_msg = '<body xmlns="%s">%s</body>' % ( + common.xmpp.NS_XHTML, xhtml) gajim.logger.write(kind, jid, log_msg) except exceptions.PysqliteOperationalError, e: self.dispatch('DB_ERROR', (_('Disk Write Error'), @@ -1751,7 +1754,7 @@ callback_args=[], now=False): def cb(jid, msg, keyID, forward_from, session, original_message, - subject, type_, msg_iq): + subject, type_, msg_iq, xhtml): msg_id = self.connection.send(msg_iq, now=now) jid = helpers.parse_jid(jid) gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, @@ -1760,7 +1763,7 @@ callback(msg_id, *callback_args) self.log_message(jid, msg, forward_from, session, original_message, - subject, type_) + subject, type_, xhtml) self._prepare_message(jid, msg, keyID, type_=type_, subject=subject, chatstate=chatstate, msg_id=msg_id, composing_xep=composing_xep, @@ -1773,7 +1776,7 @@ return def cb(jid, msg, keyID, forward_from, session, original_message, - subject, type_, msg_iq): + subject, type_, msg_iq, xhtml): msg_id = self.connection.send(msg_iq, now=obj.now) jid = helpers.parse_jid(obj.jid) gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, @@ -1784,7 +1787,7 @@ if not obj.is_loggable: return self.log_message(jid, msg, forward_from, session, original_message, - subject, type_) + subject, type_, xhtml) self._prepare_message(obj.jid, obj.message, obj.keyID, type_=obj.type_, subject=obj.subject, chatstate=obj.chatstate, msg_id=obj.msg_id, diff -r d75458337ba8 -r c5ca2af584d3 src/history_window.py --- a/src/history_window.py Sun May 29 20:45:18 2011 +0200 +++ b/src/history_window.py Mon May 30 19:47:05 2011 +0200 @@ -478,12 +478,17 @@ if subject: message = _('Subject: %s\n') % subject + message - message += '\n' + xhtml = None + if message.startswith('<body '): + xhtml = message + if tag_msg: self.history_textview.print_real_text(message, [tag_msg], - name=contact_name) + name=contact_name, xhtml=xhtml) else: - self.history_textview.print_real_text(message, name=contact_name) + self.history_textview.print_real_text(message, name=contact_name, + xhtml=xhtml) + self.history_textview.print_real_text('\n') def on_query_entry_activate(self, widget): text = self.query_entry.get_text() diff -r d75458337ba8 -r c5ca2af584d3 src/session.py --- a/src/session.py Sun May 29 20:45:18 2011 +0200 +++ b/src/session.py Mon May 30 19:47:05 2011 +0200 @@ -85,8 +85,12 @@ if self.is_loggable() and obj.msgtxt: try: + if obj.xhtml and gajim.config.get('log_xhtml_messages'): + msg_to_log = obj.xhtml + else: + msg_to_log = obj.msgtxt msg_id = gajim.logger.write(log_type, obj.fjid, - obj.msgtxt, tim=obj.timestamp, subject=obj.subject) + msg_to_log, tim=obj.timestamp, subject=obj.subject) except exceptions.PysqliteOperationalError, e: self.conn.dispatch('ERROR', (_('Disk WriteError'), str(e))) except exceptions.DatabaseMalformed:

1 0

gajim: typo
by Yann Leboulanger 29 May '11

29 May '11

changeset d75458337ba8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d75458337ba8 description: typo diffstat: src/common/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 87ec4c6a14b7 -r d75458337ba8 src/common/config.py --- a/src/common/config.py Sun May 29 20:02:25 2011 +0200 +++ b/src/common/config.py Sun May 29 20:45:18 2011 +0200 @@ -322,7 +322,7 @@ 'connection_types': [ opt_str, 'tls ssl plain', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')], 'warn_when_plaintext_connection': [ opt_bool, True, _('Show a warning dialog before sending password on an plaintext connection.') ], 'warn_when_insecure_ssl_connection': [ opt_bool, True, _('Show a warning dialog before using standard SSL library.') ], - 'warn_when_insecure_password': [ opt_bool, True, _('Show a warning dialog before sending PLAIN password over a plain conenction.') ], + 'warn_when_insecure_password': [ opt_bool, True, _('Show a warning dialog before sending PLAIN password over a plain connection.') ], 'ssl_fingerprint_sha1': [ opt_str, '', '', True ], 'ignore_ssl_errors': [ opt_str, '', _('Space separated list of ssl errors to ignore.') ], 'use_srv': [ opt_bool, True, '', True ],

1 0

gajim: don't show accounts wizzard if we have configured account...
by Yann Leboulanger 29 May '11

29 May '11

changeset 87ec4c6a14b7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=87ec4c6a14b7 description: don't show accounts wizzard if we have configured accounts that are disabled diffstat: src/roster_window.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 6414b6ef409f -r 87ec4c6a14b7 src/roster_window.py --- a/src/roster_window.py Sat May 28 15:37:40 2011 +0200 +++ b/src/roster_window.py Sun May 29 20:02:25 2011 +0200 @@ -6395,7 +6395,10 @@ gajim.config.get('trayicon') != 'always': self.window.show_all() - if len(gajim.connections) == 0: # if we have no account + if not gajim.config.get_per('accounts') or \ + gajim.config.get_per('accounts') == ['Local'] and not \ + gajim.config.get_per('accounts', 'Local', 'active'): + # if we have no account configured or only Local account but not enabled def _open_wizard(): gajim.interface.instances['account_creation_wizard'] = \ config.AccountCreationWizardWindow()

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2011