Commits April 2020

commits@gajim.org

1 participants
117 discussions

[Git][gajim/python-nbxmpp][master] SM: Correctly set delay from attribute
by Philipp Hörist 06 Apr '20

06 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 03915f1e by lovetox at 2020-04-06T23:04:49+02:00 SM: Correctly set delay from attribute - - - - - 1 changed file: - nbxmpp/smacks.py Changes: ===================================== nbxmpp/smacks.py ===================================== @@ -132,7 +132,7 @@ class Smacks: attrs = {'stamp': timestamp} if stanza.getType() != 'groupchat': # Dont leak our JID to Groupchats - attrs['from'] = stanza.getAttr('from') + attrs['from'] = str(self._client.get_bound_jid()) stanza.addChild('delay', namespace=NS_DELAY2, attrs=attrs) self._uqueue.append(stanza) self._log.debug('OUT, %s', stanza.getName()) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/03915f1efe9bb11623530cc7… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/03915f1efe9bb11623530cc7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Be more strict with websocket uri detection
by Philipp Hörist 06 Apr '20

06 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: d6596632 by lovetox at 2020-04-06T19:13:13+02:00 Be more strict with websocket uri detection - - - - - 2 changed files: - gajim/common/helpers.py - gajim/gtk/account_wizard.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1754,7 +1754,7 @@ def get_custom_host(account): type_ = app.config.get_per('accounts', account, 'custom_type') protocol = ConnectionProtocol.TCP - if host.startswith('ws'): + if host.startswith('ws://') or host.startswith('wss://'): protocol = ConnectionProtocol.WEBSOCKET return ('%s:%s' % (host, port), ===================================== gajim/gtk/account_wizard.py ===================================== @@ -699,7 +699,7 @@ class AdvancedSettings(Page): con_type = self._ui.con_type_combo.get_active_text() protocol = ConnectionProtocol.TCP - if host.startswith('ws'): + if host.startswith('ws://') or host.startswith('wss://'): protocol = ConnectionProtocol.WEBSOCKET return ('%s:%s' % (host, port), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d6596632557ebeffe525a64b91959d53… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d6596632557ebeffe525a64b91959d53… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Allow websocket for custom host
by Philipp Hörist 06 Apr '20

06 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: a61573d5 by lovetox at 2020-04-06T19:09:26+02:00 Allow websocket for custom host - - - - - 2 changed files: - gajim/common/helpers.py - gajim/gtk/account_wizard.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1748,12 +1748,17 @@ def convert_gio_to_openssl_cert(cert): def get_custom_host(account): if not app.config.get_per('accounts', account, 'use_custom_host'): - return + return None host = app.config.get_per('accounts', account, 'custom_host') port = app.config.get_per('accounts', account, 'custom_port') type_ = app.config.get_per('accounts', account, 'custom_type') + + protocol = ConnectionProtocol.TCP + if host.startswith('ws'): + protocol = ConnectionProtocol.WEBSOCKET + return ('%s:%s' % (host, port), - ConnectionProtocol.TCP, + protocol, ConnectionType(type_)) ===================================== gajim/gtk/account_wizard.py ===================================== @@ -698,8 +698,12 @@ class AdvancedSettings(Page): con_type = self._ui.con_type_combo.get_active_text() + protocol = ConnectionProtocol.TCP + if host.startswith('ws'): + protocol = ConnectionProtocol.WEBSOCKET + return ('%s:%s' % (host, port), - ConnectionProtocol.TCP, + protocol, ConnectionType(con_type)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a61573d529483490543a3066cb3f5ba8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a61573d529483490543a3066cb3f5ba8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Jingle: Fix invalid IQ error type
by Philipp Hörist 06 Apr '20

06 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6b44e6d6 by lovetox at 2020-04-06T06:59:56+02:00 Jingle: Fix invalid IQ error type - - - - - 1 changed file: - gajim/common/jingle_session.py Changes: ===================================== gajim/common/jingle_session.py ===================================== @@ -588,7 +588,7 @@ class JingleSession: creator = content['creator'] if (creator, name) not in self.contents: text = 'Content %s (created by %s) does not exist' % (name, creator) - self.__send_error(stanza, 'bad-request', text=text, type_='_modify') + self.__send_error(stanza, 'bad-request', text=text, type_='modify') raise nbxmpp.NodeProcessed cn = self.contents[(creator, name)] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6b44e6d6c833c810fbe1aca084b4888a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6b44e6d6c833c810fbe1aca084b4888a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Client: Allow websocket URIs when using set_custom_host()
by Philipp Hörist 05 Apr '20

05 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: f3df66ee by lovetox at 2020-04-05T22:57:32+02:00 Client: Allow websocket URIs when using set_custom_host() - - - - - 2 changed files: - nbxmpp/addresses.py - nbxmpp/client.py Changes: ===================================== nbxmpp/addresses.py ===================================== @@ -142,14 +142,18 @@ class ServerAddresses(Observable): if address is None: return - host, protocol, type_ = address + host_or_uri, protocol, type_ = address + if protocol == ConnectionProtocol.WEBSOCKET: + host, uri = None, host_or_uri + else: + host, uri = host_or_uri, None self._fallback_addresses = [] self._addresses = [ ServerAddress(domain=self._domain, service=None, host=host, - uri=None, + uri=uri, protocol=protocol, type=type_, proxy=None)] ===================================== nbxmpp/client.py ===================================== @@ -171,10 +171,10 @@ class Client(Observable): def custom_host(self): return self._custom_host - def set_custom_host(self, host, protocol, type_): + def set_custom_host(self, host_or_uri, protocol, type_): if self._domain is None: raise ValueError('Call set_domain() first before set_custom_host()') - self._custom_host = (host, protocol, type_) + self._custom_host = (host_or_uri, protocol, type_) def set_accepted_certificates(self, certificates): self._accepted_certificates = certificates View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/f3df66ee57b632f9526604ab… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/f3df66ee57b632f9526604ab… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Presence: Fix attribute name
by Philipp Hörist 05 Apr '20

05 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: b6979f13 by lovetox at 2020-04-05T17:41:48+02:00 Presence: Fix attribute name - - - - - b9b7f4fb by lovetox at 2020-04-05T19:07:37+02:00 HTTPUpload: Respect cert store - - - - - 6 changed files: - gajim/common/cert_store.py - gajim/common/client.py - gajim/common/config.py - gajim/common/helpers.py - gajim/common/modules/httpupload.py - gajim/common/modules/presence.py Changes: ===================================== gajim/common/cert_store.py ===================================== @@ -69,6 +69,17 @@ class CertificateStore: self._on_certificate_write_finished, path) + def verify(self, certificate, tls_errors): + if Gio.TlsCertificateFlags.UNKNOWN_CA in tls_errors: + for trusted_certificate in self._certs: + if trusted_certificate.is_same(certificate): + tls_errors.remove(Gio.TlsCertificateFlags.UNKNOWN_CA) + break + + if not tls_errors: + return True + return False + @staticmethod def _on_certificate_write_finished(data, error, path): if data is None: ===================================== gajim/common/client.py ===================================== @@ -21,7 +21,6 @@ from nbxmpp.const import StreamError from nbxmpp.const import ConnectionType from gi.repository import GLib -from gi.repository import Gio from gajim.common import passwords from gajim.common.nec import NetworkEvent @@ -36,6 +35,7 @@ from gajim.common.helpers import get_custom_host from gajim.common.helpers import get_user_proxy from gajim.common.helpers import warn_about_plain_connection from gajim.common.helpers import get_resource +from gajim.common.helpers import get_ignored_ssl_errors from gajim.common.i18n import _ from gajim.common.connection_handlers import ConnectionHandlers @@ -140,7 +140,8 @@ class Client(ConnectionHandlers): self._client.set_accepted_certificates( app.cert_store.get_certificates()) - self._client.set_ignored_tls_errors(self._get_ignored_ssl_errors()) + self._client.set_ignored_tls_errors( + get_ignored_ssl_errors(self._account)) if app.config.get_per('accounts', self._account, 'use_plain_connection'): @@ -161,11 +162,6 @@ class Client(ConnectionHandlers): self._register_new_handlers() - def _get_ignored_ssl_errors(self): - ignore_ssl_errors = app.config.get_per( - 'accounts', self.name, 'ignore_ssl_errors').split() - return {Gio.TlsCertificateFlags(int(err)) for err in ignore_ssl_errors} - def process_ssl_errors(self): if not self._ssl_errors: self.connect(ignore_all_errors=True) ===================================== gajim/common/config.py ===================================== @@ -346,7 +346,6 @@ class Config: 'ft_send_local_ips': [opt_bool, True, _('If enabled, Gajim will send your local IP so your contact can connect to your machine for file transfers.')], 'opened_chat_controls': [opt_str, '', _('List of XMPP Addresses (space separated) for which the chat window will be re-opened on next startup.')], 'recent_groupchats': [opt_str, ''], - 'httpupload_verify': [opt_bool, True, _('HTTP File Upload: Enable HTTPS Verification.')], 'filetransfer_preference' : [opt_str, 'httpupload', _('Preferred file transfer mechanism for file drag&drop on a chat window. Can be \'httpupload\' (default) or \'jingle\'.')], 'allow_posh': [opt_bool, True, _('Allow certificate verification with POSH.')], }, {}), ===================================== gajim/common/helpers.py ===================================== @@ -1764,3 +1764,9 @@ def warn_about_plain_connection(account, connection_types): if type_.is_plain and warn: return True return False + + +def get_ignored_ssl_errors(account): + ignore_ssl_errors = app.config.get_per( + 'accounts', account, 'ignore_ssl_errors').split() + return {Gio.TlsCertificateFlags(int(err)) for err in ignore_ssl_errors} ===================================== gajim/common/modules/httpupload.py ===================================== @@ -22,6 +22,7 @@ import mimetypes from nbxmpp import NS_HTTPUPLOAD_0 from nbxmpp.util import is_error_result +from nbxmpp.util import convert_tls_error_flags from gi.repository import GLib from gi.repository import Soup @@ -218,23 +219,21 @@ class HTTPUpload(BaseModule): self._session.queue_message(message, self._on_finish, transfer) def _check_certificate(self, message): - https_used, _tls_certificate, tls_errors = message.get_https_status() + https_used, tls_certificate, tls_errors = message.get_https_status() if not https_used: self._log.warning('HTTPS was not used for upload') self._session.cancel_message(message, Soup.Status.CANCELLED) return - if not app.config.get_per('accounts', - self._account, - 'httpupload_verify'): + tls_errors = convert_tls_error_flags(tls_errors) + if app.cert_store.verify(tls_certificate, tls_errors): return - if tls_errors: - phrase = get_tls_error_phrase(tls_errors) + for error in tls_errors: + phrase = get_tls_error_phrase(error) self._log.warning('TLS verification failed: %s', phrase) - self._session.cancel_message(message, Soup.Status.CANCELLED) - self._raise_information_event('httpupload-error', phrase) - return + self._session.cancel_message(message, Soup.Status.CANCELLED) + self._raise_information_event('httpupload-error', phrase) def _on_finish(self, _session, message, transfer): self._queued_messages.pop(id(transfer), None) ===================================== gajim/common/modules/presence.py ===================================== @@ -334,7 +334,7 @@ class Presence(BaseModule): self._log.info('Request Subscription to %s', jid) if auto_auth: - self.jids_for_auto_auth.add(jid) + self._jids_for_auto_auth.add(jid) infos = {'jid': jid} if name: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8a60259ab793f75a37fb100d2737883… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8a60259ab793f75a37fb100d2737883… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] MUC: Only force role/affiliation on presences
by Philipp Hörist 05 Apr '20

