Commits May 2018

commits@gajim.org

1 participants
75 discussions

[Git][gajim/gajim][master] Move signal code into gajim.py
by Philipp Hörist 17 May '18

17 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4731e849 by Philipp Hörist at 2018-05-17T20:59:22+02:00 Move signal code into gajim.py The reason for signal.signal(signal.SIGPIPE, signal.SIG_DFL) Python ignores SIGPIPE by default ( signal(SIGPIPE, SIG_IGN) ) Write on a socket return then an error 32 EPIPE, which naturally turns into an exception. signal.SIG_DFL restores normal UNIX behavior - - - - - 2 changed files: - gajim/common/connection.py - gajim/gajim.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -55,10 +55,6 @@ except Exception: randomsource = random.Random() randomsource.seed() -import signal -if os.name != 'nt': - signal.signal(signal.SIGPIPE, signal.SIG_DFL) - if os.name == 'nt': import certifi import OpenSSL.crypto ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -78,7 +78,7 @@ def _init_gtk(): from gajim.application import GajimApplication application = GajimApplication() - _install_terminate(application) + _install_sginal_handlers(application) application.run(sys.argv) @@ -100,13 +100,15 @@ def _set_proc_title(): libc.setproctitle('gajim') -def _install_terminate(application): +def _install_sginal_handlers(application): def sigint_cb(num, stack): print('SIGINT/SIGTERM received') application.quit() # ^C exits the application normally signal.signal(signal.SIGINT, sigint_cb) signal.signal(signal.SIGTERM, sigint_cb) + if os.name != 'nt': + signal.signal(signal.SIGPIPE, signal.SIG_DFL) def main(): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4731e8491bfe1ff1213ecc4a117c5b2d34… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4731e8491bfe1ff1213ecc4a117c5b2d34… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove check_X509
by Philipp Hörist 17 May '18

