Update v1.0.1

sakiodre · Jul 25, 2022 · 59ac921 · 59ac921
1 parent 571d759
commit 59ac921
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 14 deletions.
diff --git a/src/FiddlerMomoPlugin/MomoPlugin.cs b/src/FiddlerMomoPlugin/MomoPlugin.cs
@@ -78,30 +78,33 @@ public MomoPlugin()
     private string RSAEncryptWithMomoPublicKey(string data)
     {
         var encryptEngine = new Pkcs1Encoding(new RsaEngine());
+
         var bytesToEncrypt = Encoding.UTF8.GetBytes(data);
 
         try
         {
             encryptEngine.Init(true, momoPublicKey);
-            return Convert.ToBase64String(encryptEngine.ProcessBlock(bytesToEncrypt, 0, bytesToEncrypt.Length));
         }
         catch (Exception e)
         {
             CConsole.LogRed("RSAEncryptWithMomoPublicKey error: " + e.Message);
             return null;
         }
 
+        return Convert.ToBase64String(encryptEngine.ProcessBlock(bytesToEncrypt, 0, bytesToEncrypt.Length));
     }
 
     private string RSADecryptWithInjectedPrivateKey(string base64_encrypted)
     {
-        var decryptEngine = new Pkcs1Encoding(new RsaEngine());
         var bytesToDecrypt = Convert.FromBase64String(base64_encrypted);
 
+        var decryptEngine = new Pkcs1Encoding(new RsaEngine());
+
         try
         {
             decryptEngine.Init(false, injectedPrivateKey);
-            return Encoding.UTF8.GetString(decryptEngine.ProcessBlock(bytesToDecrypt, 0, bytesToDecrypt.Length));
+            var decrypted = Encoding.UTF8.GetString(decryptEngine.ProcessBlock(bytesToDecrypt, 0, bytesToDecrypt.Length));
+            return decrypted;
         }
         catch (Exception e)
         {
@@ -204,7 +207,7 @@ public void AutoTamperRequestBefore(Session oSession)
         oSession.oRequest["requestkey"] = RSAEncryptWithMomoPublicKey(aes_key);
 
         // put the decrypted key in the header for later usage in the response handling part
-        oSession.oRequest["requestkey_decrypted"] = aes_key;
+        oSession.oRequest["aes_key"] = aes_key;
 
         // decryption is expensive, check if we had the console opened else it is wasting resources for nothing.
         if (CConsole.isOpen)
@@ -214,7 +217,31 @@ public void AutoTamperRequestBefore(Session oSession)
             CConsole.LogGray(decrypted_data);
         }
     }
-    public void AutoTamperRequestAfter(Session oSession) { }
+
+    // we handle the edit/repeat request here
+    public void AutoTamperRequestAfter(Session oSession) {
+
+        if (!oSession.url.StartsWith("api.momo.vn/") && !oSession.url.StartsWith("owa.momo.vn/")) return;
+
+        // make sure the request has gone through AutoTamperRequestBefore
+        if (oSession.oRequest["aes_key"] == "") return;
+
+        string aes_key = oSession.oRequest["aes_key"];
+
+        // if the body is not encrypted, it is probably the user is trying to send something, we should encrypt it.
+        try
+        {
+            string decrypted_data = AESDecrypt(Encoding.UTF8.GetString(oSession.RequestBody), aes_key);
+        }
+        catch (Exception e)
+        {
+
+            string request_body = Encoding.UTF8.GetString(oSession.RequestBody);
+            string encrypted_request = AESEncrypt(request_body, aes_key);
+
+            oSession.RequestBody = Encoding.UTF8.GetBytes(encrypted_request);
+        }
+    }
 
     public void AutoTamperResponseBefore(Session oSession)
     {
@@ -257,18 +284,18 @@ public void AutoTamperResponseBefore(Session oSession)
         // or decrypt the request data
         else if (oSession.oRequest["requestkey"] != "")
         {
-            if (oSession.oRequest["requestkey_decrypted"] == "") return;
+            if (oSession.oRequest["aes_key"] == "") return;
 
             // uncompress the response;
             oSession.utilDecodeResponse();
 
             // decrypt the request data
             string post_data = Encoding.UTF8.GetString(oSession.RequestBody);
-            string aes_key = oSession.oRequest["requestkey_decrypted"];
+            string aes_key = oSession.oRequest["aes_key"];
             string decrypted_post_data = AESDecrypt(post_data, aes_key);
 
             oSession.RequestBody = Encoding.UTF8.GetBytes(decrypted_post_data);
-            oSession.oResponse["requestkey_decrypted"] = aes_key;
+            oSession.oResponse["aes_key"] = aes_key;
         }
     }
     public void AutoTamperResponseAfter(Session oSession) { }
@@ -330,10 +357,10 @@ public byte[] body
         set
         {
             // we have already decrypted the key when sending the request
-            if (headers["requestkey_decrypted"] != "")
+            if (value != null && value.Length > 0 && headers != null && headers["aes_key"] != "")
             {
                 string encrypted_body = Encoding.UTF8.GetString(value);
-                string decrypted_body = MomoPlugin.AESDecrypt(encrypted_body, headers["requestkey_decrypted"]);
+                string decrypted_body = MomoPlugin.AESDecrypt(encrypted_body, headers["aes_key"]);
                 jsonResponseViewer.body = Encoding.UTF8.GetBytes(decrypted_body);
             }
             else
@@ -384,10 +411,10 @@ public byte[] body
         set
         {
             // we have already decrypted the key when sending the request
-            if (headers["requestkey_decrypted"] != "")
+            if (value != null && value.Length > 0 && headers != null && headers["aes_key"] != "")
             {
                 string encrypted_body = Encoding.UTF8.GetString(value);
-                string decrypted_body = MomoPlugin.AESDecrypt(encrypted_body, headers["requestkey_decrypted"]);
+                string decrypted_body = MomoPlugin.AESDecrypt(encrypted_body, headers["aes_key"]);
                 textResponseViewer.body = Encoding.UTF8.GetBytes(decrypted_body);
             }
             else

diff --git a/src/FiddlerMomoPlugin/Properties/AssemblyInfo.cs b/src/FiddlerMomoPlugin/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]
 [assembly: NeutralResourcesLanguage("")]