Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] New DataFormWidget: Add Captcha support
by Philipp Hörist 15 Nov '18

15 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7f1dfe5a by Philipp Hörist at 2018-11-15T20:02:09Z New DataFormWidget: Add Captcha support - - - - - 8 changed files: - gajim/common/app.py - gajim/common/configpaths.py - gajim/common/modules/bits_of_binary.py - gajim/common/modules/message.py - gajim/common/modules/register.py - gajim/data/style/gajim.css - gajim/gtk/dataform.py - test/gtk/dataform.py Changes: ===================================== gajim/common/app.py ===================================== @@ -57,6 +57,7 @@ config = c_config.Config() version = gajim.__version__ connections = {} # type: Dict[str, ConnectionT] avatar_cache = {} # type: Dict[str, Dict[str, Any]] +bob_cache = {} # type: Dict[str, bytes] ipython_window = None app = None # Gtk.Application @@ -668,3 +669,14 @@ def get_win_debug_mode() -> bool: debug_folder = Path(configpaths.get('DEBUG')) debug_enabled = debug_folder / 'debug-enabled' return debug_enabled.exists() + +def get_stored_bob_data(algo_hash: str) -> Optional[bytes]: + try: + return bob_cache[algo_hash] + except KeyError: + filepath = Path(configpaths.get('BOB')) / algo_hash + if filepath.exists(): + with open(str(filepath), 'r+b') as file: + data = file.read() + return data + return None ===================================== gajim/common/configpaths.py ===================================== @@ -229,6 +229,7 @@ class ConfigPaths: # Cache paths ('CACHE_DB', 'cache.db', PathLocation.CACHE, PathType.FILE), ('AVATAR', 'avatars', PathLocation.CACHE, PathType.FOLDER), + ('BOB', 'bob', PathLocation.CACHE, PathType.FOLDER), # Config paths ('MY_THEME', 'theme', PathLocation.CONFIG, PathType.FOLDER), ===================================== gajim/common/modules/bits_of_binary.py ===================================== @@ -15,9 +15,15 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import logging +import hashlib +from base64 import b64decode +from pathlib import Path import nbxmpp +from gajim.common import app +from gajim.common import configpaths + log = logging.getLogger('gajim.c.m.bob') @@ -91,5 +97,78 @@ class BitsOfBinary: iq, self._on_bob_received, {'cid': cid}) +def parse_bob_data(stanza): + data_node = stanza.getTag('data', namespace=nbxmpp.NS_BOB) + if data_node is None: + return + + cid = data_node.getAttr('cid') + type_ = data_node.getAttr('type') + max_age = data_node.getAttr('max-age') + if max_age is not None: + try: + max_age = int(max_age) + except Exception: + log.exception(stanza) + return + + if cid is None or type_ is None: + log.warning('Invalid data node (no cid or type attr): %s', stanza) + return + + try: + algo_hash = cid.split('@')[0] + algo, hash_ = algo_hash.split('+') + except Exception: + log.exception('Invalid cid: %s', stanza) + return + + bob_data = data_node.getData() + if not bob_data: + log.warning('No data found: %s', stanza) + return + + filepath = Path(configpaths.get('BOB')) / algo_hash + if algo_hash in app.bob_cache or filepath.exists(): + log.info('BoB data already cached') + return + + try: + bob_data = b64decode(bob_data) + except Exception: + log.warning('Unable to decode data') + log.exception(stanza) + return + + if len(bob_data) > 10000: + log.warning('%s: data > 10000 bytes', stanza.getFrom()) + return + + try: + sha = hashlib.new(algo) + except ValueError as error: + log.warning(stanza) + log.warning(error) + return + + sha.update(bob_data) + if sha.hexdigest() != hash_: + log.warning('Invalid hash: %s', stanza) + return + + if max_age == 0: + app.bob_cache[algo_hash] = bob_data + else: + try: + with open(str(filepath), 'w+b') as file: + file.write(bob_data) + except Exception: + log.warning('Unable to save data') + log.exception(stanza) + return + log.info('BoB data stored: %s', algo_hash) + return filepath + + def get_instance(*args, **kwargs): return BitsOfBinary(*args, **kwargs), 'BitsOfBinary' ===================================== gajim/common/modules/message.py ===================================== @@ -26,6 +26,7 @@ from gajim.common.nec import NetworkIncomingEvent, NetworkEvent from gajim.common.modules.security_labels import parse_securitylabel from gajim.common.modules.user_nickname import parse_nickname from gajim.common.modules.carbons import parse_carbon +from gajim.common.modules.bits_of_binary import parse_bob_data from gajim.common.modules.misc import parse_delay from gajim.common.modules.misc import parse_eme from gajim.common.modules.misc import parse_correction @@ -228,6 +229,8 @@ class Message: timestamp = time.time() delayed = False + parse_bob_data(event.stanza) + event_attr = { 'popup': False, 'msg_log_id': None, ===================================== gajim/common/modules/register.py ===================================== @@ -20,6 +20,7 @@ import weakref import nbxmpp from gajim.common import app +from gajim.common.modules.bits_of_binary import parse_bob_data log = logging.getLogger('gajim.c.m.register') @@ -125,6 +126,7 @@ class Register: error_cb()(error) else: log.info('Register form received') + parse_bob_data(stanza.getQuery()) form = stanza.getQuery().getTag('x', namespace=nbxmpp.NS_DATA) is_form = form is not None if not is_form: ===================================== gajim/data/style/gajim.css ===================================== @@ -250,3 +250,6 @@ button.flat.link { padding: 0; border: 0; } .data-form-widget grid { margin: 18px; } .data-form-widget treeview { padding: 5px; } .data-form-widget scrolledwindow { border: 1px solid; border-color:@unfocused_borders; } + +/*Image Preview*/ +.preview-image { box-shadow: 0px 0px 3px 0px alpha(@theme_text_color, 0.2); } ===================================== gajim/gtk/dataform.py ===================================== @@ -17,6 +17,9 @@ from gi.repository import GLib from gi.repository import GObject from gi.repository import Pango +from gajim.gtkgui_helpers import scale_pixbuf_from_data + +from gajim.common import app from gajim.common.i18n import _ @@ -82,21 +85,21 @@ class FormGrid(Gtk.Grid): if form_node.title is not None: self.title = form_node.title - self.add_row(Title(form_node.title)) + self._add_row(Title(form_node.title)) if form_node.instructions is not None: self.instructions = form_node.instructions - self.add_row(Instructions(form_node.instructions)) + self._add_row(Instructions(form_node.instructions)) - self.analyse_fields(form_node, options) - self.parse_form(form_node, options) + self._analyse_fields(form_node, options) + self._parse_form(form_node, options) - def add_row(self, field): + def _add_row(self, field): field.add(self, self.row_count) self.row_count += 1 self.rows.append(field) @staticmethod - def analyse_fields(form_node, options): + def _analyse_fields(form_node, options): if 'right_align' in options: # Dont overwrite option return @@ -113,13 +116,33 @@ class FormGrid(Gtk.Grid): options['right_align'] = max(label_lengths) < 30 - def parse_form(self, form_node, options): + def _parse_form(self, form_node, options): for field in form_node.iter_fields(): if field.type_ == 'hidden': continue + if field.media: + if not self._add_media_field(field, options): + # We dont understand this media element, ignore it + continue + widget = self._fields[field.type_] - self.add_row(widget(field, self, options)) + self._add_row(widget(field, self, options)) + + def _add_media_field(self, field, options): + if not field.type_ in ('text-single', 'text-private', 'text-multi'): + return False + + for uri in field.media.uris: + if not uri.type_.startswith('image/'): + continue + + if not uri.uri_data.startswith('cid'): + continue + + self._add_row(ImageMediaField(uri, self, options)) + return True + return False def validate(self, is_valid): value = self._data_form.is_valid() if is_valid else False @@ -460,3 +483,23 @@ class TextMultiField(Field): def _changed(self, widget): self._field.value = widget.get_text(*widget.get_bounds(), False) self._validate() + + +class ImageMediaField(): + def __init__(self, uri, form_grid, options): + self._uri = uri + self._form_grid = form_grid + + filename = uri.uri_data.split(':')[1].split('@')[0] + data = app.bob_cache.get(filename) + if data is None: + self._image = Gtk.Image() + return + + pixbuf = scale_pixbuf_from_data(data, 170) + self._image = Gtk.Image.new_from_pixbuf(pixbuf) + self._image.set_halign(Gtk.Align.CENTER) + self._image.get_style_context().add_class('preview-image') + + def add(self, form_grid, row_number): + form_grid.attach(self._image, 1, row_number, 1, 1) ===================================== test/gtk/dataform.py ===================================== @@ -1,13 +1,45 @@ +from base64 import b64decode + from gi.repository import Gtk import nbxmpp from gajim.gtk.dataform import DataFormWidget from gajim.common.modules.dataforms import extend_form from gajim.common.const import CSSPriority +from gajim.common import app from test.gtk import util util.load_style('gajim.css', CSSPriority.APPLICATION) +image = '''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''' + +app.bob_cache['sha1+8f35fef110ffc5df08d579a50083ff9308fb6242'] = b64decode(image) + FORM = ''' <x xmlns='jabber:x:data' type='form'> <title>Bot Configuration</title> @@ -66,9 +98,16 @@ FORM = ''' <desc>Tell all your friends about your new bot!</desc> <required/> </field> + <field var='ocr' type='text-single' label='Fill in what you see'> + <media xmlns='urn:xmpp:media-element'> + <uri type='image/png'>cid:sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org</uri> + </media> + <required/> + </field> </x> ''' + class DataFormWindow(Gtk.Window): def __init__(self): Gtk.Window.__init__(self, title="Data Form Test") View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7f1dfe5a8caddf0f23bb13ac8d40ea0714… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7f1dfe5a8caddf0f23bb13ac8d40ea0714… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix typos in config.py
by Yann Leboulanger 14 Nov '18

