Logout done

Author: vineeth-ravindra

Client/client.py

@@ -83,6 +83,8 @@ def __parseMessageHelper(self, message):
             return [True, "list"]
         elif message[0] == "connect":
             return [True, "connect"]
+        elif message[0] == "logout":
+            return [True, "logout"]
         elif message[0] == "send":
             if len(message) > 1 and message is not "":
                 return [False, message[1:]]

Client/serverConnection.py

@@ -382,6 +382,11 @@ def __chatMessage(self, serverObj, address):
                 if clientMessage["user"] in self.__destHostKey:
                     self.__destHostKey.pop(clientMessage["user"])
                     self.__addressUserNameMap.pop(address)
+            if clientMessage["message"] == "logout":
+                self.__writeMessage(clientMessage["user"]+" Just left\n")
+                if clientMessage["user"] in self.__destHostKey:
+                    self.__destHostKey.pop(clientMessage["user"])
+                    self.__addressUserNameMap.pop(address)
 
 
 
@@ -457,6 +462,26 @@ def __talkToHost(self):
         self.__addressUserNameMap[message["address"]] = destHost
         self.__destHostKey[destHost] = [message["address"], message["Key"]]                 # Username , Address, Key
 
+
+    def logout(self):
+        for user in self.__destHostKey :
+            self.___disconnectClient("logout",self.__destHostKey[user][1],self.__destHostKey[user][0])
+        iv = os.urandom(16)
+        message = self.__encryptSymetric(
+            self.__sharedSecret, iv,
+            pickle.dumps({"request": "logout",
+                          "Nonce": str(int(binascii.hexlify(os.urandom(8)), base=16))
+                          }))
+        obj = {
+            "user": self.__username,
+            "message": message,
+            "IV": iv,
+            "type": "sym"
+        }
+        self.__sendData(pickle.dumps(obj))
+        self.__writeMessage("It was a pleasure having you here\nGet back soon:)\n")
+        sys.exit(0)
+
     def handleClientMessage(self,message):
         '''
             handleClientMessage(String):
@@ -470,6 +495,8 @@ def handleClientMessage(self,message):
             self.__listUsers()
         elif message == "connect":
             self.__talkToHost()
+        elif message == "logout":
+            self.logout()
         else:
             print "Unknown Message"
 
@@ -493,4 +520,4 @@ def sendMessageToClient(self,message):
                 "IV"        :   iv,
                 "data"      :   obj,
                 "Nonce"     :   str(int(binascii.hexlify(os.urandom(8)), base=16))}
-            ), self.__destHostKey[user][0])
+            ), self.__destHostKey[user][0])

Server/handelConnection.py

@@ -362,6 +362,21 @@ def __genKeyPair(self, senderObj, address):
         else:
             return [False, address]
 
+    def __xxx(self, senderObj, address):
+        '''
+
+        :param senderObj:
+        :param address:
+        :return:
+        '''
+        message = senderObj["message"]
+        if message["Nonce"] not in self.__userNonceHistor:
+            if senderObj["user"] in self.__sessionKeyDict:
+                self.__sessionKeyDict.pop(senderObj["user"])
+                self.__userNonceHistor[message["Nonce"]] = True
+                print "\nUser " + senderObj["user"] + " Just left\n"
+                print self.__sessionKeyDict
+        return True, ""
 
     def __establishedConnection(self, senderObj, address):
         '''
@@ -380,8 +395,10 @@ def __establishedConnection(self, senderObj, address):
         )
         if senderObj["message"]["request"] == "list":
             return self.__listUsers(senderObj, address)
-        if senderObj["message"]["request"] == "talk":
+        elif senderObj["message"]["request"] == "talk":
             return self.__genKeyPair(senderObj, address)
+        elif senderObj["message"]["request"] == "logout":
+            return self.__xxx(senderObj, address)