Commits November 2017

commits@gajim.org

1 participants
52 discussions

[Git][gajim/gajim][master] 2 commits: Also log the offending JID on avatar decoding issue
by Philipp Hörist 25 Nov '17

25 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: cdf4d0ee by Emmanuel Gil Peyrot at 2017-11-25T17:37:48+00:00 Also log the offending JID on avatar decoding issue - - - - - efc14f9d by Philipp Hörist at 2017-11-25T18:44:08+01:00 Merge branch 'better-avatar-error-log' into 'master' Also log the offending JID on avatar decoding issue See merge request gajim/gajim!158 - - - - - 2 changed files: - gajim/common/connection_handlers.py - gajim/vcard.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -474,7 +474,7 @@ class ConnectionVcard: app.nec.push_incoming_event( VcardNotPublishedEvent(None, conn=self)) - def get_vcard_photo(self, vcard): + def _get_vcard_photo(self, vcard, jid): try: photo = vcard['PHOTO']['BINVAL'] except (KeyError, AttributeError): @@ -488,7 +488,7 @@ class ConnectionVcard: try: photo_decoded = base64.b64decode(photo.encode('utf-8')) except binascii.Error as error: - app.log('avatar').warning('Invalid Avatar: %s', error) + app.log('avatar').warning('Invalid avatar for %s: %s', jid, error) return None, None avatar_sha = hashlib.sha1(photo_decoded).hexdigest() @@ -532,7 +532,7 @@ class ConnectionVcard: def _on_own_avatar_received(self, jid, resource, room, vcard): - avatar_sha, photo_decoded = self.get_vcard_photo(vcard) + avatar_sha, photo_decoded = self._get_vcard_photo(vcard, jid) app.log('avatar').info( 'Received own (vCard): %s', avatar_sha) @@ -570,7 +570,7 @@ class ConnectionVcard: """ Called when we receive a vCard Parse the vCard and trigger Events """ - avatar_sha, photo_decoded = self.get_vcard_photo(vcard) + avatar_sha, photo_decoded = self._get_vcard_photo(vcard, jid) app.interface.save_avatar(photo_decoded) # Received vCard from a contact ===================================== gajim/vcard.py ===================================== --- a/gajim/vcard.py +++ b/gajim/vcard.py @@ -202,7 +202,7 @@ class VcardWindow: except AttributeError: pass - def set_values(self, vcard): + def _set_values(self, vcard, jid): for i in vcard.keys(): if i == 'PHOTO' and self.xml.get_object('information_notebook').\ get_n_pages() > 4: @@ -215,7 +215,7 @@ class VcardWindow: photo_decoded = base64.b64decode( photo_encoded.encode('utf-8')) except binascii.Error as error: - app.log('avatar').warning('Invalid Avatar: %s', error) + app.log('avatar').warning('Invalid avatar for %s: %s', jid, error) continue pixbuf = gtkgui_helpers.get_pixbuf_from_data(photo_decoded) if pixbuf is None: @@ -266,7 +266,7 @@ class VcardWindow: def _nec_vcard_received(self, jid, resource, room, vcard): self.clear_values() - self.set_values(vcard) + self._set_values(vcard, jid) def set_os_info(self, obj): if obj.conn.name != self.account: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fc627fc19cc145a86383b221416422709… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fc627fc19cc145a86383b221416422709… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use appmenu only if system supports it
by Philipp Hörist 24 Nov '17

