Commits October 2011

commits@gajim.org

3 participants
64 discussions

gajim: import some improvements from xmpppy and use it where it'...
by Yann Leboulanger 31 Oct '11

31 Oct '11

changeset e59e6777df1d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e59e6777df1d description: import some improvements from xmpppy and use it where it's usefull diffstat: src/common/connection.py | 24 +++++++++--------- src/common/connection_handlers.py | 20 +++++++------- src/common/xmpp/protocol.py | 51 +++++++++++++++++++++++++++++--------- 3 files changed, 60 insertions(+), 35 deletions(-) diffs (truncated from 312 to 300 lines): diff -r cb442708efd2 -r e59e6777df1d src/common/connection.py --- a/src/common/connection.py Mon Oct 31 09:52:23 2011 +0100 +++ b/src/common/connection.py Mon Oct 31 10:47:28 2011 +0100 @@ -1503,14 +1503,14 @@ Build a Privacy rule stanza for invisibility """ iq = common.xmpp.Iq('set', common.xmpp.NS_PRIVACY, xmlns = '') - l = iq.getTag('query').setTag('list', {'name': name}) + l = iq.setQuery().setTag('list', {'name': name}) i = l.setTag('item', {'action': action, 'order': str(order)}) i.setTag('presence-out') return iq def build_invisible_rule(self): iq = common.xmpp.Iq('set', common.xmpp.NS_PRIVACY, xmlns = '') - l = iq.getTag('query').setTag('list', {'name': 'invisible'}) + l = iq.setQuery().setTag('list', {'name': 'invisible'}) if self.name in gajim.interface.status_sent_to_groups and \ len(gajim.interface.status_sent_to_groups[self.name]) > 0: for group in gajim.interface.status_sent_to_groups[self.name]: @@ -1540,7 +1540,7 @@ if not gajim.account_is_connected(self.name): return iq = common.xmpp.Iq('set', common.xmpp.NS_PRIVACY, xmlns = '') - iq.getTag('query').setTag('active', {'name': name}) + iq.setQuery().setTag('active', {'name': name}) self.connection.send(iq) def send_invisible_presence(self, msg, signed, initial = False): @@ -1892,7 +1892,7 @@ if name: infos['name'] = name iq = common.xmpp.Iq('set', common.xmpp.NS_ROSTER) - q = iq.getTag('query') + q = iq.setQuery() item = q.addChild('item', attrs=infos) for g in groups: item.addChild('group').setData(g) @@ -1937,7 +1937,7 @@ if not gajim.account_is_connected(self.name): return iq = common.xmpp.Iq('set', common.xmpp.NS_REGISTER, to = agent) - iq.getTag('query').setTag('remove') + iq.setQuery().setTag('remove') id_ = self.connection.getAnID() iq.setID(id_) self.awaiting_answers[id_] = (AGENT_REMOVED, agent) @@ -2395,7 +2395,7 @@ return iq = common.xmpp.Iq(typ = 'set', queryNS = common.xmpp.NS_MUC_OWNER, to = room_jid) - destroy = iq.getTag('query').setTag('destroy') + destroy = iq.setQuery().setTag('destroy') if reason: destroy.setTagData('reason', reason) if jid: @@ -2442,7 +2442,7 @@ return iq = common.xmpp.Iq(typ = 'set', to = room_jid, queryNS =\ common.xmpp.NS_MUC_ADMIN) - item = iq.getTag('query').setTag('item') + item = iq.setQuery().setTag('item') item.setAttr('nick', nick) item.setAttr('role', role) if reason: @@ -2457,7 +2457,7 @@ return iq = common.xmpp.Iq(typ = 'set', to = room_jid, queryNS =\ common.xmpp.NS_MUC_ADMIN) - item = iq.getTag('query').setTag('item') + item = iq.setQuery().setTag('item') item.setAttr('jid', jid) item.setAttr('affiliation', affiliation) if reason: @@ -2469,7 +2469,7 @@ return iq = common.xmpp.Iq(typ = 'set', to = room_jid, queryNS = \ common.xmpp.NS_MUC_ADMIN) - item = iq.getTag('query') + item = iq.setQuery() for jid in users_dict: item_tag = item.addChild('item', {'jid': jid, 'affiliation': users_dict[jid]['affiliation']}) @@ -2482,7 +2482,7 @@ return iq = common.xmpp.Iq(typ = 'get', to = room_jid, queryNS = \ common.xmpp.NS_MUC_ADMIN) - item = iq.getTag('query').setTag('item') + item = iq.setQuery().setTag('item') item.setAttr('affiliation', affiliation) self.connection.send(iq) @@ -2491,7 +2491,7 @@ return iq = common.xmpp.Iq(typ = 'set', to = room_jid, queryNS =\ common.xmpp.NS_MUC_OWNER) - query = iq.getTag('query') + query = iq.setQuery() form.setAttr('type', 'submit') query.addChild(node = form) self.connection.send(iq) @@ -2616,7 +2616,7 @@ def send_search_form(self, jid, form, is_form): iq = common.xmpp.Iq(typ = 'set', to = jid, queryNS = \ common.xmpp.NS_SEARCH) - item = iq.getTag('query') + item = iq.setQuery() if is_form: item.addChild(node=form) else: diff -r cb442708efd2 -r e59e6777df1d src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Oct 31 09:52:23 2011 +0100 +++ b/src/common/connection_handlers.py Mon Oct 31 10:47:28 2011 +0100 @@ -151,7 +151,7 @@ return if is_form: iq = common.xmpp.Iq('set', common.xmpp.NS_REGISTER, to=agent) - query = iq.getTag('query') + query = iq.setQuery() info.setAttr('type', 'submit') query.addChild(node=info) self.connection.SendAndCallForResponse(iq, @@ -233,8 +233,7 @@ log.debug('DiscoverInfoGetCB') if not self.connection or self.connected < 2: return - q = iq_obj.getTag('query') - node = q.getAttr('node') + node = iq_obj.getQuerynode() if self.commandInfoQuery(con, iq_obj): raise common.xmpp.NodeProcessed @@ -245,7 +244,7 @@ raise common.xmpp.NodeProcessed iq = iq_obj.buildReply('result') - q = iq.getTag('query') + q = iq.setQuery() if node: q.setAttr('node', node) q.addChild('identity', attrs=gajim.gajim_identity) @@ -390,7 +389,7 @@ iq = common.xmpp.Iq(typ='get') if jid: iq.setTo(jid) - iq.setTag(common.xmpp.NS_VCARD + ' vCard') + iq.setQuery('vCard').setNamespace(common.xmpp.NS_VCARD) id_ = self.connection.getAnID() iq.setID(id_) @@ -532,6 +531,8 @@ return if iq_obj.getType() == 'result': query = iq_obj.getTag('query') + if not query: + return delimiter = query.getTagData('roster') if delimiter: self.nested_group_delimiter = delimiter @@ -651,9 +652,8 @@ with_ = element.getAttr('with') start_ = element.getAttr('start') self.request_collection_page(with_, start_) - elif element.getName() == 'removed': + #elif element.getName() == 'removed': # do nothing - pass del self.awaiting_answers[id_] @@ -1470,7 +1470,7 @@ if obj.conn.name != self.name: return iq_obj = obj.stanza.buildReply('result') - qp = iq_obj.getTag('query') + qp = iq_obj.setQuery() qp.setTagData('name', 'Gajim') qp.setTagData('version', gajim.version) send_os = gajim.config.get_per('accounts', self.name, 'send_os_info') @@ -1493,7 +1493,7 @@ if HAS_IDLE and gajim.config.get_per('accounts', self.name, 'send_idle_time'): iq_obj = obj.stanza.buildReply('result') - qp = iq_obj.getTag('query') + qp = iq_obj.setQuery() qp.attrs['seconds'] = int(self.sleeper.getIdleSec()) else: iq_obj = obj.stanza.buildReply('error') @@ -1520,7 +1520,7 @@ return if gajim.config.get_per('accounts', self.name, 'send_time_info'): iq_obj = obj.stanza.buildReply('result') - qp = iq_obj.getTag('query') + qp = iq_obj.setQuery() qp.setTagData('utc', strftime('%Y%m%dT%H:%M:%S', gmtime())) qp.setTagData('tz', helpers.decode_string(tzname[daylight])) qp.setTagData('display', helpers.decode_string(strftime('%c', diff -r cb442708efd2 -r e59e6777df1d src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Mon Oct 31 09:52:23 2011 +0100 +++ b/src/common/xmpp/protocol.py Mon Oct 31 10:47:28 2011 +0100 @@ -779,10 +779,11 @@ def buildReply(self, text=None): """ Builds and returns another message object with specified text. The to, - from and thread properties of new message are pre-set as reply to this - message + from, thread and type properties of new message are pre-set as reply to + this message """ - m = Message(to=self.getFrom(), frm=self.getTo(), body=text) + m = Message(to=self.getFrom(), frm=self.getTo(), body=text, + typ=self.getType()) th = self.getThread() if th: m.setThread(th) @@ -939,11 +940,20 @@ if queryNS: self.setQueryNS(queryNS) + def getQuery(self): + """ + Return the IQ's child element if it exists, None otherwise. + """ + children = self.getChildren() + if children and self.getType() != 'error' and \ + children[0].getName() != 'error': + return children[0] + def getQueryNS(self): """ Return the namespace of the 'query' child element """ - tag = self.getTag('query') + tag = self.getQuery() if tag: return tag.getNamespace() @@ -951,13 +961,15 @@ """ Return the 'node' attribute value of the 'query' child element """ - return self.getTagAttr('query', 'node') + tag = self.getQuery() + if tag: + return tag.getAttr('node') def getQueryPayload(self): """ Return the 'query' child element payload """ - tag = self.getTag('query') + tag = self.getQuery() if tag: return tag.getPayload() @@ -965,36 +977,49 @@ """ Return the 'query' child element child nodes """ - tag = self.getTag('query') + tag = self.getQuery() if tag: return tag.getChildren() + def setQuery(self, name=None): + """ + Change the name of the query node, creating it if needed. Keep the + existing name if none is given (use 'query' if it's a creation). + Return the query node. + """ + query = self.getQuery() + if query is None: + query = self.addChild('query') + if name is not None: + query.setName(name) + return query + def setQueryNS(self, namespace): """ Set the namespace of the 'query' child element """ - self.setTag('query').setNamespace(namespace) + self.setQuery().setNamespace(namespace) def setQueryPayload(self, payload): """ Set the 'query' child element payload """ - self.setTag('query').setPayload(payload) + self.setQuery().setPayload(payload) def setQuerynode(self, node): """ Set the 'node' attribute value of the 'query' child element """ - self.setTagAttr('query', 'node', node) + self.setQuery().setAttr('node', node) def buildReply(self, typ): """

1 0

gajim: correctly unregister events when closing a groupchat
by Yann Leboulanger 31 Oct '11

31 Oct '11

changeset cb442708efd2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cb442708efd2 description: correctly unregister events when closing a groupchat diffstat: src/groupchat_control.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r d1ba8ee33b46 -r cb442708efd2 src/groupchat_control.py --- a/src/groupchat_control.py Mon Oct 31 09:47:01 2011 +0100 +++ b/src/groupchat_control.py Mon Oct 31 09:52:23 2011 +0100 @@ -1929,6 +1929,8 @@ self._nec_gc_config_changed_received) gajim.ged.remove_event_handler('signed-in', ged.GUI1, self._nec_signed_in) + gajim.ged.remove_event_handler('decrypted-message-received', ged.GUI2, + self._nec_decrypted_message_received) if self.room_jid in gajim.gc_connected[self.account] and \ gajim.gc_connected[self.account][self.room_jid]:

