Changeset 9113 for trunk/src/common/stanza_session.py

Timestamp:

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

Author:

bct

Message:

realtime notification of esession begin/end

Files:

• trunk/src/common/stanza_session.py (modified) (21 diffs)

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