Commits March 2020

commits@gajim.org

1 participants
104 discussions

[Git][gajim/gajim][master] 2 commits: RemoveAccount: Change success message
by Philipp Hörist 23 Mar '20

23 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: abb9782f by lovetox at 2020-03-23T18:38:25+01:00 RemoveAccount: Change success message - - - - - 832c8af9 by lovetox at 2020-03-23T18:38:25+01:00 Update .pylintrc - - - - - 2 changed files: - gajim/gtk/remove_account.py - pylintrc Changes: ===================================== gajim/gtk/remove_account.py ===================================== @@ -54,7 +54,7 @@ class RemoveAccount(Assistant): success.set_title(_('Account Removed')) success.set_heading(_('Account Removed')) success.set_text( - _('Your account has has been unregistered successfully.')) + _('Your account has has been removed successfully.')) error = self.add_default_page('error') error.set_title(_('Account Removal Failed')) ===================================== pylintrc ===================================== @@ -83,7 +83,7 @@ output-format=text reports=no # Activate the evaluation score. -score=yes +score=no [REFACTORING] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/801d0952924eed574e24fd91ea5fbe6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/801d0952924eed574e24fd91ea5fbe6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] updated translations
by Yann Leboulanger 23 Mar '20

23 Mar '20

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 801d0952 by Yann Leboulanger at 2020-03-23T12:39:47+00:00 updated translations - - - - - 30 changed files: - po/be.po - po/be(a)latin.po - po/bg.po - po/br.po - po/ca.po - po/cs.po - po/da.po - po/de.po - po/el.po - po/en_GB.po - po/eo.po - po/es.po - po/eu.po - po/fr.po - po/gl.po - po/he.po - po/hr.po - po/hu.po - po/it.po - po/ja.po - po/kk.po - po/lt.po - po/nb_NO.po - po/nl.po - po/pl.po - po/pt.po - po/pt_BR.po - po/ru.po - po/sk.po - po/sr.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/801d0952924eed574e24fd91ea5fbe65… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/801d0952924eed574e24fd91ea5fbe65… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Config: Add missing comment
by Philipp Hörist 22 Mar '20