24 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: fc627fc1 by Philipp Hörist at 2017-11-24T18:54:30+01:00 Use appmenu only if system supports it - - - - - 3 changed files: - gajim/common/app.py - gajim/gajim.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -28,6 +28,7 @@ ## import os +import sys import logging import locale import uuid @@ -500,3 +501,10 @@ def get_priority(account, show): def log(domain): root = 'gajim.' return logging.getLogger(root + domain) + +def prefers_app_menu(): + if sys.platform == 'darwin': + return True + if sys.platform == 'win32': + return False + return app.prefers_app_menu() ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -215,10 +215,9 @@ class GajimApplication(Gtk.Application): builder.add_from_file(path) menubar = builder.get_object("menubar") appmenu = builder.get_object("appmenu") - if os.name != 'nt': + if app.prefers_app_menu(): self.set_app_menu(appmenu) else: - # Dont set Application Menu for Windows # Add it to the menubar instead menubar.prepend_submenu('Gajim', appmenu) self.set_menubar(menubar) ===================================== gajim/gui_menu_builder.py ===================================== --- a/gajim/gui_menu_builder.py +++ b/gajim/gui_menu_builder.py @@ -767,9 +767,9 @@ def get_account_menu(account): def build_accounts_menu(): menubar = app.app.get_menubar() # Accounts Submenu - menu_position = 0 - if os.name == 'nt': - menu_position = 1 + menu_position = 1 + if app.prefers_app_menu(): + menu_position = 0 acc_menu = menubar.get_item_link(menu_position, 'submenu') acc_menu.remove_all() @@ -796,9 +796,9 @@ def build_bookmark_menu(account): if not bookmark_menu: return - menu_position = 0 - if os.name == 'nt': - menu_position = 1 + menu_position = 1 + if app.prefers_app_menu(): + menu_position = 0 # Accounts Submenu acc_menu = menubar.get_item_link(menu_position, 'submenu') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fc627fc19cc145a86383b221416422709b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fc627fc19cc145a86383b221416422709b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Correctly split version string
by Philipp Hörist 24 Nov '17

24 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 276daa99 by Philipp Hörist at 2017-11-24T16:49:30+01:00 Correctly split version string We changed the version format - - - - - 2 changed files: - gajim/common/optparser.py - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/common/optparser.py ===================================== --- a/gajim/common/optparser.py +++ b/gajim/common/optparser.py @@ -57,7 +57,7 @@ class OptionsParser: return False new_version = app.config.get('version') - new_version = new_version.split('-', 1)[0] + new_version = new_version.split('+', 1)[0] seen = set() regex = re.compile(r"(?P<optname>[^.=]+)(?:(?:\.(?P<key>.+))?\.(?P<subname>[^.=]+))?\s=\s(?P<value>.*)") @@ -82,7 +82,7 @@ class OptionsParser: app.config.set_per(optname, key, subname, value) old_version = app.config.get('version') - old_version = old_version.split('-', 1)[0] + old_version = old_version.split('+', 1)[0] self.update_config(old_version, new_version) self.old_values = {} # clean mem ===================================== gajim/plugins/pluginmanager.py ===================================== --- a/gajim/plugins/pluginmanager.py +++ b/gajim/plugins/pluginmanager.py @@ -509,7 +509,7 @@ class PluginManager(metaclass=Singleton): min_v = conf.get('info', 'min_gajim_version', fallback=None) max_v = conf.get('info', 'max_gajim_version', fallback=None) - gajim_v = app.config.get('version').split('-', 1)[0] + gajim_v = app.config.get('version').split('+', 1)[0] gajim_v_cmp = parse_version(gajim_v) if min_v and gajim_v_cmp < parse_version(min_v): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/276daa991c25576cd8e4cc2935955fe29f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/276daa991c25576cd8e4cc2935955fe29f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Show missing dbus message only on Linux
by Philipp Hörist 24 Nov '17

24 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9322ed44 by Philipp Hörist at 2017-11-24T16:28:22+01:00 Show missing dbus message only on Linux Mac and Windows dont have dbus available - - - - - 1 changed file: - gajim/common/dbus_support.py Changes: ===================================== gajim/common/dbus_support.py ===================================== --- a/gajim/common/dbus_support.py +++ b/gajim/common/dbus_support.py @@ -24,7 +24,7 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import os +import sys import logging from gajim.common import app @@ -40,7 +40,7 @@ try: DBusGMainLoop(set_as_default=True) except ImportError: supported = False - if not os.name == 'nt': # only say that to non Windows users + if sys.platform == 'linux': # windows and mac have no dbus print(_('D-Bus python bindings are missing in this computer')) print(_('D-Bus capabilities of Gajim cannot be used')) else: @@ -51,7 +51,7 @@ else: supported = True # does user have D-Bus bindings? except dbus.DBusException: supported = False - if not os.name == 'nt': # only say that to non Windows users + if sys.platform == 'linux': # windows and mac have no dbus print(_('D-Bus does not run correctly on this machine')) print(_('D-Bus capabilities of Gajim cannot be used')) except exceptions.SystemBusNotPresent: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9322ed440594c02283b10f6c89c172eb17… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9322ed440594c02283b10f6c89c172eb17… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix invalid dev version string
by Philipp Hörist 24 Nov '17

