Commits September 2013

commits@gajim.org

2 participants
122 discussions

gajim: typo
by Gajim 28 Sep '13

28 Sep '13

changeset e8058d4e0c19 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=e8058d4e0c19 description: typo diffstat: src/gtkgui_helpers.py | 7 +++---- 1 файлов изменено, 3 вставок(+), 4 удалений(-) различия (25 строк): diff -r e241d2170da8 -r e8058d4e0c19 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Tue Sep 17 12:41:32 2013 +0400 +++ b/src/gtkgui_helpers.py Sun Sep 29 01:06:37 2013 +0400 @@ -969,7 +969,7 @@ pixbuf = load_mood_icon(mood).get_pixbuf() return pixbuf elif isinstance(pep_class, pep.UserTunePEP): - icon = gtkgui_helpers.get_icon_pixmap('audio-x-generic', quiet=True) + icon = get_icon_pixmap('audio-x-generic', quiet=True) if not icon: path = os.path.join(gajim.DATA_DIR, 'emoticons', 'static', 'music.png') @@ -993,10 +993,9 @@ else: return load_activity_icon('unknown').get_pixbuf() elif isinstance(pep_class, pep.UserLocationPEP): - icon = gtkgui_helpers.get_icon_pixmap('applications-internet', - quiet=True) + icon = get_icon_pixmap('applications-internet', quiet=True) if not icon: - icon = gtkgui_helpers.get_icon_pixmap('gajim-earth') + icon = get_icon_pixmap('gajim-earth') return icon return None

1 0

gajim: Fix different background color for Birthday entry and Sta...
by Gajim 28 Sep '13

28 Sep '13

changeset 20b740413931 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=20b740413931 description: Fix different background color for Birthday entry and Status entry. See #7239 diffstat: data/gui/vcard_information_window.ui | 2 ++ 1 файлов изменено, 2 вставок(+), 0 удалений(-) различия (19 строк): diff -r 83c7be516721 -r 20b740413931 data/gui/vcard_information_window.ui --- a/data/gui/vcard_information_window.ui Tue Sep 24 17:03:30 2013 +0400 +++ b/data/gui/vcard_information_window.ui Sat Sep 28 17:32:09 2013 +0400 @@ -201,6 +201,7 @@ <child> <object class="GtkEventBox" id="status_label_eventbox"> <property name="visible">True</property> + <property name="visible_window">False</property> <child> <object class="GtkLabel" id="status_label"> <property name="visible">True</property> @@ -942,6 +943,7 @@ <object class="GtkEventBox" id="eventbox1"> <property name="visible">True</property> <property name="tooltip_text" translatable="yes">Format: YYYY-MM-DD</property> + <property name="visible_window">False</property> <child> <object class="GtkLabel" id="label13"> <property name="visible">True</property>

1 0

