Introduced attributes for loaded contents.

6 files changed, 515 insertions, 3 deletions

diff --git a/plugins/pychrysalide/analysis/Makefile.am b/plugins/pychrysalide/analysis/Makefile.am
index 0405243..65f2150 100644
--- a/plugins/pychrysalide/analysis/Makefile.am
+++ b/plugins/pychrysalide/analysis/Makefile.am
@@ -4,6 +4,7 @@ noinst_LTLIBRARIES = libpychrysaanalysis.la
 libpychrysaanalysis_la_SOURCES =		\
 	binary.h binary.c					\
 	block.h block.c						\
+	cattribs.h cattribs.c				\
 	content.h content.c					\
 	loaded.h loaded.c					\
 	loading.h loading.c					\
diff --git a/plugins/pychrysalide/analysis/cattribs.c b/plugins/pychrysalide/analysis/cattribs.c
new file mode 100644
index 0000000..be5c5b1
--- /dev/null
+++ b/plugins/pychrysalide/analysis/cattribs.c
@@ -0,0 +1,376 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * cattribs.c - équivalent Python du fichier "analysis/cattribs.h"
+ *
+ * Copyright (C) 2019 Cyrille Bagard
+ *
+ *  This file is part of Chrysalide.
+ *
+ *  Chrysalide 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.
+ *
+ *  Chrysalide 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 "cattribs.h"
+
+
+#include <pygobject.h>
+
+
+#include <i18n.h>
+
+
+#include <analysis/cattribs.h>
+
+
+#include "../access.h"
+#include "../helpers.h"
+
+
+
+/* Crée un nouvel objet Python de type 'ContentAttributes'. */
+static PyObject *py_content_attributes_new(PyTypeObject *, PyObject *, PyObject *);
+
+/* Fournit l'ensemble des clefs d'un ensemble d'attributs. */
+static PyObject *py_content_attributes_subscript(PyObject *, PyObject *);
+
+/* Fournit le fichier de base compris dans le chemin initial. */
+static PyObject *py_content_attributes_get_filename(PyObject *, void *);
+
+/* Fournit l'ensemble des clefs d'un ensemble d'attributs. */
+static PyObject *py_content_attributes_get_keys(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 'ContentAttributes'.     *
+*                                                                             *
+*  Retour      : Instance Python mise en place.                               *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_content_attributes_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+    PyObject *result;                       /* Instance à retourner        */
+    const char *path;                       /* Chemin d'accès à traiter    */
+    int ret;                                /* Bilan de lecture des args.  */
+    GContentAttributes *attribs;            /* Création GLib à transmettre */
+
+#define CONTENT_ATTRIBUTES_DOC                                                  \
+    "ContentAttributes is a set of values used at binary content loading.\n"    \
+    "\n"                                                                        \
+    "Such parameters are useful to transmit password for encrypted contents"    \
+    " for instance. These parameters can be accessed like dictionary items:\n"  \
+    "\n"                                                                        \
+    "    password = attributes['password']\n"                                   \
+    "    attributes['password'] = 'updated'\n"                                  \
+    "\n"                                                                        \
+    "Instances can be created using the following constructor:\n"               \
+    "\n"                                                                        \
+    "    ContentAttributes(path)\n"                                             \
+    "\n"                                                                        \
+    "Where path is a list of parameters: '[...]&key0=value0&key1=value1...'"
+
+    ret = PyArg_ParseTuple(args, "s", &path);
+    if (!ret) return NULL;
+
+    attribs = g_content_attributes_new(path);
+
+    if (attribs != NULL)
+    {
+        g_object_ref_sink(G_OBJECT(attribs));
+        result = pygobject_new(G_OBJECT(attribs));
+        g_object_unref(attribs);
+    }
+    else
+    {
+        result = Py_None;
+        Py_INCREF(result);
+    }
+
+    return result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self = objet Python concerné par l'appel.                    *
+*                key  = clef d'accès servant d'indice.                        *
+*                                                                             *
+*  Description : Fournit l'ensemble des clefs d'un ensemble d'attributs.      *
+*                                                                             *
+*  Retour      : Valeur associée à la clef trouvée, ou NULL en cas d'échec.   *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_content_attributes_subscript(PyObject *self, PyObject *key)
+{
+    PyObject *result;                       /* Valeur à retourner          */
+    void *keyval;                           /* Valeur brute de la clef     */
+    GContentAttributes *cattribs;           /* Version native              */
+    const char *value;                      /* Valeur brute trouvée        */
+
+    result = NULL;
+
+    if (!PyUnicode_Check(key))
+        PyErr_SetString(PyExc_TypeError, "key must be a string value");
+
+    else
+    {
+        keyval = PyUnicode_DATA(key);
+
+        cattribs = G_CONTENT_ATTRIBUTES(pygobject_get(self));
+
+        value = g_content_attributes_get_value(cattribs, keyval);
+
+        if (value == NULL)
+            PyErr_SetString(PyExc_KeyError, "attribute value not found for the provided key");
+
+        else
+            result = PyUnicode_FromString(value);
+
+    }
+
+    return result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self    = objet Python concerné par l'appel.                 *
+*                closure = non utilisé ici.                                   *
+*                                                                             *
+*  Description : Fournit l'ensemble des clefs d'un ensemble d'attributs.      *
+*                                                                             *
+*  Retour      : Liste de clefs des attributes conservés dans l'ensemble.     *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_content_attributes_get_keys(PyObject *self, void *closure)
+{
+    PyObject *result;                       /* Valeur à retourner          */
+    GContentAttributes *cattribs;           /* Version native              */
+    size_t count;                           /* Nombre d'éléments à traiter */
+    const char **keys;                      /* Clefs des attributs         */
+    size_t i;                               /* Boucle de parcours          */
+
+#define CONTENT_ATTRIBUTES_KEYS_ATTRIB PYTHON_GET_DEF_FULL      \
+(                                                               \
+    keys, py_content_attributes,                                \
+    "Keys of all attributes contained in a set of values."      \
+)
+
+    cattribs = G_CONTENT_ATTRIBUTES(pygobject_get(self));
+
+    keys = g_content_attributes_get_keys(cattribs, &count);
+
+    result = PyTuple_New(count);
+
+    for (i = 0; i < count; i++)
+        PyTuple_SetItem(result, i, PyUnicode_FromString(keys[i]));
+
+    return result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self    = objet Python concerné par l'appel.                 *
+*                closure = non utilisé ici.                                   *
+*                                                                             *
+*  Description : Fournit le fichier de base compris dans le chemin initial.   *
+*                                                                             *
+*  Retour      : Nom de fichier renvoyant vers un contenu à charger ou None.  *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_content_attributes_get_filename(PyObject *self, void *closure)
+{
+    PyObject *result;                       /* Valeur à retourner          */
+    GContentAttributes *cattribs;           /* Version native              */
+    const char *filename;                   /* Nom de fichier natif        */
+
+#define CONTENT_ATTRIBUTES_FILENAME_ATTRIB PYTHON_GET_DEF_FULL              \
+(                                                                           \
+    filename, py_content_attributes,                                        \
+    "Filename extracted from the path provided to the attribute set,"       \
+    " constructor, or None if no filename was defined."                     \
+)
+
+    cattribs = G_CONTENT_ATTRIBUTES(pygobject_get(self));
+
+    filename = g_content_attributes_get_filename(cattribs);
+
+    if (filename != NULL)
+        result = PyUnicode_FromString(filename);
+
+    else
+    {
+        result = Py_None;
+        Py_INCREF(result);
+    }
+
+    return result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : -                                                            *
+*                                                                             *
+*  Description : Fournit un accès à une définition de type à diffuser.        *
+*                                                                             *
+*  Retour      : Définition d'objet pour Python.                              *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+PyTypeObject *get_python_content_attributes_type(void)
+{
+    static PyMappingMethods py_content_attributes_mapping = {
+        .mp_length        = NULL,
+        .mp_subscript     = py_content_attributes_subscript,
+        .mp_ass_subscript = NULL
+    };
+
+    static PyMethodDef py_content_attributes_methods[] = {
+        { NULL }
+    };
+
+    static PyGetSetDef py_content_attributes_getseters[] = {
+        CONTENT_ATTRIBUTES_FILENAME_ATTRIB,
+        CONTENT_ATTRIBUTES_KEYS_ATTRIB,
+        { NULL }
+    };
+
+    static PyTypeObject py_content_attributes_type = {
+
+        PyVarObject_HEAD_INIT(NULL, 0)
+
+        .tp_name        = "pychrysalide.analysis.ContentAttributes",
+
+        .tp_as_mapping  = &py_content_attributes_mapping,
+
+        .tp_flags       = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+
+        .tp_doc         = CONTENT_ATTRIBUTES_DOC,
+
+        .tp_methods     = py_content_attributes_methods,
+        .tp_getset      = py_content_attributes_getseters,
+        .tp_new         = py_content_attributes_new
+
+    };
+
+    return &py_content_attributes_type;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : -                                                            *
+*                                                                             *
+*  Description : Prend en charge l'objet 'pychrysalide.....ContentAttributes'.*
+*                                                                             *
+*  Retour      : Bilan de l'opération.                                        *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+bool ensure_python_content_attributes_is_registered(void)
+{
+    PyTypeObject *type;                     /* Type 'ContentAttributes'    */
+    PyObject *module;                       /* Module à recompléter        */
+    PyObject *dict;                         /* Dictionnaire du module      */
+
+    type = get_python_content_attributes_type();
+
+    if (!PyType_HasFeature(type, Py_TPFLAGS_READY))
+    {
+        module = get_access_to_python_module("pychrysalide.analysis");
+
+        dict = PyModule_GetDict(module);
+
+        if (!register_class_for_pygobject(dict, G_TYPE_CONTENT_ATTRIBUTES, type, &PyGObject_Type))
+            return false;
+
+    }
+
+    return true;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : arg = argument quelconque à tenter de convertir.             *
+*                dst = destination des valeurs récupérées en cas de succès.   *
+*                                                                             *
+*  Description : Tente de convertir en ensemble d'attributs pour contenu.     *
+*                                                                             *
+*  Retour      : Bilan de l'opération, voire indications supplémentaires.     *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+int convert_to_content_attributes(PyObject *arg, void *dst)
+{
+    int result;                             /* Bilan à retourner           */
+
+    result = PyObject_IsInstance(arg, (PyObject *)get_python_content_attributes_type());
+
+    switch (result)
+    {
+        case -1:
+            /* L'exception est déjà fixée par Python */
+            result = 0;
+            break;
+
+        case 0:
+            PyErr_SetString(PyExc_TypeError, "unable to convert the provided argument to content attributes");
+            break;
+
+        case 1:
+            *((GContentAttributes **)dst) = G_CONTENT_ATTRIBUTES(pygobject_get(arg));
+            break;
+
+        default:
+            assert(false);
+            break;
+
+    }
+
+    return result;
+
+}
diff --git a/plugins/pychrysalide/analysis/cattribs.h b/plugins/pychrysalide/analysis/cattribs.h
new file mode 100644
index 0000000..b348826
--- /dev/null
+++ b/plugins/pychrysalide/analysis/cattribs.h
@@ -0,0 +1,45 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * cattribs.h - prototypes pour l'équivalent Python du fichier "analysis/cattribs.h"
+ *
+ * Copyright (C) 2019 Cyrille Bagard
+ *
+ *  This file is part of Chrysalide.
+ *
+ *  Chrysalide 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.
+ *
+ *  Chrysalide 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_PYCHRYSALIDE_ANALYSIS_CATTRIBS_H
+#define _PLUGINS_PYCHRYSALIDE_ANALYSIS_CATTRIBS_H
+
+
+#include <Python.h>
+#include <stdbool.h>
+
+
+
+/* Fournit un accès à une définition de type à diffuser. */
+PyTypeObject *get_python_content_attributes_type(void);
+
+/* Prend en charge l'objet 'pychrysalide.analysis.ContentAttributes'. */
+bool ensure_python_content_attributes_is_registered(void);
+
+/* Tente de convertir en ensemble d'attributs pour contenu. */
+int convert_to_content_attributes(PyObject *, void *);
+
+
+
+#endif  /* _PLUGINS_PYCHRYSALIDE_ANALYSIS_CATTRIBS_H */
diff --git a/plugins/pychrysalide/analysis/content.c b/plugins/pychrysalide/analysis/content.c
index f332167..5f8694a 100644
--- a/plugins/pychrysalide/analysis/content.c
+++ b/plugins/pychrysalide/analysis/content.c
@@ -36,6 +36,7 @@
 #include <common/endianness.h>
 
 
+#include "cattribs.h"
 #include "../access.h"
 #include "../helpers.h"
 #include "../arch/vmpa.h"
@@ -60,6 +61,12 @@ static PyObject *py_binary_content_read_u32(PyObject *, PyObject *);
 /* Lit un nombre non signé sur huit octets. */
 static PyObject *py_binary_content_read_u64(PyObject *, PyObject *);
 
+/* Associe un ensemble d'attributs au contenu binaire. */
+static int py_binary_content_set_attributes(PyObject *, PyObject *, void *);
+
+/* Fournit l'ensemble des attributs associés à un contenu. */
+static PyObject *py_binary_content_get_attributes(PyObject *, void *);
+
 /* Fournit une empreinte unique (SHA256) pour les données. */
 static PyObject *py_binary_content_get_checksum(PyObject *, void *);
 
@@ -348,6 +355,80 @@ static PyObject *py_binary_content_read_u64(PyObject *self, PyObject *args)
 /******************************************************************************
 *                                                                             *
 *  Paramètres  : self    = contenu binaire à manipuler.                       *
+*                value   = jeu d'attributs à lier au contenu courant.         *
+*                closure = adresse non utilisée ici.                          *
+*                                                                             *
+*  Description : Associe un ensemble d'attributs au contenu binaire.          *
+*                                                                             *
+*  Retour      : Jeu d'attributs liés au contenu courant.                     *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static int py_binary_content_set_attributes(PyObject *self, PyObject *value, void *closure)
+{
+    int result;                             /* Bilan à renvoyer            */
+    GBinContent *content;                   /* Version GLib du format      */
+    GContentAttributes *attribs;            /* Version native des attributs*/
+
+    content = G_BIN_CONTENT(pygobject_get(self));
+
+    if (!convert_to_content_attributes(value, &attribs))
+        result = -1;
+
+    else
+    {
+        g_binary_content_set_attributes(content, attribs);
+        result = 0;
+    }
+
+    return result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self    = contenu binaire à manipuler.                       *
+*                closure = adresse non utilisée ici.                          *
+*                                                                             *
+*  Description : Fournit l'ensemble des attributs associés à un contenu.      *
+*                                                                             *
+*  Retour      : Jeu d'attributs liés au contenu courant.                     *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_binary_content_get_attributes(PyObject *self, void *closure)
+{
+    PyObject *result;                       /* Instance à retourner        */
+    GBinContent *content;                   /* Version GLib du format      */
+    GContentAttributes *attribs;            /* Attributs à transmettre     */
+
+#define BINARY_CONTENT_ATTRIBUTES_ATTRIB PYTHON_GETSET_DEF_FULL         \
+(                                                                       \
+    attributes, py_binary_content,                                      \
+    "Provide or define the attributes linked to the binary content."    \
+)
+
+    content = G_BIN_CONTENT(pygobject_get(self));
+
+    attribs = g_binary_content_get_attributes(content);
+
+    result = pygobject_new(G_OBJECT(attribs));
+
+    g_object_unref(attribs);
+
+    return result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self    = contenu binaire à manipuler.                       *
 *                closure = adresse non utilisée ici.                          *
 *                                                                             *
 *  Description : Fournit une empreinte unique (SHA256) pour les données.      *
@@ -552,6 +633,7 @@ PyTypeObject *get_python_binary_content_type(void)
     };
 
     static PyGetSetDef py_binary_content_getseters[] = {
+        BINARY_CONTENT_ATTRIBUTES_ATTRIB,
         {
             "checksum", py_binary_content_get_checksum, NULL,
             "Compute a SHA256 hash as chechsum of handled data.", NULL
diff --git a/plugins/pychrysalide/analysis/module.c b/plugins/pychrysalide/analysis/module.c
index cf0671e..1a9a1d9 100644
--- a/plugins/pychrysalide/analysis/module.c
+++ b/plugins/pychrysalide/analysis/module.c
@@ -30,6 +30,7 @@
 
 #include "binary.h"
 #include "block.h"
+#include "cattribs.h"
 #include "content.h"
 #include "loaded.h"
 #include "loading.h"
@@ -111,6 +112,7 @@ bool populate_analysis_module(void)
     if (result) result = ensure_python_loaded_binary_is_registered();
     if (result) result = ensure_python_code_block_is_registered();
     if (result) result = ensure_python_block_list_is_registered();
+    if (result) result = ensure_python_content_attributes_is_registered();
     if (result) result = ensure_python_binary_content_is_registered();
     if (result) result = ensure_python_loaded_content_is_registered();
     if (result) result = ensure_python_content_explorer_is_registered();
diff --git a/plugins/pychrysalide/glibext/configuration.c b/plugins/pychrysalide/glibext/configuration.c
index 0fefc13..6b890a8 100644
--- a/plugins/pychrysalide/glibext/configuration.c
+++ b/plugins/pychrysalide/glibext/configuration.c
@@ -833,13 +833,19 @@ static PyObject *py_generic_config_new(PyTypeObject *type, PyObject *args, PyObj
     int ret;                                /* Bilan de lecture des args.  */
     GGenConfig *config;                     /* Version GLib du format      */
 
-    ret = PyArg_ParseTuple(args, "s", &name);
+    name = NULL;
+
+    ret = PyArg_ParseTuple(args, "|s", &name);
     if (!ret) return NULL;
 
-    config = g_generic_config_new(name);
+    if (name == NULL)
+        config = g_generic_config_new();
+    else
+        config = g_generic_config_new_from_file(name);
 
+    g_object_ref_sink(G_OBJECT(config));
     result = pygobject_new(G_OBJECT(config));
-    g_object_unref(config);
+    g_object_unref(G_OBJECT(config));
 
     return result;