24 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: f97b799f by André Apitzsch at 2017-11-23T00:22:40+01:00 Fix invalid dev version string - - - - - 359d327b by Philipp Hörist at 2017-11-24T15:58:34+01:00 Merge branch 'fix_version' into 'master' Fix invalid dev version string See merge request gajim/gajim!157 - - - - - 1 changed file: - gajim/__init__.py Changes: ===================================== gajim/__init__.py ===================================== --- a/gajim/__init__.py +++ b/gajim/__init__.py @@ -6,7 +6,7 @@ try: node = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, stdout=subprocess.PIPE).communicate()[0] if node: - __version__ += '-' + node.decode('utf-8').strip() + __version__ += '+' + node.decode('utf-8').strip() except Exception: pass View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8d43907b1e75f3bebb59a77cdc6da28f1… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8d43907b1e75f3bebb59a77cdc6da28f1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Desktop files: add information for translators
by Yann Leboulanger 22 Nov '17

22 Nov '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 42275cfb by André Apitzsch at 2017-11-22T22:11:36+01:00 Desktop files: add information for translators - - - - - 8d43907b by Yann Leboulanger at 2017-11-22T22:51:09+01:00 Merge branch 'translators' into 'master' Desktop files: add information for translators See merge request gajim/gajim!156 - - - - - 2 changed files: - data/gajim-remote.desktop.in - data/org.gajim.Gajim.desktop.in Changes: ===================================== data/gajim-remote.desktop.in ===================================== --- a/data/gajim-remote.desktop.in +++ b/data/gajim-remote.desktop.in @@ -1,6 +1,7 @@ [Desktop Entry] Categories=Network;InstantMessaging;RemoteAccess;ConsoleOnly; Name=Open URI using Gajim +# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip; Version=1.0 Exec=gajim-remote handle_uri %u ===================================== data/org.gajim.Gajim.desktop.in ===================================== --- a/data/org.gajim.Gajim.desktop.in +++ b/data/org.gajim.Gajim.desktop.in @@ -3,9 +3,11 @@ Categories=Network;InstantMessaging;GTK;GNOME; Name=Gajim GenericName=Jabber IM Client Comment=A GTK+ Jabber client +# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! Keywords=chat;messaging;im;xmpp;bonjour;voip; Version=1.0 Exec=gajim +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=org.gajim.Gajim StartupNotify=true StartupWMClass=Gajim View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ae57d66a6bfdf339a2f661a805e3187de… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ae57d66a6bfdf339a2f661a805e3187de… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Use os.urandom for random numbers
by Yann Leboulanger 22 Nov '17

22 Nov '17