17 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 72df2524 by Philipp Hörist at 2018-05-17T20:12:02+02:00 Remove check_X509 We dont need this module anymore - - - - - 2 changed files: - − gajim/common/check_X509.py - gajim/common/connection.py Changes: ===================================== gajim/common/check_X509.py deleted ===================================== --- a/gajim/common/check_X509.py +++ /dev/null @@ -1,171 +0,0 @@ -import logging -log = logging.getLogger('gajim.c.check_X509') - -import OpenSSL.SSL -import OpenSSL.crypto - -from pyasn1.type import univ, constraint, char, namedtype, tag -from pyasn1.codec.der.decoder import decode -from gajim.common.helpers import prep, InvalidFormat - -MAX = 64 -oid_xmppaddr = '1.3.6.1.5.5.7.8.5' -oid_dnssrv = '1.3.6.1.5.5.7.8.7' - - -class DirectoryString(univ.Choice): - componentType = namedtype.NamedTypes( - namedtype.NamedType( - 'teletexString', char.TeletexString().subtype( - subtypeSpec=constraint.ValueSizeConstraint(1, MAX))), - namedtype.NamedType( - 'printableString', char.PrintableString().subtype( - subtypeSpec=constraint.ValueSizeConstraint(1, MAX))), - namedtype.NamedType( - 'universalString', char.UniversalString().subtype( - subtypeSpec=constraint.ValueSizeConstraint(1, MAX))), - namedtype.NamedType( - 'utf8String', char.UTF8String().subtype( - subtypeSpec=constraint.ValueSizeConstraint(1, MAX))), - namedtype.NamedType( - 'bmpString', char.BMPString().subtype( - subtypeSpec=constraint.ValueSizeConstraint(1, MAX))), - namedtype.NamedType( - 'ia5String', char.IA5String().subtype( - subtypeSpec=constraint.ValueSizeConstraint(1, MAX))), - namedtype.NamedType( - 'gString', univ.OctetString().subtype( - subtypeSpec=constraint.ValueSizeConstraint(1, MAX))), - ) - -class AttributeValue(DirectoryString): - pass - -class AttributeType(univ.ObjectIdentifier): - pass - -class AttributeTypeAndValue(univ.Sequence): - componentType = namedtype.NamedTypes( - namedtype.NamedType('type', AttributeType()), - namedtype.NamedType('value', AttributeValue()), - ) - -class RelativeDistinguishedName(univ.SetOf): - componentType = AttributeTypeAndValue() - -class RDNSequence(univ.SequenceOf): - componentType = RelativeDistinguishedName() - -class Name(univ.Choice): - componentType = namedtype.NamedTypes( - namedtype.NamedType('', RDNSequence()), - ) - -class GeneralName(univ.Choice): - componentType = namedtype.NamedTypes( - namedtype.NamedType('otherName', univ.Sequence().subtype( - implicitTag=tag.Tag(tag.tagClassContext, - tag.tagFormatConstructed, 0x0))), - namedtype.NamedType('rfc822Name', char.IA5String().subtype( - implicitTag=tag.Tag(tag.tagClassContext, - tag.tagFormatSimple, 1))), - namedtype.NamedType('dNSName', char.IA5String().subtype( - implicitTag=tag.Tag(tag.tagClassContext, - tag.tagFormatSimple, 2))), - namedtype.NamedType('x400Address', univ.Sequence().subtype( - implicitTag=tag.Tag(tag.tagClassContext, - tag.tagFormatConstructed, 0x3))), - namedtype.NamedType('directoryName', Name().subtype( - implicitTag=tag.Tag(tag.tagClassContext, - tag.tagFormatConstructed, 0x4))), - namedtype.NamedType('ediPartyName', univ.Sequence().subtype( - implicitTag=tag.Tag(tag.tagClassContext, - tag.tagFormatConstructed, 0x5))), - namedtype.NamedType('uniformResourceIdentifier', - char.IA5String().subtype( - implicitTag=tag.Tag(tag.tagClassContext, - tag.tagFormatSimple, 6))), - namedtype.NamedType('iPAddress', univ.OctetString().subtype( - implicitTag=tag.Tag(tag.tagClassContext, - tag.tagFormatSimple, 7))), - namedtype.NamedType('registeredID', univ.ObjectIdentifier().subtype( - implicitTag=tag.Tag(tag.tagClassContext, - tag.tagFormatSimple, 8))), - ) - -class GeneralNames(univ.SequenceOf): - componentType = GeneralName() - sizeSpec = univ.SequenceOf.sizeSpec + constraint.ValueSizeConstraint(1, MAX) - -def _parse_asn1(asn1): - obj = decode(asn1, asn1Spec=GeneralNames())[0] - r = {} - for o in obj: - name = o.getName() - if name == 'dNSName': - if name not in r: - r[name] = [] - r[name].append(str(o.getComponent())) - if name == 'otherName': - if name not in r: - r[name] = {} - tag = str(tuple(o.getComponent())[0]) - val = str(tuple(o.getComponent())[1]) - if tag not in r[name]: - r[name][tag] = [] - r[name][tag].append(val) - if name == 'uniformResourceIdentifier': - r['uniformResourceIdentifier'] = True - return r - -def check_certificate(cert, domain): - cnt = cert.get_extension_count() - if '.' in domain: - compared_domain = domain.split('.', 1)[1] - else: - compared_domain = '' - srv_domain = '_xmpp-client.' + domain - compared_srv_domain = '_xmpp-client.' + compared_domain - for i in range(0, cnt): - ext = cert.get_extension(i) - if ext.get_short_name() == b'subjectAltName': - try: - r = _parse_asn1(ext.get_data()) - except: - log.error('Wrong data in certificate: subjectAltName=%s' % \ - ext.get_data()) - continue - if 'otherName' in r: - if oid_xmppaddr in r['otherName']: - for host in r['otherName'][oid_xmppaddr]: - try: - host = prep(None, host, None) - except InvalidFormat: - continue - if host == domain: - return True - if oid_dnssrv in r['otherName']: - for host in r['otherName'][oid_dnssrv]: - if host.startswith('_xmpp-client.*.'): - if host.replace('*.', '', 1) == compared_srv_domain: - return True - continue - if host == srv_domain: - return True - if 'dNSName' in r: - for host in r['dNSName']: - if host.startswith('*.'): - if host[2:] == compared_domain: - return True - continue - if host == domain: - return True - if r: - return False - break - - subject = cert.get_subject() - if subject.commonName == domain: - return True - return False - ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -70,7 +70,6 @@ from gajim.common import helpers from gajim.common import app from gajim.common import gpg from gajim.common import passwords -from gajim.common import check_X509 from gajim.common import i18n from gajim.common.connection_handlers import * from gajim.common.contacts import GC_Contact View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/72df2524e98bbfc89ecdd715db029e56c7… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/72df2524e98bbfc89ecdd715db029e56c7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Simplify set_i18n_env()
by Philipp Hörist 17 May '18

