Changeset 9113

Timestamp:

12/08/07 06:49:38 (10 months ago)

Author:

bct

Message:

realtime notification of esession begin/end

Location:

trunk/src

Files:

• chat_control.py (modified) (7 diffs)
• common/stanza_session.py (modified) (21 diffs)
• gajim.py (modified) (2 diffs)
• message_control.py (modified) (2 diffs)

trunk/src/chat_control.py

@@ -1058 +1058 @@
                         self.xml.get_widget('gpg_togglebutton').set_active(True)
 
-                self.session = session
-
-                # does this window have an existing, active esession?
-                self.esessioned = False
+                self.set_session(session)
 
                 self.status_tooltip = gtk.Tooltips()
@@ -1468 +1465 @@
                 self.kbd_activity_in_last_30_secs = False
 
+
+        # print esession settings to textview
+        def print_esession_details(self):
+                if self.session and self.session.enable_encryption:
+                        msg = _('E2E encryption enabled')
+                        ChatControlBase.print_conversation_line(self, msg, 'status', '', None)
+
+                        if self.session.loggable:
+                                msg = _('Session WILL be logged')
+                        else:
+                                msg = _('Session WILL NOT be logged')
+
+                        ChatControlBase.print_conversation_line(self, msg, 'status', '', None)
+                else:
+                        msg = _('E2E encryption disabled')
+                        ChatControlBase.print_conversation_line(self, msg, 'status', '', None)
+
         def print_conversation(self, text, frm = '', tim = None,
                 encrypted = False, subject = None, xhtml = None):
@@ -1487 +1501 @@
                         name = ''
                 else:
-                        # ESessions
                         if self.session and self.session.enable_encryption:
-                                if not self.esessioned:
-                                        msg = _('Encryption enabled')
-                                        ChatControlBase.print_conversation_line(self, msg, 
-                                                'status', '', tim)
-
-                                        if self.session.loggable:
-                                                msg = _('Session WILL be logged')
-                                        else:
-                                                msg = _('Session WILL NOT be logged')
-
-                                        ChatControlBase.print_conversation_line(self, msg, 
-                                                'status', '', tim)
-
-                                        self.esessioned = True
-                                elif not encrypted:
+                                if not encrypted:
                                         msg = _('The following message was NOT encrypted')
                                         ChatControlBase.print_conversation_line(self, msg, 
                                                 'status', '', tim)
-                        elif self.esessioned:
-                                msg = _('Encryption disabled')
-                                ChatControlBase.print_conversation_line(self, msg, 
-                                        'status', '', tim)
-                                self.esessioned = False
                         else:
                                 # GPG encryption
                                 ec = gajim.encrypted_chats[self.account]
                                 if encrypted and jid not in ec:
-                                        msg = _('Encryption enabled')
+                                        msg = _('OpenPGP Encryption enabled')
                                         ChatControlBase.print_conversation_line(self, msg, 
                                                 'status', '', tim)
                                         ec.append(jid)
                                 elif not encrypted and jid in ec:
-                                        msg = _('Encryption disabled')
+                                        msg = _('OpenPGP Encryption disabled')
                                         ChatControlBase.print_conversation_line(self, msg,
                                                 'status', '', tim)
@@ -2004 +1998 @@
         def read_queue(self):
                 '''read queue and print messages containted in it'''
+
                 jid = self.contact.jid
                 jid_with_resource = jid
@@ -2009 +2004 @@
                         jid_with_resource += '/' + self.resource
                 events = gajim.events.get_events(self.account, jid_with_resource)
+
+                if hasattr(self, 'session') and self.session and self.session.enable_encryption:
+                        self.print_esession_details()
 
                 # Is it a pm ?
@@ -2170 +2168 @@
                         ChatControlBase.print_conversation_line(self, msg, 
                                 'status', '', None)
-                        self.esessioned = False
 
                         jid = str(self.session.jid)
@@ -2177 +2174 @@
                                 self.session.thread_id)
 
-                        self.session = gajim.connections[self.account].make_new_session(jid)
+                        self.set_session(gajim.connections[self.account].make_new_session(jid))
                 else:
                         if not self.session:
-                                self.session = gajim.connections[self.account].make_new_session(
-                                        self.contact.jid)
+                                fjid = self.contact.get_full_jid()
+                                new_sess = gajim.connections[self.account].make_new_session(fjid)
+                                self.set_session(new_sess)
 
                         # XXX decide whether to use 4 or 3 message negotiation

trunk/src/common/stanza_session.py

@@ -72 +72 @@
                 '''A negotiation has been cancelled, so reset this session to its default state.'''
 
-                # XXX notify the user   
-                
+                if hasattr(self, 'control'):
+                        msg = _('Session negotiation cancelled')
+                        self.control.print_conversation_line(self, msg, 'status', '', None)
+
                 self.status = None
                 self.negotiated = {}
@@ -93 +95 @@
 
         def acknowledge_termination(self):
-                # we could send an acknowledgement message here, but we won't.
+                # we could send an acknowledgement message to the remote client here
                 self.status = None
 
@@ -106 +108 @@
 
 # an encrypted stanza negotiation has several states. i've represented them
-# as the following values in the 'status' 
+# as the following values in the 'status'
 # attribute of the session object:
 
@@ -144 +146 @@
                 # _s denotes 'self' (ie. this client)
                 self._kc_s = None
-        
+
                 # _o denotes 'other' (ie. the client at the other end of the session)
                 self._kc_o = None
@@ -162 +164 @@
                 self.decrypter = self.cipher.new(self._kc_o, self.cipher.MODE_CTR,
                         counter=self.decryptcounter)
-        
+
         def get_kc_o(self):
                 return self._kc_o
@@ -168 +170 @@
         kc_s = property(get_kc_s, set_kc_s)
         kc_o = property(get_kc_o, set_kc_o)
-        
+
         def encryptcounter(self):
                 self.c_s = (self.c_s + 1) % (2 ** self.n)
                 return crypto.encode_mpi_with_padding(self.c_s)
-        
+
         def decryptcounter(self):
                 self.c_o = (self.c_o + 1) % (2 ** self.n)
@@ -232 +234 @@
         def decompress(self, compressed):
                 if self.compression == None:
-                        return compressed 
+                        return compressed
 
         def encrypt(self, encryptable):
@@ -344 +346 @@
 
                 mac_o_calculated = self.hmac(self.ks_o, content)
-        
+
                 if self.negotiated['recv_pubkey']:
                         hash = crypto.sha256(mac_o_calculated)
@@ -381 +383 @@
                                 b64ed = base64.b64encode(self.hash(pubkey_s))
                                 pubkey_s = '<fingerprint>%s</fingerprint>' % b64ed
-                
+
                         id_s = self.encrypt(pubkey_s + sign_s)
                 else:
@@ -396 +398 @@
                                 # XXX save retained secret?
                                 self.check_identity(lambda : ())
-                
+
                 return (xmpp.DataField(name='identity', value=base64.b64encode(id_s)), \
                                                 xmpp.DataField(name='mac', value=base64.b64encode(m_s)))
@@ -438 +440 @@
 
                 self.n_s = crypto.generate_nonce()
-        
+
                 x.addChild(node=xmpp.DataField(name='my_nonce', value=base64.b64encode(self.n_s), typ='hidden'))
 
@@ -455 +457 @@
 
                 self.send(request)
-        
+
         # 4.3 esession response (bob)
         def verify_options_bob(self, form):
@@ -571 +573 @@
 
                 to_add = { 'my_nonce': self.n_s,
-                                                         'dhkeys': crypto.encode_mpi(self.d), 
-                                                         'counter': crypto.encode_mpi(self.c_o), 
+                                                         'dhkeys': crypto.encode_mpi(self.d),
+                                                         'counter': crypto.encode_mpi(self.c_o),
                                                          'nonce': self.n_o }
 
@@ -667 +669 @@
                         self.verify_identity(form, self.d, True, 'b')
                 else:
-                        srses = secrets.secrets().retained_secrets(self.conn.name, self.jid.getStripped()) 
+                        srses = secrets.secrets().retained_secrets(self.conn.name, self.jid.getStripped())
                         rshashes = [self.hmac(self.n_s, rs) for (rs,v) in srses]
 
@@ -678 +680 @@
                         result.addChild(node=xmpp.DataField(name='rshashes', value=rshashes))
                         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()))
 
@@ -688 +690 @@
                 feature.addChild(node=result)
                 self.send(accept)
-        
+
                 if self.sigmai:
                         self.status = 'active'
@@ -694 +696 @@
                 else:
                         self.status = 'identified-alice'
-        
+
         # 4.5 esession accept (bob)
         def accept_e2e_bob(self, form):
@@ -725 +727 @@
 
                 srs = ''
-        
+
                 srses = secrets.secrets().retained_secrets(self.conn.name, self.jid.getStripped())
                 rshashes = [base64.b64decode(rshash) for rshash in form.getField('rshashes').getValues()]
@@ -768 +770 @@
                 self.enable_encryption = True
 
+                if hasattr(self, 'control'):
+                        self.control.print_esession_details()
+
         def final_steps_alice(self, form):
                 srs = ''
@@ -794 +799 @@
                 self.verify_identity(form, self.d, False, 'b')
 # Note: If Alice discovers an error then she SHOULD ignore any encrypted content she received in the stanza.
-        
+
                 if self.negotiated['logging'] == 'mustnot':
                         self.loggable = False
@@ -800 +805 @@
                 self.status = 'active'
                 self.enable_encryption = True
+
+                if hasattr(self, 'control'):
+                        self.control.print_esession_details()
 
         # calculate and store the new retained secret

trunk/src/gajim.py

@@ -2032 +2032 @@
 
                                 if ctrl:
-                                        ctrl.session = gajim.connections[account].make_new_session(str(jid))
+                                        new_sess = gajim.connections[account].make_new_session(str(jid))
+                                        ctrl.set_session(new_sess)
 
                                 return
@@ -2045 +2046 @@
                                 if not contact:
                                         connection = gajim.connections[account]
-                                        contact = gajim.contacts.create_contact(jid = jid.getStripped(), resource = resource, show = connection.get_status())
+                                        contact = gajim.contacts.create_contact(jid = jid.getStripped(), 
+                                                        resource = resource, show = connection.get_status())
                                 self.roster.new_chat(contact, account, resource = resource)
 

trunk/src/message_control.py

@@ -118 +118 @@
 
         def set_session(self, session):
-                if session == self.session:
+                if hasattr(self, 'session') and session == self.session:
                         return
 
-                if self.session:
+                was_encrypted = False
+
+                if hasattr(self, 'session') and self.session:
+                        if self.session.enable_encryption:
+                                was_encrypted = True
+
                         print "starting a new session, dropping the old one!"
                         gajim.connections[self.account].delete_session(self.session.jid, self.session.thread_id)
 
                 self.session = session
+
+                if session:
+                        session.control = self
+
+                        if was_encrypted:
+                                self.print_esession_details()
 
         def send_message(self, message, keyID = '', type = 'chat',
@@ -135 +146 @@
 
                 if not self.session:
-                        self.session = gajim.connections[self.account].make_new_session(self.contact.get_full_jid())
+                        fjid = self.contact.get_full_jid()
+                        new_session = gajim.connections[self.account].make_new_session(fjid)
+
+                        self.set_session(new_session)
 
                 # Send and update history