1 0

gajim: change the insecure connection dialog behaviour. Fixes #7019
by Yann Leboulanger 31 Oct '11

31 Oct '11

changeset d1ba8ee33b46 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d1ba8ee33b46 description: change the insecure connection dialog behaviour. Fixes #7019 diffstat: src/common/config.py | 2 +- src/common/connection.py | 8 +++++++- src/dialogs.py | 7 ++++++- src/gui_interface.py | 15 ++++++++++----- 4 files changed, 24 insertions(+), 8 deletions(-) diffs (109 lines): diff -r 586991e434e6 -r d1ba8ee33b46 src/common/config.py --- a/src/common/config.py Sun Oct 30 13:27:32 2011 +0100 +++ b/src/common/config.py Mon Oct 31 09:47:01 2011 +0100 @@ -323,7 +323,7 @@ 'enable_esessions': [opt_bool, True, _('Enable ESessions encryption for this account.')], 'autonegotiate_esessions': [opt_bool, True, _('Should Gajim automatically start an encrypted session when possible?')], '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.') ], + 'action_when_plaintext_connection': [ opt_str, 'warn', _('Show a warning dialog before sending password on an plaintext connection. Can be \'warn\', \'connect\', \'disconnect\'') ], '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 connection.') ], 'ssl_fingerprint_sha1': [ opt_str, '', '', True ], diff -r 586991e434e6 -r d1ba8ee33b46 src/common/connection.py --- a/src/common/connection.py Sun Oct 30 13:27:32 2011 +0100 +++ b/src/common/connection.py Mon Oct 31 09:47:01 2011 +0100 @@ -1254,10 +1254,16 @@ return con.RegisterDisconnectHandler(self._on_disconnected) if _con_type == 'plain' and gajim.config.get_per('accounts', self.name, - 'warn_when_plaintext_connection'): + 'action_when_plaintext_connection') == 'warn': gajim.nec.push_incoming_event(PlainConnectionEvent(None, conn=self, xmpp_client=con)) return True + if _con_type == 'plain' and gajim.config.get_per('accounts', self.name, + 'action_when_plaintext_connection') == 'disconnect': + self.disconnect(on_purpose=True) + gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, + show='offline')) + return False if _con_type in ('tls', 'ssl') and con.Connection.ssl_lib != 'PYOPENSSL' \ and gajim.config.get_per('accounts', self.name, 'warn_when_insecure_ssl_connection') and \ diff -r 586991e434e6 -r d1ba8ee33b46 src/dialogs.py --- a/src/dialogs.py Sun Oct 30 13:27:32 2011 +0100 +++ b/src/dialogs.py Mon Oct 31 09:47:01 2011 +0100 @@ -1722,7 +1722,8 @@ """ def __init__(self, pritext, sectext='', checktext1='', checktext2='', - on_response_ok=None, on_response_cancel=None, is_modal=True): + tooltip1='', tooltip2='', on_response_ok=None, on_response_cancel=None, + is_modal=True): self.user_response_ok = on_response_ok self.user_response_cancel = on_response_cancel @@ -1741,11 +1742,15 @@ if checktext1: self.checkbutton1 = gtk.CheckButton(checktext1) + if tooltip1: + self.checkbutton1.set_tooltip_text(tooltip1) self.vbox.pack_start(self.checkbutton1, expand=False, fill=True) else: self.checkbutton1 = None if checktext2: self.checkbutton2 = gtk.CheckButton(checktext2) + if tooltip2: + self.checkbutton2.set_tooltip_text(tooltip2) self.vbox.pack_start(self.checkbutton2, expand=False, fill=True) else: self.checkbutton2 = None diff -r 586991e434e6 -r d1ba8ee33b46 src/gui_interface.py --- a/src/gui_interface.py Sun Oct 30 13:27:32 2011 +0100 +++ b/src/gui_interface.py Mon Oct 31 09:47:01 2011 +0100 @@ -1249,6 +1249,9 @@ # ('PLAIN_CONNECTION', account, (connection)) def on_ok(is_checked): if not is_checked[0]: + if is_checked[1]: + gajim.config.set_per('accounts', obj.conn.name, + 'action_when_plaintext_connection', 'disconnect') on_cancel() return # On cancel call del self.instances, so don't call it another time @@ -1257,7 +1260,7 @@ ['plain_connection'] if is_checked[1]: gajim.config.set_per('accounts', obj.conn.name, - 'warn_when_plaintext_connection', False) + 'action_when_plaintext_connection', 'connect') obj.conn.connection_accepted(obj.xmpp_client, 'plain') def on_cancel(): @@ -1270,18 +1273,20 @@ pritext = _('Insecure connection') sectext = _('You are about to connect to the account %(account)s ' '(%(server)s) with an insecure connection. This means all your ' - 'conversations will be exchanged unencrypted. Are you sure you ' - 'want to do that?') % {'account': obj.conn.name, + 'conversations will be exchanged unencrypted. This type of ' + 'connection is really discouraged.\nAre you sure you want to do ' + 'that?') % {'account': obj.conn.name, 'server': gajim.get_hostname_from_account(obj.conn.name)} checktext1 = _('Yes, I really want to connect insecurely') + tooltip1 = _('Gajim will NOT connect unless you check this box') checktext2 = _('_Do not ask me again') if 'plain_connection' in self.instances[obj.conn.name]['online_dialog']: self.instances[obj.conn.name]['online_dialog']['plain_connection'].\ destroy() self.instances[obj.conn.name]['online_dialog']['plain_connection'] = \ dialogs.ConfirmationDialogDoubleCheck(pritext, sectext, checktext1, - checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel, - is_modal=False) + checktext2, tooltip1=tooltip1, on_response_ok=on_ok, + on_response_cancel=on_cancel, is_modal=False) def handle_event_insecure_ssl_connection(self, obj): # ('INSECURE_SSL_CONNECTION', account, (connection, connection_type))

