Commits

commits@gajim.org

17632 discussions

gajim: don't show delivery error messages for automatic message ...
by Gajim 09 Feb '16

09 Feb '16

changeset 29ba0262464d in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=29ba0262464d description: don't show delivery error messages for automatic message stanzas. Fixes #8222 diffstat: src/chat_control.py | 2 +- src/common/connection.py | 56 ++++++++++++++++++++----------- src/common/connection_handlers.py | 4 +- src/common/connection_handlers_events.py | 19 ++++++++++- 4 files changed, 58 insertions(+), 23 deletions(-) diffs (173 lines): diff -r 65ffcdd09223 -r 29ba0262464d src/chat_control.py --- a/src/chat_control.py Sun Jan 31 19:58:51 2016 +0100 +++ b/src/chat_control.py Mon Feb 08 22:31:36 2016 +0100 @@ -808,7 +808,7 @@ keyID=keyID, type_=type_, chatstate=chatstate, msg_id=msg_id, resource=resource, user_nick=self.user_nick, xhtml=xhtml, label=label, callback=_cb, callback_args=[callback] + callback_args, - control=self, attention=attention, correction_msg=correction_msg)) + control=self, attention=attention, correction_msg=correction_msg, automatic_message=False)) # Record the history of sent messages self.save_message(message, 'sent') diff -r 65ffcdd09223 -r 29ba0262464d src/common/connection.py --- a/src/common/connection.py Sun Jan 31 19:58:51 2016 +0100 +++ b/src/common/connection.py Mon Feb 08 22:31:36 2016 +0100 @@ -2135,17 +2135,42 @@ if obj.account != self.name: return + # parameters of this function are packet into _cb_parameters for later usage in _nec_stanza_message_outgoing's cb() def cb(jid, msg, keyID, forward_from, session, original_message, subject, type_, msg_iq, xhtml): if isinstance(msg_iq, list): for iq in msg_iq: gajim.nec.push_incoming_event(StanzaMessageOutgoingEvent( - None, conn=self, msg_iq=iq, now=obj.now)) + None, conn=self, msg_iq=iq, now=obj.now, automatic_message=obj.automatic_message, + _cb_parameters={"jid":jid, "msg":msg, "keyID":keyID, "forward_from":forward_from, + "session":session, "original_message":original_message, "subject":subject, "type_":type_, + "msg_iq":msg_iq, "xhtml":xhtml, "obj":obj})) else: gajim.nec.push_incoming_event(StanzaMessageOutgoingEvent(None, - conn=self, msg_iq=msg_iq, now=obj.now)) + conn=self, msg_iq=msg_iq, now=obj.now, automatic_message=obj.automatic_message, + _cb_parameters={"jid":jid, "msg":msg, "keyID":keyID, "forward_from":forward_from, + "session":session, "original_message":original_message, "subject":subject, "type_":type_, + "msg_iq":msg_iq, "xhtml":xhtml, "obj":obj})) + + self._prepare_message(obj.jid, obj.message, obj.keyID, type_=obj.type_, + subject=obj.subject, chatstate=obj.chatstate, msg_id=obj.msg_id, + resource=obj.resource, user_nick=obj.user_nick, xhtml=obj.xhtml, + label=obj.label, session=obj.session, forward_from=obj.forward_from, + form_node=obj.form_node, original_message=obj.original_message, + delayed=obj.delayed, attention=obj.attention, + correction_msg=obj.correction_msg, callback=cb) + + def _nec_stanza_message_outgoing(self, obj): + if obj.conn.name != self.name: + return + obj.msg_id = self.connection.send(obj.msg_iq, now=obj.now) + + # obj in this function is the obj as seen in _nec_message_outgoing() + def cb(obj, jid, msg, keyID, forward_from, session, original_message, + subject, type_, msg_iq, xhtml, msg_id): gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, - jid=jid, message=msg, keyID=keyID, chatstate=obj.chatstate)) + jid=jid, message=msg, keyID=keyID, chatstate=obj.chatstate, + automatic_message=obj.automatic_message, msg_id=msg_id)) if obj.callback: obj.callback(msg_iq, *obj.callback_args) @@ -2160,19 +2185,8 @@ else: self.log_message(jid, msg, forward_from, session, original_message, subject, type_, xhtml) - - self._prepare_message(obj.jid, obj.message, obj.keyID, type_=obj.type_, - subject=obj.subject, chatstate=obj.chatstate, msg_id=obj.msg_id, - resource=obj.resource, user_nick=obj.user_nick, xhtml=obj.xhtml, - label=obj.label, session=obj.session, forward_from=obj.forward_from, - form_node=obj.form_node, original_message=obj.original_message, - delayed=obj.delayed, attention=obj.attention, - correction_msg=obj.correction_msg, callback=cb) - - def _nec_stanza_message_outgoing(self, obj): - if obj.conn.name != self.name: - return - obj.msg_id = self.connection.send(obj.msg_iq, now=obj.now) + + cb(msg_id=obj.msg_id, **obj._cb_parameters) def send_contacts(self, contacts, fjid, type_='message'): """ @@ -2728,9 +2742,10 @@ obj.correction_msg.setBody(obj.message) if obj.xhtml: obj.correction_msg.setXHTML(xhtml) - self.connection.send(obj.correction_msg) + obj.msg_id = self.connection.send(obj.correction_msg) gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, - jid=obj.jid, message=obj.message, keyID=None, chatstate=None)) + jid=obj.jid, message=obj.message, keyID=None, chatstate=None, + automatic_message=obj.automatic_message, msg_id=obj.msg_id)) if obj.callback: obj.callback(obj.correction_msg, obj.message) return @@ -2741,9 +2756,10 @@ xhtml=obj.xhtml) if obj.label is not None: msg_iq.addChild(node=label) - self.connection.send(msg_iq) + obj.msg_id = self.connection.send(msg_iq) gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, - jid=obj.jid, message=obj.message, keyID=None, chatstate=None)) + jid=obj.jid, message=obj.message, keyID=None, chatstate=None, + automatic_message=obj.automatic_message, msg_id=obj.msg_id)) if obj.callback: obj.callback(msg_iq, obj.message) diff -r 65ffcdd09223 -r 29ba0262464d src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Jan 31 19:58:51 2016 +0100 +++ b/src/common/connection_handlers.py Mon Feb 08 22:31:36 2016 +0100 @@ -1235,7 +1235,7 @@ self.dispatch('DB_ERROR', (pritext, sectext)) gajim.nec.push_incoming_event(MessageErrorEvent(None, conn=self, fjid=frm, error_code=msg.getErrorCode(), error_msg=error_msg, - msg=msgtxt, time_=tim, session=session)) + msg=msgtxt, time_=tim, session=session, stanza=msg)) def _LastResultCB(self, con, iq_obj): log.debug('LastResultCB') @@ -1423,6 +1423,8 @@ # ID of urn:xmpp:ping requests self.awaiting_xmpp_ping_id = None self.continue_connect_info = None + # IDs of sent messages (https://trac.gajim.org/ticket/8222) + self.sent_message_ids = [] try: self.sleeper = common.sleepy.Sleepy() diff -r 65ffcdd09223 -r 29ba0262464d src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Jan 31 19:58:51 2016 +0100 +++ b/src/common/connection_handlers_events.py Mon Feb 08 22:31:36 2016 +0100 @@ -1580,14 +1580,30 @@ class MessageSentEvent(nec.NetworkIncomingEvent): name = 'message-sent' base_network_events = [] + + def generate(self): + if not self.automatic_message: + self.conn.sent_message_ids.append(self.msg_id) + # only record the last 20000 message ids (should be about 1MB [36 byte per uuid] + # and about 24 hours if you send out a message every 5 seconds) + self.conn.sent_message_ids = self.conn.sent_message_ids[-20000:] + return True class MessageNotSentEvent(nec.NetworkIncomingEvent): name = 'message-not-sent' base_network_events = [] -class MessageErrorEvent(nec.NetworkIncomingEvent): +class MessageErrorEvent(nec.NetworkIncomingEvent, HelperEvent): name = 'message-error' base_network_events = [] + + def generate(self): + self.get_id() + #only alert for errors of explicitly sent messages (see https://trac.gajim.org/ticket/8222) + if self.id_ in self.conn.sent_message_ids: + self.conn.sent_message_ids.remove(self.id_) + return True + return False class AnonymousAuthEvent(nec.NetworkIncomingEvent): name = 'anonymous-auth' @@ -2622,6 +2638,7 @@ self.control = None self.attention = False self.correction_msg = None + self.automatic_message = True def generate(self): return True

