many fixes to pluginservice code as well as introduction of the AbstractJythonConsolePlugin, which provides easy acess to the JythonConsole. This could be useful when requiring interactivity. Eventually a better interactive commandline for plugins should be created.

WARNING: changes to pluginservice and new functionality has not yet been fully tested with all existing Java plugins

Author: Justine Osborne

AndroidSSLBypass/TODO.md

@@ -1,16 +1,23 @@
-* Currently not calling tearDownEvents() always for plugins to remove breakpoints, 
-  etc.
+===Feature Requests===
+ 
+  	* Ability to unload plugins on demand
 
-  	* maybe create an unload plugins command which removes all currently set events for that plugin ....
+	* Multiple handler support for a single event (might be tricky)
 
-  * Add support for all VM events (currently only four most used types supported)
+	* Support for all VM events (http://docs.oracle.com/javase/1.5.0/docs/guide/jpda/jdi/com/sun/jdi/event/package-summary.html) - currently only four most used are supported
 
-* No support for multiple handlers for a single event
+	* Support for interaction with the commandline via Jython plugins  
+	
+===Random TODOs===
 
-* Make sure everything is platform independent and configurable
+	* Currently not calling tearDownEvents() always for plugins to remove event requests
 
-* Add documentation!!
+	* Make sure everything is platform independent and configurable
 
-* Add licensing info and thirdparty libs documentation
+	* Add documentation!!
 
-* Fix all the bugs :)
+	* Add licensing info and thirdparty libs documentation
+
+	* Entire plugin service architecture should probably be reworked to something better and cleaner
+
+	* Fix all the bugs :)

AndroidSSLBypass/asb.jar

@@ -1,2 +1,2 @@
-adb.location=D:/tools/android-sdk/platform-tools/adb.exe
+adb.location=/home/freeze/android-sdks/platform-tools/adb
 

AndroidSSLBypass/defaults.prop

@@ -0,0 +1,18 @@
+from com.isecpartners.android.jdwp.pluginservice import AbstractJythonConsolePlugin
+from com.isecpartners.android.jdwp import DalvikUtils
+import com.sun.jdi.event.Event
+
+class TestJythonConsolePlugin(AbstractJythonConsolePlugin):
+
+    def __init__(self):
+        AbstractJythonConsolePlugin.__init__(self,"TestJythonConsolePlugin")
+        self.output("Python: initalized TestJythonPlugin")
+
+    def setupEvents(self):
+        self.output("Python: setupEvents for android.util.Log.i,d,v,e,w")
+        self.createBreakpointRequest("android.util.Log.i")
+        self.createBreakpointRequest("android.util.Log.d")
+    	self.createBreakpointRequest("android.util.Log.v")
+    	self.createBreakpointRequest("android.util.Log.e")
+    	self.createBreakpointRequest("android.util.Log.w")
+

AndroidSSLBypass/plugins/TestJythonConsolePlugin.py

@@ -1 +1 @@
-com.android.internal.telephony.gsm.SmsMessage
+android.util.Log

AndroidSSLBypass/plugins/filters

@@ -34,6 +34,7 @@
 import com.isecpartners.android.jdwp.pluginservice.JDIPluginServiceFactory;
 import com.isecpartners.android.jdwp.pluginservice.JythonPluginService;
 import com.isecpartners.android.jdwp.pluginservice.JythonPluginServiceFactory;
+import com.isecpartners.android.jdwp.pluginservice.PluginNotFoundException;
 import com.sun.jdi.request.EventRequest;
 
 public class CommandLine extends QueueAgent {
@@ -448,9 +449,16 @@ public String loadPlugins(
 		} catch (IOException e1) {
 			LOGGER.error("could not load plugins due to IO exception: " + e1);
 			sb.append("ERROR: could not load plugins due to IO exception");
+		} catch (PluginNotFoundException e) {
+			LOGGER.error("plugin not found");
+			sb.append("ERROR: could not load plugins due to PluginNotFoundException: " + e.getMessage());
 		}
 		return sb.toString();
 	}
