diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/pychrysa/analysis/Makefile.am | 3 | ||||
| -rw-r--r-- | plugins/pychrysa/analysis/binaries/Makefile.am | 14 | ||||
| -rw-r--r-- | plugins/pychrysa/analysis/binaries/file.c | 190 | ||||
| -rw-r--r-- | plugins/pychrysa/analysis/binaries/file.h | 42 | ||||
| -rw-r--r-- | plugins/pychrysa/analysis/binaries/module.c | 89 | ||||
| -rw-r--r-- | plugins/pychrysa/analysis/binaries/module.h | 39 | ||||
| -rw-r--r-- | plugins/pychrysa/analysis/binary.c | 64 | ||||
| -rw-r--r-- | plugins/pychrysa/analysis/module.c | 2 |
8 files changed, 55 insertions, 388 deletions
diff --git a/plugins/pychrysa/analysis/Makefile.am b/plugins/pychrysa/analysis/Makefile.am index c014dfd..5b90c07 100644 --- a/plugins/pychrysa/analysis/Makefile.am +++ b/plugins/pychrysa/analysis/Makefile.am @@ -9,7 +9,6 @@ libpychrysaanalysis_la_SOURCES = \ routine.h routine.c libpychrysaanalysis_la_LIBADD = \ - binaries/libpychrysaanalysisbinaries.la \ blocks/libpychrysaanalysisblocks.la \ contents/libpychrysaanalysiscontents.la \ db/libpychrysaanalysisdb.la @@ -22,4 +21,4 @@ AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJE AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) -SUBDIRS = binaries blocks contents db +SUBDIRS = blocks contents db diff --git a/plugins/pychrysa/analysis/binaries/Makefile.am b/plugins/pychrysa/analysis/binaries/Makefile.am deleted file mode 100644 index 03a7aeb..0000000 --- a/plugins/pychrysa/analysis/binaries/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ - -noinst_LTLIBRARIES = libpychrysaanalysisbinaries.la - -libpychrysaanalysisbinaries_la_SOURCES =\ - file.h file.c \ - module.h module.c - -libpychrysaanalysisbinaries_la_LDFLAGS = - - -AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ - -I../../../../src - -AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/plugins/pychrysa/analysis/binaries/file.c b/plugins/pychrysa/analysis/binaries/file.c deleted file mode 100644 index 40463ba..0000000 --- a/plugins/pychrysa/analysis/binaries/file.c +++ /dev/null @@ -1,190 +0,0 @@ - -/* Chrysalide - Outil d'analyse de fichiers binaires - * file.c - prototypes pour l'équivalent Python du fichier "analysis/binaries/file.c" - * - * Copyright (C) 2012 Cyrille Bagard - * - * This file is part of Chrysalide. - * - * 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 "file.h" - - -#include <pygobject.h> - - -#include <analysis/binaries/file.h> - - -#include "../binary.h" - - - -/* Crée un nouvel objet Python de type 'BinaryFile'. */ -static PyObject *py_binary_file_new(PyTypeObject *, PyObject *, PyObject *); - -/* Fournit le chemin d'accès au binaire représenté. */ -static PyObject *py_binary_file_get_filename(PyObject *, void *); - - - -/****************************************************************************** -* * -* 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 'BinaryFile'. * -* * -* Retour : Instance Python mise en place. * -* * -* Remarques : - * -* * -******************************************************************************/ - -static PyObject *py_binary_file_new(PyTypeObject *type, PyObject *args, PyObject *kwds) -{ - PyObject *result; /* Instance à retourner */ - const char *filename; /* Nom du fichier à charger */ - int ret; /* Bilan de lecture des args. */ - GLoadedBinary *binary; /* Version GLib du format */ - - ret = PyArg_ParseTuple(args, "s", &filename); - if (!ret) Py_RETURN_NONE; - - binary = g_file_binary_new_from_file(filename); - - result = pygobject_new(G_OBJECT(binary)); - g_object_unref(binary); - - return result; - -} - - -/****************************************************************************** -* * -* Paramètres : self = objet Python concerné par l'appel. * -* closure = non utilisé ici. * -* * -* Description : Fournit le chemin d'accès au binaire représenté. * -* * -* Retour : Chemin d'accès en Python. * -* * -* Remarques : - * -* * -******************************************************************************/ - -static PyObject *py_binary_file_get_filename(PyObject *self, void *closure) -{ - const GFileBinary *file; /* Fichier binaire concerné */ - const char *filename; /* Chemin d'accès à diffuser */ - - file = G_FILE_BINARY(pygobject_get(self)); - filename = g_file_binary_get_filename(file); - - return PyUnicode_FromString(filename); - -} - - -/****************************************************************************** -* * -* Paramètres : - * -* * -* Description : Fournit un accès à une définition de type à diffuser. * -* * -* Retour : Définition d'objet pour Python. * -* * -* Remarques : - * -* * -******************************************************************************/ - -PyTypeObject *get_python_binary_file_type(void) -{ - static PyMethodDef py_binary_file_methods[] = { - { NULL } - }; - - static PyGetSetDef py_binary_file_getseters[] = { - { - "filename", py_binary_file_get_filename, NULL, - "Show the filename of the loaded binary file.", NULL - }, - { NULL } - }; - - static PyTypeObject py_binary_file_type = { - - PyVarObject_HEAD_INIT(NULL, 0) - - .tp_name = "pychrysalide.analysis.binaries.BinaryFile", - .tp_basicsize = sizeof(PyGObject), - - .tp_flags = Py_TPFLAGS_DEFAULT, - - .tp_doc = "PyChrysalide binary file", - - .tp_methods = py_binary_file_methods, - .tp_getset = py_binary_file_getseters, - .tp_new = (newfunc)py_binary_file_new - - }; - - return &py_binary_file_type; - -} - - -/****************************************************************************** -* * -* Paramètres : module = module dont la définition est à compléter. * -* * -* Description : Prend en charge l'objet 'pychrysalide.analysis.BinaryFile'. * -* * -* Retour : Bilan de l'opération. * -* * -* Remarques : - * -* * -******************************************************************************/ - -bool register_python_binary_file(PyObject *module) -{ - PyTypeObject *py_binary_file_type; /* Type Python 'LoadedBinary' */ - int ret; /* Bilan d'un appel */ - PyObject *dict; /* Dictionnaire du module */ - - py_binary_file_type = get_python_binary_file_type(); - - py_binary_file_type->tp_base = get_python_loaded_binary_type(); - py_binary_file_type->tp_basicsize = py_binary_file_type->tp_base->tp_basicsize; - - if (PyType_Ready(py_binary_file_type) != 0) - return false; - - Py_INCREF(py_binary_file_type); - ret = PyModule_AddObject(module, "BinaryFile", (PyObject *)py_binary_file_type); - if (ret != 0) return false; - - dict = PyModule_GetDict(module); - pygobject_register_class(dict, "BinaryFile", G_TYPE_FILE_BINARY, py_binary_file_type, - Py_BuildValue("(O)", py_binary_file_type->tp_base)); - - return true; - -} diff --git a/plugins/pychrysa/analysis/binaries/file.h b/plugins/pychrysa/analysis/binaries/file.h deleted file mode 100644 index b381379..0000000 --- a/plugins/pychrysa/analysis/binaries/file.h +++ /dev/null @@ -1,42 +0,0 @@ - -/* Chrysalide - Outil d'analyse de fichiers binaires - * file.h - prototypes pour l'équivalent Python du fichier "analysis/binaries/file.h" - * - * Copyright (C) 2012 Cyrille Bagard - * - * This file is part of Chrysalide. - * - * 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_ANALYSIS_BINARIES_FILE_H -#define _PLUGINS_PYCHRYSA_ANALYSIS_BINARIES_FILE_H - - -#include <Python.h> -#include <stdbool.h> - - - -/* Fournit un accès à une définition de type à diffuser. */ -PyTypeObject *get_python_binary_file_type(void); - -/* Prend en charge l'objet 'pychrysalide.analysis.binaries.BinaryFile'. */ -bool register_python_binary_file(PyObject *); - - - -#endif /* _PLUGINS_PYCHRYSA_ANALYSIS_BINARIES_FILE_H */ diff --git a/plugins/pychrysa/analysis/binaries/module.c b/plugins/pychrysa/analysis/binaries/module.c deleted file mode 100644 index b43d24f..0000000 --- a/plugins/pychrysa/analysis/binaries/module.c +++ /dev/null @@ -1,89 +0,0 @@ - -/* Chrysalide - Outil d'analyse de fichiers binaires - * module.c - intégration du répertoire binaries en tant que module - * - * Copyright (C) 2012 Cyrille Bagard - * - * This file is part of Chrysalide. - * - * 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 <assert.h> - - -#include "file.h" - - - -/****************************************************************************** -* * -* Paramètres : module = module dont la définition est à compléter. * -* * -* Description : Ajoute le module 'binaries' au module Python. * -* * -* Retour : - * -* * -* Remarques : - * -* * -******************************************************************************/ - -bool add_analysis_binaries_module_to_python_module(PyObject *super) -{ - bool result; /* Bilan à retourner */ - PyObject *module; /* Sous-module mis en place */ - int ret; /* Bilan d'un appel */ - - static PyModuleDef py_chrysalide_binaries_module = { - - .m_base = PyModuleDef_HEAD_INIT, - - .m_name = "pychrysalide.analysis.binaries", - .m_doc = "Python module for Chrysalide.analysis.binaries", - - .m_size = -1, - - }; - - result = false; - - module = PyModule_Create(&py_chrysalide_binaries_module); - if (module == NULL) return false; - - ret = PyState_AddModule(super, &py_chrysalide_binaries_module); - if (ret != 0) goto loading_failed; - - ret = _PyImport_FixupBuiltin(module, "pychrysalide.analysis.binaries"); - if (ret != 0) goto loading_failed; - - Py_INCREF(module); - ret = PyModule_AddObject(super, "binaries", module); - if (ret != 0) goto loading_failed; - - result = true; - - result &= register_python_binary_file(module); - - loading_failed: - - assert(result); - - return result; - -} diff --git a/plugins/pychrysa/analysis/binaries/module.h b/plugins/pychrysa/analysis/binaries/module.h deleted file mode 100644 index 653f7da..0000000 --- a/plugins/pychrysa/analysis/binaries/module.h +++ /dev/null @@ -1,39 +0,0 @@ - -/* Chrysalide - Outil d'analyse de fichiers binaires - * module.h - prototypes pour l'intégration du répertoire binaries en tant que module - * - * Copyright (C) 2012 Cyrille Bagard - * - * This file is part of Chrysalide. - * - * 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_ANALYSIS_BINARIES_MODULE_H -#define _PLUGINS_PYCHRYSA_ANALYSIS_BINARIES_MODULE_H - - -#include <Python.h> -#include <stdbool.h> - - - -/* Ajoute le module 'binaries' au module Python. */ -bool add_analysis_binaries_module_to_python_module(PyObject *); - - - -#endif /* _PLUGINS_PYCHRYSA_ANALYSIS_BINARIES_MODULE_H */ diff --git a/plugins/pychrysa/analysis/binary.c b/plugins/pychrysa/analysis/binary.c index fad84cd..31fbfc2 100644 --- a/plugins/pychrysa/analysis/binary.c +++ b/plugins/pychrysa/analysis/binary.c @@ -35,12 +35,15 @@ -/* Lance l'analyse d'un élément binaire chargé. */ -static PyObject *py_loaded_binary_analyse(PyObject *, PyObject *); +/* Crée un nouvel objet Python de type 'LoadedBinary'. */ +static PyObject *py_loaded_binary_new(PyTypeObject *, PyObject *, PyObject *); /* Fournit le nom associé à l'élément binaire. */ static PyObject *py_loaded_binary_get_name(PyObject *, void *); +/* Lance l'analyse d'un élément binaire chargé. */ +static PyObject *py_loaded_binary_analyse(PyObject *, PyObject *); + /* Fournit le format de fichier reconnu dans le contenu binaire. */ static PyObject *py_loaded_binary_get_format(PyObject *, void *); @@ -54,26 +57,40 @@ static PyObject *py_loaded_binary_get_disassembled_buffer(PyObject *, void *); /****************************************************************************** * * -* Paramètres : self = contenu binaire à manipuler. * -* args = non utilisé ici. * +* Paramètres : type = type de l'objet à instancier. * +* args = arguments fournis à l'appel. * +* kwds = arguments de type key=val fournis. * * * -* Description : Lance l'analyse d'un élément binaire chargé. * +* Description : Crée un nouvel objet Python de type 'LoadedBinary'. * * * -* Retour : Rien (None). * +* Retour : Instance Python mise en place. * * * * Remarques : - * * * ******************************************************************************/ -static PyObject *py_loaded_binary_analyse(PyObject *self, PyObject *args) +static PyObject *py_loaded_binary_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { + PyObject *result; /* Instance à retourner */ + PyObject *content_obj; /* Objet pour le contenu */ + int ret; /* Bilan de lecture des args. */ + GBinContent *content; /* Instance GLib correspondante*/ GLoadedBinary *binary; /* Version GLib du format */ - binary = G_LOADED_BINARY(pygobject_get(self)); + ret = PyArg_ParseTuple(args, "O", &content_obj); + if (!ret) return NULL; - g_loaded_binary_analyse(binary); + ret = PyObject_IsInstance(content_obj, (PyObject *)get_python_binary_content_type()); + if (!ret) return NULL; - Py_RETURN_NONE; + content = G_BIN_CONTENT(pygobject_get(content_obj)); + binary = g_loaded_binary_new(content); + + result = pygobject_new(G_OBJECT(binary)); + + g_object_unref(binary); + + return result; } @@ -110,6 +127,32 @@ static PyObject *py_loaded_binary_get_name(PyObject *self, void *closure) /****************************************************************************** * * +* Paramètres : self = contenu binaire à manipuler. * +* args = non utilisé ici. * +* * +* Description : Lance l'analyse d'un élément binaire chargé. * +* * +* Retour : Rien (None). * +* * +* Remarques : - * +* * +******************************************************************************/ + +static PyObject *py_loaded_binary_analyse(PyObject *self, PyObject *args) +{ + GLoadedBinary *binary; /* Version GLib du format */ + + binary = G_LOADED_BINARY(pygobject_get(self)); + + g_loaded_binary_analyse(binary); + + Py_RETURN_NONE; + +} + + +/****************************************************************************** +* * * Paramètres : self = objet Python concerné par l'appel. * * closure = non utilisé ici. * * * @@ -255,6 +298,7 @@ PyTypeObject *get_python_loaded_binary_type(void) .tp_methods = py_loaded_binary_methods, .tp_getset = py_loaded_binary_getseters, + .tp_new = (newfunc)py_loaded_binary_new }; diff --git a/plugins/pychrysa/analysis/module.c b/plugins/pychrysa/analysis/module.c index 2520d42..ea0f34d 100644 --- a/plugins/pychrysa/analysis/module.c +++ b/plugins/pychrysa/analysis/module.c @@ -32,7 +32,6 @@ #include "block.h" #include "content.h" #include "routine.h" -#include "binaries/module.h" #include "blocks/module.h" #include "contents/module.h" #include "db/module.h" @@ -90,7 +89,6 @@ bool add_analysis_module_to_python_module(PyObject *super) //result &= register_python_binary_content(module); result &= register_python_binary_routine(module); - result &= add_analysis_binaries_module_to_python_module(module); result &= add_analysis_blocks_module_to_python_module(module); result &= add_analysis_contents_module_to_python_module(module); result &= add_analysis_db_module_to_python_module(module); |