1 0

gajim: Ignore received message duplicates using sender jid, mess...
by Gajim 09 Feb '16

09 Feb '16

changeset 65d9193e5b68 in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=65d9193e5b68 description: Ignore received message duplicates using sender jid, message id and message content. See #8258 diffstat: src/common/connection_handlers.py | 2 ++ src/common/connection_handlers_events.py | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diffs (50 lines): diff -r 29ba0262464d -r 65d9193e5b68 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Feb 08 22:31:36 2016 +0100 +++ b/src/common/connection_handlers.py Mon Feb 08 23:08:26 2016 +0100 @@ -2168,6 +2168,8 @@ gajim.nec.push_incoming_event(SignedInEvent(None, conn=self)) self.send_awaiting_pep() self.continue_connect_info = None + # hashes of already received messages + self.received_message_hashes = [] def request_gmail_notifications(self): if not self.connection or self.connected < 2: diff -r 29ba0262464d -r 65d9193e5b68 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Feb 08 22:31:36 2016 +0100 +++ b/src/common/connection_handlers_events.py Mon Feb 08 23:08:26 2016 +0100 @@ -1391,10 +1391,12 @@ self.encrypted = self.msg_obj.encrypted self.forwarded = self.msg_obj.forwarded self.sent = self.msg_obj.sent + self.conn = self.msg_obj.conn self.popup = False self.msg_id = None # id in log database self.attention = False # XEP-0224 self.correct_id = None # XEP-0308 + self.msghash = None self.receipt_request_tag = self.stanza.getTag('request', namespace=nbxmpp.NS_RECEIPTS) @@ -1445,6 +1447,21 @@ if replace: self.correct_id = replace.getAttr('id') + # ignore message duplicates + if self.msgtxt and self.id_ and self.jid: + self.msghash = hashlib.sha256("%s|%s|%s" % ( + hashlib.sha256(str(self.msgtxt)).hexdigest(), + hashlib.sha256(str(self.id_)).hexdigest(), + hashlib.sha256(str(self.jid)).hexdigest())).digest() + if self.msghash in self.conn.received_message_hashes: + log.info("Ignoring duplicated message from '%s' with id '%s'" % (str(self.jid), str(self.id_))) + return False + else: + log.debug("subhashes: msgtxt, id_, jid = ('%s', '%s', '%s')" % (hashlib.sha256(str(self.msgtxt)).hexdigest(), hashlib.sha256(str(self.id_)).hexdigest(), hashlib.sha256(str(self.jid)).hexdigest())) + self.conn.received_message_hashes.append(self.msghash) + # only record the last 20000 hashes (should be about 1MB [32 bytes per hash] + # and about 24 hours if you receive a message every 5 seconds) + self.conn.received_message_hashes = self.conn.received_message_hashes[-20000:] return True class ChatstateReceivedEvent(nec.NetworkIncomingEvent):

1 0