14 Nov '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 4be49987 by Bronko at 2018-11-14T21:44:41Z fix typos in config.py - - - - - 1 changed file: - gajim/common/config.py Changes: ===================================== gajim/common/config.py ===================================== @@ -166,7 +166,7 @@ class Config: 'history_window_x-position': [opt_int, 0], 'history_window_y-position': [opt_int, 0], 'latest_disco_addresses': [opt_str, ''], - 'time_stamp': [opt_str, '[%X] ', _('This option let you customize timestamp that is printed in conversation. For exemple "[%H:%M] " will show "[hour:minute] ". See python doc on strftime for full documentation: http://docs.python.org/lib/module-time.html')], + 'time_stamp': [opt_str, '[%X] ', _('This option let you customize timestamp that is printed in conversation. For example "[%H:%M] " will show "[hour:minute] ". See python doc on strftime for full documentation: http://docs.python.org/lib/module-time.html')], 'before_nickname': [opt_str, '', _('Characters that are printed before the nickname in conversations')], 'after_nickname': [opt_str, ':', _('Characters that are printed after the nickname in conversations')], 'use_gpg_agent': [opt_bool, False], @@ -284,7 +284,7 @@ class Config: 'stun_server': [opt_str, '', _('STUN server to use when using Jingle')], 'show_affiliation_in_groupchat': [opt_bool, True, _('If true, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon')], 'global_proxy': [opt_str, '', _('Proxy used for all outgoing connections if the account does not have a specific proxy configured')], - 'ignore_incoming_attention': [opt_bool, False, _('If true, Gajim will ignore incoming attention requestd ("wizz").')], + 'ignore_incoming_attention': [opt_bool, False, _('If true, Gajim will ignore incoming attention requests ("wizz").')], 'remember_opened_chat_controls': [opt_bool, True, _('If enabled, Gajim will reopen chat windows that were opened last time Gajim was closed.')], 'positive_184_ack': [opt_bool, False, _('If enabled, Gajim will show an icon to show that sent message has been received by your contact')], 'show_avatar_in_tabs': [opt_bool, False, _('Show a mini avatar in chat window tabs and in window icon')], View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4be49987045c74707a482ebbb5919788b3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4be49987045c74707a482ebbb5919788b3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix incorrect contact status on tabs
by Philipp Hörist 13 Nov '18

13 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9e24c72b by Philipp Hörist at 2018-11-13T22:47:54Z Fix incorrect contact status on tabs - - - - - 1 changed file: - gajim/common/connection_handlers.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== @@ -146,6 +146,7 @@ class ConnectionHandlersBase: obj.contact_list.append(obj.contact) obj.contact.resource = resource + obj.need_redraw = True obj.need_add_in_roster = True if not app.jid_is_transport(jid) and len(obj.contact_list) == 1: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9e24c72ba5f747f8f6f9718a0413959c10… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9e24c72ba5f747f8f6f9718a0413959c10… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 19 commits: Flatpak: update dependencies and use pip to install modules
by Philipp Hörist 13 Nov '18

13 Nov '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 8bbf3392 by André Apitzsch at 2018-11-13T20:56:19Z Flatpak: update dependencies and use pip to install modules - - - - - 213da73b by André Apitzsch at 2018-11-13T20:56:19Z Flatpak: use X11 access only if a X11 session is running Requires flatpak 1.0 or newer - - - - - 298fb153 by Philipp Hörist at 2018-11-13T20:56:20Z Better determine soundplayer on unix systems - sys.platform == 'linux', excludes many other unix systems - use shutil.which() to test if a command is available - - - - - 8061146d by Philipp Hörist at 2018-11-13T20:56:20Z Remove unused code Code is also not cross-platform compatible - - - - - 959a51c5 by Philipp Hörist at 2018-11-13T20:56:20Z Dont test if winsound is available Its a standard library which will be always available in our builds - - - - - 67786dfd by Philipp Hörist at 2018-11-13T20:56:20Z Try to play sound on all unix systems sys.platform == 'linux' excludeds other unix systems, for example FreeBSD - - - - - 584c9ff6 by Philipp Hörist at 2018-11-13T20:56:20Z Move imports into function - - - - - 08bde952 by Philipp Hörist at 2018-11-13T20:56:20Z Dont test if precis_i18n is available Its listed as dependency - - - - - 57dad43d by Philipp Hörist at 2018-11-13T20:56:21Z Dont test for sys.platform == 'linux' This excludes other unix systems which was not intended - - - - - 510985d7 by Philipp Hörist at 2018-11-13T20:56:21Z Enforce min and max version for plugin manifest This reduces problems with old plugins without max version - - - - - 5981396a by Philipp Hörist at 2018-11-13T20:56:21Z Pass account to plugins when encrypting a file - - - - - 2c2943de by Philipp Hörist at 2018-11-13T20:56:21Z Determine absolut path for custom config folder When a relative custom config path is passed via commandline, the logic which decides if a plugin can be deleted from the plugin manager fails - - - - - 19a46070 by Philipp Hörist at 2018-11-13T20:58:32Z Windows: Remove old ssl fix - - - - - e95a7fcc by André Apitzsch at 2018-11-13T20:59:58Z Test: Remove unused xmpp_mocks - - - - - e8941a4f by André Apitzsch at 2018-11-13T21:00:40Z Test: remove unused imports - - - - - 8946af33 by André Apitzsch at 2018-11-13T21:00:40Z Test: caps cache: use mock from unittest - - - - - 958e1390 by André Apitzsch at 2018-11-13T21:00:40Z Restructure test - - - - - cd65b591 by Andrey Gursky at 2018-11-13T21:00:41Z Fix clipboard paste in inactive window Fixes #9427 - - - - - df626712 by Philipp Hörist at 2018-11-13T21:01:18Z Correctly remove placeholder on focus in This is a regression from e281fb68 Fixes #9440 - - - - - 30 changed files: - .gitlab-ci.yml - flatpak/org.gajim.Gajim.yaml - gajim/common/configpaths.py - gajim/common/dbus_support.py - gajim/common/helpers.py - gajim/common/modules/httpupload.py - gajim/gui_interface.py - gajim/message_textview.py - gajim/notify.py - gajim/plugins/pluginmanager.py - gajim/roster_window.py - setup.cfg - setup.py - test/integration/test_gui_event_integration.py → test/broken/integration/test_gui_event_integration.py - test/integration/test_roster.py → test/broken/integration/test_roster.py - test/test_pluginmanager.py → test/broken/test_pluginmanager.py - test/unit/test_jingle.py → test/broken/unit/test_jingle.py - test/unit/test_sessions.py → test/broken/unit/test_sessions.py - test/unit/test_socks5.py → test/broken/unit/test_socks5.py - test/gtk/htmltextview.py - test/integration/test_resolver.py - test/lib/__init__.py - test/lib/gajim_mocks.py - − test/lib/xmpp_mocks.py - + test/no_gui/__init__.py - + test/no_gui/unit/__init__.py - test/unit/test_account.py → test/no_gui/unit/test_account.py - test/unit/test_caps_cache.py → test/no_gui/unit/test_caps_cache.py - test/unit/test_contacts.py → test/no_gui/unit/test_contacts.py - test/unit/test_protocol_caps.py → test/no_gui/unit/test_protocol_caps.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/335c3e2d3df71fb07a6d96e9c0b6ae3db… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/335c3e2d3df71fb07a6d96e9c0b6ae3db… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Get objdump output as string
by Philipp Hörist 13 Nov '18

