Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Dont use mutable objects as default arguments
by Philipp Hörist 03 Dec '17

03 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 47f1f419 by Philipp Hörist at 2017-12-03T15:34:33+01:00 Dont use mutable objects as default arguments - - - - - 2 changed files: - gajim/chat_control_base.py - gajim/conversation_textview.py Changes: ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -913,7 +913,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.received_history_pos = pos def print_conversation_line(self, text, kind, name, tim, - other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[], + other_tags_for_name=None, other_tags_for_time=None, other_tags_for_text=None, count_as_new=True, subject=None, old_kind=None, xhtml=None, simple=False, xep0184_id=None, graphics=True, displaymarking=None, msg_log_id=None, msg_stanza_id=None, correct_id=None, additional_data=None, ===================================== gajim/conversation_textview.py ===================================== --- a/gajim/conversation_textview.py +++ b/gajim/conversation_textview.py @@ -1353,11 +1353,13 @@ class ConversationTextview(GObject.GObject): buffer_.insert(end_iter, subject) self.print_empty_line(end_iter) - def print_real_text(self, text, text_tags=[], name=None, xhtml=None, + def print_real_text(self, text, text_tags=None, name=None, xhtml=None, graphics=True, mark=None, additional_data=None): """ Add normal and special text. call this to add text """ + if text_tags is None: + text_tags = [] if additional_data is None: additional_data = {} buffer_ = self.tv.get_buffer() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/47f1f41977b787bd6be058dc53b573b311… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/47f1f41977b787bd6be058dc53b573b311… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] resolve TXT record only for non-zeroconf accounts. Fixes #8792
by Yann Leboulanger 03 Dec '17

03 Dec '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 086eeb3d by Yann Leboulanger at 2017-12-03T14:55:41+01:00 resolve TXT record only for non-zeroconf accounts. Fixes #8792 - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -182,11 +182,6 @@ class CommonConnection: self.get_config_values_or_default() - h = app.config.get_per('accounts', self.name, 'hostname') - if h: - app.resolver.resolve('_xmppconnect.' + helpers.idn_to_ascii(h), - self._on_resolve_txt, type_='txt') - def _compute_resource(self): resource = app.config.get_per('accounts', self.name, 'resource') # All valid resource substitution strings should be added to this hash. @@ -709,6 +704,11 @@ class Connection(CommonConnection, ConnectionHandlers): self._nec_gc_stanza_message_outgoing) app.ged.register_event_handler('stanza-message-outgoing', ged.OUT_CORE, self._nec_stanza_message_outgoing) + + h = app.config.get_per('accounts', self.name, 'hostname') + if h: + app.resolver.resolve('_xmppconnect.' + helpers.idn_to_ascii(h), + self._on_resolve_txt, type_='txt') # END __init__ def cleanup(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/086eeb3dc851cae7993a58d5dc1131178a… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/086eeb3dc851cae7993a58d5dc1131178a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix appearance of status icon in MATE
by Philipp Hörist 01 Dec '17

01 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5a28322e by Andrey Gursky at 2017-11-30T23:30:48+01:00 Fix appearance of status icon in MATE Tested in Debian testing (Buster) with gtk2 based MATE 1.12, gtk3 based 1.16 and 1.18. Moreover the used environment variable is depreacated already in 1.12: $ echo $MATE_DESKTOP_SESSION_ID this-is-deprecated Fixes #8757 - - - - - 15a8b503 by Philipp Hörist at 2017-12-01T21:55:53+01:00 Merge branch 'fix-statusicon-in-mate' into 'master' Fix appearance of status icon in MATE Closes #8757 See merge request gajim/gajim!163 - - - - - 1 changed file: - gajim/statusicon.py Changes: ===================================== gajim/statusicon.py ===================================== --- a/gajim/statusicon.py +++ b/gajim/statusicon.py @@ -125,9 +125,6 @@ class StatusIcon: if os.environ.get('KDE_FULL_SESSION') == 'true': # detect KDE session. see #5476 self.statusicon_size = '32' - if os.environ.get('MATE_DESKTOP_SESSION_ID'): - # detect MATE session. - self.statusicon_size = '16' self.set_img() def set_img(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/91ed375b9757081360989596ff1df6892… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/91ed375b9757081360989596ff1df6892… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: refactor the way we call SQL
by Yann Leboulanger 30 Nov '17

30 Nov '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: eb764fa1 by Yann Leboulanger at 2017-11-30T22:45:21+01:00 refactor the way we call SQL - - - - - 91ed375b by Yann Leboulanger at 2017-11-30T22:47:42+01:00 Merge branch 'refactor_db_update' into 'master' refactor the way we call SQL See merge request gajim/gajim!162 - - - - - 1 changed file: - gajim/common/optparser.py Changes: ===================================== gajim/common/optparser.py ===================================== --- a/gajim/common/optparser.py +++ b/gajim/common/optparser.py @@ -267,7 +267,7 @@ class OptionsParser: try: cur.executescript( ''' - CREATE TABLE unread_messages ( + CREATE TABLE IF NOT EXISTS unread_messages ( message_id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE, jid_id INTEGER ); @@ -299,6 +299,20 @@ class OptionsParser: app.config.set_per('accounts', account, 'file_transfer_proxies', proxies_str) + @staticmethod + def call_sql(db_path, sql): + con = sqlite.connect(db_path) + cur = con.cursor() + try: + cur.executescript(sql) + con.commit() + except sqlite.OperationalError as e: + if str(e).startswith('duplicate column name:'): + log.info(str(e)) + else: + log.exception('Error') + con.close() + def update_config_x_to_09(self): # Var name that changed: # avatar_width /height -> chat_avatar_width / height @@ -384,25 +398,14 @@ class OptionsParser: """ Create table transports_cache if there is no such table """ - # FIXME see #2812 - back = os.getcwd() - os.chdir(logger.LOG_DB_FOLDER) - con = sqlite.connect(logger.LOG_DB_FILE) - os.chdir(back) - cur = con.cursor() - try: - cur.executescript( - ''' - CREATE TABLE transports_cache ( - transport TEXT UNIQUE, - type INTEGER - ); - ''' - ) - con.commit() - except sqlite.OperationalError: - pass - con.close() + self.call_sql(logger.LOG_DB_PATH, + ''' + CREATE TABLE IF NOT EXISTS transports_cache ( + transport TEXT UNIQUE, + type INTEGER + ); + ''' + ) app.config.set('version', '0.10.1.3') def update_config_to_01014(self): @@ -410,36 +413,19 @@ class OptionsParser: Apply indeces to the logs database """ print(_('migrating logs database to indices')) - # FIXME see #2812 - back = os.getcwd() - os.chdir(logger.LOG_DB_FOLDER) - con = sqlite.connect(logger.LOG_DB_FILE) - os.chdir(back) - cur = con.cursor() - # apply indeces - try: - cur.executescript( - ''' - CREATE INDEX idx_logs_jid_id_kind ON logs (jid_id, kind); - CREATE INDEX idx_unread_messages_jid_id ON unread_messages (jid_id); - ''' - ) - - con.commit() - except Exception: - pass - con.close() + self.call_sql(logger.LOG_DB_PATH, + ''' + CREATE INDEX idx_logs_jid_id_kind ON logs (jid_id, kind); + CREATE INDEX idx_unread_messages_jid_id ON unread_messages (jid_id); + ''' + ) app.config.set('version', '0.10.1.4') def update_config_to_01015(self): """ Clean show values in logs database """ - #FIXME see #2812 - back = os.getcwd() - os.chdir(logger.LOG_DB_FOLDER) - con = sqlite.connect(logger.LOG_DB_FILE) - os.chdir(back) + con = sqlite.connect(logger.LOG_DB_PATH) cur = con.cursor() status = dict((i[5:].lower(), logger.constants.__dict__[i]) for i in \ logger.constants.__dict__.keys() if i.startswith('SHOW_')) @@ -520,27 +506,16 @@ class OptionsParser: app.config.set('version', '0.11.1.2') def update_config_to_01113(self): - # copy&pasted from update_config_to_01013, possibly 'FIXME see #2812' applies too - back = os.getcwd() - os.chdir(logger.LOG_DB_FOLDER) - con = sqlite.connect(logger.LOG_DB_FILE) - os.chdir(back) - cur = con.cursor() - try: - cur.executescript( - ''' - CREATE TABLE caps_cache ( - node TEXT, - ver TEXT, - ext TEXT, - data BLOB - ); - ''' - ) - con.commit() - except sqlite.OperationalError: - pass - con.close() + self.call_sql(logger.LOG_DB_PATH, + ''' + CREATE TABLE IF NOT EXISTS caps_cache ( + node TEXT, + ver TEXT, + ext TEXT, + data BLOB + ); + ''' + ) app.config.set('version', '0.11.1.3') def update_config_to_01114(self): @@ -567,22 +542,7 @@ class OptionsParser: app.config.set('version', '0.11.1.4') def update_config_to_01115(self): - # copy&pasted from update_config_to_01013, possibly 'FIXME see #2812' applies too - back = os.getcwd() - os.chdir(logger.LOG_DB_FOLDER) - con = sqlite.connect(logger.LOG_DB_FILE) - os.chdir(back) - cur = con.cursor() - try: - cur.executescript( - ''' - DELETE FROM caps_cache; - ''' - ) - con.commit() - except sqlite.OperationalError: - pass - con.close() + self.call_sql(logger.LOG_DB_PATH, '''DELETE FROM caps_cache;''') app.config.set('version', '0.11.1.5') def update_config_to_01121(self): @@ -599,26 +559,16 @@ class OptionsParser: app.config.set('version', '0.11.2.1') def update_config_to_01141(self): - back = os.getcwd() - os.chdir(logger.LOG_DB_FOLDER) - con = sqlite.connect(logger.LOG_DB_FILE) - os.chdir(back) - cur = con.cursor() - try: - cur.executescript( - ''' - CREATE TABLE IF NOT EXISTS caps_cache ( - node TEXT, - ver TEXT, - ext TEXT, - data BLOB - ); - ''' - ) - con.commit() - except sqlite.OperationalError: - pass - con.close() + self.call_sql(logger.LOG_DB_PATH, + ''' + CREATE TABLE IF NOT EXISTS caps_cache ( + node TEXT, + ver TEXT, + ext TEXT, + data BLOB + ); + ''' + ) app.config.set('version', '0.11.4.1') def update_config_to_01142(self): @@ -640,24 +590,14 @@ class OptionsParser: app.config.set('version', '0.11.1.2') def update_config_to_01143(self): - back = os.getcwd() - os.chdir(logger.LOG_DB_FOLDER) - con = sqlite.connect(logger.LOG_DB_FILE) - os.chdir(back) - cur = con.cursor() - try: - cur.executescript( - ''' - CREATE TABLE IF NOT EXISTS rooms_last_message_time( - jid_id INTEGER PRIMARY KEY UNIQUE, - time INTEGER - ); - ''' - ) - con.commit() - except sqlite.OperationalError: - pass - con.close() + self.call_sql(logger.LOG_DB_PATH, + ''' + CREATE TABLE IF NOT EXISTS rooms_last_message_time( + jid_id INTEGER PRIMARY KEY UNIQUE, + time INTEGER + ); + ''' + ) app.config.set('version', '0.11.4.3') def update_config_to_01144(self): @@ -674,7 +614,7 @@ class OptionsParser: try: cur.executescript( ''' - CREATE TABLE caps_cache ( + CREATE TABLE IF NOT EXISTS caps_cache ( hash_method TEXT, hash TEXT, data BLOB @@ -752,35 +692,25 @@ class OptionsParser: app.config.set('version', '0.12.1.5') def update_config_to_01231(self): - back = os.getcwd() - os.chdir(logger.LOG_DB_FOLDER) - con = sqlite.connect(logger.LOG_DB_FILE) - os.chdir(back) - cur = con.cursor() - try: - cur.executescript( - ''' - CREATE TABLE IF NOT EXISTS roster_entry( - account_jid_id INTEGER, - jid_id INTEGER, - name TEXT, - subscription INTEGER, - ask BOOLEAN, - PRIMARY KEY (account_jid_id, jid_id) - ); - - CREATE TABLE IF NOT EXISTS roster_group( - account_jid_id INTEGER, - jid_id INTEGER, - group_name TEXT, - PRIMARY KEY (account_jid_id, jid_id, group_name) - ); - ''' - ) - con.commit() - except sqlite.OperationalError: - pass - con.close() + self.call_sql(logger.LOG_DB_PATH, + ''' + CREATE TABLE IF NOT EXISTS roster_entry( + account_jid_id INTEGER, + jid_id INTEGER, + name TEXT, + subscription INTEGER, + ask BOOLEAN, + PRIMARY KEY (account_jid_id, jid_id) + ); + + CREATE TABLE IF NOT EXISTS roster_group( + account_jid_id INTEGER, + jid_id INTEGER, + group_name TEXT, + PRIMARY KEY (account_jid_id, jid_id, group_name) + ); + ''' + ) app.config.set('version', '0.12.3.1') def update_config_from_0125(self): @@ -792,22 +722,10 @@ class OptionsParser: self.update_config_to_01231() def update_config_to_01251(self): - back = os.getcwd() - os.chdir(logger.LOG_DB_FOLDER) - con = sqlite.connect(logger.LOG_DB_FILE) - os.chdir(back) - cur = con.cursor() - try: - cur.executescript( - ''' - ALTER TABLE unread_messages - ADD shown BOOLEAN default 0; - ''' - ) - con.commit() - except sqlite.OperationalError: - pass - con.close() + self.call_sql(logger.LOG_DB_PATH, + '''ALTER TABLE unread_messages + ADD COLUMN 'shown' BOOLEAN default 0;''' + ) app.config.set('version', '0.12.5.1') def update_config_to_01252(self): @@ -881,43 +799,21 @@ class OptionsParser: app.config.set('version', '0.12.5.8') def update_config_to_013100(self): - back = os.getcwd() - os.chdir(logger.LOG_DB_FOLDER) - con = sqlite.connect(logger.LOG_DB_FILE) - os.chdir(back) - cur = con.cursor() - try: - cur.executescript( - ''' - ALTER TABLE caps_cache - ADD last_seen INTEGER default %d; - ''' % int(time()) - ) - con.commit() - except sqlite.OperationalError: - pass - con.close() + self.call_sql(logger.LOG_DB_PATH, + '''ALTER TABLE caps_cache + ADD COLUMN 'last_seen' INTEGER default %d;''' % int(time()) + ) app.config.set('version', '0.13.10.0') def update_config_to_013101(self): - back = os.getcwd() - os.chdir(logger.LOG_DB_FOLDER) - con = sqlite.connect(logger.LOG_DB_FILE) - os.chdir(back) - cur = con.cursor() - try: - cur.executescript( - ''' - DROP INDEX IF EXISTS idx_logs_jid_id_kind; - - CREATE INDEX IF NOT EXISTS - idx_logs_jid_id_time ON logs (jid_id, time DESC); - ''' - ) - con.commit() - except sqlite.OperationalError: - pass - con.close() + self.call_sql(logger.LOG_DB_PATH, + ''' + DROP INDEX IF EXISTS idx_logs_jid_id_kind; + + CREATE INDEX IF NOT EXISTS + idx_logs_jid_id_time ON logs (jid_id, time DESC); + ''' + ) app.config.set('version', '0.13.10.1') def update_config_to_013901(self): @@ -971,44 +867,21 @@ class OptionsParser: for account in self.old_values['accounts'].keys(): app.config.del_per('accounts', account, 'minimized_gc') - back = os.getcwd() - os.chdir(logger.LOG_DB_FOLDER) - con = sqlite.connect(logger.LOG_DB_FILE) - os.chdir(back) - cur = con.cursor() - try: - cur.executescript( - ''' - ALTER TABLE logs ADD COLUMN 'additional_data' TEXT DEFAULT '{}'; - ''' - ) - con.commit() - except sqlite.OperationalError: - pass - con.close() - + self.call_sql(logger.LOG_DB_PATH, + '''ALTER TABLE logs + ADD COLUMN 'additinal_data' TEXT default '()';''' + ) app.config.set('version', '0.16.10.2') def update_config_to_016103(self): - back = os.getcwd() - os.chdir(logger.LOG_DB_FOLDER) - con = sqlite.connect(logger.LOG_DB_FILE) - os.chdir(back) - cur = con.cursor() - try: - cur.executescript( - ''' - ALTER TABLE logs ADD COLUMN 'stanza_id' TEXT; - ALTER TABLE logs ADD COLUMN 'mam_id' TEXT; - ALTER TABLE logs ADD COLUMN 'encryption' TEXT; - ALTER TABLE logs ADD COLUMN 'encryption_state' TEXT; - ALTER TABLE logs ADD COLUMN 'marker' INTEGER; - ''' - ) - con.commit() - except sqlite.OperationalError: - pass - con.close() + self.call_sql(logger.LOG_DB_PATH, + '''ALTER TABLE logs ADD COLUMN 'stanza_id' TEXT; + ALTER TABLE logs ADD COLUMN 'mam_id' TEXT; + ALTER TABLE logs ADD COLUMN 'encryption' TEXT; + ALTER TABLE logs ADD COLUMN 'encryption_state' TEXT; + ALTER TABLE logs ADD COLUMN 'marker' INTEGER; + ''' + ) app.config.set('version', '0.16.10.3') def update_config_to_016104(self): @@ -1021,37 +894,22 @@ class OptionsParser: app.config.set('version', '0.16.10.5') def update_config_to_016111(self): - con = sqlite.connect(logger.CACHE_DB_PATH) - cur = con.cursor() - try: - cur.executescript( - ''' - ALTER TABLE roster_entry ADD COLUMN 'avatar_sha' TEXT; - ''' - ) - con.commit() - except sqlite.OperationalError: - log.exception('Error') - con.close() + self.call_sql(logger.CACHE_DB_PATH, + '''ALTER TABLE roster_entry ADD COLUMN 'avatar_sha' TEXT; + ''' + ) app.config.set('version', '0.16.11.1') def update_config_to_016112(self): - con = sqlite.connect(logger.LOG_DB_PATH) - cur = con.cursor() - try: - cur.executescript( - ''' - CREATE TABLE IF NOT EXISTS last_archive_message( - jid_id INTEGER PRIMARY KEY UNIQUE, - last_mam_id TEXT, - oldest_mam_timestamp TEXT, - last_muc_timestamp TEXT - ); - ALTER TABLE logs ADD COLUMN 'account_id' INTEGER; - ''' - ) - con.commit() - except sqlite.OperationalError: - log.exception('Error') - con.close() + self.call_sql(logger.LOG_DB_PATH, + ''' + CREATE TABLE IF NOT EXISTS last_archive_message( + jid_id INTEGER PRIMARY KEY UNIQUE, + last_mam_id TEXT, + oldest_mam_timestamp TEXT, + last_muc_timestamp TEXT + ); + ALTER TABLE logs ADD COLUMN 'account_jid' INTEGER; + ''' + ) app.config.set('version', '0.16.11.2') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/79ba81825d66383b9f98751ad0c422be1… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/79ba81825d66383b9f98751ad0c422be1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] better parse of version in config file in case old sha version of git is
by Yann Leboulanger 30 Nov '17

30 Nov '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 79ba8182 by Yann Leboulanger at 2017-11-30T17:19:17+01:00 better parse of version in config file in case old sha version of git is used (-xyz instead of +xyz) - - - - - 1 changed file: - gajim/common/optparser.py Changes: ===================================== gajim/common/optparser.py ===================================== --- a/gajim/common/optparser.py +++ b/gajim/common/optparser.py @@ -82,7 +82,10 @@ class OptionsParser: app.config.set_per(optname, key, subname, value) old_version = app.config.get('version') - old_version = old_version.split('+', 1)[0] + if '+' in old_version: + old_version = old_version.split('+', 1)[0] + elif '-' in old_version: + old_version = old_version.split('-', 1)[0] self.update_config(old_version, new_version) self.old_values = {} # clean mem View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/79ba81825d66383b9f98751ad0c422be16… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/79ba81825d66383b9f98751ad0c422be16… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_0.16] update translation files
by Yann Leboulanger 30 Nov '17

30 Nov '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: 71514417 by Yann Leboulanger at 2017-11-30T10:09:02+00:00 update translation files - - - - - 30 changed files: - po/be.po - po/be(a)latin.po - po/bg.po - po/br.po - po/cs.po - po/da.po - po/de.po - po/el.po - po/en_GB.po - po/eo.po - po/es.po - po/eu.po - po/fr.po - po/gl.po - po/he.po - po/hr.po - po/hu.po - po/it.po - po/ja.po - po/kk.po - po/lt.po - po/nb_NO.po - po/nl.po - po/pl.po - po/pt.po - po/pt_BR.po - po/ru.po - po/sk.po - po/sr.po - po/sr(a)Latn.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/71514417bd8c3c69cdb8a523a4dfeecdd9… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/71514417bd8c3c69cdb8a523a4dfeecdd9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new tag nbxmpp-0.6.1
by Yann Leboulanger 29 Nov '17

29 Nov '17

Yann Leboulanger pushed new tag nbxmpp-0.6.1 at gajim / python-nbxmpp --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/tree/nbxmpp-0.6.1 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] prepare 0.6.1 release
by Yann Leboulanger 29 Nov '17

29 Nov '17

Yann Leboulanger pushed to branch master at gajim / python-nbxmpp Commits: e79bf285 by Yann Leboulanger at 2017-11-29T21:23:59+01:00 prepare 0.6.1 release - - - - - 3 changed files: - ChangeLog - nbxmpp/__init__.py - setup.py Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +python-nbxmpp 0.6.1 (29 November 2017) + + * Add new getStanzaIDAttrs method + * Fix BOSH connexion + * stop using PyOpenSSL for random generator + python-nbxmpp 0.6.0 (25 September 2017) * Add new getOriginID/SetOriginID method for Messages ===================================== nbxmpp/__init__.py ===================================== --- a/nbxmpp/__init__.py +++ b/nbxmpp/__init__.py @@ -17,4 +17,4 @@ from .client_nb import NonBlockingClient from .plugin import PlugIn from .smacks import Smacks -__version__ = "0.6.0" +__version__ = "0.6.1" ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from distutils.core import setup setup(name='nbxmpp', - version='0.6.0', + version='0.6.1', description='Non blocking Jabber/XMPP module', author='Yann Leboulanger', author_email='asterix(a)lagaule.org', View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/e79bf2856f3b9f1bec4b6831b8… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/e79bf2856f3b9f1bec4b6831b8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: implement XEP-0156. Fixes #5795
by Yann Leboulanger 29 Nov '17

29 Nov '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 149edfe3 by Yann Leboulanger at 2017-11-20T21:31:29+01:00 implement XEP-0156. Fixes #5795 - - - - - 46711e11 by Yann Leboulanger at 2017-11-29T14:25:49+01:00 Merge branch 'XEP-156' into 'master' implement XEP-0156 Closes #5795 See merge request gajim/gajim!154 - - - - - 2 changed files: - gajim/common/connection.py - gajim/common/resolver.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -182,6 +182,11 @@ class CommonConnection: self.get_config_values_or_default() + h = app.config.get_per('accounts', self.name, 'hostname') + if h: + app.resolver.resolve('_xmppconnect.' + helpers.idn_to_ascii(h), + self._on_resolve_txt, type_='txt') + def _compute_resource(self): resource = app.config.get_per('accounts', self.name, 'resource') # All valid resource substitution strings should be added to this hash. @@ -1106,6 +1111,28 @@ class Connection(CommonConnection, ConnectionHandlers): i['ssl_port'] = ssl_p self._connect_to_next_host() + def _on_resolve_txt(self, host, result_array): + for res in result_array: + if res.startswith('_xmpp-client-xbosh='): + url = res[19:] + found = False + proxies = app.config.get_per('proxies') + for p in proxies: + if app.config.get_per('proxies', p, 'type') == 'bosh' \ + and app.config.get_per('proxies', p, 'bosh_uri') == url: + found = True + break + if not found: + h = app.config.get_per('accounts', self.name, 'hostname') + p = 'bosh_' + h + i = 0 + while p in proxies: + i += 1 + p = 'bosh_' + h + str(i) + app.config.add_per('proxies', p) + app.config.set_per('proxies', p, 'type', 'bosh') + app.config.set_per('proxies', p, 'bosh_uri', url) + def _connect_to_next_host(self, retry=False): log.debug('Connection to next host') @@ -2212,6 +2239,8 @@ class Connection(CommonConnection, ConnectionHandlers): self.on_connect_success = self._on_new_account self.on_connect_failure = self._on_new_account self.connect(config) + app.resolver.resolve('_xmppconnect.' + helpers.idn_to_ascii( + self._hostname), self._on_resolve_txt, type_='txt') def _on_new_account(self, con=None, con_type=None): if not con_type: ===================================== gajim/common/resolver.py ===================================== --- a/gajim/common/resolver.py +++ b/gajim/common/resolver.py @@ -94,9 +94,8 @@ class GioResolver(CommonResolver): def start_resolve(self, host, type_): if type_ == 'txt': - # TXT record resolution isn't used anywhere at the moment so - # implementing it here isn't urgent - raise NotImplementedError("Gio resolver does not currently implement TXT records") + callback = functools.partial(self._on_ready_txt, host) + type_ = Gio.ResolverRecordType.TXT else: callback = functools.partial(self._on_ready_srv, host) type_ = Gio.ResolverRecordType.SRV @@ -125,6 +124,19 @@ class GioResolver(CommonResolver): ] super()._on_ready(host, 'srv', result_list) + def _on_ready_txt(self, host, source_object, result): + try: + variant_results = source_object.lookup_records_finish(result) + except GLib.Error as e: + if e.domain == 'g-resolver-error-quark': + result_list = [] + log.warning("Could not resolve host: %s", e.message) + else: + raise + else: + result_list = [res[0][0] for res in variant_results] + super()._on_ready(host, 'txt', result_list) + # below lines is on how to use API and assist in testing if __name__ == '__main__': View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b3ef0d61962d310a95424c12d4eacf411… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b3ef0d61962d310a95424c12d4eacf411… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_0.16] remove usage of OpenSSL.rand deprecated module. Fixes #8788
by Yann Leboulanger 28 Nov '17

28 Nov '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: 3dd35f5e by Yann Leboulanger at 2017-11-28T10:47:56+01:00 remove usage of OpenSSL.rand deprecated module. Fixes #8788 - - - - - 2 changed files: - src/common/crypto.py - src/gajim.py Changes: ===================================== src/common/crypto.py ===================================== --- a/src/common/crypto.py +++ b/src/common/crypto.py @@ -76,50 +76,8 @@ def base28(n): else: return base28_chr[n] -def add_entropy_sources_OpenSSL(): - # Other possibly variable data. This are very low quality sources of - # entropy, but some of them are installation dependent and can be hard - # to guess for the attacker. - # Data available on all platforms Unix, Windows - sources = [sys.argv, sys.builtin_module_names, - sys.copyright, sys.getfilesystemencoding(), sys.hexversion, - sys.modules, sys.path, sys.version, sys.api_version, - os.environ, os.getcwd(), os.getpid()] - - for s in sources: - OpenSSL.rand.add(str(s), 1) - - # The /proc filesystem on POSIX systems contains many random variables: - # memory statistics, interrupt counts, network packet counts - if os.name == 'posix': - dirs = ['/proc', '/proc/net', '/proc/self'] - for d in dirs: - if os.access(d, os.R_OK): - for filename in os.listdir(d): - OpenSSL.rand.add(filename, 0) - try: - with open(d + os.sep + filename, "r") as fp: - # Limit the ammount of read bytes, in case a memory - # file was opened - OpenSSL.rand.add(str(fp.read(5000)), 1) - except IOError: - # Ignore all read and access errors - pass - -PYOPENSSL_PRNG_PRESENT = False -try: - import OpenSSL.rand - PYOPENSSL_PRNG_PRESENT = True -except ImportError: - # PyOpenSSL PRNG not available - pass - def random_bytes(bytes_): - if PYOPENSSL_PRNG_PRESENT: - OpenSSL.rand.add(os.urandom(bytes_), bytes_) - return OpenSSL.rand.bytes(bytes_) - else: - return os.urandom(bytes_) + return os.urandom(bytes_) def generate_nonce(): return random_bytes(8) ===================================== src/gajim.py ===================================== --- a/src/gajim.py +++ b/src/gajim.py @@ -296,20 +296,6 @@ gajimpaths = configpaths.gajimpaths pid_filename = gajimpaths['PID_FILE'] config_filename = gajimpaths['CONFIG_FILE'] -# Seed the OpenSSL pseudo random number generator from file and initialize -RNG_SEED = gajimpaths['RNG_SEED'] -PYOPENSSL_PRNG_PRESENT = False -try: - import OpenSSL.rand - from common import crypto - PYOPENSSL_PRNG_PRESENT = True - # Seed from file - OpenSSL.rand.load_file(str(RNG_SEED)) - crypto.add_entropy_sources_OpenSSL() - OpenSSL.rand.write_file(str(RNG_SEED)) -except ImportError: - log.info("PyOpenSSL PRNG not available") - import traceback import errno import dialogs @@ -456,9 +442,6 @@ except IOError, e2: del pid_dir def on_exit(): - # Save the entropy from OpenSSL PRNG - if PYOPENSSL_PRNG_PRESENT: - OpenSSL.rand.write_file(str(RNG_SEED)) # delete pid file on normal exit if os.path.exists(pid_filename): os.remove(pid_filename) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3dd35f5e762dcef2cf05e325705d0e7a2d… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3dd35f5e762dcef2cf05e325705d0e7a2d… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits