Fixed a bug on translator script

icezhaoL · Nov 6, 2020 · 50805cf · 50805cf
1 parent a7b5c8a
commit 50805cf
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 47 deletions.
diff --git a/libraries/defs.py b/libraries/defs.py
@@ -796,10 +796,11 @@ def my_message_handler(self,message,payload):
 
         if message["type"] == "send":
             data = message["payload"].split(":")[0].strip()
-            result = self.translator.translate(data)
-            #print(result.text)
-
-            self.script.post({"my_data": result.text}) 
+            if "trscrpt|" in data:
+                result = self.translator.translate(data[data.index("trscrpt|")+len("trscrpt|"):])
+                self.script.post({"my_data": result.text}) 
+            else:
+                print(data)
 
     def on_detached(self,reason):
         print("Session is detached due to:", reason)

diff --git a/libraries/memops.js b/libraries/memops.js
@@ -3,51 +3,16 @@ rpc.exports = {
     memorydump: function (address, size) {
         Memory.protect(ptr(address), size, "rwx");
         var a = Memory.readByteArray(ptr(address),size-1000);
-        // var baseAddress = parseInt(address,16);
-        // var endAddress = baseAddress + size;
-
-        // Process.enumerateRanges('r--').forEach(function (range) {
-        //    try {
-        //        Memory.scanSync(address, range.size, "??").forEach(function (match) {
-        //          var curent = parceInt(match.address);
-
-        //         if(curent >= baseAddress && curent <= endAddress)
-
-        //            if (range.file && range.file.path
-        //               && (// range.file.path.startsWith("/data/app/") ||
-        //                   range.file.path.startsWith("/data/dalvik-cache/") ||
-        //                   range.file.path.startsWith("/system/"))) {
-        //               return;
-        //           }
-
-        //           if (verify(match.address, range, false)) {
-        //               var dex_size = match.address.add(0x20).readUInt();
-        //               result.push({
-        //                   "addr": match.address,
-        //                   "size": dex_size
-        //               });
-        //           }
-        //       });
-
-
-
-
-
-        // console.log('pointer: Address: '+address + ' Size:'+size)
         return a;
     },
 
     moduleaddress: function (lib){
       try{
-
         var ret = [];
         var module = Process.findModuleByName(lib);
         var address = Module.findBaseAddress(lib);
         var sz = module.size;
 
-
-     // console.log('Address: '+address + ' Size:'+sz)
-
       ret.push({
         "addr": address,
         "size": sz

diff --git a/libraries/native.js b/libraries/native.js
@@ -56,4 +56,4 @@ function enumerateModules(){
 
 Java.perform(function() {
 enumerateModules(); 
-});
+});
diff --git a/libraries/natives.py b/libraries/natives.py
@@ -21,7 +21,7 @@ class nativeHandler():
     modules = []
     device = None
     script = None
-    prompt_ = WHITE+'|' +GREEN+'(E)xit '+ WHITE+  '|'+GREEN+ 'r@offset ' + WHITE+'|' +GREEN+ 'w@offset '+ WHITE+'|' +GREEN+'⏎ '+ WHITE+ '|' +GREEN+ 'scan '+ WHITE+'|'+ GREEN + '(h)elp' +WHITE + '|:'
+    prompt_ = WHITE+'|' +GREEN+'(E)xit '+ WHITE+  '|'+GREEN+ 'r@offset ' + WHITE+'|' +GREEN+ 'w@offset '+ WHITE+'|' +GREEN+'⏎ '+ WHITE+ '|' +GREEN+ 'scan '+ WHITE+'|'+ GREEN + '(h)elp' +WHITE +'|'+ GREEN + '(D)ump' +WHITE +'|:'
 
 
     def __init__(self,device):
@@ -265,6 +265,7 @@ def display_help(self):
         print("""Availlable commands:
         
         (E)xit:     Exit memops
+        (D)ump:     Dump loaded module to a file
         r@offset:   Read @ offet (e.g. r@beaf)
         Return:     Read next 296 bytes
         w@offset:   Write @ offset (e.g. w@beaf)

diff --git a/modules/helpers/anti_debug.med b/modules/helpers/anti_debug.med
@@ -10,6 +10,11 @@ https://codeshare.frida.re/@dzonerzy/fridantiroot/
     var antidebug = Java.use('android.os.Debug');
 
 
+
+
+
+
+
 antidebug.isDebuggerConnected.implementation = function(){
     console.log('[!] overwriting is debugger connected  ');
     return false;

diff --git a/modules/helpers/translator.med b/modules/helpers/translator.med
@@ -20,11 +20,11 @@ console.log('----------twiter:@Ch0pin-------------------');
         //var string_to_send = Utf8.decode(originalTxt.toString())
         var string_to_send = originalTxt.toString();
         var string_to_recv = "";
-        send(string_to_send); // send data to python code
+        send("trscrpt|"+string_to_send); // send data to python code
         recv(function (received_json_object) {
             string_to_recv = received_json_object.my_data;
         }).wait(); 
-        console.log('Translating: ' + string_to_send +" ---> "+ string_to_recv)
+        colorLog('Translating: ' + string_to_send +" ---> "+ string_to_recv, {c: Color.Green})
 
         var castTostring = String.$new(string_to_recv);
 
@@ -36,11 +36,11 @@ console.log('----------twiter:@Ch0pin-------------------');
         //var string_to_send = Utf8.decode(originalTxt.toString())
         var string_to_send = originalTxt.toString();
         var string_to_recv = "";
-        send(string_to_send); // send data to python code
+        send("trscrpt|"+string_to_send); // send data to python code
         recv(function (received_json_object) {
             string_to_recv = received_json_object.my_data;
         }).wait(); 
-        console.log('Translating: ' + string_to_send +" ---> "+ string_to_recv)
+        colorLog('Translating: ' + string_to_send +" ---> "+ string_to_recv, {c: Color.Green})
 
         var castTostring = String.$new(string_to_recv);
 
@@ -52,11 +52,11 @@ console.log('----------twiter:@Ch0pin-------------------');
         //var string_to_send = Utf8.decode(originalTxt.toString())
         var string_to_send = originalTxt.toString();
         var string_to_recv = "";
-        send(string_to_send); // send data to python code
+        send("trscrpt|"+string_to_send); // send data to python code
         recv(function (received_json_object) {
             string_to_recv = received_json_object.my_data;
         }).wait(); 
-        console.log('Translating: ' + string_to_send +" ---> "+ string_to_recv)
+        colorLog('Translating: ' + string_to_send +" ---> "+ string_to_recv, {c: Color.Green})
 
         var castTostring = String.$new(string_to_recv);
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,4 +56,4 @@ function enumerateModules(){ @@
     Java.perform(function() {
     enumerateModules();
-    });
+    });