13 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8f6dfad4 by Philipp Hörist at 2018-11-13T19:59:55Z Windows: Get objdump output as string Otherwise we have to guess the encoding of the host system - - - - - 1 changed file: - win/misc/depcheck.py Changes: ===================================== win/misc/depcheck.py ===================================== @@ -47,7 +47,7 @@ SYSTEM_LIBS = ['advapi32.dll', def get_dependencies(filename): deps = [] try: - data = subprocess.check_output(["objdump", "-p", filename]) + data = subprocess.getoutput("objdump -p %s" % filename) except Exception as error: print(error) return deps View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8f6dfad44e482ec0267c14f6f33845d2b0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8f6dfad44e482ec0267c14f6f33845d2b0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Harden parser against xml vulnerabilities
by Philipp Hörist 12 Nov '18

12 Nov '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 70de8004 by Philipp Hörist at 2018-11-12T20:22:14Z Harden parser against xml vulnerabilities - - - - - 5 changed files: - nbxmpp/dispatcher_nb.py - nbxmpp/simplexml.py - + test/__init__.py - test/runtests.py - + test/unit/test_xml_vulnerability.py Changes: ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -235,8 +235,9 @@ class XMPPDispatcher(PlugIn): if self.Stream and self.Stream.has_received_endtag(): self._owner.disconnect(self.Stream.streamError) return 0 - except ExpatError: + except ExpatError as error: log.error('Invalid XML received from server. Forcing disconnect.') + log.error(error) self._owner.Connection.disconnect() return 0 except ValueError as e: ===================================== nbxmpp/simplexml.py ===================================== @@ -22,6 +22,7 @@ from __future__ import unicode_literals import sys import xml.parsers.expat +from xml.parsers.expat import ExpatError import logging log = logging.getLogger('nbxmpp.simplexml') @@ -566,10 +567,17 @@ class NodeBuilder(object): """ log.debug("Preparing to handle incoming XML stream.") self._parser = xml.parsers.expat.ParserCreate() + self._parser.UseForeignDTD(False) self._parser.StartElementHandler = self.starttag self._parser.EndElementHandler = self.endtag self._parser.StartNamespaceDeclHandler = self.handle_namespace_start self._parser.CharacterDataHandler = self.handle_cdata + self._parser.StartDoctypeDeclHandler = self.handle_invalid_xmpp_element + self._parser.EntityDeclHandler = self.handle_invalid_xmpp_element + self._parser.CommentHandler = self.handle_invalid_xmpp_element + self._parser.ExternalEntityRefHandler = self.handle_invalid_xmpp_element + self._parser.AttlistDeclHandler = self.handle_invalid_xmpp_element + self._parser.ProcessingInstructionHandler = self.handle_invalid_xmpp_element self._parser.buffer_text = True self.Parse = self._parser.Parse @@ -673,6 +681,10 @@ class NodeBuilder(object): self.data_buffer = [data] self.last_is_data = 1 + @staticmethod + def handle_invalid_xmpp_element(*args): + raise ExpatError('Found invalid xmpp stream element: %s' % str(args)) + def handle_namespace_start(self, prefix, uri): """ XML Parser callback. Used internally ===================================== test/__init__.py ===================================== ===================================== test/runtests.py ===================================== @@ -38,6 +38,7 @@ modules = ( 'unit.test_xmpp_dispatcher_nb', 'unit.test_xmpp_smacks', #'unit.test_xmpp_client_nb', gajim.org only supports TLS/SSL connections 'unit.test_xmpp_transports_nb2', + 'unit.test_xml_vulnerability', ) nb_errors = 0 ===================================== test/unit/test_xml_vulnerability.py ===================================== @@ -0,0 +1,73 @@ +import unittest +from unittest.mock import Mock + +from nbxmpp import dispatcher_nb + + +class XMLVulnerability(unittest.TestCase): + + def setUp(self): + self.client = Mock() + self.client.Connection = Mock() + self.dispatcher = dispatcher_nb.XMPPDispatcher() + self.dispatcher.PlugIn(self.client) + self.dispatcher.StreamInit() + + def tearDown(self): + self.dispatcher = None + self.client = None + + def test_exponential_entity_expansion(self): + bomb = """<?xml version="1.0" encoding="utf-8"?> + <!DOCTYPE bomb [ + <!ENTITY a "test"> + <!ENTITY b "&a;&a;&a;&a;&a;&a;&a;&a;&a;&a;&a;&a;&a;&a;&a;&a;"> + <!ENTITY c "&b;&b;&b;&b;&b;&b;&b;&b;&b;&b;&b;&b;&b;&b;&b;&b;"> + ]> + <bomb>&c;</bomb>""" + + self.dispatcher.ProcessNonBlocking(bomb) + self.client.Connection.disconnect.assert_called() + + def test_quadratic_blowup(self): + bomb = """<?xml version="1.0" encoding="utf-8"?> + <!DOCTYPE bomb [ + <!ENTITY a "xxxxxxx... a couple of ten thousand chars"> + ]> + <bomb>&a;&a;&a;... repeat</bomb>""" + + self.dispatcher.ProcessNonBlocking(bomb) + self.client.Connection.disconnect.assert_called() + + def test_external_entity_expansion(self): + bomb = """<?xml version="1.0" encoding="utf-8"?> + <!DOCTYPE external [ + <!ENTITY ee SYSTEM "http://www.python.org/some.xml"> + ]> + <root>&ee;</root>""" + + self.dispatcher.ProcessNonBlocking(bomb) + self.client.Connection.disconnect.assert_called() + + def test_external_local_entity_expansion(self): + bomb = """<?xml version="1.0" encoding="utf-8"?> + <stream:stream xmlns:stream='http://etherx.jabber.org/streams' xmlns='jabber:client'> + <!DOCTYPE external [ + <!ENTITY ee SYSTEM "file:///PATH/TO/simple.xml"> + ]> + <root>&ee;</root>""" + + self.dispatcher.ProcessNonBlocking(bomb) + self.client.Connection.disconnect.assert_called() + + def test_dtd_retrival(self): + bomb = """<?xml version="1.0" encoding="utf-8"?> + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + <html> + <head/> + <body>text</body> + </html>""" + + self.dispatcher.ProcessNonBlocking(bomb) + self.client.Connection.disconnect.assert_called() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/70de8004a84ef62e0e2c25bc1c… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/70de8004a84ef62e0e2c25bc1c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Correctly remove placeholder on focus in
by Philipp Hörist 12 Nov '18

12 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9c5de3bf by Philipp Hörist at 2018-11-12T16:47:04Z Correctly remove placeholder on focus in This is a regression from e281fb68 Fixes #9440 - - - - - 1 changed file: - gajim/message_textview.py Changes: ===================================== gajim/message_textview.py ===================================== @@ -98,6 +98,7 @@ class MessageTextView(Gtk.TextView): self.connect('paste-clipboard', self._paste_clipboard) self.connect_after('paste-clipboard', self._after_paste_clipboard) + self.connect('focus-in-event', self._on_grab_focus) self.connect('grab-focus', self._on_grab_focus) self.connect('focus-out-event', self._on_focus_out) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9c5de3bf25cd2183bd70a813da99772f8b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9c5de3bf25cd2183bd70a813da99772f8b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor htmltextview test
by Philipp Hörist 11 Nov '18

11 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: f26db884 by Philipp Hörist at 2018-11-11T21:54:43Z Refactor htmltextview test - - - - - 1 changed file: - test/gtk/htmltextview.py Changes: ===================================== test/gtk/htmltextview.py ===================================== @@ -1,17 +1,14 @@ -import sys -import os from unittest.mock import MagicMock -sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))) - -from gi.repository import Gtk, Gdk +import gi +gi.require_version('Gtk', '3.0') +from gi.repository import Gtk from gajim.common import app from gajim.common import configpaths configpaths.init() from gajim.common import caps_cache -from gajim.gtk.util import get_cursor from gajim.conversation_textview import ConversationTextview from gajim.gui_interface import Interface @@ -20,168 +17,192 @@ app.plugin_manager = MagicMock() app.logger = MagicMock() app.interface = Interface() -change_cursor = None -htmlview = ConversationTextview(None) - - -def on_textview_motion_notify_event(widget, event): - """ - Change the cursor to a hand when we are over a mail or an url - """ - global change_cursor - w = htmlview.tv.get_window(Gtk.TextWindowType.TEXT) - device = w.get_display().get_device_manager().get_client_pointer() - pointer = w.get_device_position(device) - x = pointer[1] - y = pointer[2] - tags = htmlview.tv.get_iter_at_location(x, y)[1].get_tags() - if change_cursor: - w.set_cursor(get_cursor('XTERM')) - change_cursor = None - for tag in tags: - try: - if tag.is_anchor: - w.set_cursor(get_cursor('HAND2')) - change_cursor = tag - except Exception: - pass - -htmlview.tv.connect('motion_notify_event', on_textview_motion_notify_event) - -def handler(texttag, widget, event, iter_, kind): - if event.type == Gdk.EventType.BUTTON_PRESS: - pass - - -htmlview.print_real_text(None, xhtml='<div>' -'Hello \n' - ' <img src="http://images.slashdot.org/topics/topicsoftware.gif"/> \n' -'World\n' - '</div>\n') -htmlview.print_real_text(None, xhtml='<hr />') -htmlview.print_real_text(None, xhtml=''' -<body xmlns='http://www.w3.org/1999/xhtml'> - a:b - <a href='http://google.com/' xmlns='http://www.w3.org/1999/xhtml'>Google - </a> - -</body>''') -htmlview.print_real_text(None, xhtml=''' - <body xmlns='http://www.w3.org/1999/xhtml'> - - O - MG, - I'm green - with envy! - - </body> - ''') -htmlview.print_real_text(None, xhtml='<hr />') -htmlview.print_real_text(None, xhtml=''' -<body xmlns='http://www.w3.org/1999/xhtml'> + +XHTML = [ + ''' + <div> + Hello + \n + <img src="http://images.slashdot.org/topics/topicsoftware.gif"/> + \n + World\n + </div> + \n + ''', + + ''' + <hr /> + ''', + + ''' + <body xmlns='http://www.w3.org/1999/xhtml'> + a:b + <a href='http://google.com/' xmlns='http://www.w3.org/1999/xhtml'>Google</a> + + + </body> + ''', + + ''' + <body xmlns='http://www.w3.org/1999/xhtml'> + + O + MG + , I'm greenwith + envy! + + </body> + ''', + + ''' + <hr /> + ''', + + ''' + <body xmlns='http://www.w3.org/1999/xhtml'> http://test.com/ testing links autolinkifying -</body> - ''') -htmlview.print_real_text(None, xhtml='<hr />') -htmlview.print_real_text(None, xhtml=''' -<body xmlns='http://www.w3.org/1999/xhtml'> - As Emerson said in his essay Self-Reliance: - - "A foolish consistency is the hobgoblin of little minds." - -</body> - ''') -htmlview.print_real_text(None, xhtml='<hr />') -htmlview.print_real_text(None, xhtml=''' -<body xmlns='http://www.w3.org/1999/xhtml'> - - Hey, are you licensed to <a href='http://www.jabber.org/'>Jabber</a>? - - - <img src='http://www.xmpp.org/images/psa-license.jpg' - alt='A License to Jabber' width='50%' height='50%'/> - -</body> - ''') -htmlview.print_real_text(None, xhtml='<hr />') -htmlview.print_real_text(None, xhtml=''' -<body xmlns='http://www.w3.org/1999/xhtml'> - <ul style='background-color:rgb(120,140,100)'> - <li> One </li> - <li> Two </li> - <li> Three </li> - </ul><hr /><pre style="background-color:rgb(120,120,120)">def fac(n): -def faciter(n,acc): -if n==0: return acc -return faciter(n-1, acc*n) -if n<0: raise ValueError('Must be non-negative') -return faciter(n,1)</pre> -</body> - ''') -htmlview.print_real_text(None, xhtml='<hr />') -htmlview.print_real_text(None, xhtml=''' -<body xmlns='http://www.w3.org/1999/xhtml'> - <ol style='background-color:rgb(120,140,100)'> - <li> One </li> - <li> Two is nested: <ul style='background-color:rgb(200,200,100)'> - <li> One </li> - <li style='font-size:50%'> Two </li> - <li style='font-size:200%'> Three </li> - <li style='font-size:9999pt'> Four </li> - </ul></li> - <li> Three </li></ol> -</body> - ''') -htmlview.print_real_text(None, xhtml='<hr />') -htmlview.print_real_text(None, xhtml=''' -<body xmlns='http://www.w3.org/1999/xhtml'> - - - <a href='xmpp:example@example.org'>xmpp link</a> - : -<div xmlns='http://www.w3.org/1999/xhtml'> - <cite style='margin: 7px;' title='xmpp:examples@example.org'> - - examples(a)example.org wrote: - - this cite - bla bla bla, smile- :-) … - </cite> - <div> - some text - </div> -</div> - -#232/1 -</body> -''') -htmlview.print_real_text(None, xhtml='<hr />') -htmlview.print_real_text(None, xhtml=''' -<body xmlns='http://www.w3.org/1999/xhtml'> - -<img src='data:image/png;base64,R0lGODdhMAAwAPAAAAAAAP///ywAAAAAMAAw\ -AAAC8IyPqcvt3wCcDkiLc7C0qwyGHhSWpjQu5yqmCYsapyuvUUlvONmOZtfzgFz\ -ByTB10QgxOR0TqBQejhRNzOfkVJ+5YiUqrXF5Y5lKh/DeuNcP5yLWGsEbtLiOSp\ -a/TPg7JpJHxyendzWTBfX0cxOnKPjgBzi4diinWGdkF8kjdfnycQZXZeYGejmJl\ -ZeGl9i2icVqaNVailT6F5iJ90m6mvuTS4OK05M0vDk0Q4XUtwvKOzrcd3iq9uis\ -F81M1OIcR7lEewwcLp7tuNNkM3uNna3F2JQFo97Vriy/Xl4/f1cf5VWzXyym7PH\ -hhx4dbgYKAAA7' alt='Larry'/> -</body> -''') -htmlview.tv.show() -sw = Gtk.ScrolledWindow() -sw.set_property('hscrollbar-policy', Gtk.PolicyType.AUTOMATIC) -sw.set_property('vscrollbar-policy', Gtk.PolicyType.AUTOMATIC) -sw.set_property('border-width', 0) -sw.add(htmlview.tv) -sw.show() -frame = Gtk.Frame() -frame.set_shadow_type(Gtk.ShadowType.IN) -frame.show() -frame.add(sw) -win = Gtk.Window() -win.add(frame) -win.set_default_size(400, 300) + </body> + ''', + + ''' + <hr /> + ''', + + ''' + <body xmlns='http://www.w3.org/1999/xhtml'> + As Emerson said in his essay Self-Reliance: + + "A foolish consistency is the hobgoblin of little minds." + + </body> + ''', + + ''' + <hr /> + ''', + + ''' + <body xmlns='http://www.w3.org/1999/xhtml'> + + Hey, are you licensed to <a href='http://www.jabber.org/'>Jabber</a>? + + + <img src='http://www.xmpp.org/images/psa-license.jpg' + alt='A License to Jabber' width='50%' height='50%'/> + + </body> + ''', + + ''' + <hr /> + ''', + + ''' + <body xmlns='http://www.w3.org/1999/xhtml'> + <ul style='background-color:rgb(120,140,100)'> + <li> One </li> + <li> Two </li> + <li> Three </li> + </ul> + <hr /> + <pre style="background-color:rgb(120,120,120)">def fac(n): + def faciter(n,acc): + if n==0: return acc + return faciter(n-1, acc*n) + if n<0: raise ValueError('Must be non-negative') + return faciter(n,1)</pre> + </body> + ''', + + ''' + <hr /> + ''', + + ''' + <body xmlns='http://www.w3.org/1999/xhtml'> + <ol style='background-color:rgb(120,140,100)'> + <li> One </li> + <li> + Two is nested: + <ul style='background-color:rgb(200,200,100)'> + <li> One </li> + <li style='font-size:50%'> Two </li> + <li style='font-size:200%'> Three </li> + <li style='font-size:9999pt'> Four </li> + </ul> + </li> + <li> Three </li> + </ol> + </body> + ''', + + ''' + <hr /> + ''', + + ''' + <body xmlns='http://www.w3.org/1999/xhtml'> + + + <a href='xmpp:example@example.org'>xmpp link</a> + : + + <div xmlns='http://www.w3.org/1999/xhtml'> + <cite style='margin: 7px;' title='xmpp:examples@example.org'> + + examples(a)example.org wrote: + + this cite - bla bla bla, smile- :-) … + </cite> + <div> + some text + </div> + </div> + + #232/1 + </body> + ''', + + ''' + <hr /> + ''', + + ''' + <body xmlns='http://www.w3.org/1999/xhtml'> + + <img src='data:image/png;base64,R0lGODdhMAAwAPAAAAAAAP///ywAAAAAMAAw\ + AAAC8IyPqcvt3wCcDkiLc7C0qwyGHhSWpjQu5yqmCYsapyuvUUlvONmOZtfzgFz\ + ByTB10QgxOR0TqBQejhRNzOfkVJ+5YiUqrXF5Y5lKh/DeuNcP5yLWGsEbtLiOSp\ + a/TPg7JpJHxyendzWTBfX0cxOnKPjgBzi4diinWGdkF8kjdfnycQZXZeYGejmJl\ + ZeGl9i2icVqaNVailT6F5iJ90m6mvuTS4OK05M0vDk0Q4XUtwvKOzrcd3iq9uis\ + F81M1OIcR7lEewwcLp7tuNNkM3uNna3F2JQFo97Vriy/Xl4/f1cf5VWzXyym7PH\ + hhx4dbgYKAAA7' alt='Larry'/> + </body> + ''', + +] + + +class TextviewWindow(Gtk.Window): + def __init__(self): + Gtk.Window.__init__(self, title="Textview Test") + self.set_default_size(600, 600) + + self._textview = ConversationTextview(None) + + scrolled = Gtk.ScrolledWindow() + scrolled.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) + scrolled.add(self._textview.tv) + self.add(scrolled) + self.show() + self._print_xhtml() + + def _print_xhtml(self): + for xhtml in XHTML: + self._textview.print_real_text(None, xhtml=xhtml) + +win = TextviewWindow() +win.connect("destroy", Gtk.main_quit) win.show_all() -win.connect('destroy', lambda win: Gtk.main_quit()) Gtk.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f26db88424f000a9dde21039f9a5f6a180… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f26db88424f000a9dde21039f9a5f6a180… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix clipboard paste in inactive window
by Philipp Hörist 11 Nov '18

11 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: e281fb68 by Andrey Gursky at 2018-11-11T16:20:36Z Fix clipboard paste in inactive window Fixes #9427 - - - - - 1 changed file: - gajim/message_textview.py Changes: ===================================== gajim/message_textview.py ===================================== @@ -98,13 +98,9 @@ class MessageTextView(Gtk.TextView): self.connect('paste-clipboard', self._paste_clipboard) self.connect_after('paste-clipboard', self._after_paste_clipboard) - self.connect('focus-in-event', self._on_focus_in) + self.connect('grab-focus', self._on_grab_focus) self.connect('focus-out-event', self._on_focus_out) - start = buffer_.get_bounds()[0] - buffer_.insert_with_tags( - start, self.PLACEHOLDER, self.placeholder_tag) - def _on_buffer_changed(self, *args): text = self.get_text() # Because of inserting and removing PLACEHOLDER text @@ -136,11 +132,14 @@ class MessageTextView(Gtk.TextView): text = buf.get_text(start, end, True) return text == self.PLACEHOLDER - def _on_focus_in(self, *args): + def remove_placeholder(self): if self.is_placeholder(): self.get_buffer().set_text('') self.toggle_speller(True) + def _on_grab_focus(self, *args): + self.remove_placeholder() + def _on_focus_out(self, *args): buf = self.get_buffer() start, end = buf.get_bounds() @@ -155,9 +154,6 @@ class MessageTextView(Gtk.TextView): spell_view = Gspell.TextView.get_from_gtk_text_view(self) spell_view.set_inline_spell_checking(activate) - def remove_placeholder(self): - self._on_focus_in() - @staticmethod def _paste_clipboard(textview): if textview.is_placeholder(): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e281fb6839034f904f49c787bbbd5e17cb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e281fb6839034f904f49c787bbbd5e17cb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Test: remove unused imports
by Philipp Hörist 11 Nov '18

