Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][gajim_1.0] Flatpak: limit dbus access
by Philipp Hörist 19 May '18

19 May '18

Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim Commits: 1b757b5a by André Apitzsch at 2018-05-19T09:52:56+02:00 Flatpak: limit dbus access - - - - - 1 changed file: - org.gajim.Gajim.json Changes: ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -5,25 +5,34 @@ "sdk": "org.gnome.Sdk", "command": "gajim", "finish-args": [ - /* X11 + XShm access */ "--share=ipc", + "--share=network", "--socket=x11", - /* Wayland access */ "--socket=wayland", - /* Needs to talk to the network: */ - "--share=network", - "--filesystem=home", "--socket=pulseaudio", - "--socket=system-bus" + "--filesystem=home", + "--system-talk-name=org.freedesktop.GeoClue2", + "--system-talk-name=org.freedesktop.login1", + "--talk-name=org.gnome.ScreenSaver", + "--talk-name=org.mpris.MediaPlayer2.*", + /* Keyring */ + "--talk-name=org.freedesktop.secrets", + /* dconf */ + "--filesystem=xdg-run/dconf", + "--filesystem=~/.config/dconf:ro", + "--talk-name=ca.desrt.dconf", + "--env=DCONF_USER_CONFIG_DIR=.config/dconf" ], "build-options": { "cflags": "-O2 -g", "cxxflags": "-O2 -g" }, "cleanup": [ + "/bin/easy*", "/include", "/lib/debug", "/lib/pkgconfig", + "/lib/python2.7", "/share/aclocal", "/share/doc", "/share/man", View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1b757b5a953f08b2a15d39df1afea004fc… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1b757b5a953f08b2a15d39df1afea004fc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] 7 commits: Select account in account list if edited
by Philipp Hörist 19 May '18