05 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 19d047e0 by lovetox at 2020-04-05T15:32:06+02:00 MUC: Only force role/affiliation on presences - - - - - 1 changed file: - nbxmpp/modules/muc.py Changes: ===================================== nbxmpp/modules/muc.py ===================================== @@ -178,7 +178,8 @@ class MUC(BaseModule): muc_user = stanza.getTag('x', namespace=NS_MUC_USER) if muc_user is not None: try: - properties.muc_user = self._parse_muc_user(muc_user) + properties.muc_user = self._parse_muc_user(muc_user, + is_presence=False) except StanzaMalformed as error: self._log.warning(error) self._log.warning(stanza) @@ -540,7 +541,7 @@ class MUC(BaseModule): return CommonResult(jid=stanza.getFrom()) @staticmethod - def _parse_muc_user(muc_user): + def _parse_muc_user(muc_user, is_presence=True): item = muc_user.getTag('item') if item is None: return None @@ -548,22 +549,26 @@ class MUC(BaseModule): item_dict = item.getAttrs() role = item_dict.get('role') - if role is None: - raise StanzaMalformed('role attr missing') + if role is not None: + try: + role = Role(role) + except ValueError: + raise StanzaMalformed('invalid role %s' % role) - try: - role = Role(role) - except ValueError: - raise StanzaMalformed('invalid role %s' % role) + elif is_presence: + # role attr MUST be included in all presence broadcasts + raise StanzaMalformed('role attr missing') affiliation = item_dict.get('affiliation') - if affiliation is None: - raise StanzaMalformed('affiliation attr missing') + if affiliation is not None: + try: + affiliation = Affiliation(affiliation) + except ValueError: + raise StanzaMalformed('invalid affiliation %s' % affiliation) - try: - affiliation = Affiliation(affiliation) - except ValueError: - raise StanzaMalformed('invalid affiliation %s' % affiliation) + elif is_presence: + # affiliation attr MUST be included in all presence broadcasts + raise StanzaMalformed('affiliation attr missing') jid = item_dict.get('jid') if jid is not None: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/19d047e08a3e7cf3ac3e7a9d… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/19d047e08a3e7cf3ac3e7a9d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Adapt connection state checks
by Philipp Hörist 05 Apr '20