11 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 49758ab3 by André Apitzsch at 2018-11-11T15:50:59Z Test: remove unused imports - - - - - 522eec00 by André Apitzsch at 2018-11-11T15:50:59Z Test: caps cache: use mock from unittest - - - - - 989926a6 by André Apitzsch at 2018-11-11T15:50:59Z Restructure test - - - - - 21 changed files: - .gitlab-ci.yml - setup.cfg - setup.py - test/integration/test_gui_event_integration.py → test/broken/integration/test_gui_event_integration.py - test/integration/test_roster.py → test/broken/integration/test_roster.py - test/test_pluginmanager.py → test/broken/test_pluginmanager.py - test/unit/test_jingle.py → test/broken/unit/test_jingle.py - test/unit/test_sessions.py → test/broken/unit/test_sessions.py - test/unit/test_socks5.py → test/broken/unit/test_socks5.py - test/gtk/htmltextview.py - test/integration/test_resolver.py - test/lib/__init__.py - test/lib/gajim_mocks.py - + test/no_gui/__init__.py - + test/no_gui/unit/__init__.py - test/unit/test_account.py → test/no_gui/unit/test_account.py - test/unit/test_caps_cache.py → test/no_gui/unit/test_caps_cache.py - test/unit/test_contacts.py → test/no_gui/unit/test_contacts.py - test/unit/test_protocol_caps.py → test/no_gui/unit/test_protocol_caps.py - − test/runtests.py - test/unit/test_gui_interface.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -10,7 +10,7 @@ stages: run-test: stage: test script: - - python3 setup.py test_nogui + - python3 setup.py test -s test.no_gui -q run-mypy: stage: test ===================================== setup.cfg ===================================== @@ -18,6 +18,7 @@ classifiers = [options] python_requires = >=3.5 packages = find: +test_suite = test install_requires = cssutils>=1.0.2 keyring ===================================== setup.py ===================================== @@ -176,27 +176,6 @@ class install(_install): _install.run(self) -class test(Command): - description = "Run all tests" - user_options = [] - - def initialize_options(self): - pass - - def finalize_options(self): - pass - - def run(self): - exit(subprocess.call("./test/runtests.py")) - - -class test_nogui(test): - description = "Run tests without GUI" - - def run(self): - exit(subprocess.call(["./test/runtests.py", "-n"])) - - class update_po(Command): description = "Update po files" user_options = [] @@ -229,8 +208,6 @@ setup( cmdclass={ 'build_py': build, 'install': install, - 'test': test, - 'test_nogui': test_nogui, 'update_po': update_po, }, entry_points={ ===================================== test/integration/test_gui_event_integration.py → test/broken/integration/test_gui_event_integration.py ===================================== ===================================== test/integration/test_roster.py → test/broken/integration/test_roster.py ===================================== @@ -5,7 +5,6 @@ lib.setup_env() from data import * -from mock import Mock, expectParams from gajim_mocks import * from gajim.common import app ===================================== test/test_pluginmanager.py → test/broken/test_pluginmanager.py ===================================== ===================================== test/unit/test_jingle.py → test/broken/unit/test_jingle.py ===================================== ===================================== test/unit/test_sessions.py → test/broken/unit/test_sessions.py ===================================== @@ -1,12 +1,10 @@ import unittest -import time - import lib lib.setup_env() - import notify +import nbxmpp from gajim.common import app from gajim.common import nec @@ -14,7 +12,6 @@ from gajim.common import ged from gajim.common.nec import NetworkEvent from gajim.common.modules.message import MessageReceivedEvent from gajim.common.modules.message import DecryptedMessageReceivedEvent -import nbxmpp from gajim.session import ChatControlSession from gajim.roster_window import RosterWindow @@ -54,8 +51,6 @@ class TestChatControlSession(unittest.TestCase): msg.setBody(msgtxt) msg.setType('chat') - tim = time.localtime() - encrypted = False xml = """<message from='%s' id='1' type='chat'><body>%s</body> <thread>123</thread></message>""" % (jid, msgtxt) stanza = nbxmpp.protocol.Message(node=nbxmpp.simplexml.XML2Node(xml)) ===================================== test/unit/test_socks5.py → test/broken/unit/test_socks5.py ===================================== @@ -167,8 +167,6 @@ class TestSocks5(unittest.TestCase): self._check_inout() - - if __name__ == '__main__': unittest.main() ===================================== test/gtk/htmltextview.py ===================================== @@ -15,7 +15,6 @@ from gajim.gtk.util import get_cursor from gajim.conversation_textview import ConversationTextview from gajim.gui_interface import Interface - caps_cache.capscache = MagicMock() app.plugin_manager = MagicMock() app.logger = MagicMock() @@ -24,6 +23,7 @@ app.interface = Interface() change_cursor = None htmlview = ConversationTextview(None) + def on_textview_motion_notify_event(widget, event): """ Change the cursor to a hand when we are over a mail or an url @@ -52,7 +52,6 @@ def handler(texttag, widget, event, iter_, kind): if event.type == Gdk.EventType.BUTTON_PRESS: pass -htmlview.tv.hyperlink_handler = htmlview.hyperlink_handler htmlview.print_real_text(None, xhtml='<div>' 'Hello \n' ===================================== test/integration/test_resolver.py ===================================== @@ -1,22 +1,19 @@ import unittest -import time - -import lib +from test import lib lib.setup_env() from gi.repository import GLib from gajim.common import resolver -from gajim_mocks import * - NONSENSE_NAME = 'sfsdfsdfsdf.sdfs.fsd' JABBERCZ_TXT_NAME = '_xmppconnect.jabber.cz' JABBERCZ_SRV_NAME = '_xmpp-client._tcp.jabber.cz' TEST_LIST = [(NONSENSE_NAME, 'srv', False), - (JABBERCZ_SRV_NAME, 'srv', True)] + (JABBERCZ_SRV_NAME, 'srv', True)] + class TestResolver(unittest.TestCase): ''' @@ -47,9 +44,9 @@ class TestResolver(unittest.TestCase): def _runGR(self, name, type_): self.resolver.resolve( - host = name, - type_ = type_, - on_ready = self._myonready) + host=name, + type_=type_, + on_ready=self._myonready) self.main_loop.run() ===================================== test/lib/__init__.py ===================================== @@ -1,26 +1,15 @@ -import sys import os -import getopt -use_x = True -shortargs = 'hnv:' -longargs = 'help no-x verbose=' -opts, args = getopt.getopt(sys.argv[1:], shortargs, longargs.split()) -for o, a in opts: - if o in ('-n', '--no-x'): - use_x = False - -gajim_root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '../..') - -# look for modules in the CWD, then gajim/test/lib, then gajim/gajim, -# then everywhere else -sys.path.insert(1, gajim_root) -sys.path.insert(1, gajim_root + '/test/lib') +from tempfile import gettempdir # a temporary version of ~/.gajim for testing -configdir = gajim_root + '/test/tmp' +configdir = os.path.join(gettempdir(), 'gajim') +os.makedirs(configdir, exist_ok=True) + # plugins config dir pluginsconfigdir = configdir + '/pluginsconfig' +# theme config directory +themedir = configdir + '/theme' # define _ for i18n import builtins @@ -28,7 +17,7 @@ builtins._ = lambda x: x from gajim.common.contacts import LegacyContactsAPI -def setup_env(): +def setup_env(use_x=True): # wipe config directory if os.path.isdir(configdir): import shutil @@ -36,6 +25,7 @@ def setup_env(): os.mkdir(configdir) os.mkdir(pluginsconfigdir) + os.mkdir(themedir) from gajim.common import configpaths configpaths.set_config_root(configdir) @@ -47,13 +37,10 @@ def setup_env(): import logging logging.basicConfig() - configpaths.override_path('DATA', gajim_root + '/gajim/data') app.use_x = use_x app.contacts = LegacyContactsAPI() app.connections = {} if use_x: - from gajim import gtkgui_helpers - gtkgui_helpers.GUI_DIR = gajim_root + '/gajim/data/gui' from gajim.application import GajimApplication app.app = GajimApplication() ===================================== test/lib/gajim_mocks.py ===================================== @@ -2,7 +2,7 @@ Module with dummy classes for Gajim specific unit testing ''' -from mock import Mock +from .mock import Mock from gajim.common import app from gajim.common import ged ===================================== test/no_gui/__init__.py ===================================== ===================================== test/no_gui/unit/__init__.py ===================================== @@ -0,0 +1,5 @@ +''' + +This package just contains plain unit tests + +''' ===================================== test/unit/test_account.py → test/no_gui/unit/test_account.py ===================================== @@ -3,11 +3,9 @@ Tests for Account classes ''' import unittest -import lib -lib.setup_env() - from gajim.common.account import Account + class Test(unittest.TestCase): def testInstantiate(self): ===================================== test/unit/test_caps_cache.py → test/no_gui/unit/test_caps_cache.py ===================================== @@ -3,16 +3,11 @@ Tests for capabilities and the capabilities cache ''' import unittest -import lib -lib.setup_env() - -from unittest.mock import MagicMock +from unittest.mock import MagicMock, Mock from nbxmpp import NS_MUC, NS_PING, NS_XHTML_IM, Iq from gajim.common import caps_cache as caps from gajim.common.modules.discovery import Discovery -from mock import Mock - COMPLEX_EXAMPLE = ''' <iq from='benvolio(a)capulet.lit/230193' id='disco1' to='juliet(a)capulet.lit/chamber' type='result'> <query xmlns='http://jabber.org/protocol/disco#info' node='http://psi-im.org#q07IKJEyjvHSyhy//CH0CxmKi8w='> @@ -64,7 +59,8 @@ class CommonCapsTest(unittest.TestCase): db_caps_cache = [ (self.caps_method, self.caps_hash, self.identities, self.features), ('old', self.node + '#' + self.caps_hash, self.identities, self.features)] - self.logger = Mock(returnValues={"iter_caps_data":db_caps_cache}) + self.logger = Mock() + self.logger.iter_caps_data = Mock(return_value=db_caps_cache) self.cc = caps.CapsCache(self.logger) caps.capscache = self.cc @@ -95,8 +91,10 @@ class TestCapsCache(CommonCapsTest): item = self.cc[self.client_caps] item.set_and_store(self.identities, self.features) - self.logger.mockCheckCall(0, "add_caps_entry", self.caps_method, - self.caps_hash, self.identities, self.features) + self.logger.add_caps_entry.assert_called_once_with(self.caps_method, + self.caps_hash, + self.identities, + self.features) def test_initialize_from_db(self): ''' Read cashed dummy data from db ''' ===================================== test/unit/test_contacts.py → test/no_gui/unit/test_contacts.py ===================================== @@ -2,12 +2,9 @@ Test for Contact, GC_Contact and Contacts ''' import unittest - -import lib -lib.setup_env() +from nbxmpp import NS_MUC from gajim.common.contacts import CommonContact, Contact, GC_Contact, LegacyContactsAPI -from nbxmpp import NS_MUC from gajim.common import caps_cache ===================================== test/unit/test_protocol_caps.py → test/no_gui/unit/test_protocol_caps.py ===================================== @@ -7,9 +7,6 @@ from unittest.mock import MagicMock import nbxmpp -import lib -lib.setup_env() - from gajim.common import app from gajim.common import nec from gajim.common import ged ===================================== test/runtests.py deleted ===================================== @@ -1,71 +0,0 @@ -#!/usr/bin/env python3 - - -''' -Runs Gajim's Test Suite - -Unit tests tests will be run on each commit. -''' - -import sys -import unittest -import getopt -use_x = True -verbose = 1 - -try: - shortargs = 'hnv:' - longargs = 'help no-x verbose=' - opts, args = getopt.getopt(sys.argv[1:], shortargs, longargs.split()) -except getopt.error as msg: - print(msg) - print('for help use --help') - sys.exit(2) -for o, a in opts: - if o in ('-h', '--help'): - print('runtests [--help] [--no-x] [--verbose level]') - sys.exit() - elif o in ('-n', '--no-x'): - use_x = False - elif o in ('-v', '--verbose'): - try: - verbose = int(a) - except Exception: - print('verbose must be a number >= 0') - sys.exit(2) - -# new test modules need to be added manually -modules = ( 'unit.test_protocol_caps', - 'unit.test_caps_cache', - 'unit.test_contacts', - 'unit.test_account', - ) - -if use_x: - modules += ( 'unit.test_sessions', - #'integration.test_gui_event_integration', - 'integration.test_roster', - 'integration.test_resolver', - 'unit.test_gui_interface', - ) - -nb_errors = 0 -nb_failures = 0 - -for mod in modules: - print("Now running: %s" % mod) - suite = unittest.defaultTestLoader.loadTestsFromName(mod) - result = unittest.TextTestRunner(verbosity=verbose).run(suite) - if use_x: - # Wait 500ms to be sure all timeout_add will be called before we cleanup main loop - import time - time.sleep(0.5) - # Clean main loop - from gi.repository import GLib - mc = GLib.main_context_default() - while mc.pending(): - mc.iteration() - nb_errors += len(result.errors) - nb_failures += len(result.failures) - -sys.exit(nb_errors + nb_failures) ===================================== test/unit/test_gui_interface.py ===================================== @@ -3,7 +3,7 @@ Some diverse tests covering functionality in the GUI Interface class. ''' import unittest -import lib +from test import lib lib.setup_env() from gajim.common import logging_helpers @@ -11,9 +11,6 @@ logging_helpers.set_quiet() from gajim.common import app -from gajim_mocks import MockLogger -app.logger = MockLogger() - from gajim.gui_interface import Interface from gi.repository import GLib View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5ecdfbee5c4ba4e084df4dc6b291c5a6a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5ecdfbee5c4ba4e084df4dc6b291c5a6a… 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