19 May '18

Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim Commits: 8e479697 by Markus Wintermann at 2018-05-19T09:45:59+02:00 Select account in account list if edited Before: After a rightclick -> "Modify Account" on an account in the roster the preferences of the account are shown but the account is not selected in the account list. After: account will be selected in the account list too - - - - - 0fdb4791 by Philipp Hörist at 2018-05-19T09:46:30+02:00 Set no-store hint on groupchat chatstates - - - - - 6b804159 by Philipp Hörist at 2018-05-19T09:47:01+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 - - - - - 71648f92 by Philipp Hörist at 2018-05-19T09:47:19+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 - - - - - 56067cfd by Philipp Hörist at 2018-05-19T09:49:14+02:00 Init Roster after stream management resume nbxmpp deletes the roster object on disconnect. Init the roster from db again on resume. Fixes #8296 - - - - - c0c6380c by Philipp Hörist at 2018-05-19T09:49:26+02:00 Add pybonjour to deps on Windows Fixes #9125 - - - - - 22871918 by Philipp Hörist at 2018-05-19T09:51:17+02:00 Fix Windows build - - - - - 7 changed files: - appveyor.yml - gajim/accounts_window.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/conversation_textview.py - gajim/gui_interface.py - win/_base.sh Changes: ===================================== appveyor.yml ===================================== --- a/appveyor.yml +++ b/appveyor.yml @@ -18,7 +18,7 @@ clone_depth: 1 # - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) build_script: - - C:\msys64\usr\bin\pacman -Syuu --needed --noconfirm --ask=127 + - C:\msys64\usr\bin\pacman -Syu --needed --noconfirm --ask=20 - ps: | $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString() $env:BUILDROOT="C:\msys64\home\appveyor\gajim\win\_build_root" ===================================== gajim/accounts_window.py ===================================== --- a/gajim/accounts_window.py +++ b/gajim/accounts_window.py @@ -234,6 +234,7 @@ class AccountsWindow(Gtk.ApplicationWindow): def select_account(self, account): for row in self.account_list.get_children(): if row.get_child().account == account: + self.account_list.select_row(row) self.account_list.emit('row-activated', row) break ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1852,6 +1852,8 @@ class Connection(CommonConnection, ConnectionHandlers): our_server = app.config.get_per('accounts', self.name, 'hostname') self.discoverInfo(our_jid, id_prefix='Gajim_') self.discoverInfo(our_server, id_prefix='Gajim_') + else: + self.request_roster(resume=True) self.sm.resuming = False # back to previous state # Discover Stun server(s) @@ -2550,16 +2552,25 @@ class Connection(CommonConnection, ConnectionHandlers): iq3.addChild(name='meta', attrs=dict_) self.connection.send(iq) - def request_roster(self): + def request_roster(self, resume=False): version = None features = self.connection.Dispatcher.Stream.features - if features and features.getTag('ver', - namespace=nbxmpp.NS_ROSTER_VER): - version = app.config.get_per('accounts', self.name, - 'roster_version') + if features and features.getTag('ver', namespace=nbxmpp.NS_ROSTER_VER): + version = app.config.get_per( + 'accounts', self.name, 'roster_version') + + iq_id = self.connection.initRoster(version=version, + request=not resume) + if resume: + self._init_roster_from_db() + else: + self.awaiting_answers[iq_id] = (ROSTER_ARRIVED, ) - iq_id = self.connection.initRoster(version=version) - self.awaiting_answers[iq_id] = (ROSTER_ARRIVED, ) + def _init_roster_from_db(self): + account_jid = app.get_jid_from_account(self.name) + roster_data = app.logger.get_roster(account_jid) + roster = self.connection.getRoster(force=True) + roster.setRaw(roster_data) def send_agent_status(self, agent, ptype): if not app.account_is_connected(self.name): @@ -2683,6 +2694,8 @@ class Connection(CommonConnection, ConnectionHandlers): if obj.chatstate: msg_iq.setTag(obj.chatstate, namespace=nbxmpp.NS_CHATSTATES) + if not obj.message: + msg_iq.setTag('no-store', namespace=nbxmpp.NS_MSG_HINTS) if obj.label is not None: msg_iq.addChild(node=obj.label) ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -1497,10 +1497,7 @@ ConnectionHTTPUpload): elif self.awaiting_answers[id_][0] == ROSTER_ARRIVED: if iq_obj.getType() == 'result': if not iq_obj.getTag('query'): - account_jid = app.get_jid_from_account(self.name) - roster_data = app.logger.get_roster(account_jid) - roster = self.connection.getRoster(force=True) - roster.setRaw(roster_data) + self._init_roster_from_db() self._getRoster() elif iq_obj.getType() == 'error': self.roster_supported = False ===================================== gajim/conversation_textview.py ===================================== --- a/gajim/conversation_textview.py +++ b/gajim/conversation_textview.py @@ -842,10 +842,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: ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -1708,7 +1708,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 ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -80,28 +80,27 @@ function install_deps { mingw-w64-"${ARCH}"-goocanvas \ mingw-w64-"${ARCH}"-gspell \ mingw-w64-"${ARCH}"-hunspell \ - mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools - - build_pip install setuptools_scm + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pillow \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools-scm \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-cryptography \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pyopenssl \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-docutils \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-certifi \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-six PIP_REQUIREMENTS="\ pyasn1 -certifi git+https://dev.gajim.org/gajim/python-nbxmpp.git git+https://github.com/dlitz/pycrypto.git -cryptography -pyopenssl +git+https://dev.gajim.org/lovetox/pybonjour-python3.git +keyring python-gnupg -docutils +python-axolotl qrcode -keyring -pillow==4.3.0 -six " - build_pip install --no-binary ":all:" \ - --force-reinstall $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) - build_pip install python-axolotl + build_pip install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) # remove the large png icons, they should be used rarely and svg works fine rm -Rf "${MINGW_ROOT}/share/icons/Adwaita/512x512" View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f99ec91fc29c7ae822856b318537e565e… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f99ec91fc29c7ae822856b318537e565e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix Windows build
by Philipp Hörist 19 May '18

19 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4d9197ef by Philipp Hörist at 2018-05-19T09:37:01+02:00 Fix Windows build - - - - - 2 changed files: - appveyor.yml - win/_base.sh Changes: ===================================== appveyor.yml ===================================== --- a/appveyor.yml +++ b/appveyor.yml @@ -18,7 +18,7 @@ clone_depth: 1 # - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) build_script: - - C:\msys64\usr\bin\pacman -Syuu --needed --noconfirm --ask=127 + - C:\msys64\usr\bin\pacman -Syu --needed --noconfirm --ask=20 - ps: | $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString() $env:BUILDROOT="C:\msys64\home\appveyor\gajim\win\_build_root" ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -80,28 +80,26 @@ function install_deps { mingw-w64-"${ARCH}"-goocanvas \ mingw-w64-"${ARCH}"-gspell \ mingw-w64-"${ARCH}"-hunspell \ - mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools - - build_pip install setuptools_scm + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pillow \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools-scm \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-cryptography \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pyopenssl \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-docutils \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-certifi \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-six PIP_REQUIREMENTS="\ -certifi git+https://dev.gajim.org/gajim/python-nbxmpp.git git+https://github.com/dlitz/pycrypto.git git+https://dev.gajim.org/lovetox/pybonjour-python3.git -cryptography -pyopenssl +keyring python-gnupg -docutils +python-axolotl qrcode -keyring -pillow==4.3.0 -six " - build_pip install --no-binary ":all:" \ - --force-reinstall $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) - build_pip install python-axolotl + build_pip install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) # remove the large png icons, they should be used rarely and svg works fine rm -Rf "${MINGW_ROOT}/share/icons/Adwaita/512x512" View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4d9197ef1cadc0419c8f55e91e9d31e1e1… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4d9197ef1cadc0419c8f55e91e9d31e1e1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add pybonjour to deps on Windows
by Philipp Hörist 19 May '18

