Commits November 2017

commits@gajim.org

1 participants
52 discussions

[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

[Git][gajim/gajim][master] Catch ValueError on Gspell import
by Philipp Hörist 26 Nov '17

26 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: b3ef0d61 by Philipp Hörist at 2017-11-26T01:11:19+01:00 Catch ValueError on Gspell import - - - - - 1 changed file: - gajim/common/app.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -266,7 +266,7 @@ try: HAVE_SPELL = True else: spell_log.info('No dicts available') -except ImportError: +except (ImportError, ValueError): pass gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'} View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b3ef0d61962d310a95424c12d4eacf4114… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b3ef0d61962d310a95424c12d4eacf4114… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Refactor SpellChecker
by Philipp Hörist 25 Nov '17

25 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7692b376 by Philipp Hörist at 2017-11-26T00:44:50+01:00 Refactor SpellChecker - use Gspell instead of GtkSpell, it seems to have alot less problems and needs less code - - - - - 92917c18 by Philipp Hörist at 2017-11-26T00:54:17+01:00 Merge branch 'spell' into 'master' Refactor SpellChecker See merge request gajim/gajim!159 - - - - - 10 changed files: - README.md - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/app.py - gajim/config.py - gajim/dialogs.py - gajim/features_window.py - − gajim/gtkspell.py - gajim/message_textview.py - win/_base.sh Changes: ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ - python3-crypto to enable End to end encryption - python3-gnupg to enable GPG encryption - For zeroconf (bonjour) you need dbus-glib, python-avahi -- gir1.2-gtkspell3-3.0 and aspell-LANG where lang is your locale eg. en, fr etc +- gir1.2-gspell-1 and hunspell-LANG where lang is your locale eg. en, fr etc - gir1.2-secret-1 for GNOME Keyring or KDE support as password storage - D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required. - python3-dbus bindings (>=1.2.0) ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -1173,7 +1173,6 @@ class ChatControl(ChatControlBase): self.handlers[i].disconnect(i) del self.handlers[i] self.conv_textview.del_handlers() - self.remove_speller() self.msg_textview.destroy() # PluginSystem: calling shutdown of super class (ChatControlBase) to let # it remove it's GUI extension points ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -32,7 +32,6 @@ import time from gi.repository import Gtk from gi.repository import Gdk from gi.repository import Pango -from gi.repository import GObject from gi.repository import GLib from gi.repository import Gio @@ -42,7 +41,6 @@ from gajim import message_control from gajim import dialogs from gajim import history_window from gajim import notify -from gajim import gtkspell import re from gajim import emoticons @@ -66,6 +64,9 @@ from gajim.command_system.implementation.middleware import CommandTools from gajim.command_system.implementation import standard from gajim.command_system.implementation import execute +if app.HAVE_SPELL: + from gi.repository import Gspell + ################################################################################ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): @@ -345,8 +346,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.set_emoticon_popover() # Attach speller - self.spell = None - self.spell_handlers = [] + self.spell_checker = None self.set_speller() self.conv_textview.tv.show() @@ -471,44 +471,22 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): image.set_from_pixbuf(icon) def set_speller(self): - if not gtkspell.HAS_GTK_SPELL or not app.config.get('use_speller'): + if not app.HAVE_SPELL or not app.config.get('use_speller'): return - def _on_focus_in(*args): - if self.spell is None: - return - self.spell.attach(self.msg_textview) + gspell_lang = self.get_speller_language() + if gspell_lang is None: + return - def _on_focus_out(*args): - if self.spell is None: - return - if not self.msg_textview.has_text(): - self.spell.detach() + self.spell_checker = Gspell.Checker.new(gspell_lang) + spell_buffer = Gspell.TextBuffer.get_from_gtk_text_buffer( + self.msg_textview.get_buffer()) + spell_buffer.set_spell_checker(self.spell_checker) + spell_view = Gspell.TextView.get_from_gtk_text_view(self.msg_textview) + spell_view.set_inline_spell_checking(False) + spell_view.set_enable_language_menu(True) - lang = self.get_speller_language() - if not lang: - return - try: - self.spell = gtkspell.Spell(self.msg_textview, lang) - self.spell.connect('language_changed', self.on_language_changed) - handler_id = self.msg_textview.connect('focus-in-event', - _on_focus_in) - self.spell_handlers.append(handler_id) - handler_id = self.msg_textview.connect('focus-out-event', - _on_focus_out) - self.spell_handlers.append(handler_id) - except OSError: - dialogs.AspellDictError(lang) - app.config.set('use_speller', False) - - def remove_speller(self): - if self.spell is None: - return - self.spell.detach() - for id_ in self.spell_handlers: - self.msg_textview.disconnect(id_) - self.spell_handlers.remove(id_) - self.spell = None + self.spell_checker.connect('notify::language', self.on_language_changed) def get_speller_language(self): per_type = 'contacts' @@ -521,16 +499,20 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): lang = app.config.get('speller_language') if not lang: lang = app.LANG - return lang or None + gspell_lang = Gspell.language_lookup(lang) + if gspell_lang is None: + gspell_lang = Gspell.language_get_default() + return gspell_lang - def on_language_changed(self, spell, lang): + def on_language_changed(self, checker, param): + gspell_lang = checker.get_language() per_type = 'contacts' if self.type_id == message_control.TYPE_GC: per_type = 'rooms' if not app.config.get_per(per_type, self.contact.jid): app.config.add_per(per_type, self.contact.jid) - app.config.set_per( - per_type, self.contact.jid, 'speller_language', lang) + app.config.set_per(per_type, self.contact.jid, + 'speller_language', gspell_lang.get_code()) def on_banner_label_populate_popup(self, label, menu): """ ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -253,6 +253,21 @@ except Exception: glog.info(_('Unable to load idle module')) HAVE_IDLE = False +HAVE_SPELL = False +try: + spell_log = logging.getLogger('gajim.speller') + gi.require_version('Gspell', '1') + from gi.repository import Gspell + langs = Gspell.language_get_available() + for lang in langs: + spell_log.info('%s (%s) dict available', + lang.get_name(), lang.get_code()) + if langs: + HAVE_SPELL = True + else: + spell_log.info('No dicts available') +except ImportError: + pass gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'} gajim_common_features = [nbxmpp.NS_BYTESTREAM, nbxmpp.NS_SI, nbxmpp.NS_FILE, ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -50,7 +50,6 @@ from gajim import message_control from gajim.chat_control_base import ChatControlBase from gajim import dataforms_widget from gajim import gui_menu_builder -from gajim import gtkspell from gajim.common import helpers from gajim.common import app @@ -66,6 +65,9 @@ try: except (ImportError, ValueError): HAS_GST = False +if app.HAVE_SPELL: + from gi.repository import Gspell + #---------- PreferencesWindow class -------------# class PreferencesWindow: """ @@ -187,7 +189,7 @@ class PreferencesWindow: self.xml.get_object('xhtml_checkbutton').set_active(st) # use speller - if gtkspell.HAS_GTK_SPELL: + if app.HAVE_SPELL: st = app.config.get('use_speller') self.xml.get_object('speller_checkbutton').set_active(st) else: @@ -657,30 +659,22 @@ class PreferencesWindow: if isinstance(ctrl, ChatControlBase): ctrl.set_speller() - def remove_speller(self): - for ctrl in self._get_all_controls(): - if isinstance(ctrl, ChatControlBase): - if ctrl.spell is not None: - ctrl.remove_speller() - def on_speller_checkbutton_toggled(self, widget): active = widget.get_active() app.config.set('use_speller', active) - if active: - lang = app.config.get('speller_language') - if not lang: - lang = app.LANG - - available = gtkspell.test_language(lang) - if not available: - dialogs.AspellDictError(lang) - app.config.set('use_speller', False) - widget.set_active(False) - else: - app.config.set('speller_language', lang) - self.apply_speller() + if not active: + return + lang = app.config.get('speller_language') + gspell_lang = Gspell.language_lookup(lang) + if gspell_lang is None: + gspell_lang = Gspell.language_get_default() + if gspell_lang is None: + dialogs.AspellDictError(lang) + app.config.set('use_speller', False) + widget.set_active(False) else: - self.remove_speller() + app.config.set('speller_language', gspell_lang.get_code()) + self.apply_speller() def on_positive_184_ack_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'positive_184_ack') ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -34,6 +34,7 @@ from gi.repository import Gdk from gi.repository import GdkPixbuf from gi.repository import GObject from gi.repository import GLib + import os import nbxmpp import time @@ -42,7 +43,6 @@ from gajim import gtkgui_helpers from gajim import vcard from gajim import conversation_textview from gajim import dataforms_widget -from gajim import gtkspell from random import randrange from gajim.common import pep @@ -64,6 +64,9 @@ from gajim.common import dataforms from gajim.common.exceptions import GajimGeneralException from gajim.common.connection_handlers_events import MessageOutgoingEvent +if app.HAVE_SPELL: + from gi.repository import Gspell + import logging log = logging.getLogger('gajim.dialogs') @@ -3077,15 +3080,19 @@ class SingleMessageWindow: else: self.to_entry.set_text(to) - if app.config.get('use_speller') and gtkspell.HAS_GTK_SPELL and action == 'send': - try: - lang = app.config.get('speller_language') - if not lang: - lang = app.LANG - self.spell = gtkspell.Spell(self.message_textview, lang) - self.spell.attach(self.message_textview) - except OSError: + if app.config.get('use_speller') and app.HAVE_SPELL and action == 'send': + lang = app.config.get('speller_language') + gspell_lang = Gspell.language_lookup(lang) + if gspell_lang is None: AspellDictError(lang) + else: + spell_buffer = Gspell.TextBuffer.get_from_gtk_text_buffer( + self.message_textview.get_buffer()) + spell_buffer.set_spell_checker(Gspell.Checker.new(gspell_lang)) + spell_view = Gspell.TextView.get_from_gtk_text_view( + self.message_textview) + spell_view.set_inline_spell_checking(True) + spell_view.set_enable_language_menu(True) self.prepare_widgets_for(self.action) ===================================== gajim/features_window.py ===================================== --- a/gajim/features_window.py +++ b/gajim/features_window.py @@ -63,8 +63,8 @@ class FeaturesWindow: _('On Windows the Windows Credential Vault is used.')), _('Spell Checker'): (self.speller_available, _('Spellchecking of composed messages.'), - _('Requires libgtkspell.'), - _('Requires libgtkspell and libenchant.')), + _('Requires Gspell'), + _('Requires Gspell')), _('Automatic status'): (self.idle_available, _('Ability to measure idle time, in order to set auto status.'), _('Requires libxss library.'), @@ -164,11 +164,7 @@ class FeaturesWindow: return True def speller_available(self): - try: - __import__('gajim.gtkspell') - except ValueError: - return False - return True + return app.HAVE_SPELL def idle_available(self): from gajim.common import sleepy ===================================== gajim/gtkspell.py deleted ===================================== --- a/gajim/gtkspell.py +++ /dev/null @@ -1,104 +0,0 @@ -## src/gtkspell.py -## -## (C) 2008 Thorsten P. 'dGhvcnN0ZW5wIEFUIHltYWlsIGNvbQ==\n'.decode("base64") -## (C) 2015 Yann Leboulanger <asterix AT lagaule.org> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. - -from gi.repository import GObject -from gi.repository import Gtk -from gi.repository import GLib -import gi -try: - gi.require_version('GtkSpell', '3.0') - from gi.repository import GtkSpell - HAS_GTK_SPELL = True -except (ImportError, ValueError): - HAS_GTK_SPELL = False - - -def ensure_attached(func): - def f(self, *args, **kwargs): - if self.spell: - func(self, *args, **kwargs) - else: - raise RuntimeError("Spell object is already detached") - return f - - -class Spell(GObject.GObject): - __gsignals__ = { - 'language_changed': (GObject.SignalFlags.RUN_FIRST, None, (str,)) - } - - def __init__(self, textview, language=None, create=True, jid=None, - per_type=None): - GObject.GObject.__init__(self) - if not isinstance(textview, Gtk.TextView): - raise TypeError("Textview must be derived from Gtk.TextView") - spell = GtkSpell.Checker.get_from_text_view(textview) - if create: - if spell: - raise RuntimeError("Textview has already a Spell obj attached") - self.spell = GtkSpell.Checker.new() - - try: - self.spell.set_language(language) - except GLib.GError as error: - if error.domain == 'gtkspell-error-quark': - raise OSError("Unable to set language: '%s'" % language) - - self.spell.connect('language-changed', self.on_language_changed) - - else: - if spell: - self.spell = spell - else: - raise RuntimeError("Textview has no Spell object attached") - - def on_language_changed(self, spell, lang): - self.emit('language_changed', lang) - - @ensure_attached - def set_language(self, language): - if not self.spell.set_language(language): - raise OSError("Unable to set language: '%s'" % language) - - @ensure_attached - def recheck_all(self): - self.spell.recheck_all() - - def detach(self): - if self.spell is not None: - self.spell.detach() - - def attach(self, textview): - spell = GtkSpell.Checker.get_from_text_view(textview) - if spell is None: - print('attached') - self.spell.attach(textview) - - -GObject.type_register(Spell) - - -def test_language(lang): - spell = GtkSpell.Checker.new() - try: - spell.set_language(lang) - except GLib.GError as error: - if error.domain == 'gtkspell-error-quark': - return False - return True ===================================== gajim/message_textview.py ===================================== --- a/gajim/message_textview.py +++ b/gajim/message_textview.py @@ -30,6 +30,10 @@ from gi.repository import Pango from gajim.common import app from gajim import gtkgui_helpers +if app.HAVE_SPELL: + from gi.repository import Gspell + + class MessageTextView(Gtk.TextView): """ Class for the message textview (where user writes new messages) for @@ -101,6 +105,7 @@ class MessageTextView(Gtk.TextView): def _on_focus_in(self, *args): if not self.has_text(): self.get_buffer().set_text('') + self.toggle_speller(True) def _on_focus_out(self, *args): buf = self.get_buffer() @@ -109,6 +114,12 @@ class MessageTextView(Gtk.TextView): if text == '': buf.insert_with_tags( start, self.PLACEHOLDER, self.placeholder_tag) + self.toggle_speller(False) + + def toggle_speller(self, activate): + if app.HAVE_SPELL and app.config.get('use_speller'): + spell_view = Gspell.TextView.get_from_gtk_text_view(self) + spell_view.set_inline_spell_checking(activate) def remove_placeholder(self): self._on_focus_in() ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -75,7 +75,9 @@ function install_deps { mingw-w64-"${ARCH}"-adwaita-icon-theme \ mingw-w64-"${ARCH}"-libwebp \ mingw-w64-"${ARCH}"-sqlite3 \ - mingw-w64-"${ARCH}"-goocanvas + mingw-w64-"${ARCH}"-goocanvas \ + mingw-w64-"${ARCH}"-gspell \ + mingw-w64-"${ARCH}"-hunspell build_pip install setuptools_scm @@ -136,6 +138,10 @@ function install_gajim { mkdir "${PACKAGE_DIR}"/gajim/data/plugins 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins "${BUILD_ROOT}"/plugin_installer.zip + # Install language dicts + curl -o "${BUILD_ROOT}"/speller_dicts.zip https://gajim.org/downloads/snap/win/build/speller_dicts.zip + 7z x -o"${MINGW_ROOT}"/share "${BUILD_ROOT}"/speller_dicts.zip + # Install themes # rm -Rf "${MINGW_ROOT}"/etc # rm -Rf "${MINGW_ROOT}"/share/themes @@ -194,7 +200,6 @@ function cleanup_install { rm -Rf "${MINGW_ROOT}"/share/ffmpeg rm -Rf "${MINGW_ROOT}"/share/vala rm -Rf "${MINGW_ROOT}"/share/readline - rm -Rf "${MINGW_ROOT}"/share/xml rm -Rf "${MINGW_ROOT}"/share/bash-completion rm -Rf "${MINGW_ROOT}"/share/common-lisp rm -Rf "${MINGW_ROOT}"/share/emacs View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f75dd8bcadf06e6acdf416434496bb1c4… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f75dd8bcadf06e6acdf416434496bb1c4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix Window build
by Philipp Hörist 25 Nov '17

25 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: f75dd8bc by Philipp Hörist at 2017-11-25T20:09:25+01:00 Fix Window build New version scheme - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -122,7 +122,7 @@ function install_gajim { build_pip install . QL_VERSION=$(MSYSTEM= build_python -c \ - "import gajim; import sys; sys.stdout.write(gajim.__version__.split('-')[0])") + "import gajim; import sys; sys.stdout.write(gajim.__version__.split('+')[0])") QL_VERSION_DESC=$(MSYSTEM= build_python -c \ "import gajim; import sys; sys.stdout.write(gajim.__version__)") View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f75dd8bcadf06e6acdf416434496bb1c40… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f75dd8bcadf06e6acdf416434496bb1c40… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2017