diff options
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/pychrysa/format/Makefile.am | 5 | ||||
-rw-r--r-- | plugins/pychrysa/format/elf/Makefile.am | 17 | ||||
-rw-r--r-- | plugins/pychrysa/format/elf/elf.c | 150 | ||||
-rw-r--r-- | plugins/pychrysa/format/elf/elf.h | 39 | ||||
-rw-r--r-- | plugins/pychrysa/format/elf/module.c | 68 | ||||
-rw-r--r-- | plugins/pychrysa/format/elf/module.h | 39 | ||||
-rw-r--r-- | plugins/pychrysa/format/module.c | 2 | ||||
-rw-r--r-- | plugins/python/androperms/androperms.py | 6 | ||||
-rw-r--r-- | plugins/python/androperms/panel.py | 5 |
9 files changed, 328 insertions, 3 deletions
diff --git a/plugins/pychrysa/format/Makefile.am b/plugins/pychrysa/format/Makefile.am index 9a48749..46d4d23 100644 --- a/plugins/pychrysa/format/Makefile.am +++ b/plugins/pychrysa/format/Makefile.am @@ -7,7 +7,8 @@ libpychrysaformat_la_SOURCES = \ module.h module.c libpychrysaformat_la_LIBADD = \ - dex/libpychrysaformatdex.la + dex/libpychrysaformatdex.la \ + elf/libpychrysaformatelf.la libpychrysaformat_la_LDFLAGS = @@ -20,4 +21,4 @@ AM_CPPFLAGS = AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) -SUBDIRS = dex +SUBDIRS = dex elf diff --git a/plugins/pychrysa/format/elf/Makefile.am b/plugins/pychrysa/format/elf/Makefile.am new file mode 100644 index 0000000..e2731cb --- /dev/null +++ b/plugins/pychrysa/format/elf/Makefile.am @@ -0,0 +1,17 @@ + +noinst_LTLIBRARIES = libpychrysaformatelf.la + +libpychrysaformatelf_la_SOURCES = \ + elf.h elf.c \ + module.h module.c + + +libpychrysaformatelf_la_LDFLAGS = + + +INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ + -I../../../../src + +AM_CPPFLAGS = + +AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/plugins/pychrysa/format/elf/elf.c b/plugins/pychrysa/format/elf/elf.c new file mode 100644 index 0000000..16baf5d --- /dev/null +++ b/plugins/pychrysa/format/elf/elf.c @@ -0,0 +1,150 @@ + +/* OpenIDA - Outil d'analyse de fichiers binaires + * elf.c - équivalent Python du fichier "format/elf/elf.c" + * + * Copyright (C) 2013 Cyrille Bagard + * + * This file is part of OpenIDA. + * + * OpenIDA is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * OpenIDA 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#include "elf.h" + + +#include <pygobject.h> + + +#include <format/elf/elf-int.h> + + +#include "../../quirks.h" + + + +/* Crée un nouvel objet Python de type 'ElfFormat'. */ +static PyObject *py_elf_format_new(PyTypeObject *, PyObject *, PyObject *); + + + +/****************************************************************************** +* * +* Paramètres : type = type de l'objet à instancier. * +* args = arguments fournis à l'appel. * +* kwds = arguments de type key=val fournis. * +* * +* Description : Crée un nouvel objet Python de type 'ElfFormat'. * +* * +* Retour : Instance Python mise en place. * +* * +* Remarques : - * +* * +******************************************************************************/ + +static PyObject *py_elf_format_new(PyTypeObject *type, PyObject *args, PyObject *kwds) +{ + PyObject *result; /* Instance à retourner */ + const bin_t *content; /* Données binaires */ + int length; /* Quantité de ces données */ + int ret; /* Bilan de lecture des args. */ + GBinFormat *format; /* Version GLib du format */ + + ret = PyArg_ParseTuple(args, "s#", &content, &length); + if (!ret) Py_RETURN_NONE; + + format = g_elf_format_new(content, length); + if (format == NULL) Py_RETURN_NONE; + + result = pygobject_new(G_OBJECT(format)); + //g_object_unref(format); + + return (PyObject *)result; + +} + + + + + + + + +/****************************************************************************** +* * +* Paramètres : module = module dont la définition est à compléter. * +* * +* Description : Prend en charge l'objet 'pychrysalide.format.elf.ElfFormat'. * +* * +* Retour : Bilan de l'opération. * +* * +* Remarques : - * +* * +******************************************************************************/ + +bool register_python_elf_format(PyObject *module) +{ + PyObject *parent_mod; /* Accès au module parent */ + int ret; /* Bilan d'un appel */ + + static PyMethodDef py_elf_format_methods[] = { + { NULL } + }; + + static PyGetSetDef py_elf_format_getseters[] = { + { NULL } + }; + + static PyTypeObject py_elf_format_type = { + + PyObject_HEAD_INIT(NULL) + + .tp_name = "pychrysalide.format.elf.ElfFormat", + .tp_basicsize = sizeof(PyGObject), + + .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, + + .tp_doc = "PyChrysalide Elf format", + + .tp_methods = py_elf_format_methods, + .tp_getset = py_elf_format_getseters, + .tp_new = (newfunc)py_elf_format_new + + }; + + parent_mod = PyImport_ImportModule("pychrysalide.format"); + if (parent_mod == NULL) return false; + + py_elf_format_type.tp_base = (PyTypeObject *)PyObject_GetAttrString(parent_mod, "ExeFormat"); + Py_DECREF(parent_mod); + + if (PyType_Ready(&py_elf_format_type) < 0) + return false; + + Py_INCREF(&py_elf_format_type); + ret = PyModule_AddObject(module, "ElfFormat", (PyObject *)&py_elf_format_type); + + parent_mod = PyImport_ImportModule("pychrysalide.format"); + if (parent_mod == NULL) return false; + + pygobject_register_class(module, "GElfFormat", G_TYPE_ELF_FORMAT, &py_elf_format_type, + Py_BuildValue("(OO)", py_elf_format_type.tp_base, + PyObject_GetAttrString(parent_mod, "BinFormat"))); + + Py_DECREF(parent_mod); + + return (ret == 0); + +} diff --git a/plugins/pychrysa/format/elf/elf.h b/plugins/pychrysa/format/elf/elf.h new file mode 100644 index 0000000..2b87970 --- /dev/null +++ b/plugins/pychrysa/format/elf/elf.h @@ -0,0 +1,39 @@ + +/* OpenIDA - Outil d'analyse de fichiers binaires + * elf.h - prototypes pour l'équivalent Python du fichier "format/elf/elf.h" + * + * Copyright (C) 2013 Cyrille Bagard + * + * This file is part of OpenIDA. + * + * OpenIDA is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * OpenIDA 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#ifndef _PLUGINS_PYCHRYSA_FORMAT_ELF_ELF_H +#define _PLUGINS_PYCHRYSA_FORMAT_ELF_ELF_H + + +#include <Python.h> +#include <stdbool.h> + + + +/* Prend en charge l'objet 'pychrysalide.format.elf.ElfFormat'. */ +bool register_python_elf_format(PyObject *module); + + + +#endif /* _PLUGINS_PYCHRYSA_FORMAT_ELF_ELF_H */ diff --git a/plugins/pychrysa/format/elf/module.c b/plugins/pychrysa/format/elf/module.c new file mode 100644 index 0000000..ed515ea --- /dev/null +++ b/plugins/pychrysa/format/elf/module.c @@ -0,0 +1,68 @@ + +/* OpenIDA - Outil d'analyse de fichiers binaires + * module.c - intégration du répertoire elf en tant que module + * + * Copyright (C) 2013 Cyrille Bagard + * + * This file is part of OpenIDA. + * + * OpenIDA is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * OpenIDA 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#include "module.h" + + +#include "elf.h" + + + +/****************************************************************************** +* * +* Paramètres : module = module dont la définition est à compléter. * +* * +* Description : Ajoute le module 'format.elf' au module Python. * +* * +* Retour : - * +* * +* Remarques : - * +* * +******************************************************************************/ + +bool add_format_elf_module_to_python_module(PyObject *super) +{ + bool result; + PyObject *module; + int ret; /* Bilan d'un appel */ + + static PyMethodDef py_format_elf_methods[] = { + { NULL } + }; + + module = Py_InitModule("pychrysalide.format.elf", py_format_elf_methods); + if (module == NULL) return false; + + Py_INCREF(module); + ret = PyModule_AddObject(super, "pychrysalide.format.elf", module); + + result = (ret == 0); + + if (ret != 0) /* ... */; + + result &= register_python_elf_format(module); + + return true; + +} diff --git a/plugins/pychrysa/format/elf/module.h b/plugins/pychrysa/format/elf/module.h new file mode 100644 index 0000000..bd2a0d4 --- /dev/null +++ b/plugins/pychrysa/format/elf/module.h @@ -0,0 +1,39 @@ + +/* OpenIDA - Outil d'analyse de fichiers binaires + * module.h - prototypes pour l'intégration du répertoire elf en tant que module + * + * Copyright (C) 2013 Cyrille Bagard + * + * This file is part of OpenIDA. + * + * OpenIDA is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * OpenIDA 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#ifndef _PLUGINS_PYCHRYSA_FORMAT_ELF_MODULE_H +#define _PLUGINS_PYCHRYSA_FORMAT_ELF_MODULE_H + + +#include <Python.h> +#include <stdbool.h> + + + +/* Ajoute le module 'format.elf' au module Python. */ +bool add_format_elf_module_to_python_module(PyObject *); + + + +#endif /* _PLUGINS_PYCHRYSA_FORMAT_ELF_MODULE_H */ diff --git a/plugins/pychrysa/format/module.c b/plugins/pychrysa/format/module.c index 3045dac..14bb9bd 100644 --- a/plugins/pychrysa/format/module.c +++ b/plugins/pychrysa/format/module.c @@ -28,6 +28,7 @@ #include "executable.h" #include "format.h" #include "dex/module.h" +#include "elf/module.h" @@ -67,6 +68,7 @@ bool add_format_module_to_python_module(PyObject *super) result &= register_python_executable_format(module); result &= add_format_dex_module_to_python_module(module); + result &= add_format_elf_module_to_python_module(module); return result; diff --git a/plugins/python/androperms/androperms.py b/plugins/python/androperms/androperms.py index ddccb8a..f68b9a5 100644 --- a/plugins/python/androperms/androperms.py +++ b/plugins/python/androperms/androperms.py @@ -5,6 +5,7 @@ from manifest import AndroidManifest from db import PermsDataBase from panel import PermsPanel from pychrysalide import Plugin +from pychrysalide.format.dex import DexFormat from xml.dom import minidom import re @@ -31,6 +32,10 @@ class AndroPerms(Plugin): def execute_on_binary(self, binary, action): """Process once a binary is disassembled.""" + fmt = binary.get_format() + if not isinstance(fmt, DexFormat): + return False + zf = zipfile.ZipFile(binary.get_filename()) f = zf.open('AndroidManifest.xml', 'r') @@ -56,7 +61,6 @@ class AndroPerms(Plugin): db = PermsDataBase() db.filter_permissions(plist) - fmt = binary.get_format() instrs = binary.get_instructions() buf = binary.disassembled_buffer diff --git a/plugins/python/androperms/panel.py b/plugins/python/androperms/panel.py index b892339..8f8e925 100644 --- a/plugins/python/androperms/panel.py +++ b/plugins/python/androperms/panel.py @@ -1,6 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- +from pychrysalide.format.dex import DexFormat from pychrysalide.gui.panels import PanelItem import gtk @@ -88,6 +89,10 @@ class PermsPanel(PanelItem): self._store.clear() + fmt = binary.get_format() + if not isinstance(fmt, DexFormat): + return False + used = self._perms[binary] for p in used: |