1 0

gajim: remove old unused function
by Yann Leboulanger 30 Oct '11

30 Oct '11

changeset 02bac92365c1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=02bac92365c1 description: remove old unused function diffstat: src/common/connection_handlers.py | 49 --------------------------------------- 1 files changed, 0 insertions(+), 49 deletions(-) diffs (59 lines): diff -r ae1819d30005 -r 02bac92365c1 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Oct 23 21:06:25 2011 +0200 +++ b/src/common/connection_handlers.py Sun Oct 30 13:26:41 2011 +0100 @@ -1673,55 +1673,6 @@ self.connection.SendAndCallForResponse(iq, self._on_bob_received, {'cid': cid}) - # process and dispatch a groupchat message - def dispatch_gc_message(self, msg, frm, msgtxt, jid, tim): - has_timestamp = bool(msg.timestamp) - - statusCode = msg.getStatusCode() - - displaymarking = None - seclabel = msg.getTag('securitylabel') - if seclabel and seclabel.getNamespace() == common.xmpp.NS_SECLABEL: - # Ignore message from room in which we are not - displaymarking = seclabel.getTag('displaymarking') - - if jid not in self.last_history_time: - return - - captcha = msg.getTag('captcha', namespace=common.xmpp.NS_CAPTCHA) - if captcha: - captcha = captcha.getTag('x', namespace=common.xmpp.NS_DATA) - found = helpers.replace_dataform_media(captcha, msg) - if not found: - self.get_bob_data(uri_data, frm, self.dispatch_gc_message, - [msg, frm, msgtxt, jid, tim], 0) - return - self.dispatch('GC_MSG', (frm, msgtxt, tim, has_timestamp, - msg.getXHTML(), statusCode, displaymarking, captcha)) - - tim_int = int(float(mktime(tim))) - if gajim.config.should_log(self.name, jid) and not \ - tim_int <= self.last_history_time[jid] and msgtxt and frm.find('/') >= 0: - # if frm.find('/') < 0, it means message comes from room itself - # usually it hold description and can be send at each connection - # so don't store it in logs - try: - gajim.logger.write('gc_msg', frm, msgtxt, tim=tim) - # store in memory time of last message logged. - # this will also be saved in rooms_last_message_time table - # when we quit this muc - self.last_history_time[jid] = mktime(tim) - - except exceptions.PysqliteOperationalError, e: - self.dispatch('DB_ERROR', (_('Disk Write Error'), 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 - self.dispatch('DB_ERROR', (pritext, sectext)) - def _presenceCB(self, con, prs): """ Called when we receive a presence