05 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8a60259a by lovetox at 2020-04-05T13:28:49+02:00 Adapt connection state checks - - - - - 9 changed files: - gajim/command_system/implementation/standard.py - gajim/common/client.py - gajim/common/helpers.py - gajim/common/jingle_session.py - gajim/common/modules/presence.py - gajim/gtk/remove_account.py - gajim/gtk/settings.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -137,7 +137,7 @@ class StandardCommonCommands(CommandContainer): if not app.config.get_per('accounts', connection.name, 'sync_with_global_status'): continue - if not connection.state.is_connected: + if not connection.state.is_available: continue connection.change_status(status, message) @@ -151,7 +151,7 @@ class StandardCommonCommands(CommandContainer): if not app.config.get_per('accounts', connection.name, 'sync_with_global_status'): continue - if not connection.state.is_connected: + if not connection.state.is_available: continue connection.change_status('away', message) @@ -165,7 +165,7 @@ class StandardCommonCommands(CommandContainer): if not app.config.get_per('accounts', connection.name, 'sync_with_global_status'): continue - if not connection.state.is_connected: + if not connection.state.is_available: continue connection.change_status('online', message) ===================================== gajim/common/client.py ===================================== @@ -442,7 +442,7 @@ class Client(ConnectionHandlers): return self._client.send_stanza(stanza) def send_message(self, message): - if not self._state.is_connected: + if not self._state.is_available: log.warning('Trying to send message while offline') return @@ -477,7 +477,7 @@ class Client(ConnectionHandlers): self.get_module('Message').log_message(message) def send_messages(self, jids, message): - if not self._state.is_connected: + if not self._state.is_available: log.warning('Trying to send message while offline') return ===================================== gajim/common/helpers.py ===================================== @@ -690,7 +690,7 @@ def get_connection_status(account): if con.state.is_reconnect_scheduled: return 'error' - if con.state.is_connecting: + if con.state.is_connecting or con.state.is_connected: return 'connecting' if con.state.is_disconnected: ===================================== gajim/common/jingle_session.py ===================================== @@ -758,7 +758,7 @@ class JingleSession: def _session_terminate(self, reason=None): stanza, jingle = self.__make_jingle('session-terminate', reason=reason) self.__broadcast_all(stanza, jingle, None, 'session-terminate-sent') - if self.connection.connection and self.connection.state.is_connected: + if self.connection.connection and self.connection.state.is_available: self.connection.connection.send(stanza) # TODO: Move to GUI? reason, text = self.__reason_from_stanza(jingle) @@ -806,7 +806,7 @@ class JingleSession: def __content_remove(self, content, reason=None): assert self.state != JingleStates.ENDED - if self.connection.connection and self.connection.state.is_connected: + if self.connection.connection and self.connection.state.is_available: stanza, jingle = self.__make_jingle('content-remove', reason=reason) self.__append_content(jingle, content) self.connection.connection.send(stanza) ===================================== gajim/common/modules/presence.py ===================================== @@ -198,7 +198,7 @@ class Presence(BaseModule): if jid in app.to_be_removed[self._account]: app.to_be_removed[self._account].remove(jid) elif event.old_show > 1 and event.new_show == 0 and \ - self._con.state.is_connected: + self._con.state.is_available: if not jid in app.to_be_removed[self._account]: app.to_be_removed[self._account].append(jid) if jid in app.newly_added[self._account]: ===================================== gajim/gtk/remove_account.py ===================================== @@ -89,7 +89,7 @@ class RemoveAccount(Assistant): app.interface.remove_account(self.account) def _set_remove_from_server_checkbox(self): - enabled = self._con is not None and self._con.state.is_connected + enabled = self._con is not None and self._con.state.is_available self.get_page('remove_choice').set_remove_from_server(enabled) @staticmethod ===================================== gajim/gtk/settings.py ===================================== @@ -642,5 +642,5 @@ class ChangePasswordSetting(DialogSetting): activatable = False if self.account in app.connections: con = app.connections[self.account] - activatable = con.state.is_connected and con.register_supported + activatable = con.state.is_available and con.register_supported self.set_activatable(activatable) ===================================== gajim/gui_interface.py ===================================== @@ -1959,7 +1959,8 @@ class Interface: else: log.info('Network connection lost') for connection in app.connections.values(): - if connection.state.is_connected: + if (connection.state.is_connected or + connection.state.is_available): connection.disconnect(gracefully=False, reconnect=True) def create_zeroconf_default_config(self): ===================================== gajim/roster_window.py ===================================== @@ -2501,7 +2501,7 @@ class RosterWindow: GLib.timeout_add_seconds(5, self.remove_newly_added, jid, account) elif obj.old_show > 1 and obj.new_show == 0 and \ - obj.conn.state.is_connected: + obj.conn.state.is_available: GLib.timeout_add_seconds(5, self.remove_to_be_removed, jid, account) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8a60259ab793f75a37fb100d27378835… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8a60259ab793f75a37fb100d27378835… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix pylint error
by Philipp Hörist 05 Apr '20