gajim-plugins: Colored traceback plugin. with wrong manifest.ui(...
by Gajim Plugins 25 Sep '13

25 Sep '13

changeset c35c8b4bfcb7 in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=c35c8b4bfcb7 description: Colored traceback plugin. with wrong manifest.ui(for devs) diffstat: colored_traceback/__init__.py | 1 + colored_traceback/colored_traceback.png | Bin colored_traceback/colored_traceback.py | 57 ++++++++++++++++++++++++++++++++ colored_traceback/manifest.ini | 8 ++++ 4 файлов изменено, 66 вставок(+), 0 удалений(-) различия (80 строк): diff -r 71b93ac2c414 -r c35c8b4bfcb7 colored_traceback/__init__.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/colored_traceback/__init__.py Wed Sep 25 11:00:02 2013 +0400 @@ -0,0 +1,1 @@ +from .colored_traceback import ColoredTracebackPlugin diff -r 71b93ac2c414 -r c35c8b4bfcb7 colored_traceback/colored_traceback.png Binary file colored_traceback/colored_traceback.png has changed diff -r 71b93ac2c414 -r c35c8b4bfcb7 colored_traceback/colored_traceback.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/colored_traceback/colored_traceback.py Wed Sep 25 11:00:02 2013 +0400 @@ -0,0 +1,57 @@ +# -*- coding: utf-8 -*- +## + +from common import gajim +from plugins import GajimPlugin +from plugins.helpers import log_calls +import sys +import os +import traceback +import threading +from cStringIO import StringIO + +have_pygments = True +try: + from pygments import highlight + from pygments.lexers import PythonConsoleLexer + from pygments.formatters import TerminalFormatter + test = PythonConsoleLexer.name + +except ImportError: + have_pygments = False +import catcher + +class ColoredTracebackPlugin(GajimPlugin): + + @log_calls('ColoredTracebackPlugin') + def init(self): + self.config_dialog = None # ColoredTracebackPluginConfigDialog(self) + if not have_pygments: + self.available_text = _('Pygments are not available. ' + 'Install python-pygments.') + self.activatable = False + + @log_calls('ColoredTracebackPlugin') + def activate(self): + # gdb/kdm etc if we use startx this is not True + if os.name == 'nt' or sys.stderr.isatty(): + self._exception_in_progress = threading.Lock() + self._excepthook_save = sys.excepthook + sys.excepthook = self._info + + @log_calls('ColoredTracebackPlugin') + def deactivate(self): + sys.excepthook = self._excepthook_save + + def _info(self, type_, value, tb): + if not self._exception_in_progress.acquire(False): + # Exceptions have piled up, so we use the default exception + # handler for such exceptions + self._excepthook_save(type_, value, tb) + return + trace = StringIO() + traceback.print_exception(type_, value, tb, None, trace) + + print highlight(trace.getvalue(), PythonConsoleLexer(), + TerminalFormatter()) + self._exception_in_progress.release() diff -r 71b93ac2c414 -r c35c8b4bfcb7 colored_traceback/manifest.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/colored_traceback/manifest.ini Wed Sep 25 11:00:02 2013 +0400 @@ -0,0 +1,8 @@ +[info] +name: Colored traceback +short_name: colored_traceback +#version: 0.0.0 +description: colored text for traceback in console +authors: Denis Fomin <fominde(a)gmail.com> +homepage: http://trac-plugins.gajim.org/wiki/ +max_gajim_version: 0.16.9

1 0

gajim: Set transient_for for 'Plugin already exists'
by Gajim 24 Sep '13

24 Sep '13

changeset 83c7be516721 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=83c7be516721 description: Set transient_for for 'Plugin already exists' diffstat: src/plugins/gui.py | 2 +- 1 файлов изменено, 1 вставок(+), 1 удалений(-) различия (12 строк): diff -r 70a8f4aadbf1 -r 83c7be516721 src/plugins/gui.py --- a/src/plugins/gui.py Sat Sep 21 14:06:45 2013 +0400 +++ b/src/plugins/gui.py Tue Sep 24 17:03:30 2013 +0400 @@ -284,7 +284,7 @@ sel.select_iter(iter_) YesNoDialog(_('Plugin already exists'), sectext=_('Overwrite?'), - on_response_yes=on_yes) + on_response_yes=on_yes, transient_for=self.window) def _try_install(zip_filename): try:

1 0

gajim-plugins: EmoticonsPackPlugin. Add EmotiPonies
by Gajim Plugins 24 Sep '13

24 Sep '13

changeset 8f0b8b34a043 in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.15 details:gajim-plugins?cmd=changeset;node=8f0b8b34a043 description: EmoticonsPackPlugin. Add EmotiPonies diffstat: emoticons_pack/contents.ini | 9 +++++++++ emoticons_pack/emoticons_pack.zip | Bin emoticons_pack/manifest.ini | 2 +- 3 файлов изменено, 10 вставок(+), 1 удалений(-) различия (33 строк): diff -r 1a016519eddd -r 8f0b8b34a043 emoticons_pack/contents.ini --- a/emoticons_pack/contents.ini Sun Sep 22 17:07:44 2013 +0200 +++ b/emoticons_pack/contents.ini Tue Sep 24 16:23:24 2013 +0400 @@ -16,6 +16,15 @@ converter: churchyard (JID: churchyard(a)njs.netlab.cz) homepage: https://trac.gajim.org/wiki/cittersemoticons +[EmotiPonies] +icon: pinkiesmile.png +description: <body xmlns='http://www.w3.org/1999/xhtml'> + EmotiPonies <br/> + <img src="preview.image"/> + </body> +authors: midori-no-ink (Copyright (c) Hasbro, Inc.) +homepage: https://trac.gajim.org/wiki/EmotiPonies + [Google Talk Emoticons] icon: equal_smile.gif description: <body xmlns='http://www.w3.org/1999/xhtml'> diff -r 1a016519eddd -r 8f0b8b34a043 emoticons_pack/emoticons_pack.zip Binary file emoticons_pack/emoticons_pack.zip has changed diff -r 1a016519eddd -r 8f0b8b34a043 emoticons_pack/manifest.ini --- a/emoticons_pack/manifest.ini Sun Sep 22 17:07:44 2013 +0200 +++ b/emoticons_pack/manifest.ini Tue Sep 24 16:23:24 2013 +0400 @@ -1,7 +1,7 @@ [info] name: Emoticons pack short_name: emoticons_pack -version: 0.0.2 +version: 0.0.4 description: Install, update and view detailed legend of emoticons authors: Denis Fomin <fominde(a)gmail.com> homepage: http://trac-plugins.gajim.org/wiki/