1 0

gajim: implement XEP-0306 : status conditions for MUC
by Yann Leboulanger 30 Oct '11

30 Oct '11

changeset 586991e434e6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=586991e434e6 description: implement XEP-0306 : status conditions for MUC diffstat: src/common/connection_handlers_events.py | 41 ++++++++++++++++++++++++++++++- src/common/xmpp/protocol.py | 12 +++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) diffs (94 lines): diff -r 02bac92365c1 -r 586991e434e6 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Oct 30 13:26:41 2011 +0100 +++ b/src/common/connection_handlers_events.py Sun Oct 30 13:27:32 2011 +0100 @@ -42,6 +42,28 @@ import logging log = logging.getLogger('gajim.c.connection_handlers_events') +CONDITION_TO_CODE = { + 'realjid-public': 100, + 'affiliation-changed': 101, + 'unavailable-shown': 102, + 'unavailable-not-shown': 103, + 'configuration-changed': 104, + 'self-presence': 110, + 'logging-enabled': 170, + 'logging-disabled': 171, + 'non-anonymous': 172, + 'semi-anonymous': 173, + 'fully-anonymous': 174, + 'room-created': 201, + 'nick-assigned': 210, + 'banned': 301, + 'new-nick': 303, + 'kicked': 307, + 'removed-affiliation': 321, + 'removed-membership': 322, + 'removed-shutdown': 332, +} + class HelperEvent: def get_jid_resource(self, check_fake_jid=False): if check_fake_jid and hasattr(self, 'id_') and \ @@ -898,7 +920,15 @@ self.status_code = ['destroyed'] else: self.reason = self.stanza.getReason() - self.status_code = self.stanza.getStatusCode() + conditions = self.stanza.getStatusConditions() + if conditions: + self.status_code = [] + for condition in conditions: + if condition in CONDITION_TO_CODE: + self.status_code.append(CONDITION_TO_CODE[condition]) + else: + self.status_code = self.stanza.getStatusCode() + self.role = self.stanza.getRole() self.affiliation = self.stanza.getAffiliation() self.real_jid = self.stanza.getJid() @@ -1198,7 +1228,14 @@ conn=self.conn, msg_event=self)) return - self.status_code = self.stanza.getStatusCode() + conditions = self.stanza.getStatusConditions() + if conditions: + self.status_code = [] + for condition in conditions: + if condition in CONDITION_TO_CODE: + self.status_code.append(CONDITION_TO_CODE[condition]) + else: + self.status_code = self.stanza.getStatusCode() if not self.stanza.getTag('body'): # no <body> # It could be a config change. See diff -r 02bac92365c1 -r 586991e434e6 src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Sun Oct 30 13:26:41 2011 +0100 +++ b/src/common/xmpp/protocol.py Sun Oct 30 13:27:32 2011 +0100 @@ -53,6 +53,7 @@ NS_CHATSTATES = 'http://jabber.org/protocol/chatstates' # JEP-0085 NS_CHATTING = 'http://jabber.org/protocol/chatting' # XEP-0194 NS_CLIENT = 'jabber:client' +NS_CONDITIONS = 'urn:xmpp:muc:conditions:0' # XEP-0306 NS_COMMANDS = 'http://jabber.org/protocol/commands' NS_COMPONENT_ACCEPT = 'jabber:component:accept' NS_COMPONENT_1 = 'http://jabberd.jabberstudio.org/ns/component/1.0' @@ -625,6 +626,17 @@ """ return self.getTagAttr('error', 'code') + def getStatusConditions(self): + """ + Return the status conditions list as defined in XEP-0306. + """ + conds = [] + condtag = self.getTag('conditions', namespace=NS_CONDITIONS) + if condtag: + for tag in condtag.getChildren(): + conds.append(tag.getName()) + return conds + def setError(self, error, code=None): """ Set the error code. Obsolete. Use error-conditions instead

