diff --git a/mobiotsec2filehasher/app/src/main/AndroidManifest.xml b/mobiotsec2filehasher/app/src/main/AndroidManifest.xml index 82c553f..e48a600 100644 --- a/mobiotsec2filehasher/app/src/main/AndroidManifest.xml +++ b/mobiotsec2filehasher/app/src/main/AndroidManifest.xml @@ -12,7 +12,7 @@ - + diff --git a/mobiotsec2filehasher/app/src/main/java/com/example/maliciousapp/HashfileActivity.java b/mobiotsec2filehasher/app/src/main/java/com/example/maliciousapp/HashfileActivity.java index d42c7ce..de53e28 100644 --- a/mobiotsec2filehasher/app/src/main/java/com/example/maliciousapp/HashfileActivity.java +++ b/mobiotsec2filehasher/app/src/main/java/com/example/maliciousapp/HashfileActivity.java @@ -25,8 +25,9 @@ public class HashfileActivity extends AppCompatActivity { Intent intent = getIntent(); Log.d("MOBIOTSEC", "PROVA 1"); + Log.d("MOBIOTSEC", intent.getAction()); - //if(intent.getAction() == "com.mobiotsec.intent.action.HASHFILE") { + if(intent.getAction() == "com.mobiotsec.intent.action.HASHFILE") { String filePath = intent.getData().getPath(); Log.d("MOBIOTSEC", filePath); @@ -36,8 +37,6 @@ public class HashfileActivity extends AppCompatActivity { hash = calcHash(filePath); - - // return the hash in a "result" intent Intent resultIntent = new Intent(); resultIntent.putExtra("hash", hash); @@ -48,18 +47,15 @@ public class HashfileActivity extends AppCompatActivity { e.printStackTrace(); } - //} + } } static public String calcHash(String filePath) throws IOException { File file = new File(filePath); - if(file.exists()) { - Log.d("MOBIOTSEC", "PROVA 3"); - return DigestUtils.sha256Hex(FileUtils.readFileToByteArray(file)); - } - else - Log.d("MOBIOTSEC", "Errore"); + Log.d("MOBIOTSEC", "PROVA 3"); + byte[] bytes = FileUtils.readFileToByteArray(file); + Log.d("MOBIOTSEC", "PROVA 4"); + return DigestUtils.sha256Hex(bytes); - return "prova"; } } \ No newline at end of file diff --git a/mobiotsec2filehasher/filehasher/filehasher_checker.py b/mobiotsec2filehasher/filehasher/filehasher_checker.py old mode 100644 new mode 100755 index 7aeec33..7712a4b --- a/mobiotsec2filehasher/filehasher/filehasher_checker.py +++ b/mobiotsec2filehasher/filehasher/filehasher_checker.py @@ -4,6 +4,8 @@ # ~/Android/Sdk/tools/avdmanager create avd --force --name mobiotsec --abi google_apis/x86 --package 'system-images;android-26;google_apis;x86' # ~/Android/Sdk/emulator/emulator -avd mobiotsec -no-audio -no-boot-anim -accel on -gpu swiftshader_indirect & +# TODO check if the emulator is already running + import argparse import os import shutil @@ -62,6 +64,7 @@ def main(args): uninstall(malApk) install(malApk) launch_app(victimApk) + #time.sleep(2) print_logs() if __name__ == "__main__": diff --git a/mobiotsec2filehasher/filehasher/filehasher_logs.txt b/mobiotsec2filehasher/filehasher/filehasher_logs.txt index ae55fd1..0fd25bb 100644 --- a/mobiotsec2filehasher/filehasher/filehasher_logs.txt +++ b/mobiotsec2filehasher/filehasher/filehasher_logs.txt @@ -1,8 +1,5 @@ --------- beginning of main --------- beginning of system --------- beginning of kernel -03-04 12:36:43.827 13072 13072 I MOBIOTSEC: /storage/emulated/0/YM3oPnYG.dat -03-04 12:36:45.489 13095 13095 D MOBIOTSEC: PROVA 0 -03-04 12:36:45.489 13095 13095 D MOBIOTSEC: PROVA 1 -03-04 12:36:45.489 13095 13095 D MOBIOTSEC: /storage/emulated/0/YM3oPnYG.dat -03-04 12:36:45.489 13095 13095 D MOBIOTSEC: PROVA 3 +03-04 14:10:11.909 15435 15435 I MOBIOTSEC: /storage/emulated/0/YM3oPnYG.dat +--------- beginning of crash