Even more chat encryption...

1 files changed, 90 insertions, 59 deletions

diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/chat.js b/main/app/sprinkles/core/assets/SiteAssets/js/chat.js
index 54f8262..76e34db 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/js/chat.js
+++ b/main/app/sprinkles/core/assets/SiteAssets/js/chat.js
@@ -3,9 +3,17 @@
  */
 var ReceiversUsername = ""; // HARD
 var openpgp = window.openpgp;
-var options, EncryptedText;
+var options, EncryptedMessage, DecryptedMessage;
 var PublicKey = [];
 openpgp.initWorker({path: '/assets-raw/core/assets/SiteAssets/js/openpgp.worker.js'});
+var privKeyObj = openpgp.key.readArmored(localStorage.getItem("PrivateKey").replace(/\r/, "")).keys[0];
+privKeyObj.decrypt(localStorage.getItem("🔒"));
+
+/**
+ * GLOBAL DECLARATIONS
+ */
+var LastMessage, Username;
+
 
 /**
  * GENERAL CHAT
@@ -37,10 +45,10 @@ function InitializeChatServer() {
         ChatSocket.onmessage = function (e) {
             // DECLARATIONS
             var TypingIndicatorMessage = $(".TypingIndicatorMessage").parent();
-            var LastMessage = $(".MessageWrapper.Normal:last .ChatMessage");
+            LastMessage = $(".MessageWrapper.Normal:last .ChatMessage");
             var MessageObject = JSON.parse(e.data);
             var Message = MessageObject.Message; // ENCRYPTED MESSAGE (NOT ENCRYPTED ON SERVER MESSAGES)
-            var Username = MessageObject.Username;
+            Username = MessageObject.Username;
             var Fullname = MessageObject.Fullname;
             var Avatar = MessageObject.Avatar;
             var GroupName = MessageObject.GroupName;
@@ -52,14 +60,14 @@ function InitializeChatServer() {
             ReceiversUsername = MessageObject.Receiver;
 
             // GET PUBLIC KEY IF NOT ALREADY DID
-            if (!(ReceiversUsername in PublicKey) && ReceiversUsername !== null) {
+            if (!(ReceiversUsername in PublicKey) && ReceiversUsername !== null && ReceiversUsername !== undefined) {
                 $.ajax({
                     type: 'GET',
                     url: site.uri.public + '/api/users/u/' + ReceiversUsername + '/publickey',
                     dataType: "json",
                     success: function (response) {
                         PublicKey[ReceiversUsername] = response.PublicKey;
-                        console.log(PublicKey[ReceiversUsername])
+                        console.log("%c[ENCRYPTION LOGGER] Publickey of " + ReceiversUsername + ": " + PublicKey[ReceiversUsername].substr(96).slice(0, -35), "color: #20c20e; background-color: black;")
                     }
                 });
             }
@@ -67,58 +75,44 @@ function InitializeChatServer() {
             if (ServerMessage === false) { // NO SERVER MESSAGE -> SENT BY USER
 
                 // DECRYPT MESSAGE
-                var privKeyObj = openpgp.key.readArmored(localStorage.getItem("PrivateKey")).keys[0];
-                privKeyObj.decrypt(localStorage.getItem("🔒"));
                 options = {
-                    message: openpgp.message.readArmored("-----BEGIN PGP MESSAGE-----\r\nVersion: OpenPGP.js v3.0.9\r\nComment: https://openpgpjs.org\r\n\n" + Message + "\r\n-----END PGP MESSAGE-----\r\n"),
-                    //publicKeys: openpgp.key.readArmored(PublicKey[Username]).keys, // FOR VERIFICATION
+                    message: openpgp.message.readArmored("-----BEGIN PGP MESSAGE-----\r\nVersion: OpenPGP.js v3.0.9\r\nComment: https://openpgpjs.org\r\n\r\n" + Message + "\r\n\-----END PGP MESSAGE-----\r\n"),
+                    publicKeys: openpgp.key.readArmored(PublicKey[Username]).keys, // FOR VERIFICATION
                     privateKeys: [privKeyObj]
                 };
                 openpgp.decrypt(options).then(function(plaintext) {
-                    Message = plaintext.data;
-                });
-
-                if (WasHimself === true) { // -> MESSAGE WAS FROM HIMSELF
-                    console.log("%c[CHATSOCKET LOGGER] You sent a message!", "color: darkorange");
-                    if (!LastMessage.hasClass("MessageSent")) { // CHECK IF PREVIOUS MESSAGE WAS FROM HIMSELF TOO -> IF NOT, CREATE NEW 'ALONE' MESSAGE
-                        ChatMessages.append("<div class='MessageWrapper Normal'><div class='ChatMessage MessageSent AloneMessage animated fadeInRight'>" + Message + "</div></div>");
-                    } else if (LastMessage.hasClass("MessageSent")) { // IF PREVIOUS MESSAGE WAS FROM HIMSELF TOO -> CREATE WITH CORRESPONDING CLASSES FOR DESIGN
-                        ChatMessages.append("<div class='MessageWrapper Normal'><div class='ChatMessage MessageSent BottomMessage animated fadeInRight'>" + Message + "</div></div>");
-                        if (LastMessage.hasClass("AloneMessage")) {
-                            LastMessage.removeClass("AloneMessage");
-                            LastMessage.addClass("TopMessage");
-                        } else if (LastMessage.hasClass("BottomMessage")) {
-                            LastMessage.removeClass("BottomMessage");
-                            LastMessage.addClass("MiddleMessage");
-                        }
-                    }
-                } else if (WasHimself === false) { // -> MESSAGE WAS FROM OTHER USER
-                    console.log("%c[CHATSOCKET LOGGER] You received a message!", "color: darkorange");
-                    NotifySound.play();
-                    Push.create(Fullname, { // CREATE NOTIFICATION
-                        body: Message,
-                        icon: Avatar,
-                        timeout: 5000,
-                        onClick: function () {
-                            window.focus();
-                            this.close();
-                        }
-                    });
-                    if (!LastMessage.hasClass("MessageReceived")) { // CHECK IF PREVIOUS MESSAGE WAS FROM OTHER USER TOO -> IF NOT, CREATE NEW 'ALONE' MESSAGE
-                        ChatMessages.append("<div class='MessageWrapper Normal'><div class='ChatMessage MessageReceived AloneMessage animated fadeInLeft'>" + Message + "</div></div>");
-                    } else if (LastMessage.hasClass("MessageReceived")) { // IF PREVIOUS MESSAGE WAS FROM OTHER USER TOO -> CREATE WITH CORRESPONDING CLASSES FOR DESIGN
-                        ChatMessages.append("<div class='MessageWrapper Normal'><div class='ChatMessage MessageReceived BottomMessage animated fadeInLeft'>" + Message + "</div></div>");
-                        if (LastMessage.hasClass("AloneMessage")) {
-                            LastMessage.removeClass("AloneMessage");
-                            LastMessage.addClass("TopMessage");
-                        } else if (LastMessage.hasClass("BottomMessage")) {
-                            LastMessage.removeClass("BottomMessage");
-                            LastMessage.addClass("MiddleMessage");
+                    DecryptedMessage = plaintext.data;
+                    if (WasHimself === true) { // -> MESSAGE WAS FROM HIMSELF -> Don't write to chat, as its done directly (on enter function at the bottom, for performance)
+                        console.log("%c[CHATSOCKET LOGGER] Message sending succeeded!", "color: darkorange");
+                    } else if (WasHimself === false) { // -> MESSAGE WAS FROM OTHER USER
+                        console.log("%c[CHATSOCKET LOGGER] You received a message!", "color: darkorange");
+                        NotifySound.play();
+                        Push.create(Fullname, { // CREATE NOTIFICATION
+                            body: DecryptedMessage,
+                            icon: Avatar,
+                            timeout: 5000,
+                            onClick: function () {
+                                window.focus();
+                                this.close();
+                            }
+                        });
+                        if (!LastMessage.hasClass("MessageReceived")) { // CHECK IF PREVIOUS MESSAGE WAS FROM OTHER USER TOO -> IF NOT, CREATE NEW 'ALONE' MESSAGE
+                            ChatMessages.append("<div class='MessageWrapper Normal'><div class='ChatMessage MessageReceived AloneMessage animated fadeInLeft'>" + DecryptedMessage + "</div></div>");
+                        } else if (LastMessage.hasClass("MessageReceived")) { // IF PREVIOUS MESSAGE WAS FROM OTHER USER TOO -> CREATE WITH CORRESPONDING CLASSES FOR DESIGN
+                            ChatMessages.append("<div class='MessageWrapper Normal'><div class='ChatMessage MessageReceived BottomMessage animated fadeInLeft'>" + DecryptedMessage + "</div></div>");
+                            if (LastMessage.hasClass("AloneMessage")) {
+                                LastMessage.removeClass("AloneMessage");
+                                LastMessage.addClass("TopMessage");
+                            } else if (LastMessage.hasClass("BottomMessage")) {
+                                LastMessage.removeClass("BottomMessage");
+                                LastMessage.addClass("MiddleMessage");
+                            }
                         }
                     }
-                }
+                });
+
                 // CONVERT LINKS TO LINKS
-                $('.MessageReceived').linkify({
+                $('.ChatMessage').linkify({
                     target: "_blank"
                 });
             } else if (ServerMessage === true) { // SERVER MESSAGE
@@ -223,24 +217,61 @@ function InitializeChatServer() {
         // SEND MESSAGE FROM INPUT FIELD
         ChatTextInput.keyup(function (e) {
             if (e.keyCode === 13 && ChatTextInput.val().length > 0) {
+
+                var LastMessage = $(".MessageWrapper.Normal:last .ChatMessage");
+                if (!LastMessage.hasClass("MessageSent")) { // CHECK IF PREVIOUS MESSAGE WAS FROM HIMSELF TOO -> IF NOT, CREATE NEW 'ALONE' MESSAGE
+                    ChatMessages.append("<div class='MessageWrapper Normal'><div class='ChatMessage MessageSent AloneMessage animated fadeInRight'>" + ChatTextInput.val() + "</div></div>");
+                } else if (LastMessage.hasClass("MessageSent")) { // IF PREVIOUS MESSAGE WAS FROM HIMSELF TOO -> CREATE WITH CORRESPONDING CLASSES FOR DESIGN
+                    ChatMessages.append("<div class='MessageWrapper Normal'><div class='ChatMessage MessageSent BottomMessage animated fadeInRight'>" + ChatTextInput.val() + "</div></div>");
+                    if (LastMessage.hasClass("AloneMessage")) {
+                        LastMessage.removeClass("AloneMessage");
+                        LastMessage.addClass("TopMessage");
+                    } else if (LastMessage.hasClass("BottomMessage")) {
+                        LastMessage.removeClass("BottomMessage");
+                        LastMessage.addClass("MiddleMessage");
+                    }
+                }
+
+                // USER USUALLY STOPS TYPING ON SENDING -> CHANGE STATE TO FALSE
+                sendTypingState(false);
+                isTyping = false;
+                clearTimeout(typingTimer);
+
+                // ENCRYPT AND SEND MESSAGE WITH OWN PUBLIC KEY
                 options = {
                     data: ChatTextInput.val(),
-                    publicKeys: openpgp.key.readArmored(PublicKey[ReceiversUsername]).keys
-                    //privateKeys: [privKeyObj] // FOR SIGNING
+                    publicKeys: openpgp.key.readArmored(PublicKey[ReceiversUsername]).keys,
+                    privateKeys: [privKeyObj] // FOR SIGNING
                 };
                 openpgp.encrypt(options).then(function (Encrypted) {
-                    EncryptedText = Encrypted.data;
-                    console.log(EncryptedText);
+                    EncryptedMessage = Encrypted.data.substr(91).slice(0,-29); // SLICING FOR DATABASE SAVING (LESS DATA)
+                    console.log("%c[ENCRYPTION LOGGER] Encrypted message for sender: " + EncryptedMessage, "color: #20c20e; background-color: black;");
 
-                    // USER USUALLY STOPS TYPING ON SENDING -> CHANGE STATE TO FALSE
-                    sendTypingState(false);
-                    isTyping = false;
-                    clearTimeout(typingTimer);
+                    ChatSocket.send(JSON.stringify({
+                        ClientMessageType: "ChatMessage",
+                        MessageType: "Private",
+                        EncryptedWithKey: ReceiversUsername,
+                        Message: EncryptedMessage
+                    }));
+                    ChatTextInput.val("");
+                    ChatTextInput.val("");
+                });
+
+                // ENCRYPT AND SEND MESSAGE WITH RECEIVERS PUBLIC KEY
+                options = {
+                    data: ChatTextInput.val(),
+                    publicKeys: openpgp.key.readArmored(PublicKey[ReceiversUsername]).keys,
+                    privateKeys: [privKeyObj] // FOR SIGNING
+                };
+                openpgp.encrypt(options).then(function (Encrypted) {
+                    EncryptedMessage = Encrypted.data.substr(91).slice(0,-29); // SLICING FOR DATABASE SAVING (LESS DATA)
+                    console.log("%c[ENCRYPTION LOGGER] Encrypted message for receiver: " + EncryptedMessage, "color: #20c20e; background-color: black;");
 
                     ChatSocket.send(JSON.stringify({
                         ClientMessageType: "ChatMessage",
                         MessageType: "Private",
-                        Message: EncryptedText.substr(91).slice(0,-29) // SLICING FOR DATABASE SAVING (LESS DATA)
+                        EncryptedWithKey: ReceiversUsername,
+                        Message: EncryptedMessage
                     }));
                     ChatTextInput.val("");
                     ChatTextInput.val("");