1 0

gajim: fix socks5 FT
by Jefry Lagrange 29 Oct '11

29 Oct '11

changeset 8b2fa4dbe31e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8b2fa4dbe31e description: fix socks5 FT diffstat: src/common/jingle_ft.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (19 lines): diff -r 8bfa9f5a7834 -r 8b2fa4dbe31e src/common/jingle_ft.py --- a/src/common/jingle_ft.py Sat Oct 29 11:34:05 2011 +0200 +++ b/src/common/jingle_ft.py Sat Oct 29 14:31:06 2011 -0400 @@ -374,10 +374,15 @@ def start_transfer(self): self.state = STATE_TRANSFERING + + # It tells wether we start the transfer as client or server + type = None if self.isOurCandUsed(): + type = 'client' streamhost_used = self.nominated_cand['our-cand'] else: + type = 'server' streamhost_used = self.nominated_cand['peer-cand'] if streamhost_used['type'] == 'proxy':

1 0

gajim: send a candidate-error when we get a session-accept with ...
by Yann Leboulanger 29 Oct '11

29 Oct '11

changeset 8bfa9f5a7834 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8bfa9f5a7834 description: send a candidate-error when we get a session-accept with no streamhost diffstat: src/common/socks5.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r f734ef0113c2 -r 8bfa9f5a7834 src/common/socks5.py --- a/src/common/socks5.py Sat Oct 29 00:09:45 2011 -0400 +++ b/src/common/socks5.py Sat Oct 29 11:34:05 2011 +0200 @@ -133,6 +133,9 @@ file_props = self.files_props[account][sid] file_props['failure_cb'] = on_failure + if not file_props['streamhosts']: + on_failure(file_props['sid']) + # add streamhosts to the queue for streamhost in file_props['streamhosts']: if 'type' in streamhost and streamhost['type'] == 'proxy':

1 0

gajim: socks5 proxy fixed
by Jefry Lagrange 29 Oct '11

29 Oct '11