+	
+	public String unloadPlugins(String pluginDirToUnload){
+		return "not implemented";
+	}
 
 	/**
 	 * Initialize a specific plugin from those available (see list-plugins).
@@ -468,10 +476,12 @@ public String initializePlugin(
 				this.jythonPluginService.initPlugin(this.ctrl.getVMEM(),
 						pluginName);
 				LOGGER.info("attempted to init plugin: " + pluginName);
-				sb.append("plugin initialized: " + pluginName);
+				sb.append("attempted to init plugin: " + pluginName);
 			} catch (NoVMSessionException e) {
 				LOGGER.error("No virtual machine session");
 				sb.append("ERROR: no virtual machine session");
+			} catch (PluginNotFoundException e) {
+				sb.append("plugin not found: " + e.getMessage());
 			}
 		return sb.toString();
 	}
@@ -498,13 +508,13 @@ public String listPlugins() {
 	@Command(name = "list-vm-events", abbrev = "events", description= "List all the currently set VM events (breakpoints, etc.)")
 	public String listVMEvents(){
 		StringBuilder sb = new StringBuilder();
-		sb.append("Currently set VirtualMachine events: \n");
+		sb.append("Currently set VirtualMachine events: \n\n");
 		if(this.ctrl.isConnected()){
 			try {
 				VirtualMachineEventManager vmem = this.ctrl.getVMEM();
 				for(EventRequest er : vmem.getVmEvents().keySet()){
 					JDIPlugin handler = vmem.getVmEvents().get(er);
-					sb.append(INDENT + er + " handler: " + handler.getClass().getName());
+					sb.append(INDENT + "event request: " + er + ", handler: " + handler.getClass().getName() + "\n\n");
 				}
 			} catch (NoVMSessionException e) {
 				// TODO Auto-generated catch block

AndroidSSLBypass/plugins/plugins.jar

@@ -41,19 +41,16 @@
 public class DalvikUtils extends Thread{
 	private final static org.apache.log4j.Logger LOGGER = Logger
 			.getLogger(DalvikUtils.class.getName());
-	private static final String NEW_INSTANCE_METHOD_NAME = "newInstance";
-	private static final String LOAD_CLASS_METHOD_NAME = "loadClass";
 	public static ArrayList<Value> NOARGS = new ArrayList<Value>();
 	private ThreadReference currentThread = null;
 	private EventRequestManager eventRequestManager = null;
-	private String name = null;
 	private VirtualMachine vm = null;
-	private DalvikUtils vmUtils;
 	private ClassLoaderUtils classLoaderUtils;
+	private String name = null;
 
 	public DalvikUtils(VirtualMachine vm, int threadIndex) {
 		this.vm = vm;
-		this.name = this.vm.name();
+		this.name  = this.vm.name();
 
 		// TODO dont know if this should be defaulted or exception thrown
 		if ((threadIndex < 0) || (threadIndex >= this.vm.allThreads().size())) {
@@ -272,8 +269,20 @@ public List<LocalVariable> getLocals(ThreadReference tr, int idx)
 		}
 		return null;
 	}
+	
+	public Value getLocalVariableValue(ThreadReference tr, int frameIdx,
+			String localName) throws AbsentInformationException,
+			IncompatibleThreadStateException {
+		StackFrame fr = tr.frame(frameIdx);
+		Value ret = null;
+		LocalVariable var = fr.visibleVariableByName(localName);
+		if (var != null) {
+			ret = fr.getValue(var);
+		}
+		return ret;
+	}
 
-	public Value getLocalVariableValue(ThreadReference tr, StackFrame fr,
+	public Value getLocalVariableValue(StackFrame fr,
 			String localName) throws AbsentInformationException,
 			IncompatibleThreadStateException {
 		Value ret = null;
@@ -283,9 +292,28 @@ public Value getLocalVariableValue(ThreadReference tr, StackFrame fr,
 		}
 		return ret;
 	}
+	
+	public StringReference getLocalVariableValueAsString(StackFrame fr,
+			String localName) throws AbsentInformationException,
+			IncompatibleThreadStateException {
+		Value val = null;
+		StringReference ret = null;
+		LocalVariable var = fr.visibleVariableByName(localName);
+		if (var != null) {
+			val = fr.getValue(var);
+			if( val instanceof StringReference){
+				ret = (StringReference) fr.getValue(var);
+			} else {
+				LOGGER.warn("getLocalVariableValueAsString called with non-String Object: " + var.getClass().getName());
+			}
+		} else {
+			LOGGER.warn("LocalVariable with name: " + localName + " was not found");
+		}
+		return ret;
+	}
 
 	/*
-	 * THis function appears to take an exorbitant amount of time why why why
+	 * This function appears to take an exorbitant amount of time why why why
 	 */
 	public boolean setLocalVariableValue(int i, String name, Value sf)
 			throws IncompatibleThreadStateException, InvalidTypeException,

AndroidSSLBypass/src/com/isecpartners/android/jdwp/CommandLine.java

@@ -1,4 +1,4 @@
-package com.isecpartners.android.jdwp.plugin;
+ package com.isecpartners.android.jdwp.plugin;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -10,9 +10,10 @@
 
 import com.isecpartners.android.jdwp.LocationNotFoundException;
 import com.isecpartners.android.jdwp.pluginservice.AbstractJDIPlugin;
+import com.isecpartners.android.jdwp.pluginservice.AbstractJythonConsolePlugin;
 import com.sun.jdi.event.Event;
 