17 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3b130db6 by Philipp Hörist at 2018-05-17T20:07:30+02:00 Simplify set_i18n_env() We already determine LANG in initialize_lang() getdefaultlocale() takes env var LANG into consideration - - - - - 1 changed file: - gajim/common/i18n.py Changes: ===================================== gajim/common/i18n.py ===================================== --- a/gajim/common/i18n.py +++ b/gajim/common/i18n.py @@ -54,14 +54,7 @@ def initialize(): def set_i18n_env(): if os.name == 'nt': - lang = os.getenv('LANG') - if lang is None: - default_lang = locale.getdefaultlocale()[0] - if default_lang: - lang = default_lang - - if lang: - os.environ['LANG'] = lang + os.environ['LANG'] = LANG def initialize_lang(): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3b130db60c16694657629b93c2153e56f4… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3b130db60c16694657629b93c2153e56f4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Remove unused comments
by Philipp Hörist 17 May '18

17 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 40aa3d80 by Philipp Hörist at 2018-05-17T20:01:59+02:00 Remove unused comments The attributes were removed in 8e09fd92 - - - - - 2a8c0da3 by Philipp Hörist at 2018-05-17T20:01:59+02:00 Use i18n module to determine locale - - - - - 03aa1db3 by Philipp Hörist at 2018-05-17T20:01:59+02:00 Handle LC_ALL=C correctly We default to 'en' for LANG if LC_ALL=C is set - - - - - 2 changed files: - gajim/common/connection.py - gajim/common/i18n.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -71,6 +71,7 @@ from gajim.common import app from gajim.common import gpg from gajim.common import passwords from gajim.common import check_X509 +from gajim.common import i18n from gajim.common.connection_handlers import * from gajim.common.contacts import GC_Contact from gajim.gtkgui_helpers import get_action @@ -619,12 +620,7 @@ class Connection(CommonConnection, ConnectionHandlers): def __init__(self, name): CommonConnection.__init__(self, name) ConnectionHandlers.__init__(self) - # this property is used to prevent double connections - # If we succeed to connect, remember it so next time we try (after a - # disconnection) we try only this type. - self.lang = None - if locale.getdefaultlocale()[0]: - self.lang = locale.getdefaultlocale()[0].split('_')[0] + # increase/decrease default timeout for server responses self.try_connecting_for_foo_secs = 45 # holds the actual hostname to which we are connected @@ -1522,8 +1518,7 @@ class Connection(CommonConnection, ConnectionHandlers): # END connect def add_lang(self, stanza): - if self.lang: - stanza.setAttr('xml:lang', self.lang) + stanza.setAttr('xml:lang', i18n.LANG) def get_privacy_lists(self): if not app.account_is_connected(self.name): ===================================== gajim/common/i18n.py ===================================== --- a/gajim/common/i18n.py +++ b/gajim/common/i18n.py @@ -68,7 +68,10 @@ def initialize_lang(): global LANG try: # en_US, fr_FR, el_GR etc.. - LANG = locale.getdefaultlocale()[0] + default = locale.getdefaultlocale()[0] + if default is None: + # LC_ALL=C + return LANG = LANG[:2] except (ValueError, locale.Error): pass View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4f29e2b353c2adec10c5754d56d8e0ba6… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4f29e2b353c2adec10c5754d56d8e0ba6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Preserve SSL handshake errors order
by Philipp Hörist 16 May '18

16 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4f29e2b3 by Andrey Gursky at 2018-05-16T19:50:21+02:00 Preserve SSL handshake errors order Sets are unordered and list with push/pop acts as LIFO, though we need FIFO. Since the number of elements is tiny, no need to use deque. Addresses #9120 - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1333,7 +1333,8 @@ class Connection(CommonConnection, ConnectionHandlers): ssl_errors = con.Connection.ssl_errors ignored_ssl_errors = self._get_ignored_ssl_errors() - self._ssl_errors = set(ssl_errors) - set(ignored_ssl_errors) + self._ssl_errors = [n for n in ssl_errors if n not in ignored_ssl_errors] + self._ssl_errors.reverse() self.process_ssl_errors() def _get_ignored_ssl_errors(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4f29e2b353c2adec10c5754d56d8e0ba62… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4f29e2b353c2adec10c5754d56d8e0ba62… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix call to config.get_per() in method that gets account name from jid
by Philipp Hörist 16 May '18