changeset f734ef0113c2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f734ef0113c2 description: socks5 proxy fixed diffstat: src/common/jingle_content.py | 10 +-- src/common/jingle_ft.py | 75 +++++++++++++++++++++++------------ src/common/jingle_transport.py | 82 +++++++++++++++++++++++--------------- src/common/protocol/bytestream.py | 4 +- src/common/socks5.py | 40 ++++++++++-------- 5 files changed, 127 insertions(+), 84 deletions(-) diffs (truncated from 501 to 300 lines): diff -r 505b0680b4cb -r f734ef0113c2 src/common/jingle_content.py --- a/src/common/jingle_content.py Wed Aug 24 23:53:36 2011 +0200 +++ b/src/common/jingle_content.py Sat Oct 29 00:09:45 2011 -0400 @@ -101,7 +101,6 @@ Add a list of candidates to the list of remote candidates """ self.transport.remote_candidates = candidates - pass def on_stanza(self, stanza, content, error, action): """ @@ -112,15 +111,14 @@ callback(stanza, content, error, action) def __on_transport_replace(self, stanza, content, error, action): - content.addChild(node=self.transport.make_transport()) - + def __on_transport_info(self, stanza, content, error, action): """ Got a new transport candidate """ candidates = self.transport.parse_transport_stanza( - content.getTag('transport')) + content.getTag('transport')) if candidates: self.add_remote_candidates(candidates) @@ -139,7 +137,7 @@ content = self.__content() content.addChild(node=self.transport.make_transport([candidate])) self.session.send_transport_info(content) - + def send_error_candidate(self): """ Sends a candidate-error when we can't connect to a candidate. @@ -149,7 +147,7 @@ tp.addChild(name='candidate-error') content.addChild(node=tp) self.session.send_transport_info(content) - + def send_description_info(self): content = self.__content() diff -r 505b0680b4cb -r f734ef0113c2 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Wed Aug 24 23:53:36 2011 +0200 +++ b/src/common/jingle_ft.py Sat Oct 29 00:09:45 2011 -0400 @@ -24,7 +24,7 @@ from jingle_content import contents, JingleContent from jingle_transport import JingleTransportICEUDP, JingleTransportSocks5 from common import helpers -from common.socks5 import Socks5Receiver +from common.socks5 import Socks5Receiver, Socks5Sender from common.connection_handlers_events import FileRequestReceivedEvent import logging @@ -181,6 +181,14 @@ self.state = STATE_CAND_RECEIVED_PENDING_REPLY return + + if content.getTag('transport').getTag('activated'): + self.state = STATE_TRANSFERING + jid = gajim.get_jid_without_resource(self.session.ourjid) + gajim.socks5queue.send_file(self.file_props, + self.session.connection.name, 'client') + return + streamhost_cid = content.getTag('transport').getTag('candidate-used').\ getAttr('cid') streamhost_used = None @@ -274,7 +282,7 @@ self.session.send_transport_info(content) - def _on_connect_error(self, to, _id, sid, code=404): + def _on_connect_error(self, sid): self.nominated_cand['our-cand'] = False self.send_error_candidate() @@ -321,7 +329,6 @@ receiver = self.file_props['receiver'] sender = self.file_props['sender'] - sha_str = helpers.get_auth_sha(self.file_props['sid'], sender, receiver) self.file_props['sha_str'] = sha_str @@ -368,36 +375,52 @@ self.state = STATE_TRANSFERING - # It tells wether we start the transfer as client or server - type = None - if self.isOurCandUsed(): - type = 'client' streamhost_used = self.nominated_cand['our-cand'] else: - type = 'server' streamhost_used = self.nominated_cand['peer-cand'] + + if streamhost_used['type'] == 'proxy': + self.file_props['is_a_proxy'] = True - # FIXME if streamhost_used is none where do we get the proxy host - if streamhost_used and streamhost_used['type'] == 'proxy': + if not self.weinitiate and streamhost_used['type'] == 'proxy': + r = gajim.socks5queue.readers + for reader in r: + if r[reader].host == streamhost_used['host'] and \ + r[reader].connected: + return + + if streamhost_used['type'] == 'proxy': self.file_props['streamhost-used'] = True - for proxy in self.file_props['proxyhosts']: - if proxy['host'] == streamhost_used['host'] and \ - proxy['port'] == streamhost_used['port'] and \ - proxy['jid'] == streamhost_used['jid']: - host_used = proxy - break - if 'streamhosts' not in self.file_props: - self.file_props['streamhosts'] = [] - self.file_props['streamhosts'].append(streamhost_used) - self.file_props['is_a_proxy'] = True - receiver = Socks5Receiver(gajim.idlequeue, streamhost_used, - self.file_props['sid'], self.file_props) - gajim.socks5queue.add_receiver(self.session.connection.name, - receiver) - streamhost_used['idx'] = receiver.queue_idx + streamhost_used['sid'] = self.file_props['sid'] + self.file_props['streamhosts'] = [] + self.file_props['streamhosts'].append(streamhost_used) + self.file_props['proxyhosts'] = [] + self.file_props['proxyhosts'].append(streamhost_used) + self.file_props['is_a_proxy'] = True + + gajim.socks5queue.idx += 1 + idx = gajim.socks5queue.idx + sockobj = Socks5Sender(gajim.idlequeue, idx, + gajim.socks5queue, + mode='client', + _sock=None, + host=str(streamhost_used['host']), + port=int(streamhost_used['port']), + fingerprint=None, + connected=False, + file_props=self.file_props) + sockobj.proxy = True + sockobj.streamhost = streamhost_used + gajim.socks5queue.add_sockobj(self.session.connection.name, + sockobj, 'sender') + streamhost_used['idx'] = sockobj.queue_idx + # If we offered the nominated candidate used, we activate + # the proxy + if not self.isOurCandUsed(): gajim.socks5queue.on_success[self.file_props['sid']] = \ - self.transport._on_proxy_auth_ok + self.transport._on_proxy_auth_ok + # TODO: add on failure else: jid = gajim.get_jid_without_resource(self.session.ourjid) gajim.socks5queue.send_file(self.file_props, diff -r 505b0680b4cb -r f734ef0113c2 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Wed Aug 24 23:53:36 2011 +0200 +++ b/src/common/jingle_transport.py Sat Oct 29 00:09:45 2011 -0400 @@ -118,7 +118,7 @@ return xmpp.Node('candidate', attrs=attrs) def make_transport(self, candidates=None, add_candidates = True): - if add_candidates: + if add_candidates: self._add_local_ips_as_candidates() self._add_additional_candidates() self._add_proxy_candidates() @@ -139,10 +139,10 @@ 'state': 0, 'target': self.ourjid, 'host': candidate['host'], - 'port': candidate['port'], + 'port': int(candidate['port']), 'cid': candidate['cid'], 'type': typ, - 'priority': candidate['priority'] + 'priority': candidate['priority'] } candidates.append(cand) @@ -151,11 +151,22 @@ return candidates + def _add_candidates(self, candidates): + for cand in candidates: + in_remote = False + for cand2 in self.remote_candidates: + if cand['host'] == cand2['host'] and \ + cand['port'] == cand2['port']: + in_remote = True + break + if not in_remote: + self.candidates.append(cand) + def _add_local_ips_as_candidates(self): if not self.connection: return local_ip_cand = [] - port = gajim.config.get('file_transfers_port') + port = int(gajim.config.get('file_transfers_port')) type_preference = 126 #type preference of connection type. XEP-0260 section 2.2 c = {'host': self.connection.peerhost[0]} c['candidate_id'] = self.connection.connection.getAnID() @@ -178,14 +189,14 @@ c['target'] = self.file_props['receiver'] local_ip_cand.append(c) - self.candidates += local_ip_cand + self._add_candidates(local_ip_cand) def _add_additional_candidates(self): if not self.connection: return type_preference = 126 additional_ip_cand = [] - port = gajim.config.get('file_transfers_port') + port = int(gajim.config.get('file_transfers_port')) ft_add_hosts = gajim.config.get('ft_add_hosts_to_send') if ft_add_hosts: @@ -200,7 +211,8 @@ c['initiator'] = self.file_props['sender'] c['target'] = self.file_props['receiver'] additional_ip_cand.append(c) - self.candidates += additional_ip_cand + + self._add_candidates(additional_ip_cand) def _add_proxy_candidates(self): if not self.connection: @@ -219,14 +231,15 @@ for proxyhost in proxyhosts: c = {'host': proxyhost['host']} c['candidate_id'] = self.connection.connection.getAnID() - c['port'] = proxyhost['port'] + c['port'] = int(proxyhost['port']) c['type'] = 'proxy' c['jid'] = proxyhost['jid'] c['priority'] = (2**16) * type_preference c['initiator'] = self.file_props['sender'] c['target'] = self.file_props['receiver'] proxy_cand.append(c) - self.candidates += proxy_cand + + self._add_candidates(proxy_cand) def get_content(self): sesn = self.connection.get_jingle_session(self.ourjid, @@ -240,54 +253,59 @@ # send activate request to proxy, send activated confirmation to peer if not self.connection: return - file_props = self.file_props - iq = xmpp.Iq(to=proxy['initiator'], typ='set') + sesn = self.connection.get_jingle_session(self.ourjid, + self.file_props['session-sid']) + if sesn is None: + return + + iq = xmpp.Iq(to=proxy['jid'], frm=self.ourjid, typ='set') auth_id = "au_" + proxy['sid'] iq.setID(auth_id) query = iq.setTag('query', namespace=xmpp.NS_BYTESTREAM) query.setAttr('sid', proxy['sid']) activate = query.setTag('activate') - activate.setData(file_props['proxy_receiver']) + activate.setData(sesn.peerjid) iq.setID(auth_id) self.connection.connection.send(iq) + content = xmpp.Node('content') content.setAttr('creator', 'initiator') c = self.get_content() content.setAttr('name', c.name) transport = xmpp.Node('transport') transport.setNamespace(xmpp.NS_JINGLE_BYTESTREAM) + transport.setAttr('sid', proxy['sid']) activated = xmpp.Node('activated') cid = None - for host in self.candidates: - if host['host'] == proxy['host'] and host['jid'] == proxy['jid'] \ - and host['port'] == proxy['port']: - cid = host['candidate_id'] - break + + if 'cid' in proxy:

1 0

gajim: test_ft_proxies_on_startup is a per_account option
by Yann Leboulanger 23 Oct '11

23 Oct '11

changeset ae1819d30005 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ae1819d30005 description: test_ft_proxies_on_startup is a per_account option diffstat: src/common/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (19 lines): diff -r 156d299a5b75 -r ae1819d30005 src/common/config.py --- a/src/common/config.py Sun Oct 23 20:26:28 2011 +0200 +++ b/src/common/config.py Sun Oct 23 21:06:25 2011 +0200 @@ -290,7 +290,6 @@ 'use_stun_server': [opt_bool, False, _('If True, Gajim will try to use a STUN server when using jingle. The one in "stun_server" option, or the one given by the jabber server.')], 'stun_server': [opt_str, '', _('STUN server to use when using jingle')], 'show_affiliation_in_groupchat': [opt_bool, True, _('If True, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon')], - 'test_ft_proxies_on_startup': [opt_bool, True, _('If True, Gajim will test file transfer proxies on startup to be sure it works. Openfire\'s proxies are known to fail this test even if they work.')], } __options_per_key = { @@ -351,6 +350,7 @@ # proxy65 for FT 'file_transfer_proxies': [opt_str, 'proxy.eu.jabber.org, proxy.jabber.ru, proxy.jabbim.cz'], 'use_ft_proxies': [opt_bool, True, _('If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer.'), True], + 'test_ft_proxies_on_startup': [opt_bool, True, _('If True, Gajim will test file transfer proxies on startup to be sure it works. Openfire\'s proxies are known to fail this test even if they work.')], 'msgwin-x-position': [opt_int, -1], # Default is to let the wm decide 'msgwin-y-position': [opt_int, -1], # Default is to let the wm decide 'msgwin-width': [opt_int, 480],

1 0

gajim: add advanced option to disable testing of file transfer p...
by Yann Leboulanger 23 Oct '11

23 Oct '11

changeset 156d299a5b75 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=156d299a5b75 description: add advanced option to disable testing of file transfer proxies on startup diffstat: src/common/config.py | 1 + src/common/connection.py | 4 +++- src/common/connection_handlers.py | 5 ++++- src/common/proxy65_manager.py | 15 ++++++++++++--- 4 files changed, 20 insertions(+), 5 deletions(-) diffs (97 lines): diff -r 7d715bcd769d -r 156d299a5b75 src/common/config.py --- a/src/common/config.py Sun Oct 23 19:52:32 2011 +0200 +++ b/src/common/config.py Sun Oct 23 20:26:28 2011 +0200 @@ -290,6 +290,7 @@ 'use_stun_server': [opt_bool, False, _('If True, Gajim will try to use a STUN server when using jingle. The one in "stun_server" option, or the one given by the jabber server.')], 'stun_server': [opt_str, '', _('STUN server to use when using jingle')], 'show_affiliation_in_groupchat': [opt_bool, True, _('If True, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon')], + 'test_ft_proxies_on_startup': [opt_bool, True, _('If True, Gajim will test file transfer proxies on startup to be sure it works. Openfire\'s proxies are known to fail this test even if they work.')], } __options_per_key = { diff -r 7d715bcd769d -r 156d299a5b75 src/common/connection.py --- a/src/common/connection.py Sun Oct 23 19:52:32 2011 +0200 +++ b/src/common/connection.py Sun Oct 23 20:26:28 2011 +0200 @@ -1707,8 +1707,10 @@ gajim.config.get_per('accounts', self.name, 'use_ft_proxies'): our_fjid = helpers.parse_jid(our_jid + '/' + \ self.server_resource) + testit = gajim.config.get_per('accounts', self.name, + 'test_ft_proxies_on_startup') gajim.proxy65_manager.resolve(obj.fjid, self.connection, - our_fjid, self.name) + our_fjid, default=self.name, testit=testit) if common.xmpp.NS_MUC in obj.features and is_muc: type_ = transport_type or 'jabber' self.muc_jid[type_] = obj.fjid diff -r 7d715bcd769d -r 156d299a5b75 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Oct 23 19:52:32 2011 +0200 +++ b/src/common/connection_handlers.py Sun Oct 23 20:26:28 2011 +0200 @@ -1888,10 +1888,13 @@ 'file_transfer_proxies') our_jid = helpers.parse_jid(gajim.get_jid_from_account(self.name) + \ '/' + self.server_resource) + testit = gajim.config.get_per('accounts', self.name, + 'test_ft_proxies_on_startup') if cfg_proxies: proxies = [e.strip() for e in cfg_proxies.split(',')] for proxy in proxies: - gajim.proxy65_manager.resolve(proxy, self.connection, our_jid) + gajim.proxy65_manager.resolve(proxy, self.connection, our_jid, + testit=testit) def _on_roster_set(self, roster): gajim.nec.push_incoming_event(RosterReceivedEvent(None, conn=self, diff -r 7d715bcd769d -r 156d299a5b75 src/common/proxy65_manager.py --- a/src/common/proxy65_manager.py Sun Oct 23 19:52:32 2011 +0200 +++ b/src/common/proxy65_manager.py Sun Oct 23 20:26:28 2011 +0200 @@ -55,15 +55,17 @@ # dict {account: proxy} default proxy for account self.default_proxies = {} - def resolve(self, proxy, connection, sender_jid, default=None): + def resolve(self, proxy, connection, sender_jid, default=None, + testit=True): """ Start + if testit=False, Gajim won't try to resolve it """ if proxy in self.proxies: resolver = self.proxies[proxy] else: # proxy is being ressolved for the first time - resolver = ProxyResolver(proxy, sender_jid) + resolver = ProxyResolver(proxy, sender_jid, testit) self.proxies[proxy] = resolver resolver.add_connection(connection) if default: @@ -115,6 +117,9 @@ self.host = str(host) self.port = int(port) self.jid = unicode(jid) + if not self.testit: + self.state = S_FINISHED + return self.state = S_INITIAL log.info('start resolving %s:%s' % (self.host, self.port)) self.receiver_tester = ReceiverTester(self.host, self.port, self.jid, @@ -209,7 +214,10 @@ query.setNamespace(common.xmpp.NS_BYTESTREAM) connection.send(iq) - def __init__(self, proxy, sender_jid): + def __init__(self, proxy, sender_jid, testit): + """ + if testit is False, don't test it, only get IP/port + """ self.proxy = proxy self.state = S_INITIAL self.active_connection = None @@ -221,6 +229,7 @@ self.port = None self.sid = helpers.get_random_string_16() self.sender_jid = sender_jid + self.testit = testit class HostTester(Socks5, IdleObject): """

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2011