-public class JythonConsoleJDIPlugin extends AbstractJDIPlugin {
+public class JythonConsoleJDIPlugin extends AbstractJythonConsolePlugin {
 	private static final String BREAKPOINT_LOCATION = "breakpoint.location";
 
 	private final static org.apache.log4j.Logger LOGGER = Logger
@@ -25,33 +26,6 @@ public JythonConsoleJDIPlugin() throws FileNotFoundException,
 		super(JythonConsoleJDIPlugin.class.getName());
 	}
 
-	public void consoleQuit(Event event) {
-		JythonConsoleJDIPlugin.LOGGER.info("console quit called!");
-		this.resumeEventSet();
-	}
-
-	@Override
-	public void handleEvent(Event event) {
-		JythonConsoleJDIPlugin.LOGGER.info("handling event: " + event);
-		PySystemState.initialize();
-		PythonInterpreter pyi = new PythonInterpreter();
-		pyi.exec("import sys");
-		pyi.exec("import os");
-		// you can pass the python.path to java to avoid hardcoding this
-		// java -Dpython.path=/path/to/jythonconsole-0.0.6 EmbedExample
-		pyi.exec("con_path = os.path.abspath(r'jythonconsole/jythonconsole-0.0.7/')");
-		pyi.exec("sys.path.append(con_path)");
-		pyi.exec("from console import main");
-		PyObject main = pyi.get("main");
-
-		// stuff some objects into the namespace
-
-		// TODO make an event wrapper object for easier console use?
-		pyi.set("event", event);
-		pyi.set("plugin", this);
-		main.__call__(pyi.getLocals());
-	}
-
 	@Override
 	public void setupEvents() {
 		this.breakpointLocation = this.properties
@@ -60,10 +34,12 @@ public void setupEvents() {
 		try {
 
 			this.createBreakpointRequest(this.breakpointLocation);
+			LOGGER.info("success setting up events!");
 		} catch (LocationNotFoundException e) {
 			JythonConsoleJDIPlugin.LOGGER
 					.error("could not set breakpoint on location: "
 							+ this.breakpointLocation);
 		}
 	}
+	
 }

AndroidSSLBypass/src/com/isecpartners/android/jdwp/DalvikUtils.java

@@ -9,6 +9,7 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.log4j.Logger;
@@ -45,34 +46,42 @@ public TraceMethodsJDIPlugin() throws FileNotFoundException, IOException {
 
 	@Override
 	public void handleEvent(Event event) {
+		StringBuilder out = new StringBuilder("");
 		if (event instanceof MethodEntryEvent) {
 			MethodEntryEvent meEvent = (MethodEntryEvent) event;
 			ThreadReference tr = meEvent.thread();
 			StackFrame fr;
-			StringBuilder out = new StringBuilder("");
+			
 			try {
-				fr = tr.frames().get(0);
+				fr = tr.frame(0);
 				Location loc = fr.location();
 				Method method = loc.method();
-				out.append("\n =============== \n" + method.toString() + "\n=============== \n");
+				out.append("\n===============\n" + method.toString()
+						+ "\n===============\n");
 				out.append("local variables:\n");
-				Map<LocalVariable, Value> vars = fr.getValues(fr.visibleVariables());
-				for(LocalVariable key : vars.keySet()){
-					out.append("\t" + key + " : " + vars.get(key) + "\n");
+				List<LocalVariable> visVars = fr.visibleVariables();
+				if (visVars != null && !visVars.isEmpty()) {
+					Map<LocalVariable, Value> vars = fr.getValues(visVars);
+					for (LocalVariable key : vars.keySet()) {
+						out.append("\t" + key + " : " + vars.get(key) + "\n");
+					}
 				}
 				out.append("\n =============== \n");
-				LOGGER.info(out.toString());
 			} catch (IncompatibleThreadStateException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+				out.append("could not get visible variables due to IncompatibleThreadStateException");
+				LOGGER.error(e);
 			} catch (AbsentInformationException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+				out.append("could not get visible variables due to AbsentInformationException");
+				//TODO should probably print full stack trace
+				LOGGER.error(e);
 			}
 
 		} else {
-			LOGGER.info("received unexpected event type: " + event);
+			out.append("unexpected event type for handler: " + event);
 		}
+		
+		LOGGER.info(out.toString());
+		this.output(out.toString());
 		this.resumeEventSet();
 	}
 

AndroidSSLBypass/src/com/isecpartners/android/jdwp/plugin/JythonConsoleJDIPlugin.java

@@ -4,6 +4,8 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Properties;
 
@@ -46,7 +48,7 @@ public abstract class AbstractJDIPlugin extends QueueAgent implements JDIPlugin
 	public AbstractJDIPlugin(String name){
 		this.name = name;
 	}
-
+	
 	public void output(String message){
 		LOGGER.info(message);
 		try {
@@ -111,9 +113,10 @@ public void init(VirtualMachineEventManager vmem, String path)
 		this.vmem = vmem;
 		this.basePath = path;
 		this.propsPath = path + File.separator + this.getPluginName() + ".prop";
-		this.propsFile = new File(this.propsPath);
-		if(this.propsFile.isFile()){
-			this.properties.load(new FileInputStream(this.propsPath));
+		
+		URL pathURL = ClassLoader.getSystemResource(this.propsPath);
+		if(pathURL != null) {
+		     this.propsFile = new File(pathURL.getPath());
 		}
 		this.setupEvents();
 	}