Commits August 2017

commits@gajim.org

1 participants
94 discussions

[Git][gajim/gajim][master] Fix broken menus when renaming an account
by Philipp Hörist 14 Aug '17

14 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: dbbd3fe1 by Philipp Hörist at 2017-08-14T15:02:55+02:00 Fix broken menus when renaming an account - - - - - 1 changed file: - gajim/config.py Changes: ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -2156,6 +2156,9 @@ class AccountsWindow: gajim.interface.roster.setup_and_draw_roster() self.init_accounts() self.select_account(new_name) + gajim.app.remove_account_actions(old_name) + gajim.app.add_account_actions(new_name) + gui_menu_builder.build_accounts_menu() title = _('Rename Account') message = _('Enter a new name for account %s') % self.current_account View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dbbd3fe11138e83d4e912040c90071ce1e… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dbbd3fe11138e83d4e912040c90071ce1e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix socks5 problem:
by Yann Leboulanger 14 Aug '17

14 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: f8383954 by Yann Leboulanger at 2017-08-14T14:44:04+02:00 Fix socks5 problem: receive() returns bytes, not str - - - - - 1 changed file: - gajim/common/socks5.py Changes: ===================================== gajim/common/socks5.py ===================================== --- a/gajim/common/socks5.py +++ b/gajim/common/socks5.py @@ -145,10 +145,10 @@ class SocksQueue: self.add_sockobj(account, socks5obj) else: if 'candidate_id' in streamhost: - log.debug('Trying to connect as sender to cid' + \ + log.debug('Trying to connect as sender to cid ' + \ streamhost['candidate_id']) else: - log.debug('Trying to connect as sender to jid' + \ + log.debug('Trying to connect as sender to jid ' + \ streamhost['jid']) if file_props.sha_str: idx = file_props.sha_str @@ -1208,7 +1208,7 @@ class Socks5Client(Socks5): """ result = 1 buff = self.receive() - if buff == '': + if buff == b'': # end connection self.pollend() return View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f8383954e38c9f0c7665b9d69a52004e4c… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f8383954e38c9f0c7665b9d69a52004e4c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: rework password interface. Fixes #8347
by Yann Leboulanger 14 Aug '17

14 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 89d3c3af by Yann Leboulanger at 2017-08-13T14:22:28+02:00 rework password interface. Fixes #8347 - - - - - bda11b7d by Yann Leboulanger at 2017-08-14T10:15:07+02:00 Merge branch 'master' into 'master' rework password interface. Fixes #8347 Closes #8347 See merge request !117 - - - - - 1 changed file: - gajim/common/passwords.py Changes: ===================================== gajim/common/passwords.py ===================================== --- a/gajim/common/passwords.py +++ b/gajim/common/passwords.py @@ -33,6 +33,7 @@ __all__ = ['get_password', 'save_password'] log = logging.getLogger('gajim.password') +keyring = None if os.name == 'nt': try: import keyring @@ -40,77 +41,52 @@ if os.name == 'nt': log.debug('python-keyring missing, falling back to plaintext storage') -Secret = None - class PasswordStorage(object): + """Interface for password stores""" def get_password(self, account_name): + """Return the password for account_name, or None if not found.""" raise NotImplementedError def save_password(self, account_name, password): + """Save password for account_name. Return a bool indicating success.""" raise NotImplementedError -class SimplePasswordStorage(PasswordStorage): - def get_password(self, account_name): - passwd = gajim.config.get_per('accounts', account_name, 'password') - if passwd and (passwd.startswith('libsecret:') or passwd.startswith('winvault:')): - # this is not a real password, it’s stored through libsecret. - return None - else: - return passwd - - def save_password(self, account_name, password): - gajim.config.set_per('accounts', account_name, 'password', password) - if account_name in gajim.connections: - gajim.connections[account_name].password = password - - -class SecretPasswordStorage(PasswordStorage): +class LibSecretPasswordStorage(PasswordStorage): + """Store password using libsecret""" + identifier = 'libsecret:' def __init__(self): - self.GAJIM_SCHEMA = Secret.Schema.new("org.gnome.keyring.NetworkPassword", - Secret.SchemaFlags.NONE, + gi.require_version('Secret', '1') + gir = __import__('gi.repository', globals(), locals(), ['Secret'], 0) + self.Secret = gir.Secret + self.GAJIM_SCHEMA = self.Secret.Schema.new( + "org.gnome.keyring.NetworkPassword", + self.Secret.SchemaFlags.NONE, { - 'user': Secret.SchemaAttributeType.STRING, - 'server': Secret.SchemaAttributeType.STRING, - 'protocol': Secret.SchemaAttributeType.STRING, + 'user': self.Secret.SchemaAttributeType.STRING, + 'server': self.Secret.SchemaAttributeType.STRING, + 'protocol': self.Secret.SchemaAttributeType.STRING, } ) def get_password(self, account_name): - conf = gajim.config.get_per('accounts', account_name, 'password') - if conf is None: - return None - if not conf.startswith('libsecret:'): - password = conf - ## migrate the password over to keyring - try: - self.save_password(account_name, password, update=False) - except Exception: - ## no keyring daemon: in the future, stop using it - set_storage(SimplePasswordStorage()) - return password server = gajim.config.get_per('accounts', account_name, 'hostname') user = gajim.config.get_per('accounts', account_name, 'name') - password = Secret.password_lookup_sync(self.GAJIM_SCHEMA, {'user': user, - 'server': server, 'protocol': 'xmpp'}, None) + password = self.Secret.password_lookup_sync(self.GAJIM_SCHEMA, + {'user': user, 'server': server, 'protocol': 'xmpp'}, None) return password def save_password(self, account_name, password, update=True): server = gajim.config.get_per('accounts', account_name, 'hostname') user = gajim.config.get_per('accounts', account_name, 'name') display_name = _('XMPP account %s@%s') % (user, server) - if password is None: - password = str() attributes = {'user': user, 'server': server, 'protocol': 'xmpp'} - Secret.password_store_sync(self.GAJIM_SCHEMA, attributes, - Secret.COLLECTION_DEFAULT, display_name, password, None) - gajim.config.set_per('accounts', account_name, 'password', - 'libsecret:') - if account_name in gajim.connections: - gajim.connections[account_name].password = password + return self.Secret.password_store_sync(self.GAJIM_SCHEMA, attributes, + self.Secret.COLLECTION_DEFAULT, display_name, password or '', None) class SecretWindowsPasswordStorage(PasswordStorage): """ Windows Keyring """ + identifier = 'winvault:' def __init__(self): self.win_keyring = keyring.get_keyring() @@ -118,53 +94,99 @@ class SecretWindowsPasswordStorage(PasswordStorage): def save_password(self, account_name, password): try: self.win_keyring.set_password('gajim', account_name, password) - gajim.config.set_per( - 'accounts', account_name, 'password', 'winvault:') + return True except: log.exception('error:') - set_storage(SimplePasswordStorage()) - storage.save_password(account_name, password) + return False def get_password(self, account_name): log.debug('getting password') - conf = gajim.config.get_per('accounts', account_name, 'password') - if conf is None: - return None - if not conf.startswith('winvault:'): - password = conf - # migrate the password over to keyring - self.save_password(account_name, password) - return password return self.win_keyring.get_password('gajim', account_name) +class PasswordStorageManager(PasswordStorage): + """Access all the implemented password storage backends, knowing which ones + are available and which we prefer to use. + Also implements storing directly in gajim config (former + SimplePasswordStorage class).""" + + def __init__(self): + self.preferred_backend = None + + self.libsecret = None + self.winsecret = None + + self.connect_backends() + self.set_preferred_backend() + + def connect_backends(self): + """Initialize backend connections, determining which ones are available. + """ + # TODO: handle disappearing backends -storage = None -def get_storage(): - global storage - if storage is None: # None is only in first time get_storage is called - global Secret if gajim.config.get('use_keyring'): - try: - gi.require_version('Secret', '1') - gir = __import__('gi.repository', globals(), locals(), - ['Secret'], 0) - Secret = gir.Secret - except (ValueError, AttributeError): - pass - try: - if os.name != 'nt': - storage = SecretPasswordStorage() - else: - storage = SecretWindowsPasswordStorage() - except Exception: - storage = SimplePasswordStorage() + if os.name == 'nt' and keyring: + self.winsecret = SecretWindowsPasswordStorage() + else: + try: + self.libsecret = LibSecretPasswordStorage() + except (ValueError, AttributeError) as e: + log.debug("Could not connect to libsecret: %s" % e) + + def get_password(self, account_name): + pw = gajim.config.get_per('accounts', account_name, 'password') + if not pw: + return pw + if pw.startswith(LibSecretPasswordStorage.identifier) and \ + self.libsecret: + backend = self.libsecret + elif pw.startswith(SecretWindowsPasswordStorage.identifier) and \ + self.winsecret: + backend = self.winsecret + else: + backend = None + + if backend: + pw = backend.get_password(account_name) + if backend != self.preferred_backend: + # migrate password to preferred_backend + self.preferred_backend.save_password(account_name, pw) + # TODO: remove from old backend + return pw + + def save_password(self, account_name, password): + if self.preferred_backend: + if self.preferred_backend.save_password(account_name, password): + gajim.config.set_per('accounts', account_name, 'password', + self.preferred_backend.identifier) + if account_name in gajim.connections: + gajim.connections[account_name].password = password + return True + + gajim.config.set_per('accounts', account_name, 'password', password) + if account_name in gajim.connections: + gajim.connections[account_name].password = password + return True + + def set_preferred_backend(self): + if self.libsecret: + self.preferred_backend = self.libsecret + elif self.winsecret: + self.preferred_backend = self.winsecret else: - storage = SimplePasswordStorage() - return storage + self.preferred_backend = None + + def has_keyring(self): + """Is there a real password storage backend? Else, passwords are stored + plain in gajim config""" + return bool(self.preferred_backend) -def set_storage(storage_): - global storage - storage = storage_ +passwordStorageManager = None + +def get_storage(): + global passwordStorageManager + if not passwordStorageManager: + passwordStorageManager = PasswordStorageManager() + return passwordStorageManager def get_password(account_name): return get_storage().get_password(account_name) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9b866fd1a05ddd37d70aecda9c605d204… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9b866fd1a05ddd37d70aecda9c605d204… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_0.16] do not create Event when we auto popup a normal message. Fixes #8645
by Yann Leboulanger 13 Aug '17

13 Aug '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: 59b3b3ae by Yann Leboulanger at 2017-08-13T23:05:25+02:00 do not create Event when we auto popup a normal message. Fixes #8645 - - - - - 1 changed file: - src/session.py Changes: ===================================== src/session.py ===================================== --- a/src/session.py +++ b/src/session.py @@ -247,18 +247,24 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): # We have a ChatControl open obj.show_in_roster = False obj.show_in_systray = False + do_event = False elif obj.forwarded and obj.sent: # Its a Carbon Copied Message we sent obj.show_in_roster = False obj.show_in_systray = False gajim.events.remove_events(self.conn.name, fjid, types=['chat']) + do_event = False else: # Everything else obj.show_in_roster = notify.get_show_in_roster(event_type, self.conn.name, contact, self) obj.show_in_systray = notify.get_show_in_systray(event_type, self.conn.name, contact) - + if obj.mtype == 'normal' and not obj.popup: + do_event = False + else: + do_event = True + if do_event: event = event_t(obj.msgtxt, obj.subject, obj.mtype, obj.timestamp, obj.encrypted, obj.resource, obj.msg_log_id, correct_id=(obj.id_, obj.correct_id), xhtml=obj.xhtml, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/59b3b3aed94ad143a16261a9f8e171c41c… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/59b3b3aed94ad143a16261a9f8e171c41c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] do not create Event when we auto popup a normal message. Fixes #8645
by Yann Leboulanger 13 Aug '17

13 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 9b866fd1 by Yann Leboulanger at 2017-08-13T23:03:11+02:00 do not create Event when we auto popup a normal message. Fixes #8645 - - - - - 1 changed file: - gajim/session.py Changes: ===================================== gajim/session.py ===================================== --- a/gajim/session.py +++ b/gajim/session.py @@ -242,18 +242,24 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): # We have a ChatControl open obj.show_in_roster = False obj.show_in_systray = False + do_event = False elif obj.forwarded and obj.sent: # Its a Carbon Copied Message we sent obj.show_in_roster = False obj.show_in_systray = False gajim.events.remove_events(self.conn.name, fjid, types=['chat']) + do_event = False else: # Everything else obj.show_in_roster = notify.get_show_in_roster(event_type, self.conn.name, contact, self) obj.show_in_systray = notify.get_show_in_systray(event_type, self.conn.name, contact) - + if obj.mtype == 'normal' and not obj.popup: + do_event = False + else: + do_event = True + if do_event: event = event_t(obj.msgtxt, obj.subject, obj.mtype, obj.timestamp, obj.encrypted, obj.resource, obj.msg_log_id, correct_id=(obj.id_, obj.correct_id), xhtml=obj.xhtml, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9b866fd1a05ddd37d70aecda9c605d2040… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9b866fd1a05ddd37d70aecda9c605d2040… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix norwegian translation
by Yann Leboulanger 13 Aug '17

13 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 0244ac44 by Yann Leboulanger at 2017-08-13T15:51:36+02:00 fix norwegian translation - - - - - 3 changed files: - po/LINGUAS - po/nb.po → po/nb_NO.po - − po/no.po Changes: ===================================== po/LINGUAS ===================================== --- a/po/LINGUAS +++ b/po/LINGUAS @@ -7,7 +7,7 @@ es ru bg de -nb +nb_NO cs nl pt_BR @@ -15,7 +15,6 @@ sv it eu sk -no zh_CN br eo ===================================== po/nb.po → po/nb_NO.po ===================================== ===================================== po/no.po deleted ===================================== The diff for this file was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0244ac447514af869aa29deaa740fb75f4… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0244ac447514af869aa29deaa740fb75f4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] OptionsDialog: Center switch button vertically
by Philipp Hörist 12 Aug '17

12 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 27afece6 by Philipp Hörist at 2017-08-13T00:50:39+02:00 OptionsDialog: Center switch button vertically - - - - - 1 changed file: - gajim/dialogs.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -3678,6 +3678,7 @@ class SwitchOption(Gtk.Grid): self.switch.connect("notify::active", callback, *user_data) self.switch.set_hexpand(True) self.switch.set_halign(Gtk.Align.END) + self.switch.set_valign(Gtk.Align.CENTER) self.add(label) self.add(self.switch) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/27afece67808eb6460bc970f125ae3f885… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/27afece67808eb6460bc970f125ae3f885… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add maximize button to XMLConsole window
by Philipp Hörist 12 Aug '17

12 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5554e994 by Philipp Hörist at 2017-08-13T00:45:03+02:00 Add maximize button to XMLConsole window - - - - - 1 changed file: - gajim/dialogs.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -3365,8 +3365,6 @@ class XMLConsoleWindow(Gtk.Window): switch.connect("notify::active", self.on_enable) headerbar.pack_start(switch) - headerbar.set_decoration_layout(':minimize,close') - self.enabled = True self.presence = True self.message = True View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5554e994524a1840e8b166958fa4adfc89… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5554e994524a1840e8b166958fa4adfc89… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] unify cid -> candidate_id
by Yann Leboulanger 12 Aug '17

12 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 43b3d1bd by Yann Leboulanger at 2017-08-12T22:55:17+02:00 unify cid -> candidate_id - - - - - 3 changed files: - gajim/common/jingle_ftstates.py - gajim/common/jingle_transport.py - gajim/common/socks5.py Changes: ===================================== gajim/common/jingle_ftstates.py ===================================== --- a/gajim/common/jingle_ftstates.py +++ b/gajim/common/jingle_ftstates.py @@ -79,7 +79,7 @@ class StateCandSent(JingleFileTransferStates): transport.setNamespace(nbxmpp.NS_JINGLE_BYTESTREAM) transport.setAttr('sid', self.jft.transport.sid) candidateused = nbxmpp.Node('candidate-used') - candidateused.setAttr('cid', streamhost['cid']) + candidateused.setAttr('cid', streamhost['candidate_id']) transport.addChild(node=candidateused) content.addChild(node=transport) self.jft.session.send_transport_info(content) ===================================== gajim/common/jingle_transport.py ===================================== --- a/gajim/common/jingle_transport.py +++ b/gajim/common/jingle_transport.py @@ -156,7 +156,7 @@ class JingleTransportSocks5(JingleTransport): 'target': self.ourjid, 'host': candidate['host'], 'port': int(candidate['port']), - 'cid': candidate['cid'], + 'candidate_id': candidate['cid'], 'type': typ, 'priority': candidate['priority'] } ===================================== gajim/common/socks5.py ===================================== --- a/gajim/common/socks5.py +++ b/gajim/common/socks5.py @@ -133,13 +133,23 @@ class SocksQueue: else: fp = fingerprint if receiving: - log.debug('Trying to connect as receiver to cid ' + streamhost['cid']) + if 'candidate_id' in streamhost: + log.debug('Trying to connect as receiver to cid ' + \ + streamhost['candidate_id']) + else: + log.debug('Trying to connect as receiver to jid ' + \ + streamhost['jid']) file_props.type_ = 'r' socks5obj = Socks5ReceiverClient(self.idlequeue, streamhost, sid, file_props, fingerprint=fp) self.add_sockobj(account, socks5obj) else: - log.debug('Trying to connect as sender to cid' + streamhost['cid']) + if 'candidate_id' in streamhost: + log.debug('Trying to connect as sender to cid' + \ + streamhost['candidate_id']) + else: + log.debug('Trying to connect as sender to jid' + \ + streamhost['jid']) if file_props.sha_str: idx = file_props.sha_str else: @@ -166,7 +176,10 @@ class SocksQueue: Called when there is a host connected to one of the senders's streamhosts. Stop other attempts for connections """ - log.debug('Connected to cid ' + streamhost['cid']) + if 'candidate_id' in streamhost: + log.debug('Connected to cid ' + streamhost['candidate_id']) + else: + log.debug('Connected to jid ' + streamhost['jid']) for host in file_props.streamhosts: if host != streamhost and 'idx' in host: if host['state'] == 1: @@ -228,7 +241,10 @@ class SocksQueue: """ Called when we loose connection during transfer """ - log.debug('Connection refused to cid ' + streamhost['cid']) + if 'candidate_id' in streamhost: + log.debug('Connection refused to cid ' + streamhost['candidate_id']) + else: + log.debug('Connection refused to jid ' + streamhost['jid']) if file_props is None: return streamhost['state'] = -1 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/43b3d1bd83538d3fe222c42d40295176da… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/43b3d1bd83538d3fe222c42d40295176da… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: use precis_i18n instead of stringprepare when available to sanitize JIDs
by Yann Leboulanger 12 Aug '17

12 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 1a2ac87f by Yann Leboulanger at 2017-08-11T08:11:52+02:00 use precis_i18n instead of stringprepare when available to sanitize JIDs - - - - - b6189a60 by Yann Leboulanger at 2017-08-11T08:12:00+02:00 use idna python module to check domainpart when available - - - - - d468a1d9 by Yann Leboulanger at 2017-08-11T08:12:00+02:00 update optional dependencies - - - - - baa54f50 by Yann Leboulanger at 2017-08-12T14:55:08+02:00 Merge branch 'use_precis' into 'master' Use precis instead of stringprep when available. Fixes #8566 See merge request !116 - - - - - 2 changed files: - README - gajim/common/helpers.py Changes: ===================================== README ===================================== --- a/README +++ b/README @@ -37,6 +37,7 @@ <li>gir1.2-farstream-0.2, gir1.2-gstreamer-1.0 and gir1.2-gst-plugins-base-1.0 for audio and video calls</li> <li>gir1.2-gupnpigd-1.0 for better NAT traversing</li> <li>gir1.2-networkmanager-1.0 for network lose detection</li> +<li>python3-idna and python3-precis-i18n for correctly parsing JIDs</li> </ul> <p>Some distributions also split too much python standard library. I know SUSE does. In such distros you also need python-xml the xml lib that *comes* with python and not pyxml or whatever.</p> ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -53,6 +53,18 @@ import nbxmpp from common.i18n import Q_ from common.i18n import ngettext +try: + import precis_i18n.codec + HAS_PRECIS_I18N = True +except ImportError: + HAS_PRECIS_I18N = False + +try: + import idna + HAS_IDNA = True +except ImportError: + HAS_IDNA = False + HAS_SOUND = True if sys.platform == 'win32': try: @@ -244,8 +256,11 @@ def parse_resource(resource): """ if resource: try: - from nbxmpp.stringprepare import resourceprep - return resourceprep.prepare(resource) + if HAS_PRECIS_I18N: + return resource.encode('Nickname').decode('utf-8') + else: + from nbxmpp.stringprepare import resourceprep + return resourceprep.prepare(resource) except UnicodeError: raise InvalidFormat('Invalid character in resource.') @@ -274,33 +289,44 @@ def prep(user, server, resource): if not ip_address: if server is not None: - if len(server) < 1 or len(server) > 1023: - raise InvalidFormat(_('Server must be between 1 and 1023 chars')) + if server.endswith('.'): # RFC7622, 3.2 + server = server[:-1] + if len(server) < 1 or len(server.encode('utf-8')) > 1023: + raise InvalidFormat(_('Server must be between 1 and 1023 bytes')) try: - from nbxmpp.stringprepare import nameprep - server = nameprep.prepare(server) + if HAS_IDNA: + server = idna.encode(server).decode('utf-8') + else: + from nbxmpp.stringprepare import nameprep + server = nameprep.prepare(server) except UnicodeError: raise InvalidFormat(_('Invalid character in hostname.')) else: raise InvalidFormat(_('Server address required.')) if user is not None: - if len(user) < 1 or len(user) > 1023: - raise InvalidFormat(_('Username must be between 1 and 1023 chars')) + if len(user) < 1 or len(user.encode('utf-8')) > 1023: + raise InvalidFormat(_('Username must be between 1 and 1023 bytes')) try: - from nbxmpp.stringprepare import nodeprep - user = nodeprep.prepare(user) + if HAS_PRECIS_I18N: + user = user.encode('UsernameCaseMapped').decode('utf-8') + else: + from nbxmpp.stringprepare import nodeprep + user = nodeprep.prepare(user) except UnicodeError: raise InvalidFormat(_('Invalid character in username.')) else: user = None if resource is not None: - if len(resource) < 1 or len(resource) > 1023: - raise InvalidFormat(_('Resource must be between 1 and 1023 chars')) + if len(resource) < 1 or len(resource.encode('utf-8')) > 1023: + raise InvalidFormat(_('Resource must be between 1 and 1023 bytes')) try: - from nbxmpp.stringprepare import resourceprep - resource = resourceprep.prepare(resource) + if HAS_PRECIS_I18N: + resource = resource.encode('OpaqueString').decode('utf-8') + else: + from nbxmpp.stringprepare import resourceprep + resource = resourceprep.prepare(resource) except UnicodeError: raise InvalidFormat(_('Invalid character in resource.')) else: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/af547a1827a1fd8e8b408912426e68367… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/af547a1827a1fd8e8b408912426e68367… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2017