19 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9154658d by Philipp Hörist at 2018-05-19T07:56:24+02:00 Add pybonjour to deps on Windows Fixes #9125 - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -88,6 +88,7 @@ function install_deps { certifi git+https://dev.gajim.org/gajim/python-nbxmpp.git git+https://github.com/dlitz/pycrypto.git +git+https://dev.gajim.org/lovetox/pybonjour-python3.git cryptography pyopenssl python-gnupg View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9154658dbc776dcd55fa2255091e34b6ab… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9154658dbc776dcd55fa2255091e34b6ab… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Init Roster after stream management resume
by Philipp Hörist 18 May '18

18 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 117036b8 by Philipp Hörist at 2018-05-18T18:20:30+02:00 Init Roster after stream management resume nbxmpp deletes the roster object on disconnect. Init the roster from db again on resume. Fixes #8296 - - - - - 2 changed files: - gajim/common/connection.py - gajim/common/connection_handlers.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1837,6 +1837,8 @@ class Connection(CommonConnection, ConnectionHandlers): our_server = app.config.get_per('accounts', self.name, 'hostname') self.discoverInfo(our_jid, id_prefix='Gajim_') self.discoverInfo(our_server, id_prefix='Gajim_') + else: + self.request_roster(resume=True) self.sm.resuming = False # back to previous state # Discover Stun server(s) @@ -2535,16 +2537,25 @@ class Connection(CommonConnection, ConnectionHandlers): iq3.addChild(name='meta', attrs=dict_) self.connection.send(iq) - def request_roster(self): + def request_roster(self, resume=False): version = None features = self.connection.Dispatcher.Stream.features - if features and features.getTag('ver', - namespace=nbxmpp.NS_ROSTER_VER): - version = app.config.get_per('accounts', self.name, - 'roster_version') + if features and features.getTag('ver', namespace=nbxmpp.NS_ROSTER_VER): + version = app.config.get_per( + 'accounts', self.name, 'roster_version') + + iq_id = self.connection.initRoster(version=version, + request=not resume) + if resume: + self._init_roster_from_db() + else: + self.awaiting_answers[iq_id] = (ROSTER_ARRIVED, ) - iq_id = self.connection.initRoster(version=version) - self.awaiting_answers[iq_id] = (ROSTER_ARRIVED, ) + def _init_roster_from_db(self): + account_jid = app.get_jid_from_account(self.name) + roster_data = app.logger.get_roster(account_jid) + roster = self.connection.getRoster(force=True) + roster.setRaw(roster_data) def send_agent_status(self, agent, ptype): if not app.account_is_connected(self.name): ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -1546,10 +1546,7 @@ ConnectionHTTPUpload): elif self.awaiting_answers[id_][0] == ROSTER_ARRIVED: if iq_obj.getType() == 'result': if not iq_obj.getTag('query'): - account_jid = app.get_jid_from_account(self.name) - roster_data = app.logger.get_roster(account_jid) - roster = self.connection.getRoster(force=True) - roster.setRaw(roster_data) + self._init_roster_from_db() self._getRoster() elif iq_obj.getType() == 'error': self.roster_supported = False View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/117036b872d0afef2ca241bea9d319df14… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/117036b872d0afef2ca241bea9d319df14… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Pass arguments to plugin/plugout method
by Philipp Hörist 18 May '18