16 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: f13ff8ac by BBreeziN at 2018-05-15T23:39:44-04:00 Fix call to config.get_per() in method that gets account name from jid - - - - - 1 changed file: - gajim/common/app.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -484,7 +484,7 @@ def get_jid_from_account(account_name): return jid def get_account_from_jid(jid): - for account in app.config.get_per('accounts'): + for account in config.get_per('accounts'): if jid == get_jid_from_account(account): return account View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f13ff8ac68d8e2e015f35e750346acf70e… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f13ff8ac68d8e2e015f35e750346acf70e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Bring control to front when notification is clicked
by Philipp Hörist 12 May '18

12 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3c22ab75 by Philipp Hörist at 2018-05-12T23:36:52+02:00 Bring control to front when notification is clicked if autopopup_chat_opened is activated no control is found because the event that triggered the notification is already deleted when the notification is clicked by the user. So instead of searching for the event, search for the control with jid/account. Fixes #9124 - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -1664,7 +1664,15 @@ class Interface: if not event: event = app.events.get_first_event(account, jid, type_) if not event: - return + # If autopopup_chat_opened = True, then we send out + # notifications even if a control is open. This means the + # event is already deleted (because its printed to the + # control) when the notification is clicked. So try to + # get a control from account/jid + ctrl = self.msg_win_mgr.get_control(fjid, account) + if ctrl is None: + return + w = ctrl.parent_win if type_ == 'printed_chat': ctrl = event.control View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3c22ab752ac64871f14b4b88297ee07539… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3c22ab752ac64871f14b4b88297ee07539… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add flake8 config file
by Philipp Hörist 11 May '18

11 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9e096e87 by Philipp Hörist at 2018-05-11T22:03:13+02:00 Add flake8 config file - - - - - 1 changed file: - + .flake8 Changes: ===================================== .flake8 ===================================== --- /dev/null +++ b/.flake8 @@ -0,0 +1,5 @@ +[flake8] +ignore = +exclude = .git,__pycache__,.gitlab +max-complexity = 15 +builtins=_ \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9e096e87728365a9751f35fae7bc626cbf… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9e096e87728365a9751f35fae7bc626cbf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont show OOB uri if message body is the same
by Philipp Hörist 10 May '18

10 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 04b86a7b by Philipp Hörist at 2018-05-10T16:16:38+02:00 Dont show OOB uri if message body is the same if oob uri == body there is no need to show the uri below the message - - - - - 1 changed file: - gajim/conversation_textview.py Changes: ===================================== gajim/conversation_textview.py ===================================== --- a/gajim/conversation_textview.py +++ b/gajim/conversation_textview.py @@ -838,10 +838,9 @@ class ConversationTextview(GObject.GObject): except KeyError: pass else: - oob_desc = additional_data['gajim'].get('oob_desc', None) - if oob_desc is None: - oob_desc = _('URL:') - otext += '\n{} {}'.format(oob_desc, oob_url) + oob_desc = additional_data['gajim'].get('oob_desc', 'URL:') + if oob_url != otext: + otext += '\n{} {}'.format(oob_desc, oob_url) # basic: links + mail + formatting is always checked (we like that) if app.config.get('emoticons_theme') and graphics: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/04b86a7bd0d0a99da3a05acc3723bfc8cd… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/04b86a7bd0d0a99da3a05acc3723bfc8cd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Return account instead of jid
by Philipp Hörist 10 May '18

10 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: ffe8ee80 by Philipp Hörist at 2018-05-10T13:28:26+02:00 Return account instead of jid - - - - - 1 changed file: - gajim/common/app.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -486,7 +486,7 @@ def get_jid_from_account(account_name): def get_account_from_jid(jid): for account in app.config.get_per('accounts'): if jid == get_jid_from_account(account): - return jid + return account def get_our_jids(): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ffe8ee8068046f1b407884e892cbdab6bd… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ffe8ee8068046f1b407884e892cbdab6bd… 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 May 2018