gajim-plugins: decrypt encrypted images (conversations' encrypti...
by Gajim Plugins 08 Feb '16

08 Feb '16

changeset ca703ea05557 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=ca703ea05557 description: decrypt encrypted images (conversations' encryption mode) using aes_gcm.py from omemo plugin warning: this can take very long (about 1 minute for 1 MB) diffstat: url_image_preview/aes_gcm.py | 155 +++++++++++++++++++++++++++++++++ url_image_preview/manifest.ini | 2 +- url_image_preview/url_image_preview.py | 62 +++++++++++- 3 files changed, 210 insertions(+), 9 deletions(-) diffs (269 lines): diff -r 71138d5be41a -r ca703ea05557 url_image_preview/aes_gcm.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/url_image_preview/aes_gcm.py Mon Feb 08 20:25:57 2016 +0100 @@ -0,0 +1,155 @@ +# -*- coding: utf-8 -*- +# +# Copyright 2014 Jonathan Zdziarski <jonathan(a)zdziarski.com> +# +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors +# may be used to endorse or promote products derived from this software without +# specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import logging +from struct import pack, unpack + +from Crypto.Cipher import AES +from Crypto.Util import strxor + +log = logging.getLogger('gajim.plugin_system.aes_gcm') + + +def gcm_rightshift(vec): + for x in range(15, 0, -1): + c = vec[x] >> 1 + c |= (vec[x - 1] << 7) & 0x80 + vec[x] = c + vec[0] >>= 1 + return vec + + +def gcm_gf_mult(a, b): + mask = [0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01] + poly = [0x00, 0xe1] + + Z = [0] * 16 + V = [c for c in a] + + for x in range(128): + if b[x >> 3] & mask[x & 7]: + Z = [V[y] ^ Z[y] for y in range(16)] + bit = V[15] & 1 + V = gcm_rightshift(V) + V[0] ^= poly[bit] + return Z + + +def ghash(h, auth_data, data): + u = (16 - len(data)) % 16 + v = (16 - len(auth_data)) % 16 + + x = auth_data + chr(0) * v + data + chr(0) * u + x += pack('>QQ', len(auth_data) * 8, len(data) * 8) + + y = [0] * 16 + vec_h = [ord(c) for c in h] + + for i in range(0, len(x), 16): + block = [ord(c) for c in x[i:i + 16]] + y = [y[j] ^ block[j] for j in range(16)] + y = gcm_gf_mult(y, vec_h) + + return ''.join(chr(c) for c in y) + + +def inc32(block): + counter, = unpack('>L', block[12:]) + counter += 1 + return block[:12] + pack('>L', counter) + + +def gctr(k, icb, plaintext): + y = '' + if len(plaintext) == 0: + return y + + aes = AES.new(k) + cb = icb + + for i in range(0, len(plaintext), aes.block_size): + cb = inc32(cb) + encrypted = aes.encrypt(cb) + plaintext_block = plaintext[i:i + aes.block_size] + y += strxor.strxor(plaintext_block, encrypted[:len(plaintext_block)]) + + return y + + +def gcm_decrypt(k, iv, encrypted, auth_data, tag): + aes = AES.new(k) + h = aes.encrypt(chr(0) * aes.block_size) + + if len(iv) == 12: + y0 = iv + "\x00\x00\x00\x01" + else: + y0 = ghash(h, '', iv) + + decrypted = gctr(k, y0, encrypted) + s = ghash(h, auth_data, encrypted) + + t = aes.encrypt(y0) + T = strxor.strxor(s, t) + if T != tag: + raise ValueError('Decrypted data is invalid') + else: + return decrypted + + +def gcm_encrypt(k, iv, plaintext, auth_data): + aes = AES.new(k) + h = aes.encrypt(chr(0) * aes.block_size) + + if len(iv) == 12: + y0 = iv + "\x00\x00\x00\x01" + else: + y0 = ghash(h, '', iv) + + encrypted = gctr(k, y0, plaintext) + s = ghash(h, auth_data, encrypted) + + t = aes.encrypt(y0) + T = strxor.strxor(s, t) + return (encrypted, T) + + +def aes_encrypt(key, nonce, plaintext): + """ Use AES128 GCM with the given key and iv to encrypt the payload. """ + c, t = gcm_encrypt(key, nonce, plaintext, '') + result = c + t + return result + + +def aes_decrypt(key, nonce, payload): + """ Use AES128 GCM with the given key and iv to decrypt the payload. """ + ciphertext = payload[:-16] + mac = payload[-16:] + return gcm_decrypt(key, nonce, ciphertext, '', mac) diff -r 71138d5be41a -r ca703ea05557 url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Fri Feb 05 04:53:55 2016 +0100 +++ b/url_image_preview/manifest.ini Mon Feb 08 20:25:57 2016 +0100 @@ -1,7 +1,7 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.6.5 +version: 0.7 description: Url image preview in chatbox. Based on patch in <a href="http://trac.gajim.org/attachment/ticket/5300">ticket #5300</a>. authors = Denis Fomin <fominde(a)gmail.com> diff -r 71138d5be41a -r ca703ea05557 url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Fri Feb 05 04:53:55 2016 +0100 +++ b/url_image_preview/url_image_preview.py Mon Feb 08 20:25:57 2016 +0100 @@ -7,6 +7,7 @@ import urllib2 from urlparse import urlparse +import logging import nbxmpp from common import gajim from common import ged @@ -15,6 +16,9 @@ from plugins.helpers import log_calls, log from plugins.gui import GajimPluginConfigDialog from conversation_textview import TextViewImage +from .aes_gcm import aes_decrypt + +log = logging.getLogger('gajim.plugin_system.url_image_preview') ACCEPTED_MIME_TYPES = ('image/png','image/jpeg','image/gif','image/raw', 'image/svg+xml') @@ -140,12 +144,54 @@ # URL is already displayed return - # Start downloading image - gajim.thread_interface(helpers.download_image, [ self.textview.account, { - 'src': url, 'max_size': self.plugin.config['MAX_FILE_SIZE'] } ], - self._update_img, [url, file_mime, repl_start, repl_end]) + # check for encryption (conversations mode) + urlparts = urlparse(url) + key = '' + iv = '' + if len(urlparts.fragment): + fragment = [] + for i in range(0, len(urlparts.fragment), 2): + fragment.append( chr( int (urlparts.fragment[i:i+2], 16 ) ) ) + fragment = ''.join(fragment) + key = fragment[16:] + iv = fragment[:16] + + # decrypt if the encryption parameters are correct + if len(urlparts.fragment) and len(key)==32 and len(iv)==16: + def _decryptor((mem, alt), url, file_mime, repl_start, repl_end, key, iv): + if not mem: + log.error('Could not download image for URL: %s -- %s' % (url, alt)) + return + # start self._decrypt_url() in own thread and self._update_img() afterwards + gajim.thread_interface(self._decrypt_url, + [(mem, alt), key, iv], + self._update_img, + [url, file_mime, repl_start, repl_end, True]) + + # Start downloading image (_decryptor is callback when download has finished) + gajim.thread_interface(helpers.download_image, [ self.textview.account, { + 'src': url, 'max_size': self.plugin.config['MAX_FILE_SIZE'] } ], + _decryptor, [url, file_mime, repl_start, repl_end, key, iv]) + else: + # Start downloading image (self._update_img() is callback when download has finished) + gajim.thread_interface(helpers.download_image, [ self.textview.account, { + 'src': url, 'max_size': self.plugin.config['MAX_FILE_SIZE'] } ], + self._update_img, [url, file_mime, repl_start, repl_end]) - def _update_img(self, (mem, alt), url, file_mime, repl_start, repl_end): + def _decrypt_url(self, (mem, alt), key, iv): + try: + log.info("Before decrypt image") + mem = aes_decrypt(key, iv, mem) + log.info("After decrypt image") + except Exception: + log.error('Could not decrypt image for URL (exception raised): %s' % url) + raise + if not mem or not len(mem): + log.error('Could not decrypt image for URL: %s' % url) + return (None, alt) + return (mem, alt) + + def _update_img(self, (mem, alt), url, file_mime, repl_start, repl_end, decrypted=False): if mem: try: loader = gtk.gdk.PixbufLoader() @@ -179,8 +225,9 @@ log.error('Could not display image for URL: %s' % url) raise else: - # If image could not be downloaded, URL is already displayed - log.error('Could not download image for URL: %s -- %s' % (url, alt)) + if not decrypted: + # If image could not be downloaded, URL is already displayed + log.error('Could not download image for URL: %s -- %s' % (url, alt)) def _get_http_head (self, account, url): # Check if proxy is used @@ -345,4 +392,3 @@ def max_size_value_changed(self, widget): self.plugin.config['MAX_FILE_SIZE'] = self.max_file_size[ self.max_size_combobox.get_active()] -

1 0

gajim-plugins: merged upstream
by Gajim Plugins 08 Feb '16

08 Feb '16

changeset 5379369582e4 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=5379369582e4 description: merged upstream diffstat: ubuntu_integration/__init__.py | 1 - ubuntu_integration/doc/example.jpg | Bin ubuntu_integration/manifest.ini | 10 - ubuntu_integration/plugin.py | 196 ------------------------------ ubuntu_integration/ubuntu_integration.png | Bin 5 files changed, 0 insertions(+), 207 deletions(-) diffs (223 lines): diff -r ca703ea05557 -r 5379369582e4 ubuntu_integration/__init__.py --- a/ubuntu_integration/__init__.py Mon Feb 08 20:25:57 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -from plugin import UbuntuIntegrationPlugin diff -r ca703ea05557 -r 5379369582e4 ubuntu_integration/doc/example.jpg Binary file ubuntu_integration/doc/example.jpg has changed diff -r ca703ea05557 -r 5379369582e4 ubuntu_integration/manifest.ini --- a/ubuntu_integration/manifest.ini Mon Feb 08 20:25:57 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -[info] -name: Ubuntu Ayatana Integration -short_name: ubuntu_integration -version: 0.1.5 -description: This plugin integrates Gajim with the Ubuntu Messaging Menu. - You must have python-indicate and python-xdg (and Gajim obviously) installed to enable this plugin. - Many thanks to the guys from gajim(a)conference.gajim.org for answering my questions :) -authors: Michael Kainer <kaini(a)linuxlovers.at> -homepage: http://trac-plugins.gajim.org/wiki/UbuntuIntegrationPlugin -max_gajim_version: 0.16.9 diff -r ca703ea05557 -r 5379369582e4 ubuntu_integration/plugin.py --- a/ubuntu_integration/plugin.py Mon Feb 08 20:25:57 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,196 +0,0 @@ -# -*- coding: utf-8 -*- -""" -Ubuntu Ayatana Integration plugin. - -TODO: -* handle gc-invitation, subscription_request: it looks like they don't fire -* nice error if plugin can't load -* me menu -* permanent integration into the messaging menu after quitting gajim -* show/hide gajim on root menu entry -* switch workspace on click on events -* corrent group chat handling -* hide gajim if the plugin is disabled - -:author: Michael Kainer <kaini(a)linuxlovers.at> -:since: 21st October 2010 -:copyright: Copyright (2010) Michael Kainer <kaini1123(a)gmail.com> -:license: GPLv3 -""" -# Python -import time -# Gajim -from plugins import GajimPlugin -from plugins.plugin import GajimPluginException -from plugins.helpers import log_calls -from common import gajim -import gtkgui_helpers -try: - from xdg.BaseDirectory import load_data_paths - import indicate -except ImportError: - pass - - -class UbuntuIntegrationPlugin(GajimPlugin): - """ - Class for Messaging Menu and Me Menu. - """ - - @log_calls("UbuntuIntegrationPlugin") - def init(self): - """ - Does nothing. - """ - self.config_dialog = None - self.test_activatable() - - def test_activatable(self): - self.available_text = '' - try: - from xdg.BaseDirectory import load_data_paths - except ImportError: - self.activatable = False - self.available_text += _('python-xdg is missing! ' - 'Install python-xdg.\n') - try: - import indicate - except ImportError: - self.activatable = False - self.available_text += _('python-indicate is missing! ' - 'Install python-indicate.') - - def show_roster_window(a, b, c): - roster = gajim.interface.roster.window - roster.present() - - @log_calls("UbuntuIntegrationPlugin") - def activate(self): - """ - Displays gajim in the Messaging Menu. - """ - # {(account, jid): (indicator, [event, ...]), ...} - self.events = {} - - version = gajim.version.split('-')[0] - if version == '0.15' and self.available_text: - raise GajimPluginException(self.available_text) - - self.server = indicate.indicate_server_ref_default() - self.server.set_type("message.im") - dfile = "" - for file in load_data_paths("applications/gajim.desktop"): - dfile = file - break - if not dfile: - raise GajimPluginException("Can't locate gajim.desktop!") - self.server.set_desktop_file(dfile) - roster = gajim.interface.roster.window - self.server.connect('server-display', self.show_roster_window) - self.server.show() - - gajim.events.event_added_subscribe(self.on_event_added) - gajim.events.event_removed_subscribe(self.on_event_removed) - - @log_calls("UbuntuIntegrationPlugin") - def deactivate(self): - """ - Cleaning up. - """ - gajim.events.event_added_unsubscribe(self.on_event_added) - gajim.events.event_removed_unsubscribe(self.on_event_removed) - - if hasattr(self, 'server'): - self.server.hide() - del self.server - - if hasattr(self, 'events'): - for (_, event) in self.events: - event[0].hide() - del self.events - - def on_indicator_activate(self, indicator, _): - """ - Forwards the action to gajims event handler. - """ - key = indicator.key - event = self.events[key][1][0] - gajim.interface.handle_event(event.account, event.jid, event.type_) - - def on_event_added(self, event): - """ - Adds "Nickname Time" to the Messaging menu. - """ - print "----", event.type_ - - # Basic variables - account = event.account - jid = event.jid - when = time.time() - contact = "" - key = (account, jid) - - # Check if the event is valid and modify the variables - if event.type_ == "chat" or \ - event.type_ == "printed_chat" or \ - event.type_ == "normal" or \ - event.type_ == "printed_normal" or \ - event.type_ == "file-request" or \ - event.type_ == "jingle-incoming": - contact = gajim.contacts.get_contact_from_full_jid(account, jid) - if contact: - contact = contact.get_shown_name() - else: - contact = jid - elif event.type_ == "pm" or event.type_ == "printed_pm": - contact = gajim.get_nick_from_jid(gajim.get_room_from_fjid(jid)) +\ - "/" + gajim.get_room_and_nick_from_fjid(jid)[1] - elif event.type_ == "printed_marked_gc_msg": - contact = gajim.get_nick_from_jid(gajim.get_room_from_fjid(jid)) - else: - print "ignored" - return - - print account, jid, when, contact - - # Add a new indicator if necessary - if key not in self.events: - indicator = indicate.Indicator() - indicator.set_property("name", contact) - indicator.set_property_time("time", when) - indicator.set_property_bool("draw-attention", True) - if gajim.config.get("show_avatars_in_roster"): - pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(jid) - if pixbuf not in (None, "ask"): - indicator.set_property_icon("icon", pixbuf) - indicator.connect("user-display", self.on_indicator_activate) - indicator.show() - indicator.key = key - self.events[key] = (indicator, []) - - # Prepare the event and save it - event.time = when - self.events[key][1].append(event) - - def on_event_removed(self, events): - """ - Goes through the events and removes them from the array and - the indicator if there are no longer any events pending. - """ - for event in events: - print "====", event.type_ - - key = (event.account, event.jid) - - if key in self.events and \ - event in self.events[key][1]: - self.events[key][1].remove(event) - - if len(self.events[key][1]) == 0: # remove indicator - self.events[key][0].hide() - del self.events[key] - else: # set the indicator time to the text event - self.events[key][0].set_property_time("time", - self.events[key][1][0].time) - else: - print "ignored" diff -r ca703ea05557 -r 5379369582e4 ubuntu_integration/ubuntu_integration.png Binary file ubuntu_integration/ubuntu_integration.png has changed

1 0

gajim-plugins: remove the outdated ubuntu ayatana plugin. Fixes #94
by Gajim Plugins 07 Feb '16

07 Feb '16

changeset a1d73b70ebab in /home/hg/repos/gajim-plugins author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:gajim-plugins?cmd=changeset;node=a1d73b70ebab description: remove the outdated ubuntu ayatana plugin. Fixes #94 diffstat: ubuntu_integration/__init__.py | 1 - ubuntu_integration/doc/example.jpg | Bin ubuntu_integration/manifest.ini | 10 - ubuntu_integration/plugin.py | 196 ------------------------------ ubuntu_integration/ubuntu_integration.png | Bin 5 files changed, 0 insertions(+), 207 deletions(-) diffs (223 lines): diff -r 71138d5be41a -r a1d73b70ebab ubuntu_integration/__init__.py --- a/ubuntu_integration/__init__.py Fri Feb 05 04:53:55 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -from plugin import UbuntuIntegrationPlugin diff -r 71138d5be41a -r a1d73b70ebab ubuntu_integration/doc/example.jpg Binary file ubuntu_integration/doc/example.jpg has changed diff -r 71138d5be41a -r a1d73b70ebab ubuntu_integration/manifest.ini --- a/ubuntu_integration/manifest.ini Fri Feb 05 04:53:55 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -[info] -name: Ubuntu Ayatana Integration -short_name: ubuntu_integration -version: 0.1.5 -description: This plugin integrates Gajim with the Ubuntu Messaging Menu. - You must have python-indicate and python-xdg (and Gajim obviously) installed to enable this plugin. - Many thanks to the guys from gajim(a)conference.gajim.org for answering my questions :) -authors: Michael Kainer <kaini(a)linuxlovers.at> -homepage: http://trac-plugins.gajim.org/wiki/UbuntuIntegrationPlugin -max_gajim_version: 0.16.9 diff -r 71138d5be41a -r a1d73b70ebab ubuntu_integration/plugin.py --- a/ubuntu_integration/plugin.py Fri Feb 05 04:53:55 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,196 +0,0 @@ -# -*- coding: utf-8 -*- -""" -Ubuntu Ayatana Integration plugin. - -TODO: -* handle gc-invitation, subscription_request: it looks like they don't fire -* nice error if plugin can't load -* me menu -* permanent integration into the messaging menu after quitting gajim -* show/hide gajim on root menu entry -* switch workspace on click on events -* corrent group chat handling -* hide gajim if the plugin is disabled - -:author: Michael Kainer <kaini(a)linuxlovers.at> -:since: 21st October 2010 -:copyright: Copyright (2010) Michael Kainer <kaini1123(a)gmail.com> -:license: GPLv3 -""" -# Python -import time -# Gajim -from plugins import GajimPlugin -from plugins.plugin import GajimPluginException -from plugins.helpers import log_calls -from common import gajim -import gtkgui_helpers -try: - from xdg.BaseDirectory import load_data_paths - import indicate -except ImportError: - pass - - -class UbuntuIntegrationPlugin(GajimPlugin): - """ - Class for Messaging Menu and Me Menu. - """ - - @log_calls("UbuntuIntegrationPlugin") - def init(self): - """ - Does nothing. - """ - self.config_dialog = None - self.test_activatable() - - def test_activatable(self): - self.available_text = '' - try: - from xdg.BaseDirectory import load_data_paths - except ImportError: - self.activatable = False - self.available_text += _('python-xdg is missing! ' - 'Install python-xdg.\n') - try: - import indicate - except ImportError: - self.activatable = False - self.available_text += _('python-indicate is missing! ' - 'Install python-indicate.') - - def show_roster_window(a, b, c): - roster = gajim.interface.roster.window - roster.present() - - @log_calls("UbuntuIntegrationPlugin") - def activate(self): - """ - Displays gajim in the Messaging Menu. - """ - # {(account, jid): (indicator, [event, ...]), ...} - self.events = {} - - version = gajim.version.split('-')[0] - if version == '0.15' and self.available_text: - raise GajimPluginException(self.available_text) - - self.server = indicate.indicate_server_ref_default() - self.server.set_type("message.im") - dfile = "" - for file in load_data_paths("applications/gajim.desktop"): - dfile = file - break - if not dfile: - raise GajimPluginException("Can't locate gajim.desktop!") - self.server.set_desktop_file(dfile) - roster = gajim.interface.roster.window - self.server.connect('server-display', self.show_roster_window) - self.server.show() - - gajim.events.event_added_subscribe(self.on_event_added) - gajim.events.event_removed_subscribe(self.on_event_removed) - - @log_calls("UbuntuIntegrationPlugin") - def deactivate(self): - """ - Cleaning up. - """ - gajim.events.event_added_unsubscribe(self.on_event_added) - gajim.events.event_removed_unsubscribe(self.on_event_removed) - - if hasattr(self, 'server'): - self.server.hide() - del self.server - - if hasattr(self, 'events'): - for (_, event) in self.events: - event[0].hide() - del self.events - - def on_indicator_activate(self, indicator, _): - """ - Forwards the action to gajims event handler. - """ - key = indicator.key - event = self.events[key][1][0] - gajim.interface.handle_event(event.account, event.jid, event.type_) - - def on_event_added(self, event): - """ - Adds "Nickname Time" to the Messaging menu. - """ - print "----", event.type_ - - # Basic variables - account = event.account - jid = event.jid - when = time.time() - contact = "" - key = (account, jid) - - # Check if the event is valid and modify the variables - if event.type_ == "chat" or \ - event.type_ == "printed_chat" or \ - event.type_ == "normal" or \ - event.type_ == "printed_normal" or \ - event.type_ == "file-request" or \ - event.type_ == "jingle-incoming": - contact = gajim.contacts.get_contact_from_full_jid(account, jid) - if contact: - contact = contact.get_shown_name() - else: - contact = jid - elif event.type_ == "pm" or event.type_ == "printed_pm": - contact = gajim.get_nick_from_jid(gajim.get_room_from_fjid(jid)) +\ - "/" + gajim.get_room_and_nick_from_fjid(jid)[1] - elif event.type_ == "printed_marked_gc_msg": - contact = gajim.get_nick_from_jid(gajim.get_room_from_fjid(jid)) - else: - print "ignored" - return - - print account, jid, when, contact - - # Add a new indicator if necessary - if key not in self.events: - indicator = indicate.Indicator() - indicator.set_property("name", contact) - indicator.set_property_time("time", when) - indicator.set_property_bool("draw-attention", True) - if gajim.config.get("show_avatars_in_roster"): - pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(jid) - if pixbuf not in (None, "ask"): - indicator.set_property_icon("icon", pixbuf) - indicator.connect("user-display", self.on_indicator_activate) - indicator.show() - indicator.key = key - self.events[key] = (indicator, []) - - # Prepare the event and save it - event.time = when - self.events[key][1].append(event) - - def on_event_removed(self, events): - """ - Goes through the events and removes them from the array and - the indicator if there are no longer any events pending. - """ - for event in events: - print "====", event.type_ - - key = (event.account, event.jid) - - if key in self.events and \ - event in self.events[key][1]: - self.events[key][1].remove(event) - - if len(self.events[key][1]) == 0: # remove indicator - self.events[key][0].hide() - del self.events[key] - else: # set the indicator time to the text event - self.events[key][0].set_property_time("time", - self.events[key][1][0].time) - else: - print "ignored" diff -r 71138d5be41a -r a1d73b70ebab ubuntu_integration/ubuntu_integration.png Binary file ubuntu_integration/ubuntu_integration.png has changed

1 0

gajim-plugins: Ignore oob tag when oob url is the same as the bo...
by Gajim Plugins 05 Feb '16

05 Feb '16

changeset 71138d5be41a in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=71138d5be41a description: Ignore oob tag when oob url is the same as the body text (as sent by conversations) diffstat: url_image_preview/manifest.ini | 2 +- url_image_preview/url_image_preview.py | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletions(-) diffs (54 lines): diff -r 8e0104f168df -r 71138d5be41a url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Sun Jan 31 20:37:02 2016 +0100 +++ b/url_image_preview/manifest.ini Fri Feb 05 04:53:55 2016 +0100 @@ -1,7 +1,7 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.6.4 +version: 0.6.5 description: Url image preview in chatbox. Based on patch in <a href="http://trac.gajim.org/attachment/ticket/5300">ticket #5300</a>. authors = Denis Fomin <fominde(a)gmail.com> diff -r 8e0104f168df -r 71138d5be41a url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Sun Jan 31 20:37:02 2016 +0100 +++ b/url_image_preview/url_image_preview.py Fri Feb 05 04:53:55 2016 +0100 @@ -7,7 +7,9 @@ import urllib2 from urlparse import urlparse +import nbxmpp from common import gajim +from common import ged from common import helpers from plugins import GajimPlugin from plugins.helpers import log_calls, log @@ -21,6 +23,9 @@ @log_calls('UrlImagePreviewPlugin') def init(self): self.config_dialog = UrlImagePreviewPluginConfigDialog(self) + self.events_handlers = {} + self.events_handlers['message-received'] = (ged.PRECORE, + self.handle_message_received) self.gui_extension_points = { 'chat_control_base': (self.connect_with_chat_control, self.disconnect_from_chat_control), @@ -32,6 +37,18 @@ self.chat_control = None self.controls = [] + # remove oob tag if oob url == message text + def handle_message_received(self, event): + oob_node = event.stanza.getTag('x', namespace=nbxmpp.NS_X_OOB) + oob_url = None + oob_desc = None + if oob_node: + oob_url = oob_node.getTagData('url') + oob_desc = oob_node.getTagData('desc') + if oob_url and oob_url == event.msgtxt and (not oob_desc or oob_desc == ""): + log.debug("Detected oob tag containing same url as the message text, deleting oob tag...") + event.stanza.delChild(oob_node) + @log_calls('UrlImagePreviewPlugin') def connect_with_chat_control(self, chat_control):

1 0

gajim-plugins: [plugin_installer] prevent a traceback.
by Gajim Plugins 31 Jan '16

31 Jan '16

changeset 8e0104f168df in /home/hg/repos/gajim-plugins author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:gajim-plugins?cmd=changeset;node=8e0104f168df description: [plugin_installer] prevent a traceback. diffstat: plugin_installer/manifest.ini | 2 +- plugin_installer/plugin_installer.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diffs (25 lines): diff -r bfa12b3fd164 -r 8e0104f168df plugin_installer/manifest.ini --- a/plugin_installer/manifest.ini Tue Jan 26 15:13:15 2016 +0100 +++ b/plugin_installer/manifest.ini Sun Jan 31 20:37:02 2016 +0100 @@ -1,7 +1,7 @@ [info] name: Plugin Installer short_name: plugin_installer -version: 0.11.20 +version: 0.11.21 description: Install and upgrade plugins from ftp authors: Denis Fomin <fominde(a)gmail.com> Yann Leboulanger <asterix(a)lagaule.org> diff -r bfa12b3fd164 -r 8e0104f168df plugin_installer/plugin_installer.py --- a/plugin_installer/plugin_installer.py Tue Jan 26 15:13:15 2016 +0100 +++ b/plugin_installer/plugin_installer.py Sun Jan 31 20:37:02 2016 +0100 @@ -468,7 +468,8 @@ selection = self.available_treeview.get_selection() if selection.count_selected_rows() == 0: root_iter = self.available_plugins_model.get_iter_root() - selection.select_iter(root_iter) + if root_iter: + selection.select_iter(root_iter) scr_win = self.xml.get_object('scrolledwindow2') vadjustment = scr_win.get_vadjustment() if vadjustment:

1 0

gajim: correctly store and restore single message subject. Fixes...
by Gajim 31 Jan '16

31 Jan '16

changeset 65ffcdd09223 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=65ffcdd09223 description: correctly store and restore single message subject. Fixes #8251 diffstat: src/chat_control.py | 12 ++++++++---- src/common/connection.py | 5 +---- src/common/logger.py | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diffs (74 lines): diff -r 209d558b9401 -r 65ffcdd09223 src/chat_control.py --- a/src/chat_control.py Sun Jan 24 19:12:30 2016 +0000 +++ b/src/chat_control.py Sun Jan 31 19:58:51 2016 +0100 @@ -2957,7 +2957,8 @@ local_old_kind = None self.conv_textview.just_cleared = True for row in rows: # row[0] time, row[1] has kind, row[2] the message - if not row[2]: # message is empty, we don't print it + msg = row[2] + if not msg: # message is empty, we don't print it continue if row[1] in (constants.KIND_CHAT_MSG_SENT, constants.KIND_SINGLE_MSG_SENT): @@ -2978,9 +2979,12 @@ else: small_attr = [] xhtml = None - if row[2].startswith('<body '): - xhtml = row[2] - ChatControlBase.print_conversation_line(self, row[2], kind, name, + if msg.startswith('<body '): + xhtml = msg + if row[3]: + msg = _('Subject: %(subject)s\n%(message)s') % \ + {'subject': row[3], 'message': msg} + ChatControlBase.print_conversation_line(self, msg, kind, name, tim, small_attr, small_attr + ['restored_message'], small_attr + ['restored_message'], False, old_kind=local_old_kind, xhtml=xhtml) diff -r 209d558b9401 -r 65ffcdd09223 src/common/connection.py --- a/src/common/connection.py Sun Jan 24 19:12:30 2016 +0000 +++ b/src/common/connection.py Sun Jan 31 19:58:51 2016 +0100 @@ -522,9 +522,6 @@ log_msg = msg if original_message is not None: log_msg = original_message - if subject: - log_msg = _('Subject: %(subject)s\n%(message)s') % \ - {'subject': subject, 'message': log_msg} if log_msg: if type_ == 'chat': kind = 'chat_msg_sent' @@ -534,7 +531,7 @@ if xhtml and gajim.config.get('log_xhtml_messages'): log_msg = '<body xmlns="%s">%s</body>' % ( nbxmpp.NS_XHTML, xhtml) - gajim.logger.write(kind, jid, log_msg) + gajim.logger.write(kind, jid, log_msg, subject=subject) except exceptions.PysqliteOperationalError as e: self.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) diff -r 209d558b9401 -r 65ffcdd09223 src/common/logger.py --- a/src/common/logger.py Sun Jan 24 19:12:30 2016 +0000 +++ b/src/common/logger.py Sun Jan 31 19:58:51 2016 +0100 @@ -585,8 +585,8 @@ Accept how many rows to restore and when to time them out (in minutes) (mark them as too old) and number of messages that are in queue and are already logged but pending to be viewed, returns a list of tupples - containg time, kind, message, list with empty tupple if nothing found to - meet our demands + containg time, kind, message, sibject list with empty tupple if nothing + found to meet our demands """ try: self.get_jid_id(jid) @@ -601,7 +601,7 @@ # 3 - 8 (we avoid the last 2 lines but we still return 5 asked) try: self.cur.execute(''' - SELECT time, kind, message FROM logs + SELECT time, kind, message, subject FROM logs WHERE (%s) AND kind IN (%d, %d, %d, %d, %d) AND time > %d ORDER BY time DESC LIMIT %d OFFSET %d ''' % (where_sql, constants.KIND_SINGLE_MSG_RECV,

1 0

gajim-plugins: Squashed 'omemo/lib/python-omemo/' content from c...
by Gajim Plugins 26 Jan '16

26 Jan '16

changeset 126ab83789e3 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=126ab83789e3 description: Squashed 'omemo/lib/python-omemo/' content from commit b396ef9 git-subtree-dir: omemo/lib/python-omemo git-subtree-split: b396ef99d7665e82d9d5dafe83473f2e9d0cba66 diffstat: .ackrc | 19 + .bumpversion.cfg | 11 + .cookiecutterrc | 47 ++ .coveragerc | 12 + .editorconfig | 13 + .gitignore | 63 +++ .travis.yml | 44 ++ AUTHORS.rst | 7 + CHANGELOG.rst | 8 + CONTRIBUTING.rst | 280 +++++++++++++ COPYING | 675 +++++++++++++++++++++++++++++++++ MANIFEST.in | 21 + README.rst | 123 ++++++ appveyor.yml | 110 +++++ ci/appveyor-bootstrap.py | 113 +++++ ci/appveyor-download.py | 107 +++++ ci/appveyor-with-compiler.cmd | 46 ++ ci/bootstrap.py | 53 ++ ci/templates/.travis.yml | 37 + ci/templates/appveyor.yml | 53 ++ docs/authors.rst | 1 + docs/changelog.rst | 1 + docs/conf.py | 54 ++ docs/contributing.rst | 1 + docs/index.rst | 22 + docs/installation.rst | 7 + docs/readme.rst | 1 + docs/reference/index.rst | 7 + docs/reference/omemo.rst | 8 + docs/requirements.txt | 2 + docs/spelling_wordlist.txt | 11 + docs/usage.rst | 7 + setup.cfg | 44 ++ setup.py | 67 +++ src/.gitignore | 2 + src/.style.yapf | 4 + src/COPYING | 674 ++++++++++++++++++++++++++++++++ src/omemo.png | Bin src/omemo/__init__.py | 1 + src/omemo/aes_gcm.py | 160 +++++++ src/omemo/db_helpers.py | 13 + src/omemo/encryption.py | 95 ++++ src/omemo/liteaxolotlstore.py | 127 ++++++ src/omemo/liteidentitykeystore.py | 76 +++ src/omemo/liteprekeystore.py | 72 +++ src/omemo/litesessionstore.py | 80 +++ src/omemo/litesignedprekeystore.py | 77 +++ src/omemo/state.py | 298 ++++++++++++++ tests/test_db_helpers.py | 19 + tests/test_encryption_store.py | 31 + tests/test_migrate_encryption_state.py | 47 ++ tests/test_omemo.py | 6 + tests/test_omemo_state.py | 107 +++++ tox.ini | 131 ++++++ 54 files changed, 4095 insertions(+), 0 deletions(-) diffs (truncated from 4309 to 300 lines): diff -r 000000000000 -r 126ab83789e3 .ackrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.ackrc Tue Jan 26 14:54:59 2016 +0100 @@ -0,0 +1,19 @@ +--ignore-dir + .tox + +--ignore-dir + dist + +--ignore-dir + .venv + +--ignore-dir + .ropeproject + +--ignore-dir + src/omemo.egg-info/ + +--ignore-file +ext:pyc +--ignore-file +match:.coverage.python diff -r 000000000000 -r 126ab83789e3 .bumpversion.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.bumpversion.cfg Tue Jan 26 14:54:59 2016 +0100 @@ -0,0 +1,11 @@ +[bumpversion] +current_version = 0.1.0 +commit = True +tag = True + +[bumpversion:file:setup.py] + +[bumpversion:file:docs/conf.py] + +[bumpversion:file:src/omemo/__init__.py] + diff -r 000000000000 -r 126ab83789e3 .cookiecutterrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.cookiecutterrc Tue Jan 26 14:54:59 2016 +0100 @@ -0,0 +1,47 @@ +# This file exists so you can easily regenerate your project. +# +# `cookiepatcher` is a convenient shim around `cookiecutter` +# for regenerating projects (it will generate a .cookiecutterrc +# automatically for any template). To use it: +# +# pip install cookiepatcher +# cookiepatcher gh:ionelmc/cookiecutter-pylibrary project-path +# +# See: +# https://pypi.python.org/pypi/cookiecutter +# +# Alternatively, you can run: +# +# cookiecutter --overwrite-if-exists --config-file=project-path/.cookiecutterrc gh:ionelmc/cookiecutter-pylibrary + +default_context: + + appveyor: 'yes' + bin_name: 'omemo' + c_extension_cython: 'no' + c_extension_optional: 'no' + c_extension_support: 'no' + codacy: 'no' + codeclimate: 'no' + codecov: 'yes' + command_line_interface: 'no' + coveralls: 'no' + distribution_name: 'python-omemo' + email: 'bahtiar(a)gadimov.de' + full_name: 'Bahtiar `kalkin-` Gadimov' + github_username: 'kalkin' + landscape: 'no' + package_name: 'omemo' + project_name: 'Python OMEMO Library' + project_short_description: 'This is an implementation o*OMEMO Multi-End Message and Object Encryption** in Python.' + release_date: 'today' + repo_name: 'python-omemo' + requiresio: 'yes' + scrutinizer: 'no' + sphinx_theme: 'readthedocs' + test_matrix_configurator: 'no' + test_runner: 'pytest' + travis: 'yes' + version: '0.1.0' + website: 'https://github.com/omemo' + year: 'now' diff -r 000000000000 -r 126ab83789e3 .coveragerc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.coveragerc Tue Jan 26 14:54:59 2016 +0100 @@ -0,0 +1,12 @@ +[paths] +source = src + +[run] +branch = True +source = src +parallel = true + +[report] +show_missing = true +precision = 2 +omit = *migrations* diff -r 000000000000 -r 126ab83789e3 .editorconfig --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.editorconfig Tue Jan 26 14:54:59 2016 +0100 @@ -0,0 +1,13 @@ +# see http://editorconfig.org +root = true + +[*] +end_of_line = lf +trim_trailing_whitespace = true +insert_final_newline = true +indent_style = space +indent_size = 4 +charset = utf-8 + +[*.{bat,cmd,ps1}] +end_of_line = crlf diff -r 000000000000 -r 126ab83789e3 .gitignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.gitignore Tue Jan 26 14:54:59 2016 +0100 @@ -0,0 +1,63 @@ +*.py[cod] + +# C extensions +*.so + +# Packages +*.egg +*.egg-info +dist +build +eggs +.eggs +parts +bin +var +sdist +develop-eggs +.installed.cfg +lib +lib64 +venv*/ +pyvenv*/ + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +.tox +.coverage.* +nosetests.xml +coverage.xml +htmlcov + +# Translations +*.mo + +# Mr Developer +.mr.developer.cfg +.project +.pydevproject +.idea +*.iml +*.komodoproject + +# Complexity +output/*.html +output/*/index.html + +# Sphinx +docs/_build + +.DS_Store +*~ +.*.sw[po] +.build +.ve +.env +.cache +.pytest +.bootstrap +.appveyor.token +*.bak diff -r 000000000000 -r 126ab83789e3 .travis.yml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.travis.yml Tue Jan 26 14:54:59 2016 +0100 @@ -0,0 +1,44 @@ +language: python +python: '3.5' +sudo: false +env: + global: + - LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so + - SEGFAULT_SIGNALS=all + matrix: + - TOXENV=check + + - TOXENV=py27-cover,codecov + - TOXENV=py27-nocov + - TOXENV=py33-cover,codecov + - TOXENV=py33-nocov + - TOXENV=py34-cover,codecov + - TOXENV=py34-nocov + - TOXENV=py35-cover,codecov + - TOXENV=py35-nocov + - TOXENV=pypy-cover,codecov + - TOXENV=pypy-nocov +before_install: + - python --version + - uname -a + - lsb_release -a +install: + - pip install tox + - virtualenv --version + - easy_install --version + - pip --version + - tox --version +script: + - tox -v +after_failure: + - more .tox/log/* | cat + - more .tox/*/log/* | cat +before_cache: + - rm -rf $HOME/.cache/pip/log +cache: + directories: + - $HOME/.cache/pip +notifications: + email: + on_success: never + on_failure: always diff -r 000000000000 -r 126ab83789e3 AUTHORS.rst --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/AUTHORS.rst Tue Jan 26 14:54:59 2016 +0100 @@ -0,0 +1,7 @@ + +Authors +======= + +* Bahtiar `kalkin-` Gadimov - https://github.com/kalkin +* Daniel Gultsch - https://github.com/inputmice +* Tarek Galal - https://github.com/tgalal (original axolotl store implementation) diff -r 000000000000 -r 126ab83789e3 CHANGELOG.rst --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/CHANGELOG.rst Tue Jan 26 14:54:59 2016 +0100 @@ -0,0 +1,8 @@ + +Changelog +========= + +0.1.0 (2016-01-11) +----------------------------------------- + +* First release on PyPI. diff -r 000000000000 -r 126ab83789e3 CONTRIBUTING.rst --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/CONTRIBUTING.rst Tue Jan 26 14:54:59 2016 +0100 @@ -0,0 +1,280 @@ +.. _c4 +===================================== +Collective Code Construction Contract +===================================== + + +The **Collective Code Construction Contract (C4)** is an evolution of the +`github.com Fork + Pull Model +<https://help.github.com/articles/using-pull-requests/>`_, aimed at providing an +optimal collaboration model for free software projects. This is revision 1 of +the C4 specification. + +License +======= +Copyright (c) 2009-2015 Pieter Hintjens. + +This Specification 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; either version 3 of the License, or (at your option) any +later version. + +This Specification 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 +this program; if not, see <http://www.gnu.org/licenses>. + +Language +======== + +The key words "**MUST**", "**MUST NOT**", "**REQUIRED**", "**SHALL**", "**SHALL NOT**", "**SHOULD**", +"**SHOULD NOT**", "**RECOMMENDED**", "**MAY**", and "**OPTIONAL**" in this document are to be +interpreted as described in `RFC 2119 <https://tools.ietf.org/html/rfc2119>`_. +

1 0

gajim-plugins: Update archlinux PKGBUILD to 0.3
by Gajim Plugins 26 Jan '16

26 Jan '16

changeset 3cc1152c2aa4 in /home/hg/repos/gajim-plugins author: cippaciong <lacapannadelloziotom(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=3cc1152c2aa4 description: Update archlinux PKGBUILD to 0.3 diffstat: omemo/pkgs/PKGBUILD | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 0ad2a8bf5e82 -r 3cc1152c2aa4 omemo/pkgs/PKGBUILD --- a/omemo/pkgs/PKGBUILD Sun Jan 10 21:12:12 2016 +0100 +++ b/omemo/pkgs/PKGBUILD Mon Jan 11 11:05:06 2016 +0100 @@ -2,7 +2,7 @@ pkgname=gajim-plugin-omemo _pkgname=gajim-omemo -pkgver=0.2 +pkgver=0.3 pkgrel=1 pkgdesc="Gajim plugin for OMEMO Multi-End Message and Object Encryption." arch=(any) @@ -12,7 +12,7 @@ provides=('gajim-plugin-omemo') conflicts=('gajim-plugin-omemo-git') source=("https://github.com/kalkin/${_pkgname}/archive/${pkgver}.tar.gz") -sha512sums=('c7a5f78011c3c2fcce03871620a5980fb3b8a2450e46d8e640e19f2bd0c058a89710ccddd051b135098509c46ef2cb2300256de9550df188149a148778f1a0c2') +sha512sums=('0f4f1c1d6b799c3a6c159d33b4c65367da038db75f169793f13d2710b93d3651489cccd17b3782093a3a76324d701dbf9facacd373526f70e9c274e21f9f2b57') package() { cd $srcdir/gajim-omemo-${pkgver}

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