Commits September 2007

commits@gajim.org

6 participants
193 discussions

[commit-gajim] r8828 - trunk/src
by asterix＠gajim.org 18 Sep '07

18 Sep '07

Author: asterix Date: 2007-09-18 18:06:53 +0200 (Tue, 18 Sep 2007) New Revision: 8828 Modified: trunk/src/dialogs.py Log: don't add our jid in chat2muc dialog Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-09-18 15:45:25 UTC (rev 8827) +++ trunk/src/dialogs.py 2007-09-18 16:06:53 UTC (rev 8828) @@ -3261,9 +3261,10 @@ contact = \ gajim.contacts.get_contact_with_highest_priority(account, jid) contact_transport = gajim.get_transport_name_from_jid(jid) - if contact.jid not in self.auto_jids and \ - not contact_transport and not contact.is_transport() and \ - contact.jid not in gajim.interface.minimized_controls[account]: + if contact.jid not in self.auto_jids and contact.jid != \ + gajim.get_jid_from_account(self.account) not contact_transport and \ + not contact.is_transport() and contact.jid not in \ + gajim.interface.minimized_controls[account]: if contact.show not in ('offline', 'error'): img = gajim.interface.roster.jabber_state_images['16'][ contact.show]

1 0

[commit-gajim] r8827 - trunk/src/common
by asterix＠gajim.org 18 Sep '07

18 Sep '07

Author: asterix Date: 2007-09-18 17:45:25 +0200 (Tue, 18 Sep 2007) New Revision: 8827 Modified: trunk/src/common/connection.py Log: fix typo Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-09-18 12:50:22 UTC (rev 8826) +++ trunk/src/common/connection.py 2007-09-18 15:45:25 UTC (rev 8827) @@ -490,7 +490,7 @@ if errnum > 0: # FIXME: tell the user that the certificat is untrusted, and ask him what to do try: - log.warning("The authenticity of the "+hostname+" certificate could be unvalid.\nSSL Error: "+ssl_error[errnum]) + log.warning("The authenticity of the "+hostname+" certificate could be invalid.\nSSL Error: "+ssl_error[errnum]) except KeyError: log.warning("Unknown SSL error: %d" % errnum) con.auth(name, self.password, self.server_resource, 1, self.__on_auth)

1 0

[commit-gajim] r8826 - trunk/src/common
by asterix＠gajim.org 18 Sep '07

18 Sep '07

Author: asterix Date: 2007-09-18 14:50:22 +0200 (Tue, 18 Sep 2007) New Revision: 8826 Modified: trunk/src/common/stanza_session.py Log: don't require pycrypto. fixes #3444 Modified: trunk/src/common/stanza_session.py =================================================================== --- trunk/src/common/stanza_session.py 2007-09-17 18:03:44 UTC (rev 8825) +++ trunk/src/common/stanza_session.py 2007-09-18 12:50:22 UTC (rev 8826) @@ -12,7 +12,6 @@ import time from common import dh -from common import crypto import xmpp.c14n import base64 @@ -100,6 +99,7 @@ from Crypto.Cipher import AES from Crypto.Hash import HMAC, SHA256 from Crypto.PublicKey import RSA + from common import crypto # an encrypted stanza negotiation has several states. i've represented them # as the following values in the 'status'

1 0

[commit-gajim] r8825 - trunk/src
by asterix＠gajim.org 17 Sep '07

17 Sep '07