18 May '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 964d31b5 by Philipp Hörist at 2018-05-18T17:11:06+02:00 Pass arguments to plugin/plugout method - - - - - 467572b7 by Philipp Hörist at 2018-05-18T17:14:18+02:00 Allow initRoster without requesting the roster - - - - - 2 changed files: - nbxmpp/client_nb.py - nbxmpp/plugin.py Changes: ===================================== nbxmpp/client_nb.py ===================================== --- a/nbxmpp/client_nb.py +++ b/nbxmpp/client_nb.py @@ -601,12 +601,13 @@ class NonBlockingClient(object): self.NonBlockingBind.NonBlockingBind(self._Resource, self._on_sasl_auth) return True - def initRoster(self, version=''): + def initRoster(self, version='', request=True): """ Plug in the roster """ if 'NonBlockingRoster' not in self.__dict__: - return roster_nb.NonBlockingRoster.get_instance(version=version).PlugIn(self) + return roster_nb.NonBlockingRoster.get_instance( + version=version).PlugIn(self, request=request) def getRoster(self, on_ready=None, force=False): """ ===================================== nbxmpp/plugin.py ===================================== --- a/nbxmpp/plugin.py +++ b/nbxmpp/plugin.py @@ -37,7 +37,7 @@ class PlugIn(object): def __init__(self): self._exported_methods=[] - def PlugIn(self, owner): + def PlugIn(self, owner, *args, **kwargs): """ Attach to owner and register ourself and our _exported_methods in it. If defined by a subclass, call self.plugin(owner) to execute hook @@ -62,9 +62,9 @@ class PlugIn(object): # Execute hook if hasattr(self, 'plugin'): - return self.plugin(owner) + return self.plugin(owner, *args, **kwargs) - def PlugOut(self): + def PlugOut(self, *args, **kwargs): """ Unregister our _exported_methods from owner and detach from it. If defined by a subclass, call self.plugout() after unplugging to execute @@ -82,7 +82,7 @@ class PlugIn(object): del self._owner.__dict__[self.__class__.__name__] # Execute hook if hasattr(self, 'plugout'): - return self.plugout() + return self.plugout(*args, **kwargs) del self._owner @classmethod View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/e471a74e40d378d2c27e1a045… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/e471a74e40d378d2c27e1a045… You're receiving this email because of your account on dev.gajim.org.

1 0

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

17 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 496bfd31 by Philipp Hörist at 2018-05-17T22:42:29+02:00 Remove pyasn1 dependency its not used anymore - - - - - 5 changed files: - README.md - org.gajim.Gajim.json - setup.py - win/_base.sh - win/dev_env.sh Changes: ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -9,7 +9,6 @@ - gir1.2-gtk-3.0 (>=3.22) - python3-nbxmpp - python3-openssl (>=0.14) -- python3-pyasn1 ### Optional Runtime Requirements ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -204,20 +204,6 @@ ] }, { - "name": "python3-pyasn1", - "buildsystem": "simple", - "build-commands": [ - "pip3 install --prefix=/app pyasn1-0.4.2-py2.py3-none-any.whl" - ], - "sources": [ - { - "type": "file", - "url": "https://pypi.python.org/packages/ba/fe/02e3e2ee243966b143657fb8bd6bc9759584…", - "sha256": "d5cd6ed995dba16fad0c521cfe31cd2d68400b53fcc2bce93326829be73ab6d1" - } - ] - }, - { "name": "python3-dbus-python", "sources": [ { ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -287,7 +287,6 @@ setup( install_requires=[ 'nbxmpp>=0.6.5', 'pyOpenSSL>=0.12', - 'pyasn1', ], extras_require={ 'secret_password': ["keyring"] ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -85,7 +85,6 @@ function install_deps { build_pip install setuptools_scm PIP_REQUIREMENTS="\ -pyasn1 certifi git+https://dev.gajim.org/gajim/python-nbxmpp.git git+https://github.com/dlitz/pycrypto.git ===================================== win/dev_env.sh ===================================== --- a/win/dev_env.sh +++ b/win/dev_env.sh @@ -19,7 +19,6 @@ function main { pip3 install setuptools_scm PIP_REQUIREMENTS="\ -pyasn1 certifi git+https://dev.gajim.org/gajim/python-nbxmpp.git git+https://dev.gajim.org/lovetox/pybonjour-python3.git View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/496bfd312da2554f7874922e3f32a06cbb… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/496bfd312da2554f7874922e3f32a06cbb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Simplify generating random int
by Philipp Hörist 17 May '18

17 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6ed04e2d by Philipp Hörist at 2018-05-17T21:13:37+02:00 Simplify generating random int No need to use SystemRandom() here, as this is not needed for security purposes - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -49,12 +49,6 @@ from string import Template from urllib.request import urlopen from urllib.error import URLError -try: - randomsource = random.SystemRandom() -except Exception: - randomsource = random.Random() - randomsource.seed() - if os.name == 'nt': import certifi import OpenSSL.crypto @@ -805,7 +799,7 @@ class Connection(CommonConnection, ConnectionHandlers): # do exponential backoff until less than 5 minutes if self.retrycount < 2 or self.last_time_to_reconnect is None: self.last_time_to_reconnect = 5 - self.last_time_to_reconnect += randomsource.randint(0, 5) + self.last_time_to_reconnect += random.randint(0, 5) if self.last_time_to_reconnect < 200: self.last_time_to_reconnect *= 1.5 self.time_to_reconnect = int(self.last_time_to_reconnect) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6ed04e2dd2d91b92dbafbdaa6e101822f0… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6ed04e2dd2d91b92dbafbdaa6e101822f0… You're receiving this email because of your account on dev.gajim.org.

1 0

[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

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