diff --git a/app/src/main/java/com/emanuelef/remote_capture/MitmAddon.java b/app/src/main/java/com/emanuelef/remote_capture/MitmAddon.java index 08038f82..67067d3c 100644 --- a/app/src/main/java/com/emanuelef/remote_capture/MitmAddon.java +++ b/app/src/main/java/com/emanuelef/remote_capture/MitmAddon.java @@ -48,8 +48,8 @@ import java.io.IOException; import java.lang.ref.WeakReference; public class MitmAddon { - public static final long PACKAGE_VERSION_CODE = 14; - public static final String PACKAGE_VERSION_NAME = "v0.14"; + public static final long PACKAGE_VERSION_CODE = 15; + public static final String PACKAGE_VERSION_NAME = "v0.15"; public static final String REPOSITORY = "https://github.com/emanuele-f/PCAPdroid-mitm"; private static final String TAG = "MitmAddon"; private final Context mContext; diff --git a/app/src/main/java/com/emanuelef/remote_capture/MitmReceiver.java b/app/src/main/java/com/emanuelef/remote_capture/MitmReceiver.java index 1eff3a26..4650089c 100644 --- a/app/src/main/java/com/emanuelef/remote_capture/MitmReceiver.java +++ b/app/src/main/java/com/emanuelef/remote_capture/MitmReceiver.java @@ -95,6 +95,7 @@ public class MitmReceiver implements Runnable, ConnectionsListener, MitmListener DATA_TRUNCATED, MASTER_SECRET, LOG, + JS_INJECTED } private static class PendingMessage { @@ -319,9 +320,11 @@ public class MitmReceiver implements Runnable, ConnectionsListener, MitmListener // see ConnectionDescriptor.processUpdate if(conn.status == ConnectionDescriptor.CONN_STATUS_CLOSED) conn.status = ConnectionDescriptor.CONN_STATUS_CLIENT_ERROR; - } else if(type == MsgType.DATA_TRUNCATED) + } else if(type == MsgType.DATA_TRUNCATED) { conn.setPayloadTruncatedByAddon(); - else + } else if(type == MsgType.JS_INJECTED) { + conn.js_injected_scripts = new String(message, StandardCharsets.US_ASCII); + } else conn.addPayloadChunkMitm(new PayloadChunk(message, getChunkType(type), isSent(type), tstamp)); } @@ -380,6 +383,8 @@ public class MitmReceiver implements Runnable, ConnectionsListener, MitmListener return MsgType.MASTER_SECRET; case "log": return MsgType.LOG; + case "js_inject": + return MsgType.JS_INJECTED; default: return MsgType.UNKNOWN; } diff --git a/app/src/main/java/com/emanuelef/remote_capture/adapters/ConnectionsAdapter.java b/app/src/main/java/com/emanuelef/remote_capture/adapters/ConnectionsAdapter.java index a74f4482..707c64f6 100644 --- a/app/src/main/java/com/emanuelef/remote_capture/adapters/ConnectionsAdapter.java +++ b/app/src/main/java/com/emanuelef/remote_capture/adapters/ConnectionsAdapter.java @@ -76,6 +76,7 @@ public class ConnectionsAdapter extends RecyclerView.Adapter + + diff --git a/app/src/main/res/layout/connection_item.xml b/app/src/main/res/layout/connection_item.xml index 034f4ae6..a73598fd 100644 --- a/app/src/main/res/layout/connection_item.xml +++ b/app/src/main/res/layout/connection_item.xml @@ -58,6 +58,15 @@ android:gravity="center_vertical" android:orientation="horizontal"> + + + + + + Decrypt… Don\'t decrypt… Encrypted + Injected