1 0

gajim-plugins: EmoticonsPackPlugin. Add EmotiPonies
by Gajim Plugins 24 Sep '13

24 Sep '13

changeset 71b93ac2c414 in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=71b93ac2c414 description: EmoticonsPackPlugin. Add EmotiPonies diffstat: emoticons_pack/contents.ini | 9 +++++++++ emoticons_pack/emoticons_pack.zip | Bin emoticons_pack/manifest.ini | 2 +- 3 файлов изменено, 10 вставок(+), 1 удалений(-) различия (33 строк): diff -r 4975f1df0e41 -r 71b93ac2c414 emoticons_pack/contents.ini --- a/emoticons_pack/contents.ini Sun Sep 22 17:08:37 2013 +0200 +++ b/emoticons_pack/contents.ini Tue Sep 24 16:18:59 2013 +0400 @@ -16,6 +16,15 @@ converter: churchyard (JID: churchyard(a)njs.netlab.cz) homepage: https://trac.gajim.org/wiki/cittersemoticons +[EmotiPonies] +icon: pinkiesmile.png +description: <body xmlns='http://www.w3.org/1999/xhtml'> + EmotiPonies <br/> + <img src="preview.image"/> + </body> +authors: midori-no-ink (Copyright (c) Hasbro, Inc.) +homepage: https://trac.gajim.org/wiki/EmotiPonies + [Google Talk Emoticons] icon: equal_smile.gif description: <body xmlns='http://www.w3.org/1999/xhtml'> diff -r 4975f1df0e41 -r 71b93ac2c414 emoticons_pack/emoticons_pack.zip Binary file emoticons_pack/emoticons_pack.zip has changed diff -r 4975f1df0e41 -r 71b93ac2c414 emoticons_pack/manifest.ini --- a/emoticons_pack/manifest.ini Sun Sep 22 17:08:37 2013 +0200 +++ b/emoticons_pack/manifest.ini Tue Sep 24 16:18:59 2013 +0400 @@ -1,7 +1,7 @@ [info] name: Emoticons pack short_name: emoticons_pack -version: 0.0.4 +version: 0.0.5 description: Install, update and view detailed legend of emoticons authors: Denis Fomin <fominde(a)gmail.com> homepage: http://trac-plugins.gajim.org/wiki/

1 0

gajim-plugins: gotr: push plugin version
by Gajim Plugins 22 Sep '13

22 Sep '13

changeset 1a016519eddd in /home/hg/repos/gajim-plugins author: Kjell Braden <afflux.gajim(a)pentabarf.de> branches: gajim_0.15 details:gajim-plugins?cmd=changeset;node=1a016519eddd description: gotr: push plugin version diffstat: gotr/manifest.ini | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r bded6f237d11 -r 1a016519eddd gotr/manifest.ini --- a/gotr/manifest.ini Sun Sep 22 17:05:14 2013 +0200 +++ b/gotr/manifest.ini Sun Sep 22 17:07:44 2013 +0200 @@ -1,7 +1,7 @@ [info] name: Off-The-Record Encryption short_name: gotr -version: 1.7.6 +version: 1.7.7 description: Provide OTR encryption authors: Kjell Braden <afflux.gajim(a)pentabarf.de> homepage: http://gajim-otr.pentabarf.de

1 0

gajim-plugins: gotr: push plugin version
by Gajim Plugins 22 Sep '13

22 Sep '13

changeset 4975f1df0e41 in /home/hg/repos/gajim-plugins author: Kjell Braden <afflux.gajim(a)pentabarf.de> branches: details:gajim-plugins?cmd=changeset;node=4975f1df0e41 description: gotr: push plugin version diffstat: gotr/manifest.ini | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 7a34f38ee083 -r 4975f1df0e41 gotr/manifest.ini --- a/gotr/manifest.ini Sun Sep 22 17:04:49 2013 +0200 +++ b/gotr/manifest.ini Sun Sep 22 17:08:37 2013 +0200 @@ -1,7 +1,7 @@ [info] name: Off-The-Record Encryption short_name: gotr -version: 1.7.6 +version: 1.7.7 description: Provide OTR encryption. See <a href="http://www.cypherpunks.ca/otr/">Author website</a> authors: Kjell Braden <afflux.gajim(a)pentabarf.de> homepage: http://gajim-otr.pentabarf.de