22 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6730e814 by lovetox at 2020-03-22T22:35:22+01:00 Config: Add missing comment - - - - - fdd15e44 by lovetox at 2020-03-22T23:03:27+01:00 Refactor get_random_string() - - - - - 4d599687 by lovetox at 2020-03-22T23:10:03+01:00 Interface: Set resource on account creation Otherwise the resource is changed on first connect which can trigger the relogin check in the Accounts Dialog - - - - - 4f5762c7 by lovetox at 2020-03-22T23:20:34+01:00 AccountWizard: Make login button a suggested action - - - - - 8 changed files: - gajim/common/cert_store.py - gajim/common/config.py - gajim/common/helpers.py - gajim/common/modules/jingle.py - gajim/common/proxy65_manager.py - gajim/gtk/account_wizard.py - gajim/gtk/filetransfer.py - gajim/gui_interface.py Changes: ===================================== gajim/common/cert_store.py ===================================== @@ -21,7 +21,7 @@ from gi.repository import Gio from gajim.common import configpaths -from gajim.common.helpers import get_random_string_16 +from gajim.common.helpers import get_random_string from gajim.common.helpers import write_file_async @@ -36,7 +36,7 @@ class CertificateStore: self._load_certificates() def _get_random_path(self): - filename = get_random_string_16() + filename = get_random_string() path = self._path / filename if path.exists(): return self._get_random_path() ===================================== gajim/common/config.py ===================================== @@ -66,7 +66,7 @@ class Config: DEFAULT_ACTIVITY_ICONSET = 'default' __options = ({ - # name: [ type, default_value, help_string ] + # name: [ type, default_value, help_string, restart ] 'verbose': [opt_bool, False, '', True], 'autopopup': [opt_bool, False], 'notify_on_signin': [opt_bool, False], ===================================== gajim/common/helpers.py ===================================== @@ -798,15 +798,14 @@ def remove_invalid_xml_chars(string_): string_ = re.sub(app.interface.invalid_XML_chars_re, '', string_) return string_ -def get_random_string_16(): +def get_random_string(count=16): """ - Create random string of length 16 + Create random string of count length + + WARNING: Don't use this for security purposes """ - rng = list(range(65, 90)) - rng.extend(range(48, 57)) - char_sequence = [chr(e) for e in rng] - from random import sample - return ''.join(sample(char_sequence, 16)) + allowed = string.ascii_uppercase + string.digits + return ''.join(random.choice(allowed) for char in range(count)) def get_os_info(): if app.os_info: @@ -1568,11 +1567,9 @@ def get_resource(account): if not resource: return None - rand = ''.join(random.choice( - string.ascii_uppercase + string.digits) for _ in range(8)) resource = Template(resource).safe_substitute( {'hostname': socket.gethostname(), - 'rand': rand}) + 'rand': get_random_string()}) app.config.set_per('accounts', account, 'resource', resource) return resource ===================================== gajim/common/modules/jingle.py ===================================== @@ -215,7 +215,7 @@ class Jingle(BaseModule): senders=senders) file_props.transport_sid = transport.sid file_props.algo = self.__hash_support(contact) - jingle.add_content('file' + helpers.get_random_string_16(), transfer) + jingle.add_content('file' + helpers.get_random_string(), transfer) jingle.start_session() return transfer.transport.sid ===================================== gajim/common/proxy65_manager.py ===================================== @@ -233,7 +233,7 @@ class ProxyResolver: self.jid = None self.host = None self.port = None - self.sid = helpers.get_random_string_16() + self.sid = helpers.get_random_string() self.sender_jid = sender_jid self.testit = testit ===================================== gajim/gtk/account_wizard.py ===================================== @@ -60,7 +60,7 @@ class AccountWizard(Assistant): css_class='suggested-action') self.add_button('connect', _('Connect'), css_class='suggested-action') self.add_button('next', _('Next'), css_class='suggested-action') - self.add_button('login', _('Log In')) + self.add_button('login', _('Log In'), css_class='suggested-action') self.add_button('back', _('Back')) self.add_pages({'login': Login(self._on_button_clicked), ===================================== gajim/gtk/filetransfer.py ===================================== @@ -310,7 +310,7 @@ class FileTransfersWindow: account, jid) fjid = contact.get_full_jid() # Request the file to the sender - sid = helpers.get_random_string_16() + sid = helpers.get_random_string() new_file_props = FilesProp.getNewFileProp(account, sid) new_file_props.file_name = file_props.file_name new_file_props.name = file_props.name @@ -721,7 +721,7 @@ class FileTransfersWindow: _('It is not possible to send empty files')) return None file_props = FilesProp.getNewFileProp( - account, sid=helpers.get_random_string_16()) + account, sid=helpers.get_random_string()) mod_date = os.path.getmtime(file_path) file_props.file_name = file_path file_props.name = file_name ===================================== gajim/gui_interface.py ===================================== @@ -1666,6 +1666,7 @@ class Interface: config = {} config['active'] = False config['name'] = username + config['resource'] = 'gajim.%s' % helpers.get_random_string(8) config['account_label'] = '%s@%s' % (username, domain) config['hostname'] = domain config['savepass'] = True View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/cc600fd99114f9f49791196e1934575… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/cc600fd99114f9f49791196e1934575… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Interface: Set missing connection type on account creation
by Philipp Hörist 22 Mar '20

22 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: cc600fd9 by lovetox at 2020-03-22T22:14:39+01:00 Interface: Set missing connection type on account creation - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== @@ -1684,6 +1684,7 @@ class Interface: host, port = host.split(':') config['custom_port'] = int(port) config['custom_host'] = host + config['custom_type'] = type_.value app.config.add_per('accounts', account) for opt in config: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cc600fd99114f9f49791196e19345752… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cc600fd99114f9f49791196e19345752… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] AccountWizard: Don't forget proxy and custom host settings
by Philipp Hörist 22 Mar '20

22 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: a914136c by lovetox at 2020-03-22T22:07:51+01:00 AccountWizard: Don't forget proxy and custom host settings - - - - - 2 changed files: - gajim/gtk/account_wizard.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/account_wizard.py ===================================== @@ -282,10 +282,16 @@ class AccountWizard(Assistant): def _on_login_successful(self, client, _signal_name): account = self._generate_account_name(client.domain) + proxy_name = None + if client.proxy is not None: + proxy_name = self.get_page('advanced').get_proxy() + app.interface.create_account(account, client.username, client.domain, - client.password) + client.password, + proxy_name, + client.custom_host) self.get_page('success').set_account(account) self.show_page('success', Gtk.StackTransitionType.SLIDE_LEFT) @@ -399,10 +405,17 @@ class AccountWizard(Assistant): username, password = self.get_page('form').get_credentials() account = self._generate_account_name(self._client.domain) + + proxy_name = None + if self._client.proxy is not None: + proxy_name = self.get_page('advanced').get_proxy() + app.interface.create_account(account, username, self._client.domain, - password) + password, + proxy_name, + self._client.custom_host) self.get_page('success').set_account(account) self.show_page('success', Gtk.StackTransitionType.SLIDE_LEFT) ===================================== gajim/gui_interface.py ===================================== @@ -1653,6 +1653,8 @@ class Interface: username, domain, password, + proxy_name, + custom_host, anonymous=False): if not account or not username or not domain: @@ -1671,10 +1673,17 @@ class Interface: config['anonymous_auth'] = anonymous config['autoconnect'] = True config['sync_with_global_status'] = True - config['proxy'] = '' - config['use_custom_host'] = False - config['custom_port'] = 0 - config['custom_host'] = '' + + if proxy_name is not None: + config['proxy'] = proxy_name + + use_custom_host = custom_host is not None + config['use_custom_host'] = use_custom_host + if custom_host: + host, _protocol, type_ = custom_host + host, port = host.split(':') + config['custom_port'] = int(port) + config['custom_host'] = host app.config.add_per('accounts', account) for opt in config: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a914136cf7769121eec92802f687c508… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a914136cf7769121eec92802f687c508… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Client: Add property custom_host
by Philipp Hörist 22 Mar '20

22 Mar '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 3e5e6efc by lovetox at 2020-03-22T21:51:41+01:00 Client: Add property custom_host - - - - - 1 changed file: - nbxmpp/client.py Changes: ===================================== nbxmpp/client.py ===================================== @@ -167,6 +167,10 @@ class Client(Observable): def set_mode(self, mode): self._mode = mode + @property + def custom_host(self): + return self._custom_host + def set_custom_host(self, host, protocol, type_): if self._domain is None: raise ValueError('Call set_domain() first before set_custom_host()') View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/3e5e6efc2a6169266ff3307b… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/3e5e6efc2a6169266ff3307b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] AccountWizard: Simplify success page
by Philipp Hörist 22 Mar '20

22 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: d1d5dd34 by lovetox at 2020-03-22T19:49:39+01:00 AccountWizard: Simplify success page - - - - - 1 changed file: - gajim/gtk/account_wizard.py Changes: ===================================== gajim/gtk/account_wizard.py ===================================== @@ -40,6 +40,7 @@ from gajim.common.const import GIO_TLS_ERRORS from gajim.gtk.assistant import Assistant from gajim.gtk.assistant import Page +from gajim.gtk.assistant import SuccessPage from gajim.gtk.dataform import DataFormWidget from gajim.gtk.util import get_builder from gajim.gtk.util import open_window @@ -814,27 +815,13 @@ class Redirect(Page): open_uri(self._link) -class Success(Page): +class Success(SuccessPage): def __init__(self): - Page.__init__(self) - self.title = _('Account Added') - self._account = None + SuccessPage.__init__(self) + self.set_title(_('Account Added')) + self.set_heading(_('Account has been added successfully')) - heading = Gtk.Label(label=_('Account has been added successfully')) - heading.get_style_context().add_class('large-header') - heading.set_max_width_chars(30) - heading.set_line_wrap(True) - heading.set_halign(Gtk.Align.CENTER) - heading.set_justify(Gtk.Justification.CENTER) - - icon = Gtk.Image.new_from_icon_name('object-select-symbolic', - Gtk.IconSize.DIALOG) - icon.get_style_context().add_class('success-color') - - self.pack_start(icon, False, True, 0) - self.pack_start(heading, False, True, 0) - - self.show_all() + self._account = None def set_account(self, account): self._account = account View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d1d5dd349c47cabf05bfff0c4e93dacf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d1d5dd349c47cabf05bfff0c4e93dacf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Add license to gstreamer module
by Philipp Hörist 22 Mar '20

22 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 720b0c50 by lovetox at 2020-03-22T18:49:43+01:00 Add license to gstreamer module - - - - - b32e8ca7 by lovetox at 2020-03-22T19:40:40+01:00 Accounts: Add connection type setting for custom host - - - - - 4 changed files: - gajim/common/config.py - gajim/common/helpers.py - gajim/gtk/accounts.py - gajim/gtk/gstreamer.py Changes: ===================================== gajim/common/config.py ===================================== @@ -308,6 +308,7 @@ class Config: 'use_custom_host': [opt_bool, False, '', True], 'custom_port': [opt_int, 5222, '', True], 'custom_host': [opt_str, '', '', True], + 'custom_type': [opt_str, 'START TLS', _('ConnectionType: START TLS, DIRECT TLS or PLAIN'), True], 'sync_with_global_status': [opt_bool, False, ], 'no_log_for': [opt_str, '', _('List of XMPP Addresses (space separated) for which you do not want to store chat history. You can also add the name of an account to disable storing chat history for this account.')], 'attached_gpg_keys': [opt_str, ''], ===================================== gajim/common/helpers.py ===================================== @@ -1775,9 +1775,10 @@ def get_custom_host(account): return 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') return ('%s:%s' % (host, port), ConnectionProtocol.TCP, - ConnectionType.DIRECT_TLS) + ConnectionType(type_)) def warn_about_plain_connection(account, connection_types): ===================================== gajim/gtk/accounts.py ===================================== @@ -764,6 +764,8 @@ class PriorityDialog(SettingsDialog): class CutstomHostnameDialog(SettingsDialog): def __init__(self, account, parent): + type_values = ('START TLS', 'DIRECT TLS', 'PLAIN') + settings = [ Setting(SettingKind.SWITCH, _('Enable'), SettingType.ACCOUNT_CONFIG, @@ -776,6 +778,11 @@ class CutstomHostnameDialog(SettingsDialog): Setting(SettingKind.ENTRY, _('Port'), SettingType.ACCOUNT_CONFIG, 'custom_port', enabledif=('custom', True)), + + Setting(SettingKind.COMBO, _('Type'), + SettingType.ACCOUNT_CONFIG, 'custom_type', + enabledif=('custom', True), + props={'combo_items': type_values}), ] SettingsDialog.__init__(self, parent, _('Connection Settings'), ===================================== gajim/gtk/gstreamer.py ===================================== @@ -1,3 +1,17 @@ +# 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/>. + try: from gi.repository import Gst except Exception: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/86164a02969b50c660cf1299ec27487… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/86164a02969b50c660cf1299ec27487… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Register: Handle errors when requesting the register form
by Philipp Hörist 22 Mar '20

22 Mar '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 1031b9af by lovetox at 2020-03-22T18:30:40+01:00 Register: Handle errors when requesting the register form - - - - - 1 changed file: - nbxmpp/modules/register.py Changes: ===================================== nbxmpp/modules/register.py ===================================== @@ -59,8 +59,10 @@ class Register(BaseModule): @callback def _on_register_form(self, stanza): - query = stanza.getQuery() + if not isResultNode(stanza): + return raise_error(self._log.info, stanza) + query = stanza.getQuery() instructions = query.getTagData('instructions') or None data = RegisterData(instructions=instructions, View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/1031b9afc7acd5606158bb54… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/1031b9afc7acd5606158bb54… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Register: Use nbxmpp methods
by Philipp Hörist 22 Mar '20

22 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 86164a02 by lovetox at 2020-03-22T16:19:44+01:00 Register: Use nbxmpp methods - - - - - 2 changed files: - gajim/common/modules/register.py - gajim/gtk/change_password.py Changes: ===================================== gajim/common/modules/register.py ===================================== @@ -28,6 +28,8 @@ class Register(BaseModule): _nbxmpp_extends = 'Register' _nbxmpp_methods = [ 'unregister', + 'change_password', + 'change_password_with_form', ] def __init__(self, con): @@ -35,35 +37,6 @@ class Register(BaseModule): self.agent_registrations = {} - def change_password(self, password, success_cb, error_cb): - if not app.account_is_connected(self._account): - return - hostname = app.config.get_per('accounts', self._account, 'hostname') - username = app.config.get_per('accounts', self._account, 'name') - iq = nbxmpp.Iq(typ='set', to=hostname) - query = iq.setTag(nbxmpp.NS_REGISTER + ' query') - query.setTagData('username', username) - query.setTagData('password', password) - - weak_success_cb = weakref.WeakMethod(success_cb) - weak_error_cb = weakref.WeakMethod(error_cb) - self._log.info('Send password change') - self._con.connection.SendAndCallForResponse( - iq, self._change_password_response, {'success_cb': weak_success_cb, - 'error_cb': weak_error_cb}) - - def _change_password_response(self, _nbxmpp_client, stanza, - success_cb, error_cb): - if not nbxmpp.isResultNode(stanza): - error = stanza.getErrorMsg() - self._log.info('Error: %s', error) - if error_cb() is not None: - error_cb()(error) - else: - self._log.info('Password changed') - if success_cb() is not None: - success_cb()() - def register_agent(self, agent, form, is_form, success_cb, error_cb): if not app.account_is_connected(self._account): return ===================================== gajim/gtk/change_password.py ===================================== @@ -110,15 +110,14 @@ class ChangePassword(Assistant): self.set_default_button('back') def _on_apply(self, next_stage=False): - register = self._con.connection.get_module('Register') if next_stage: form = self.get_page('next_stage').get_submit_form() - register.change_password_with_form( + self._con.get_module('Register').change_password_with_form( form, callback=self._on_change_password) else: password = self.get_page('password').get_password() - register.change_password(password, - callback=self._on_change_password) + self._con.get_module('Register').change_password( + password, callback=self._on_change_password) @ensure_not_destroyed def _on_change_password(self, result): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/86164a02969b50c660cf1299ec274870… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/86164a02969b50c660cf1299ec274870… 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 March 2020