05 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 446ee5a2 by lovetox at 2020-04-05T11:27:42+02:00 Fix pylint error - - - - - 1 changed file: - gajim/common/const.py Changes: ===================================== gajim/common/const.py ===================================== @@ -248,7 +248,6 @@ class ClientState(IntEnum): @property def is_available(self): return self == ClientState.AVAILABLE - MUC_CREATION_EXAMPLES = [ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/446ee5a292f9ea478f1b7494cce48f22… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/446ee5a292f9ea478f1b7494cce48f22… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Client: Add ClientState.AVAILABLE
by Philipp Hörist 05 Apr '20

05 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3d738ae7 by lovetox at 2020-04-05T11:23:12+02:00 Client: Add ClientState.AVAILABLE When we are connected to the server we need to set some things up before we send our initial available presence. The new state makes it possible for other code to difference between when we are connected and when we are available. For example other code should not send a presence before we requested the roster. Fixes #9983 - - - - - 30 changed files: - gajim/application.py - gajim/chat_control_base.py - gajim/common/app.py - gajim/common/client.py - gajim/common/const.py - gajim/common/dbus/location.py - gajim/common/modules/bookmarks.py - gajim/common/modules/bytestream.py - gajim/common/modules/caps.py - gajim/common/modules/discovery.py - gajim/common/modules/entity_time.py - gajim/common/modules/gateway.py - gajim/common/modules/metacontacts.py - gajim/common/modules/muc.py - gajim/common/modules/ping.py - gajim/common/modules/presence.py - gajim/common/modules/pubsub.py - gajim/common/modules/register.py - gajim/common/modules/roster.py - gajim/common/modules/roster_item_exchange.py - gajim/common/modules/vcard_temp.py - gajim/dialogs.py - gajim/groupchat_control.py - gajim/gtk/add_contact.py - gajim/gtk/discovery.py - gajim/gtk/groupchat_creation.py - gajim/gtk/profile.py - gajim/gtk/single_message.py - gajim/gtk/start_chat.py - gajim/gtk/statusicon.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3d738ae7ee8deb5935c30a94adf35474… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3d738ae7ee8deb5935c30a94adf35474… 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 April 2020