1 0

gajim-plugins: gotr: update provided potr to 1.0.0beta7
by Gajim Plugins 22 Sep '13

22 Sep '13

changeset 10545d5cd4f3 in /home/hg/repos/gajim-plugins author: Kjell Braden <afflux.gajim(a)pentabarf.de> branches: gtk3 details:gajim-plugins?cmd=changeset;node=10545d5cd4f3 description: gotr: update provided potr to 1.0.0beta7 diffstat: gotr/potr/__init__.py | 2 +- gotr/potr/compatcrypto/common.py | 14 +- gotr/potr/compatcrypto/pycrypto.py | 25 +-- gotr/potr/context.py | 156 ++++++++++++++++++++--------- gotr/potr/crypt.py | 188 ++++++++++++++++++------------------ gotr/potr/proto.py | 170 +++++++++++++++++++++------------ gotr/potr/utils.py | 5 +- 7 files changed, 332 insertions(+), 228 deletions(-) diffs (truncated from 1221 to 300 lines): diff -r b08c72baa3af -r 10545d5cd4f3 gotr/potr/__init__.py --- a/gotr/potr/__init__.py Wed Sep 04 21:57:11 2013 +0400 +++ b/gotr/potr/__init__.py Sun Sep 22 17:05:00 2013 +0200 @@ -24,4 +24,4 @@ ''' version is: (major, minor, patch, sub) with sub being one of 'alpha', 'beta', 'final' ''' -VERSION = (1, 0, 0, 'beta5') +VERSION = (1, 0, 0, 'beta7') diff -r b08c72baa3af -r 10545d5cd4f3 gotr/potr/compatcrypto/common.py --- a/gotr/potr/compatcrypto/common.py Wed Sep 04 21:57:11 2013 +0400 +++ b/gotr/potr/compatcrypto/common.py Sun Sep 22 17:05:00 2013 +0200 @@ -26,8 +26,8 @@ DEFAULT_KEYTYPE = 0x0000 pkTypes = {} def registerkeytype(cls): - if not hasattr(cls, 'parsePayload'): - raise TypeError('registered key types need parsePayload()') + if cls.keyType is None: + raise TypeError('registered key class needs a type value') pkTypes[cls.keyType] = cls return cls @@ -35,12 +35,16 @@ return pkTypes[DEFAULT_KEYTYPE].generate() class PK(object): - __slots__ = [] + keyType = None @classmethod def generate(cls): raise NotImplementedError + @classmethod + def parsePayload(cls, data, private=False): + raise NotImplementedError + def sign(self, data): raise NotImplementedError def verify(self, data): @@ -80,13 +84,13 @@ @classmethod def parsePrivateKey(cls, data): implCls, data = cls.getImplementation(data) - logging.debug('Got privkey of type %r' % implCls) + logging.debug('Got privkey of type %r', implCls) return implCls.parsePayload(data, private=True) @classmethod def parsePublicKey(cls, data): implCls, data = cls.getImplementation(data) - logging.debug('Got pubkey of type %r' % implCls) + logging.debug('Got pubkey of type %r', implCls) return implCls.parsePayload(data) def __str__(self): diff -r b08c72baa3af -r 10545d5cd4f3 gotr/potr/compatcrypto/pycrypto.py --- a/gotr/potr/compatcrypto/pycrypto.py Wed Sep 04 21:57:11 2013 +0400 +++ b/gotr/potr/compatcrypto/pycrypto.py Sun Sep 22 17:05:00 2013 +0200 @@ -15,18 +15,16 @@ # You should have received a copy of the GNU Lesser General Public License # along with this library. If not, see <http://www.gnu.org/licenses/>. -from Crypto import Cipher, Random +from Crypto import Cipher from Crypto.Hash import SHA256 as _SHA256 -from Crypto.Hash import SHA as _SHA1 +from Crypto.Hash import SHA as _SHA1 from Crypto.Hash import HMAC as _HMAC from Crypto.PublicKey import DSA +from Crypto.Random import random from numbers import Number from potr.compatcrypto import common -from potr.utils import pack_mpi, read_mpi, bytes_to_long, long_to_bytes - -# XXX atfork? -RNG = Random.new() +from potr.utils import read_mpi, bytes_to_long, long_to_bytes def SHA256(data): return _SHA256.new(data).digest() @@ -54,7 +52,6 @@ return Cipher.AES.new(key, Cipher.AES.MODE_CTR, counter=counter) class Counter(object): - __slots__ = ['prefix', 'val'] def __init__(self, prefix): self.prefix = prefix self.val = 0 @@ -72,17 +69,15 @@ return '<Counter(p={p!r},v={v!r})>'.format(p=self.prefix, v=self.val) def byteprefix(self): - return long_to_bytes(self.prefix).rjust(8, b'\0') + return long_to_bytes(self.prefix, 8) def __call__(self): - val = long_to_bytes(self.val) - prefix = long_to_bytes(self.prefix) + bytesuffix = long_to_bytes(self.val, 8) self.val += 1 - return self.byteprefix() + val.rjust(8, b'\0') + return self.byteprefix() + bytesuffix @common.registerkeytype class DSAKey(common.PK): - __slots__ = ['priv', 'pub'] keyType = 0x0000 def __init__(self, key=None, private=False): @@ -111,10 +106,10 @@ return SHA1(self.getSerializedPublicPayload()) def sign(self, data): - # 2 <= K <= q = 160bit = 20 byte - K = bytes_to_long(RNG.read(19)) + 2 + # 2 <= K <= q + K = random.randrange(2, self.priv.q) r, s = self.priv.sign(data, K) - return long_to_bytes(r) + long_to_bytes(s) + return long_to_bytes(r, 20) + long_to_bytes(s, 20) def verify(self, data, sig): r, s = bytes_to_long(sig[:20]), bytes_to_long(sig[20:]) diff -r b08c72baa3af -r 10545d5cd4f3 gotr/potr/context.py --- a/gotr/potr/context.py Wed Sep 04 21:57:11 2013 +0400 +++ b/gotr/potr/context.py Sun Sep 22 17:05:00 2013 +0200 @@ -19,7 +19,7 @@ from __future__ import unicode_literals try: - basestring = basestring + type(basestring) except NameError: # all strings are unicode in python3k basestring = str @@ -27,7 +27,7 @@ # callable is not available in python 3.0 and 3.1 try: - callable = callable + type(callable) except NameError: from collections import Callable def callable(x): @@ -42,6 +42,7 @@ from potr import crypt from potr import proto +from potr import compatcrypto from time import time @@ -62,16 +63,11 @@ OFFER_ACCEPTED = 3 class Context(object): - __slots__ = ['user', 'policy', 'crypto', 'tagOffer', 'lastSend', - 'lastMessage', 'mayRetransmit', 'fragment', 'fragmentInfo', 'state', - 'inject', 'trust', 'peer', 'trustName'] - def __init__(self, account, peername): self.user = account self.peer = peername self.policy = {} self.crypto = crypt.CryptEngine(self) - self.discardFragment() self.tagOffer = OFFER_NOTSENT self.mayRetransmit = 0 self.lastSend = 0 @@ -79,6 +75,10 @@ self.state = STATE_PLAINTEXT self.trustName = self.peer + self.fragmentInfo = None + self.fragment = None + self.discardFragment() + def getPolicy(self, key): raise NotImplementedError @@ -100,13 +100,19 @@ params = message.split(b',') if len(params) < 5 or not params[1].isdigit() or not params[2].isdigit(): logger.warning('invalid formed fragmented message: %r', params) - return None + self.discardFragment() + return message K, N = self.fragmentInfo + try: + k = int(params[1]) + n = int(params[2]) + except ValueError: + logger.warning('invalid formed fragmented message: %r', params) + self.discardFragment() + return message - k = int(params[1]) - n = int(params[2]) fragData = params[3] logger.debug(params) @@ -114,17 +120,17 @@ if n >= k == 1: # first fragment self.discardFragment() - self.fragmentInfo = (k,n) + self.fragmentInfo = (k, n) self.fragment.append(fragData) elif N == n >= k > 1 and k == K+1: # accumulate - self.fragmentInfo = (k,n) + self.fragmentInfo = (k, n) self.fragment.append(fragData) else: # bad, discard self.discardFragment() logger.warning('invalid fragmented message: %r', params) - return None + return message if n == k > 0: assembled = b''.join(self.fragment) @@ -210,7 +216,7 @@ if self.state != STATE_ENCRYPTED: self.sendInternal(proto.Error( 'You sent encrypted to {user}, who wasn\'t expecting it.' - .format(user=self.user.name)), appdata=appdata) + .format(user=self.user.name).encode('utf-8')), appdata=appdata) if ignore: return IGN raise NotEncryptedError(EXC_UNREADABLE_MESSAGE) @@ -263,12 +269,13 @@ return msg def processOutgoingMessage(self, msg, flags, tlvs=[]): - if isinstance(self.parse(msg), proto.Query): + isQuery = self.parseExplicitQuery(msg) is not None + if isQuery: return self.user.getDefaultQueryMessage(self.getPolicy) if self.state == STATE_PLAINTEXT: if self.getPolicy('REQUIRE_ENCRYPTION'): - if not isinstance(self.parse(msg), proto.Query): + if not isQuery: self.lastMessage = msg self.lastSend = time() self.mayRetransmit = 2 @@ -277,8 +284,12 @@ return msg if self.getPolicy('SEND_TAG') and self.tagOffer != OFFER_REJECTED: self.tagOffer = OFFER_SENT - return proto.TaggedPlaintext(msg, self.getPolicy('ALLOW_V1'), - self.getPolicy('ALLOW_V2')) + versions = set() + if self.getPolicy('ALLOW_V1'): + versions.add(1) + if self.getPolicy('ALLOW_V2'): + versions.add(2) + return proto.TaggedPlaintext(msg, versions) return msg if self.state == STATE_ENCRYPTED: msg = self.crypto.createDataMessage(msg, flags, tlvs) @@ -304,9 +315,9 @@ def sendFragmented(self, msg, policy=FRAGMENT_SEND_ALL, appdata=None): mms = self.maxMessageSize(appdata) msgLen = len(msg) - if mms != 0 and len(msg) > mms: + if mms != 0 and msgLen > mms: fms = mms - 19 - fragments = [ msg[i:i+fms] for i in range(0, len(msg), fms) ] + fragments = [ msg[i:i+fms] for i in range(0, msgLen, fms) ] fc = len(fragments) @@ -375,9 +386,9 @@ self.crypto.smpSecret(secret, question=question, appdata=appdata) def handleQuery(self, message, appdata=None): - if message.v2 and self.getPolicy('ALLOW_V2'): + if 2 in message.versions and self.getPolicy('ALLOW_V2'): self.authStartV2(appdata=appdata) - elif message.v1 and self.getPolicy('ALLOW_V1'): + elif 1 in message.versions and self.getPolicy('ALLOW_V1'): self.authStartV1(appdata=appdata) def authStartV1(self, appdata=None): @@ -386,7 +397,33 @@ def authStartV2(self, appdata=None): self.crypto.startAKE(appdata=appdata) - def parse(self, message): + def parseExplicitQuery(self, message): + otrTagPos = message.find(proto.OTRTAG) + + if otrTagPos == -1:

1 0

gajim-plugins: gotr: update provided potr to 1.0.0beta7
by Gajim Plugins 22 Sep '13

22 Sep '13

changeset bded6f237d11 in /home/hg/repos/gajim-plugins author: Kjell Braden <afflux.gajim(a)pentabarf.de> branches: gajim_0.15 details:gajim-plugins?cmd=changeset;node=bded6f237d11 description: gotr: update provided potr to 1.0.0beta7 diffstat: gotr/potr/__init__.py | 2 +- gotr/potr/compatcrypto/common.py | 14 +- gotr/potr/compatcrypto/pycrypto.py | 25 +-- gotr/potr/context.py | 156 ++++++++++++++++++++--------- gotr/potr/crypt.py | 188 ++++++++++++++++++------------------ gotr/potr/proto.py | 170 +++++++++++++++++++++------------ gotr/potr/utils.py | 5 +- 7 files changed, 332 insertions(+), 228 deletions(-) diffs (truncated from 1221 to 300 lines): diff -r 544a362f921f -r bded6f237d11 gotr/potr/__init__.py --- a/gotr/potr/__init__.py Fri Sep 20 16:13:30 2013 +0400 +++ b/gotr/potr/__init__.py Sun Sep 22 17:05:14 2013 +0200 @@ -24,4 +24,4 @@ ''' version is: (major, minor, patch, sub) with sub being one of 'alpha', 'beta', 'final' ''' -VERSION = (1, 0, 0, 'beta5') +VERSION = (1, 0, 0, 'beta7') diff -r 544a362f921f -r bded6f237d11 gotr/potr/compatcrypto/common.py --- a/gotr/potr/compatcrypto/common.py Fri Sep 20 16:13:30 2013 +0400 +++ b/gotr/potr/compatcrypto/common.py Sun Sep 22 17:05:14 2013 +0200 @@ -26,8 +26,8 @@ DEFAULT_KEYTYPE = 0x0000 pkTypes = {} def registerkeytype(cls): - if not hasattr(cls, 'parsePayload'): - raise TypeError('registered key types need parsePayload()') + if cls.keyType is None: + raise TypeError('registered key class needs a type value') pkTypes[cls.keyType] = cls return cls @@ -35,12 +35,16 @@ return pkTypes[DEFAULT_KEYTYPE].generate() class PK(object): - __slots__ = [] + keyType = None @classmethod def generate(cls): raise NotImplementedError + @classmethod + def parsePayload(cls, data, private=False): + raise NotImplementedError + def sign(self, data): raise NotImplementedError def verify(self, data): @@ -80,13 +84,13 @@ @classmethod def parsePrivateKey(cls, data): implCls, data = cls.getImplementation(data) - logging.debug('Got privkey of type %r' % implCls) + logging.debug('Got privkey of type %r', implCls) return implCls.parsePayload(data, private=True) @classmethod def parsePublicKey(cls, data): implCls, data = cls.getImplementation(data) - logging.debug('Got pubkey of type %r' % implCls) + logging.debug('Got pubkey of type %r', implCls) return implCls.parsePayload(data) def __str__(self): diff -r 544a362f921f -r bded6f237d11 gotr/potr/compatcrypto/pycrypto.py --- a/gotr/potr/compatcrypto/pycrypto.py Fri Sep 20 16:13:30 2013 +0400 +++ b/gotr/potr/compatcrypto/pycrypto.py Sun Sep 22 17:05:14 2013 +0200 @@ -15,18 +15,16 @@ # You should have received a copy of the GNU Lesser General Public License # along with this library. If not, see <http://www.gnu.org/licenses/>. -from Crypto import Cipher, Random +from Crypto import Cipher from Crypto.Hash import SHA256 as _SHA256 -from Crypto.Hash import SHA as _SHA1 +from Crypto.Hash import SHA as _SHA1 from Crypto.Hash import HMAC as _HMAC from Crypto.PublicKey import DSA +from Crypto.Random import random from numbers import Number from potr.compatcrypto import common -from potr.utils import pack_mpi, read_mpi, bytes_to_long, long_to_bytes - -# XXX atfork? -RNG = Random.new() +from potr.utils import read_mpi, bytes_to_long, long_to_bytes def SHA256(data): return _SHA256.new(data).digest() @@ -54,7 +52,6 @@ return Cipher.AES.new(key, Cipher.AES.MODE_CTR, counter=counter) class Counter(object): - __slots__ = ['prefix', 'val'] def __init__(self, prefix): self.prefix = prefix self.val = 0 @@ -72,17 +69,15 @@ return '<Counter(p={p!r},v={v!r})>'.format(p=self.prefix, v=self.val) def byteprefix(self): - return long_to_bytes(self.prefix).rjust(8, b'\0') + return long_to_bytes(self.prefix, 8) def __call__(self): - val = long_to_bytes(self.val) - prefix = long_to_bytes(self.prefix) + bytesuffix = long_to_bytes(self.val, 8) self.val += 1 - return self.byteprefix() + val.rjust(8, b'\0') + return self.byteprefix() + bytesuffix @common.registerkeytype class DSAKey(common.PK): - __slots__ = ['priv', 'pub'] keyType = 0x0000 def __init__(self, key=None, private=False): @@ -111,10 +106,10 @@ return SHA1(self.getSerializedPublicPayload()) def sign(self, data): - # 2 <= K <= q = 160bit = 20 byte - K = bytes_to_long(RNG.read(19)) + 2 + # 2 <= K <= q + K = random.randrange(2, self.priv.q) r, s = self.priv.sign(data, K) - return long_to_bytes(r) + long_to_bytes(s) + return long_to_bytes(r, 20) + long_to_bytes(s, 20) def verify(self, data, sig): r, s = bytes_to_long(sig[:20]), bytes_to_long(sig[20:]) diff -r 544a362f921f -r bded6f237d11 gotr/potr/context.py --- a/gotr/potr/context.py Fri Sep 20 16:13:30 2013 +0400 +++ b/gotr/potr/context.py Sun Sep 22 17:05:14 2013 +0200 @@ -19,7 +19,7 @@ from __future__ import unicode_literals try: - basestring = basestring + type(basestring) except NameError: # all strings are unicode in python3k basestring = str @@ -27,7 +27,7 @@ # callable is not available in python 3.0 and 3.1 try: - callable = callable + type(callable) except NameError: from collections import Callable def callable(x): @@ -42,6 +42,7 @@ from potr import crypt from potr import proto +from potr import compatcrypto from time import time @@ -62,16 +63,11 @@ OFFER_ACCEPTED = 3 class Context(object): - __slots__ = ['user', 'policy', 'crypto', 'tagOffer', 'lastSend', - 'lastMessage', 'mayRetransmit', 'fragment', 'fragmentInfo', 'state', - 'inject', 'trust', 'peer', 'trustName'] - def __init__(self, account, peername): self.user = account self.peer = peername self.policy = {} self.crypto = crypt.CryptEngine(self) - self.discardFragment() self.tagOffer = OFFER_NOTSENT self.mayRetransmit = 0 self.lastSend = 0 @@ -79,6 +75,10 @@ self.state = STATE_PLAINTEXT self.trustName = self.peer + self.fragmentInfo = None + self.fragment = None + self.discardFragment() + def getPolicy(self, key): raise NotImplementedError @@ -100,13 +100,19 @@ params = message.split(b',') if len(params) < 5 or not params[1].isdigit() or not params[2].isdigit(): logger.warning('invalid formed fragmented message: %r', params) - return None + self.discardFragment() + return message K, N = self.fragmentInfo + try: + k = int(params[1]) + n = int(params[2]) + except ValueError: + logger.warning('invalid formed fragmented message: %r', params) + self.discardFragment() + return message - k = int(params[1]) - n = int(params[2]) fragData = params[3] logger.debug(params) @@ -114,17 +120,17 @@ if n >= k == 1: # first fragment self.discardFragment() - self.fragmentInfo = (k,n) + self.fragmentInfo = (k, n) self.fragment.append(fragData) elif N == n >= k > 1 and k == K+1: # accumulate - self.fragmentInfo = (k,n) + self.fragmentInfo = (k, n) self.fragment.append(fragData) else: # bad, discard self.discardFragment() logger.warning('invalid fragmented message: %r', params) - return None + return message if n == k > 0: assembled = b''.join(self.fragment) @@ -210,7 +216,7 @@ if self.state != STATE_ENCRYPTED: self.sendInternal(proto.Error( 'You sent encrypted to {user}, who wasn\'t expecting it.' - .format(user=self.user.name)), appdata=appdata) + .format(user=self.user.name).encode('utf-8')), appdata=appdata) if ignore: return IGN raise NotEncryptedError(EXC_UNREADABLE_MESSAGE) @@ -263,12 +269,13 @@ return msg def processOutgoingMessage(self, msg, flags, tlvs=[]): - if isinstance(self.parse(msg), proto.Query): + isQuery = self.parseExplicitQuery(msg) is not None + if isQuery: return self.user.getDefaultQueryMessage(self.getPolicy) if self.state == STATE_PLAINTEXT: if self.getPolicy('REQUIRE_ENCRYPTION'): - if not isinstance(self.parse(msg), proto.Query): + if not isQuery: self.lastMessage = msg self.lastSend = time() self.mayRetransmit = 2 @@ -277,8 +284,12 @@ return msg if self.getPolicy('SEND_TAG') and self.tagOffer != OFFER_REJECTED: self.tagOffer = OFFER_SENT - return proto.TaggedPlaintext(msg, self.getPolicy('ALLOW_V1'), - self.getPolicy('ALLOW_V2')) + versions = set() + if self.getPolicy('ALLOW_V1'): + versions.add(1) + if self.getPolicy('ALLOW_V2'): + versions.add(2) + return proto.TaggedPlaintext(msg, versions) return msg if self.state == STATE_ENCRYPTED: msg = self.crypto.createDataMessage(msg, flags, tlvs) @@ -304,9 +315,9 @@ def sendFragmented(self, msg, policy=FRAGMENT_SEND_ALL, appdata=None): mms = self.maxMessageSize(appdata) msgLen = len(msg) - if mms != 0 and len(msg) > mms: + if mms != 0 and msgLen > mms: fms = mms - 19 - fragments = [ msg[i:i+fms] for i in range(0, len(msg), fms) ] + fragments = [ msg[i:i+fms] for i in range(0, msgLen, fms) ] fc = len(fragments) @@ -375,9 +386,9 @@ self.crypto.smpSecret(secret, question=question, appdata=appdata) def handleQuery(self, message, appdata=None): - if message.v2 and self.getPolicy('ALLOW_V2'): + if 2 in message.versions and self.getPolicy('ALLOW_V2'): self.authStartV2(appdata=appdata) - elif message.v1 and self.getPolicy('ALLOW_V1'): + elif 1 in message.versions and self.getPolicy('ALLOW_V1'): self.authStartV1(appdata=appdata) def authStartV1(self, appdata=None): @@ -386,7 +397,33 @@ def authStartV2(self, appdata=None): self.crypto.startAKE(appdata=appdata) - def parse(self, message): + def parseExplicitQuery(self, message): + otrTagPos = message.find(proto.OTRTAG) + + if otrTagPos == -1:

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2013