Yann Leboulanger pushed to branch master at gajim / python-nbxmpp Commits: 0b77b07b by Philipp Hörist at 2017-11-22T18:03:18+01:00 Use os.urandom for random numbers - - - - - ef78e16c by Yann Leboulanger at 2017-11-22T22:50:11+01:00 Merge branch 'master' into 'master' Use os.urandom for random numbers See merge request gajim/python-nbxmpp!9 - - - - - 3 changed files: - nbxmpp/auth_nb.py - nbxmpp/bosh.py - − nbxmpp/rndg.py Changes: ===================================== nbxmpp/auth_nb.py ===================================== --- a/nbxmpp/auth_nb.py +++ b/nbxmpp/auth_nb.py @@ -29,6 +29,8 @@ from .protocol import Node, NodeProcessed, isResultNode, Iq, Protocol, JID from .plugin import PlugIn import sys import re +import os +import binascii import base64 from . import dispatcher_nb import hmac @@ -37,8 +39,6 @@ import hashlib import logging log = logging.getLogger('nbxmpp.auth_nb') -from . import rndg - def HH(some): return hashlib.md5(some).hexdigest() def H(some): return hashlib.md5(some).digest() def C(some): return b':'.join(some) @@ -463,7 +463,7 @@ class SASL(PlugIn): (isinstance(chal['qop'], list) and 'auth' in chal['qop'])): self.resp = {'username': self.username, 'nonce': chal['nonce'], - 'cnonce': '%x' % rndg.getrandbits(196), + 'cnonce': '%x' % int(binascii.hexlify(os.urandom(24)), 16), 'nc': ('00000001'), # ToDo: Is this a tupel or only a string? 'qop': 'auth', 'digest-uri': 'xmpp/' + self._owner.Server, @@ -498,7 +498,7 @@ class SASL(PlugIn): def set_password(self, password): self.password = '' if password is None else password if self.mechanism in ('SCRAM-SHA-1', 'SCRAM-SHA-1-PLUS'): - self.client_nonce = '%x' % rndg.getrandbits(196) + self.client_nonce = '%x' % int(binascii.hexlify(os.urandom(24)), 16) self.scram_soup = 'n=' + self.username + ',r=' + self.client_nonce if self.mechanism == 'SCRAM-SHA-1': if self.channel_binding is None: ===================================== nbxmpp/bosh.py ===================================== --- a/nbxmpp/bosh.py +++ b/nbxmpp/bosh.py @@ -17,7 +17,8 @@ ## You should have received a copy of the GNU General Public License ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. - +import os +import binascii import locale from hashlib import sha1 from .transports_nb import NonBlockingTransport, NonBlockingHTTPBOSH,\ @@ -29,8 +30,6 @@ from .simplexml import Node import logging log = logging.getLogger('nbxmpp.bosh') -from . import rndg - KEY_COUNT = 10 # Fake file descriptor - it's used for setting read_timeout in idlequeue for @@ -486,11 +485,9 @@ class NonBlockingBOSH(NonBlockingTransport): def get_rand_number(): - # with 50-bit random initial rid, session would have to go up - # to 7881299347898368 messages to raise rid over 2**53 # (see http://www.xmpp.org/extensions/xep-0124.html#rids) # it's also used for sequence key initialization - return rndg.getrandbits(50) + return int(binascii.hexlify(os.urandom(6)), 16) class AckChecker(object): ===================================== nbxmpp/rndg.py deleted ===================================== --- a/nbxmpp/rndg.py +++ /dev/null @@ -1,49 +0,0 @@ -## rndg.py -## -## cryptographically secure pseudo-random number generator. -## When possible use OpenSSL PRNG combined with os.random, -## if OpenSSL PRNG is not available, use only os.random. -## -## Copyright (C) 2013 Fedor Brunner <fedor.brunner(a)azet.sk> -## -## 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/>. - -USE_PYOPENSSL = False -try: - import OpenSSL.rand - import binascii, os - USE_PYOPENSSL = True -except ImportError: - import random - -if not USE_PYOPENSSL: - getrandbits = random.SystemRandom().getrandbits -else: - def getrandbits(k): - """getrandbits(k) -> x. Generates a long int with k random bits.""" - if k <= 0: - raise ValueError('number of bits must be greater than zero') - if k != int(k): - raise TypeError('number of bits should be an integer') - - bytes = (k + 7) // 8 # bits / 8 and rounded up - - # Add system entropy to OpenSSL PRNG - OpenSSL.rand.add(os.urandom(bytes), bytes) - # Extract random bytes from OpenSSL PRNG - random_str = OpenSSL.rand.bytes(bytes) - - x = int(binascii.hexlify(random_str), 16) - return x >> (bytes * 8 - k) # trim excess bits View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/6807867b231ed7e25fbdbac36… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/6807867b231ed7e25fbdbac36… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Create desktop and appdata files in build directory
by Philipp Hörist 22 Nov '17

22 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8e8eff79 by André Apitzsch at 2017-11-22T20:30:13+01:00 Create desktop and appdata files in build directory - - - - - ae57d66a by Philipp Hörist at 2017-11-22T21:25:27+01:00 Merge branch 'build_location' into 'master' Create desktop and appdata files in build directory See merge request gajim/gajim!155 - - - - - 1 changed file: - setup.py Changes: ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -19,6 +19,7 @@ import gajim pos = [x for x in os.listdir('po') if x[-3:] == ".po"] ALL_LINGUAS = sorted([os.path.split(x)[-1][:-3] for x in pos]) cwd = os.path.dirname(os.path.realpath(__file__)) +build_dir = os.path.join(cwd, "build") def update_trans(): @@ -56,7 +57,7 @@ def build_trans(build_cmd): data_files = build_cmd.distribution.data_files for lang in ALL_LINGUAS: po_file = os.path.join('po', lang + '.po') - mo_file = os.path.join(cwd, 'build', 'mo', lang, 'LC_MESSAGES', 'gajim.mo') + mo_file = os.path.join(build_dir, 'mo', lang, 'LC_MESSAGES', 'gajim.mo') mo_dir = os.path.dirname(mo_file) if not (os.path.isdir(mo_dir) or os.path.islink(mo_dir)): os.makedirs(mo_dir) @@ -84,7 +85,7 @@ def build_man(build_cmd): data_files = build_cmd.distribution.data_files for man in ['gajim.1', 'gajim-history-manager.1', 'gajim-remote.1']: filename = os.path.join('data', man) - newdir = os.path.join(cwd, 'build', 'man') + newdir = os.path.join(build_dir, 'man') if not (os.path.isdir(newdir) or os.path.islink(newdir)): os.makedirs(newdir) @@ -112,7 +113,7 @@ def build_intl(build_cmd): Merge translation files into desktop and mime files ''' data_files = build_cmd.distribution.data_files - base = cwd + base = build_dir merge_files = (('data/org.gajim.Gajim.desktop', 'share/applications', '--desktop'), ('data/gajim-remote.desktop', 'share/applications', '--desktop'), View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d86c7f47f5593ff3973be7e7f8327ff22… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d86c7f47f5593ff3973be7e7f8327ff22… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_0.16] Fix showing normal message event
by Yann Leboulanger 22 Nov '17

22 Nov '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: 81bf435b by Yann Leboulanger at 2017-11-22T15:58:42+01:00 Fix showing normal message event - - - - - 1 changed file: - src/session.py Changes: ===================================== src/session.py ===================================== --- a/src/session.py +++ b/src/session.py @@ -260,7 +260,7 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): self.conn.name, contact, self) obj.show_in_systray = notify.get_show_in_systray(event_type, self.conn.name, contact) - if obj.mtype == 'normal' and not obj.popup: + if obj.mtype == 'normal' and obj.popup: do_event = False else: do_event = True View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/81bf435b09ee70790e8aa5d7871ee87604… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/81bf435b09ee70790e8aa5d7871ee87604… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] lower debug level for unresolved host.
by Yann Leboulanger 22 Nov '17

22 Nov '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: d86c7f47 by Yann Leboulanger at 2017-11-22T14:57:08+01:00 lower debug level for unresolved host. - - - - - 1 changed file: - gajim/common/resolver.py Changes: ===================================== gajim/common/resolver.py ===================================== --- a/gajim/common/resolver.py +++ b/gajim/common/resolver.py @@ -109,7 +109,7 @@ class GioResolver(CommonResolver): except GLib.Error as e: if e.domain == 'g-resolver-error-quark': result_list = [] - log.warning("Could not resolve host: %s", e.message) + log.info("Could not resolve host: %s", e.message) else: raise else: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d86c7f47f5593ff3973be7e7f8327ff22b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d86c7f47f5593ff3973be7e7f8327ff22b… 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