Author: asterix Date: 2007-09-17 20:03:44 +0200 (Mon, 17 Sep 2007) New Revision: 8825 Modified: trunk/src/gajim.py Log: add account name to XEP-70 dialog when several are connected Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-09-16 21:56:42 UTC (rev 8824) +++ trunk/src/gajim.py 2007-09-17 18:03:44 UTC (rev 8825) @@ -432,6 +432,8 @@ gajim.connections[account].build_http_auth_answer(iq_obj, answer) sec_msg = _('Do you accept this request?') + if gajim.get_number_of_connected_accounts() > 1: + sec_msg = _('Do you accept this request on account %s?') % account if data[4]: sec_msg = data[4] + '\n' + sec_msg self.dialog = dialogs.YesNoDialog(_('HTTP (%s) Authorization for %s (id: %s)') \

1 0

[commit-gajim] r8824 - trunk/src/common
by bct＠gajim.org 16 Sep '07

16 Sep '07

Author: bct Date: 2007-09-16 23:56:42 +0200 (Sun, 16 Sep 2007) New Revision: 8824 Modified: trunk/src/common/crypto.py Log: fixed imports Modified: trunk/src/common/crypto.py =================================================================== --- trunk/src/common/crypto.py 2007-09-16 21:27:11 UTC (rev 8823) +++ trunk/src/common/crypto.py 2007-09-16 21:56:42 UTC (rev 8824) @@ -1,5 +1,10 @@ # common crypto functions (mostly specific to XEP-0116, but useful elsewhere) +import os +import math + +from Crypto.Hash import SHA256 + # convert a large integer to a big-endian bitstring def encode_mpi(n): if n >= 256: @@ -8,15 +13,23 @@ return chr(n) # convert a large integer to a big-endian bitstring, padded with \x00s to -# 16 bytes +# a multiple of 16 bytes def encode_mpi_with_padding(n): - ret = encode_mpi(n) + return pad_to_multiple(encode_mpi(n), 16, '\x00', True) - mod = len(ret) % 16 - if mod != 0: - ret = ((16 - mod) * '\x00') + ret +# pad 'string' to a multiple of 'multiple_of' with 'char'. +# pad on the left if 'left', otherwise pad on the right. +def pad_to_multiple(string, multiple_of, char, left): + mod = len(string) % multiple_of + if mod == 0: + return string + else: + padding = (multiple_of - mod) * char - return ret + if left: + return padding + string + else: + return string + padding # convert a big-endian bitstring to an integer def decode_mpi(s):

1 0

[commit-gajim] r8823 - trunk/src/common
by asterix＠gajim.org 16 Sep '07

16 Sep '07

Author: asterix Date: 2007-09-16 23:27:11 +0200 (Sun, 16 Sep 2007) New Revision: 8823 Modified: trunk/src/common/helpers.py Log: revert bad commit from [8817]. fixes #3443 Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2007-09-16 17:28:51 UTC (rev 8822) +++ trunk/src/common/helpers.py 2007-09-16 21:27:11 UTC (rev 8823) @@ -722,10 +722,11 @@ full_path_to_executable = is_in_path(executable, return_abs_path = True) if full_path_to_executable: command = executable + params - p = Popen([command], shell=True, stdin=subprocess.PIPE, - stdout=subprocess.PIPE, close_fds=True) - p.wait() - output = temp_failure_retry(p.stdout.readline).strip() + child_stdin, child_stdout = os.popen2(command) + output = temp_failure_retry(child_stdout.readline).strip() + child_stdout.close() + child_stdin.close() + os.wait() # some distros put n/a in places, so remove those output = output.replace('n/a', '').replace('N/A', '') return output

1 0

[commit-gajim] r8822 - trunk/src/common
by asterix＠gajim.org 16 Sep '07

16 Sep '07

Author: asterix Date: 2007-09-16 19:28:51 +0200 (Sun, 16 Sep 2007) New Revision: 8822 Modified: trunk/src/common/connection_handlers.py Log: send our local ip only once Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-09-16 09:02:04 UTC (rev 8821) +++ trunk/src/common/connection_handlers.py 2007-09-16 17:28:51 UTC (rev 8822) @@ -203,17 +203,16 @@ ostreamhost.setAttr('port', unicode(port)) ostreamhost.setAttr('host', ft_host) ostreamhost.setAttr('jid', sender) - for thehost in self.peerhost: - try: - thehost = self.peerhost[0] - streamhost = common.xmpp.Node(tag = 'streamhost') # My IP - query.addChild(node = streamhost) - streamhost.setAttr('port', unicode(port)) - streamhost.setAttr('host', thehost) - streamhost.setAttr('jid', sender) - except socket.gaierror: - self.dispatch('ERROR', (_('Wrong host'), - _('Invalid local address? :-O'))) + try: + thehost = self.peerhost[0] + streamhost = common.xmpp.Node(tag = 'streamhost') # My IP + query.addChild(node = streamhost) + streamhost.setAttr('port', unicode(port)) + streamhost.setAttr('host', thehost) + streamhost.setAttr('jid', sender) + except socket.gaierror: + self.dispatch('ERROR', (_('Wrong host'), + _('Invalid local address? :-O'))) if fast and proxyhosts != [] and gajim.config.get_per('accounts', self.name, 'use_ft_proxies'):

1 0

[commit-gajim] r8821 - trunk/src
by asterix＠gajim.org 16 Sep '07

16 Sep '07

Author: asterix Date: 2007-09-16 11:02:04 +0200 (Sun, 16 Sep 2007) New Revision: 8821 Modified: trunk/src/chat_control.py trunk/src/groupchat_control.py trunk/src/message_window.py Log: move accelerators tom (group)chat_control to message_window. fixes traceback with minimized groupchats Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-09-16 04:16:45 UTC (rev 8820) +++ trunk/src/chat_control.py 2007-09-16 09:02:04 UTC (rev 8821) @@ -967,12 +967,6 @@ id = widget.connect('clicked', self.on_actions_button_clicked) self.handlers[id] = widget - ag = gtk.accel_groups_from_object(self.parent_win.window)[0] - key, mod = gtk.accelerator_parse("<Control>h") - ag.connect_group(key, mod, gtk.ACCEL_VISIBLE, self.accel_group_func) - key, mod = gtk.accelerator_parse("<Control>i") - ag.connect_group(key, mod, gtk.ACCEL_VISIBLE, self.accel_group_func) - compact_view = gajim.config.get('compact_view') self.chat_buttons_set_visible(compact_view) self.widget_set_visible(self.xml.get_widget('banner_eventbox'), @@ -1664,13 +1658,6 @@ # destroy menu menu.destroy() - def accel_group_func(self, accel_group, acceleratable, keyval, modifier): - if modifier & gtk.gdk.CONTROL_MASK: - if keyval == gtk.keysyms.h: - self._on_history_menuitem_activate() - if keyval == gtk.keysyms.i: - self._on_contact_information_menuitem_activate(None) - def send_chatstate(self, state, contact = None): ''' sends OUR chatstate as STANDLONE chat state message (eg. no body) to contact only if new chatstate is different from the previous one Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-09-16 04:16:45 UTC (rev 8820) +++ trunk/src/groupchat_control.py 2007-09-16 09:02:04 UTC (rev 8821) @@ -193,10 +193,6 @@ self.on_list_treeview_leave_notify_event) self.handlers[id] = widget - ag = gtk.accel_groups_from_object(self.parent_win.window)[0] - key, mod = gtk.accelerator_parse("<Control>h") - ag.connect_group(key, mod, gtk.ACCEL_VISIBLE, self.accel_group_func) - self.room_jid = self.contact.jid self.nick = contact.name self.name = self.room_jid.split('@')[0] @@ -540,11 +536,6 @@ self.change_nick_menuitem.set_sensitive(False) return self.gc_popup_menu - def accel_group_func(self, accel_group, acceleratable, keyval, modifier): - if modifier & gtk.gdk.CONTROL_MASK: - if keyval == gtk.keysyms.h: - self._on_history_menuitem_activate() - def on_message(self, nick, msg, tim, has_timestamp = False, xhtml = None, status_code = []): if '100' in status_code: Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2007-09-16 04:16:45 UTC (rev 8820) +++ trunk/src/message_window.py 2007-09-16 09:02:04 UTC (rev 8821) @@ -71,6 +71,12 @@ self.handlers[id] = self.window accel_group = gtk.AccelGroup() + key, mod = gtk.accelerator_parse('<Control>h') + accel_group.connect_group(key, mod, gtk.ACCEL_VISIBLE, + self.accel_group_func) + key, mod = gtk.accelerator_parse('<Control>i') + accel_group.connect_group(key, mod, gtk.ACCEL_VISIBLE, + self.accel_group_func) self.window.add_accel_group(accel_group) # gtk+ doesn't make use of the motion notify on gtkwindow by default @@ -244,6 +250,18 @@ elif event.keyval == gtk.keysyms.Page_Up: # CTRL + PAGE UP self.notebook.emit('key_press_event', event) + def accel_group_func(self, accel_group, acceleratable, keyval, modifier): + control = self.get_active_control() + if not control: + # No more control in this window + return + if modifier & gtk.gdk.CONTROL_MASK: + if keyval == gtk.keysyms.h: + control._on_history_menuitem_activate() + if control.type_id == message_control.TYPE_CHAT and \ + keyval == gtk.keysyms.i: + control._on_contact_information_menuitem_activate(None) + def _on_close_button_clicked(self, button, control): '''When close button is pressed: close a tab''' self.remove_tab(control, self.CLOSE_CLOSE_BUTTON)

1 0

[commit-gajim] r8820 - trunk/src/common
by bct＠gajim.org 16 Sep '07

16 Sep '07

Author: bct Date: 2007-09-16 06:16:45 +0200 (Sun, 16 Sep 2007) New Revision: 8820 Added: trunk/src/common/crypto.py Modified: trunk/src/common/stanza_session.py Log: split common crypto operations into a separate module Added: trunk/src/common/crypto.py =================================================================== --- trunk/src/common/crypto.py (rev 0) +++ trunk/src/common/crypto.py 2007-09-16 04:16:45 UTC (rev 8820) @@ -0,0 +1,73 @@ +# common crypto functions (mostly specific to XEP-0116, but useful elsewhere) + +# convert a large integer to a big-endian bitstring +def encode_mpi(n): + if n >= 256: + return encode_mpi(n / 256) + chr(n % 256) + else: + return chr(n) + +# convert a large integer to a big-endian bitstring, padded with \x00s to +# 16 bytes +def encode_mpi_with_padding(n): + ret = encode_mpi(n) + + mod = len(ret) % 16 + if mod != 0: + ret = ((16 - mod) * '\x00') + ret + + return ret + +# convert a big-endian bitstring to an integer +def decode_mpi(s): + if len(s) == 0: + return 0 + else: + return 256 * decode_mpi(s[:-1]) + ord(s[-1]) + +def sha256(string): + sh = SHA256.new() + sh.update(string) + return sh.digest() + +base28_chr = "acdefghikmopqruvwxy123456789" + +def sas_28x5(m_a, form_b): + sha = sha256(m_a + form_b + 'Short Authentication String') + lsb24 = decode_mpi(sha[-3:]) + return base28(lsb24) + +def base28(n): + if n >= 28: + return base28(n / 28) + base28_chr[n % 28] + else: + return base28_chr[n] + +def random_bytes(bytes): + return os.urandom(bytes) + +def generate_nonce(): + return random_bytes(8) + +# generate a random number between 'bottom' and 'top' +def srand(bottom, top): + # minimum number of bytes needed to represent that range + bytes = int(math.ceil(math.log(top - bottom, 256))) + + # in retrospect, this is horribly inadequate. + return (decode_mpi(random_bytes(bytes)) % (top - bottom)) + bottom + +# a faster version of (base ** exp) % mod +# taken from <http://lists.danga.com/pipermail/yadis/2005-September/001445.html> +def powmod(base, exp, mod): + square = base % mod + result = 1 + + while exp > 0: + if exp & 1: # exponent is odd + result = (result * square) % mod + + square = (square * square) % mod + exp /= 2 + + return result Modified: trunk/src/common/stanza_session.py =================================================================== --- trunk/src/common/stanza_session.py 2007-09-15 13:38:55 UTC (rev 8819) +++ trunk/src/common/stanza_session.py 2007-09-16 04:16:45 UTC (rev 8820) @@ -12,6 +12,7 @@ import time from common import dh +from common import crypto import xmpp.c14n import base64 @@ -164,43 +165,18 @@ kc_s = property(get_kc_s, set_kc_s) kc_o = property(get_kc_o, set_kc_o) - # convert a large integer to a big-endian bitstring - def encode_mpi(self, n): - if n >= 256: - return self.encode_mpi(n / 256) + chr(n % 256) - else: - return chr(n) - - # convert a large integer to a big-endian bitstring, padded with \x00s to - # 16 bytes - def encode_mpi_with_padding(self, n): - ret = self.encode_mpi(n) - - mod = len(ret) % 16 - if mod != 0: - ret = ((16 - mod) * '\x00') + ret - - return ret - - # convert a big-endian bitstring to an integer - def decode_mpi(self, s): - if len(s) == 0: - return 0 - else: - return 256 * self.decode_mpi(s[:-1]) + ord(s[-1]) - def encryptcounter(self): self.c_s = (self.c_s + 1) % (2 ** self.n) - return self.encode_mpi_with_padding(self.c_s) + return crypto.encode_mpi_with_padding(self.c_s) def decryptcounter(self): self.c_o = (self.c_o + 1) % (2 ** self.n) - return self.encode_mpi_with_padding(self.c_o) + return crypto.encode_mpi_with_padding(self.c_o) def sign(self, string): if self.negotiated['sign_algs'] == (XmlDsig + 'rsa-sha256'): - hash = self.sha256(string) - return self.encode_mpi(gajim.pubkey.sign(hash, '')[0]) + hash = crypto.sha256(string) + return crypto.encode_mpi(gajim.pubkey.sign(hash, '')[0]) def encrypt_stanza(self, stanza): encryptable = filter(lambda x: x.getName() not in ('error', 'amp', @@ -229,31 +205,13 @@ m_content = ''.join(map(str, c.getChildren())) c.NT.mac = base64.b64encode(self.hmac(self.km_s, m_content + \ - self.encode_mpi(old_en_counter))) + crypto.encode_mpi(old_en_counter))) return stanza def hmac(self, key, content): return HMAC.new(key, content, self.hash_alg).digest() - def sha256(self, string): - sh = SHA256.new() - sh.update(string) - return sh.digest() - - base28_chr = "acdefghikmopqruvwxy123456789" - - def sas_28x5(self, m_a, form_b): - sha = self.sha256(m_a + form_b + 'Short Authentication String') - lsb24 = self.decode_mpi(sha[-3:]) - return self.base28(lsb24) - - def base28(self, n): - if n >= 28: - return self.base28(n / 28) + self.base28_chr[n % 28] - else: - return self.base28_chr[n] - def generate_initiator_keys(self, k): return (self.hmac(k, 'Initiator Cipher Key'), self.hmac(k, 'Initiator MAC Key'), @@ -279,13 +237,6 @@ return self.encrypter.encrypt(encryptable) - # FIXME: use a real PRNG - def random_bytes(self, bytes): - return os.urandom(bytes) - - def generate_nonce(self): - return self.random_bytes(8) - def decrypt_stanza(self, stanza): c = stanza.getTag(name='c', namespace='http://www.xmpp.org/extensions/xep-0200.html#ns') @@ -298,7 +249,7 @@ received_mac = base64.b64decode(c.getTagData('mac')) calculated_mac = self.hmac(self.km_o, macable + \ - self.encode_mpi_with_padding(self.c_o)) + crypto.encode_mpi_with_padding(self.c_o)) if not calculated_mac == received_mac: raise exceptions.DecryptionError, 'bad signature' @@ -325,7 +276,7 @@ return ["may", "mustnot"] else: return ["mustnot", "may"] - + def get_shared_secret(self, e, y, p): if (not 1 < e < (p - 1)): raise exceptions.NegotiationError, "invalid DH value" @@ -341,14 +292,14 @@ m_o = base64.b64decode(form['mac']) id_o = base64.b64decode(form['identity']) - m_o_calculated = self.hmac(self.km_o, self.encode_mpi(self.c_o) + id_o) + m_o_calculated = self.hmac(self.km_o, crypto.encode_mpi(self.c_o) + id_o) if m_o_calculated != m_o: raise exceptions.NegotiationError, 'calculated m_%s differs from received m_%s' % (i_o, i_o) if i_o == 'a' and self.sas_algs == 'sas28x5': # XXX not necessary if there's a verified retained secret - self.sas = self.sas_28x5(m_o, self.form_s) + self.sas = crypto.sas_28x5(m_o, self.form_s) if self.negotiated['recv_pubkey']: plaintext = self.decrypt(id_o) @@ -363,7 +314,7 @@ if self.negotiated['sign_algs'] == (XmlDsig + 'rsa-sha256'): keyvalue = parsed.getTag(name='RSAKeyValue', namespace=XmlDsig) - n, e = map(lambda x: self.decode_mpi(base64.b64decode( + n, e = map(lambda x: crypto.decode_mpi(base64.b64decode( keyvalue.getTagData(x))), ('Modulus', 'Exponent')) eir_pubkey = RSA.construct((n,long(e))) @@ -374,14 +325,14 @@ enc_sig = parsed.getTag(name='SignatureValue', namespace=XmlDsig).getData() - signature = (self.decode_mpi(base64.b64decode(enc_sig)),) + signature = (crypto.decode_mpi(base64.b64decode(enc_sig)),) else: mac_o = self.decrypt(id_o) pubkey_o = '' c7l_form = self.c7lize_mac_id(form) - content = self.n_s + self.n_o + self.encode_mpi(dh_i) + pubkey_o + content = self.n_s + self.n_o + crypto.encode_mpi(dh_i) + pubkey_o if sigmai: self.form_o = c7l_form @@ -393,7 +344,7 @@ mac_o_calculated = self.hmac(self.ks_o, content) if self.negotiated['recv_pubkey']: - hash = self.sha256(mac_o_calculated) + hash = crypto.sha256(mac_o_calculated) if not eir_pubkey.verify(hash, signature): raise exceptions.NegotiationError, 'public key signature verification failed!' @@ -404,9 +355,10 @@ def make_identity(self, form, dh_i): if self.negotiated['send_pubkey']: if self.negotiated['sign_algs'] == (XmlDsig + 'rsa-sha256'): - fields = (gajim.pubkey.n, gajim.pubkey.e) + pubkey = gajim.interface.get_pubkey(self.conn.name) + fields = (pubkey.n, pubkey.e) - cb_fields = map(lambda f: base64.b64encode(self.encode_mpi(f)), fields) + cb_fields = map(lambda f: base64.b64encode(crypto.encode_mpi(f)), fields) pubkey_s = '<RSAKeyValue xmlns="http://www.w3.org/2000/09/xmldsig#"><Modulus>%s</Modulus><Exponent>%s</Exponent></RSAKeyValue>' % tuple(cb_fields) else: @@ -415,7 +367,7 @@ form_s2 = ''.join(map(lambda el: xmpp.c14n.c14n(el), form.getChildren())) old_c_s = self.c_s - content = self.n_o + self.n_s + self.encode_mpi(dh_i) + pubkey_s + self.form_s + form_s2 + content = self.n_o + self.n_s + crypto.encode_mpi(dh_i) + pubkey_s + self.form_s + form_s2 mac_s = self.hmac(self.ks_s, content) @@ -432,12 +384,12 @@ else: id_s = self.encrypt(mac_s) - m_s = self.hmac(self.km_s, self.encode_mpi(old_c_s) + id_s) + m_s = self.hmac(self.km_s, crypto.encode_mpi(old_c_s) + id_s) if self.status == 'requested-e2e' and self.sas_algs == 'sas28x5': # we're alice; check for a retained secret # if none exists, prompt the user with the SAS - self.sas = self.sas_28x5(m_s, self.form_o) + self.sas = crypto.sas_28x5(m_s, self.form_o) if self.sigmai: self.check_identity() @@ -482,7 +434,7 @@ x.addChild(node=xmpp.DataField(name='sas_algs', value='sas28x5', typ='hidden')) x.addChild(node=xmpp.DataField(name='sign_algs', value='http://www.w3.org/2000/09/xmldsig#rsa-sha256', typ='hidden')) - self.n_s = self.generate_nonce() + self.n_s = crypto.generate_nonce() x.addChild(node=xmpp.DataField(name='my_nonce', value=base64.b64encode(self.n_s), typ='hidden')) @@ -607,17 +559,17 @@ bytes = int(self.n / 8) - self.n_s = self.generate_nonce() + self.n_s = crypto.generate_nonce() - self.c_o = self.decode_mpi(self.random_bytes(bytes)) # n-bit random number + self.c_o = crypto.decode_mpi(crypto.random_bytes(bytes)) # n-bit random number self.c_s = self.c_o ^ (2 ** (self.n - 1)) - self.y = self.srand(2 ** (2 * self.n - 1), p - 1) - self.d = self.powmod(g, self.y, p) + self.y = crypto.srand(2 ** (2 * self.n - 1), p - 1) + self.d = crypto.powmod(g, self.y, p) to_add = { 'my_nonce': self.n_s, - 'dhkeys': self.encode_mpi(self.d), - 'counter': self.encode_mpi(self.c_o), + 'dhkeys': crypto.encode_mpi(self.d), + 'counter': crypto.encode_mpi(self.c_o), 'nonce': self.n_o } for name in to_add: @@ -688,7 +640,7 @@ result = xmpp.DataForm(typ='result') - self.c_s = self.decode_mpi(base64.b64decode(form['counter'])) + self.c_s = crypto.decode_mpi(base64.b64decode(form['counter'])) self.c_o = self.c_s ^ (2 ** (self.n - 1)) self.n_o = base64.b64decode(form['my_nonce']) @@ -698,7 +650,7 @@ x = self.xes[mod_p] e = self.es[mod_p] - self.d = self.decode_mpi(base64.b64decode(form['dhkeys'])) + self.d = crypto.decode_mpi(base64.b64decode(form['dhkeys'])) self.k = self.get_shared_secret(self.d, x, p) @@ -720,7 +672,7 @@ rshashes = [base64.b64encode(rshash) for rshash in rshashes] result.addChild(node=xmpp.DataField(name='rshashes', value=rshashes)) - result.addChild(node=xmpp.DataField(name='dhkeys', value=base64.b64encode(self.encode_mpi(e)))) + result.addChild(node=xmpp.DataField(name='dhkeys', value=base64.b64encode(crypto.encode_mpi(e)))) self.form_o = ''.join(map(lambda el: xmpp.c14n.c14n(el), form.getChildren())) @@ -752,10 +704,10 @@ assert field in form.asDict(), "alice's form didn't have a %s field" % field # 4.5.1 generating provisory session keys - e = self.decode_mpi(base64.b64decode(form['dhkeys'])) + e = crypto.decode_mpi(base64.b64decode(form['dhkeys'])) p = dh.primes[self.modp] - if self.sha256(self.encode_mpi(e)) != self.negotiated['He']: + if crypto.sha256(crypto.encode_mpi(e)) != self.negotiated['He']: raise exceptions.NegotiationError, 'SHA256(e) != He' k = self.get_shared_secret(e, self.y, p) @@ -778,19 +730,20 @@ srs = secret break - # other shared secret, we haven't got one. + # other shared secret + # (we're not using one) oss = '' - k = self.sha256(k + srs + oss) + k = crypto.sha256(k + srs + oss) self.kc_s, self.km_s, self.ks_s = self.generate_responder_keys(k) self.kc_o, self.km_o, self.ks_o = self.generate_initiator_keys(k) # 4.5.5 if srs: - srshash = self.hmac(srs, 'Shared Retained Secret') + srshash = crypto.hmac(srs, 'Shared Retained Secret') else: - srshash = self.random_bytes(32) + srshash = crypto.random_bytes(32) x.addChild(node=xmpp.DataField(name='FORM_TYPE', value='urn:xmpp:ssn')) x.addChild(node=xmpp.DataField(name='nonce', value=base64.b64encode(self.n_o))) @@ -823,7 +776,7 @@ break oss = '' - k = self.sha256(self.k + srs + oss) + k = crypto.sha256(self.k + srs + oss) del self.k self.do_retained_secret(k, srs) @@ -857,14 +810,6 @@ self.check_identity() gajim.interface.save_new_secret(account, bjid, new_srs) - # generate a random number between 'bottom' and 'top' - def srand(self, bottom, top): - # minimum number of bytes needed to represent that range - bytes = int(math.ceil(math.log(top - bottom, 256))) - - # in retrospect, this is horribly inadequate. - return (self.decode_mpi(self.random_bytes(bytes)) % (top - bottom)) + bottom - def make_dhfield(self, modp_options, sigmai): dhs = [] @@ -872,39 +817,24 @@ p = dh.primes[modp] g = dh.generators[modp] - x = self.srand(2 ** (2 * self.n - 1), p - 1) + x = crypto.srand(2 ** (2 * self.n - 1), p - 1) # XXX this may be a source of performance issues - e = self.powmod(g, x, p) + e = crypto.powmod(g, x, p) self.xes[modp] = x self.es[modp] = e if sigmai: - dhs.append(base64.b64encode(self.encode_mpi(e))) + dhs.append(base64.b64encode(crypto.encode_mpi(e))) name = 'dhkeys' else: - He = self.sha256(self.encode_mpi(e)) + He = crypto.sha256(crypto.encode_mpi(e)) dhs.append(base64.b64encode(He)) name = 'dhhashes' return xmpp.DataField(name=name, typ='hidden', value=dhs) - # a faster version of (base ** exp) % mod - # taken from <http://lists.danga.com/pipermail/yadis/2005-September/001445.html> - def powmod(self, base, exp, mod): - square = base % mod - result = 1 - - while exp > 0: - if exp & 1: # exponent is odd - result = (result * square) % mod - - square = (square * square) % mod - exp /= 2 - - return result - def terminate_e2e(self): self.terminate()

1 0

[commit-gajim] r8819 - trunk/src/common
by jim++＠gajim.org 15 Sep '07

15 Sep '07

Author: jim++ Date: 2007-09-15 15:38:55 +0200 (Sat, 15 Sep 2007) New Revision: 8819 Modified: trunk/src/common/connection.py Log: Do not check last log time when we join GC if we don't log Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-09-15 13:05:23 UTC (rev 8818) +++ trunk/src/common/connection.py 2007-09-15 13:38:55 UTC (rev 8819) @@ -1248,8 +1248,13 @@ # last date/time in history to avoid duplicate if not self.last_history_line.has_key(room_jid): # Not in memory, get it from DB - last_log = gajim.logger.get_last_date_that_has_logs(room_jid, - is_room = True) + last_log = None + no_log_for = gajim.config.get_per('accounts', self.name, 'no_log_for')\ + .split() + if self.name not in no_log_for and room_jid not in no_log_for: + # Do not check if we are not logging for this room + last_log = gajim.logger.get_last_date_that_has_logs(room_jid, + is_room = True) if last_log is None: last_log = 0 self.last_history_line[room_jid]= last_log

1 0

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

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 September 2007