Merge pull request #1 from FreedomCoder/master

Changes and first commit
swdunlop · Jul 14, 2011 · bc605f8 · bc605f8
2 parents e48a9b9 + ff601ea
commit bc605f8
Show file tree

Hide file tree

Showing 37 changed files with 99 additions and 35 deletions.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -0,0 +1,9 @@
+Special Thanks go to the creator and brain behind this project:
+
+  Scott W. Dunlop <swdunlop@gmail.com>
+    Creator and developer of AndBug.
+
+Thanks go to the following people for patches and contributions:
+
+  Matias Pablo Brutti <matiasbrutti@gmail.com>
+    Only a few touches here and there.
diff --git a/README.rst b/README.rst
@@ -76,7 +76,7 @@ Since AndBug is currently where we (IOActive) offer our own internal tools and t
 License
 -------
 
-Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+Copyright 2011, IOActive All rights reserved.
 
 AndBug is free software: you can redistribute it and/or modify it under 
 the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/andbug b/andbug
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/andbug/__init__.py b/lib/andbug/__init__.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/andbug/cmd/break.py b/lib/andbug/cmd/break.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/andbug/cmd/class_trace.py b/lib/andbug/cmd/class_trace.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/andbug/cmd/classes.py b/lib/andbug/cmd/classes.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/andbug/cmd/dump.py b/lib/andbug/cmd/dump.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/andbug/cmd/exit.py b/lib/andbug/cmd/exit.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/andbug/cmd/help.py b/lib/andbug/cmd/help.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/andbug/cmd/method_trace.py b/lib/andbug/cmd/method_trace.py
@@ -0,0 +1,55 @@
+## Copyright 2011, IOActive, Inc. All rights reserved.
+##
+## AndBug is free software: you can redistribute it and/or modify it under 
+## the terms of version 3 of the GNU Lesser General Public License as 
+## published by the Free Software Foundation.
+##
+## AndBug is distributed in the hope that it will be useful, but WITHOUT ANY
+## WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
+## FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for 
+## more details.
+##
+## You should have received a copy of the GNU Lesser General Public License
+## along with AndBug.  If not, see <http://www.gnu.org/licenses/>.
+
+'implementation of the "mtrace" command'
+
+import andbug.command, andbug.screed, andbug.options
+from Queue import Queue
+
+def report_hit(t):
+    t = t[0]
+    try:
+        with andbug.screed.section("trace %s" % t):
+            f = t.frames[0]
+            name = str(f.loc)
+            if f.native:
+            	name += ' <native>'
+            with andbug.screed.item(name):
+            	for k, v in f.values.items():
+                	andbug.screed.item( "%s=%s" %(k, v))
+    finally:
+        t.resume()
+
+def cmd_hook_methods(ctxt, cpath, mpath):
+    for c in ctxt.sess.classes(cpath):
+        for m in c.methods(mpath):
+            l = m.firstLoc
+            if l.native:
+                andbug.screed.item('Could not hook native %s' % l)
+                continue
+            l.hook(func = report_hit)
+            andbug.screed.item('Hooked %s' % l)
+
+@andbug.command.action(
+    '<method>', name='method-trace', aliases=('mt','mtrace'), shell=True
+)
+def method_trace(ctxt, mpath):
+    'reports calls to specific dalvik method'
+
+    cpath, mname, mjni = andbug.options.parse_mquery(".".join(mpath.split('.')[0:-1]),  mpath.split('.')[-1])
+
+    with andbug.screed.section('Setting Hooks'):
+		cmd_hook_methods(ctxt, cpath, mname)
+
+    ctxt.block_exit()
diff --git a/lib/andbug/cmd/methods.py b/lib/andbug/cmd/methods.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/andbug/cmd/resume.py b/lib/andbug/cmd/resume.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/andbug/cmd/shell.py b/lib/andbug/cmd/shell.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/andbug/cmd/source.py b/lib/andbug/cmd/source.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/andbug/cmd/statics.py b/lib/andbug/cmd/statics.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/andbug/cmd/suspend.py b/lib/andbug/cmd/suspend.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/andbug/cmd/threads.py b/lib/andbug/cmd/threads.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/andbug/command.py b/lib/andbug/command.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/andbug/data.py b/lib/andbug/data.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/andbug/errors.py b/lib/andbug/errors.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/andbug/log.py b/lib/andbug/log.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/andbug/options.py b/lib/andbug/options.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/andbug/proto.py b/lib/andbug/proto.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/andbug/screed.py b/lib/andbug/screed.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/andbug/source.py b/lib/andbug/source.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/andbug/util.py b/lib/andbug/util.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without 
 ## modification, are permitted provided that the following conditions are 

diff --git a/lib/andbug/vm.py b/lib/andbug/vm.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/jdwp/jdwp.pyx b/lib/jdwp/jdwp.pyx
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/jdwp/wire.c b/lib/jdwp/wire.c
@@ -1,4 +1,4 @@
-/* Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+/* Copyright 2011, IOActive All rights reserved.
 
    AndBug is free software: you can redistribute it and/or modify it under 
    the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/lib/jdwp/wire.h b/lib/jdwp/wire.h
@@ -1,4 +1,4 @@
-/* Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+/* Copyright 2011, IOActive All rights reserved.
 
    AndBug is free software: you can redistribute it and/or modify it under 
    the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/tests/__init__.py b/tests/__init__.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/tests/jdwp.py b/tests/jdwp.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/tests/log.py b/tests/log.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/tests/options.py b/tests/options.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as 

diff --git a/tests/proto.py b/tests/proto.py
@@ -1,4 +1,4 @@
-## Copyright 2011, Scott W. Dunlop <swdunlop@gmail.com> All rights reserved.
+## Copyright 2011, IOActive, Inc. All rights reserved.
 ##
 ## AndBug is free software: you can redistribute it and/or modify it under 
 ## the terms of version 3 of the GNU Lesser General Public License as