1 files changed, 733 insertions, 0 deletions

diff --git a/src/lib/common/gnunet_dbus_lib_pop.c b/src/lib/common/gnunet_dbus_lib_pop.c
new file mode 100644
index 0000000..dd945e4
--- /dev/null
+++ b/src/lib/common/gnunet_dbus_lib_pop.c
@@ -0,0 +1,733 @@
+#include "config.h"
+
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_common.h>
+#include <gnunet/gnunet_strings_lib.h>
+
+#include "gnunet_dbus_lib.h"
+#include "gnunet_crypto_dbus_lib.h"
+
+#define LOG(kind, ...) GNUNET_log_from (kind, "dbus-pop", __VA_ARGS__)
+
+static DBusMessage *
+pop_basic (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    int expected_type,
+    void *value)
+{
+  int arg_type = dbus_message_iter_get_arg_type (iter);
+  if (expected_type != arg_type)
+  {
+    return dbus_message_new_error_printf (
+        message,
+        DBUS_ERROR_INVALID_ARGS,
+        "Bad argument for '%s'. Expected %s. Got %s",
+          arg_name,
+          GNUNET_DBUS_signature_typecode_to_string (expected_type),
+          GNUNET_DBUS_signature_typecode_to_string (arg_type));
+  };
+  dbus_message_iter_get_basic (iter, value);
+  dbus_message_iter_next (iter);
+
+  return NULL;
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_byte (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    unsigned char *value)
+{
+  return pop_basic (
+      message,
+      iter,
+      arg_name,
+      DBUS_TYPE_BYTE,
+      (void *)value);
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_boolean (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    dbus_bool_t *value)
+{
+  return pop_basic (
+      message,
+      iter,
+      arg_name,
+      DBUS_TYPE_BOOLEAN,
+      (void *)value);
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_int16 (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    dbus_int16_t *value)
+{
+  return pop_basic (
+      message,
+      iter,
+      arg_name,
+      DBUS_TYPE_INT16,
+      (void *)value);
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_uint16 (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    dbus_uint16_t *value)
+{
+  return pop_basic (
+      message,
+      iter,
+      arg_name,
+      DBUS_TYPE_UINT16,
+      (void *)value);
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_int32 (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    dbus_int32_t *value)
+{
+  return pop_basic (
+      message,
+      iter,
+      arg_name,
+      DBUS_TYPE_INT32,
+      (void *)value);
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_uint32 (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    dbus_uint32_t *value)
+{
+  return pop_basic (
+      message,
+      iter,
+      arg_name,
+      DBUS_TYPE_UINT32,
+      (void *)value);
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_int64 (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    dbus_int64_t *value)
+{
+  return pop_basic (
+      message,
+      iter,
+      arg_name,
+      DBUS_TYPE_INT64,
+      (void *)value);
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_uint64 (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    dbus_uint64_t *value)
+{
+  return pop_basic (
+      message,
+      iter,
+      arg_name,
+      DBUS_TYPE_UINT64,
+      (void *)value);
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_double (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    double *value)
+{
+  return pop_basic (
+      message,
+      iter,
+      arg_name,
+      DBUS_TYPE_DOUBLE,
+      (void *)value);
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_string (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    const char **value)
+{
+  return pop_basic (
+      message,
+      iter,
+      arg_name,
+      DBUS_TYPE_STRING,
+      (void *)value);
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_object_path (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    const char **value)
+{
+  return pop_basic (
+      message,
+      iter,
+      arg_name,
+      DBUS_TYPE_OBJECT_PATH,
+      (void *)value);
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_signature (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    const char **value)
+{
+  return pop_basic (
+      message,
+      iter,
+      arg_name,
+      DBUS_TYPE_SIGNATURE,
+      (void *)value);
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_unix_fd (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    int *value)
+{
+  return pop_basic (
+      message,
+      iter,
+      arg_name,
+      DBUS_TYPE_UNIX_FD,
+      (void *)value);
+};
+
+static DBusMessage *
+pop_enter_container (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    DBusMessageIter *iter_sub,
+    int type,
+    const char *arg_name)
+{
+  int arg_type = dbus_message_iter_get_arg_type (iter);
+  if (type != arg_type)
+  {
+    return dbus_message_new_error_printf (
+        message,
+        DBUS_ERROR_INVALID_ARGS,
+        "Bad argument for '%s'. Expected %s. Got %s",
+          arg_name,
+          GNUNET_DBUS_signature_typecode_to_string (type),
+          GNUNET_DBUS_signature_typecode_to_string (arg_type));
+  }
+  dbus_message_iter_recurse (iter, iter_sub);
+  dbus_message_iter_next (iter);
+  return NULL;
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_enter_array (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    DBusMessageIter *iter_sub,
+    const char *arg_name,
+    size_t *len)
+{
+  if (len && dbus_message_iter_get_arg_type (iter) == DBUS_TYPE_ARRAY)
+  {
+    DBusMessageIter iter_calc_len;
+    dbus_message_iter_recurse (iter, &iter_calc_len);
+    *len = 0;
+    while (dbus_message_iter_get_arg_type (&iter_calc_len) != DBUS_TYPE_INVALID)
+    {
+      ++*len;
+      dbus_message_iter_next (&iter_calc_len);
+    };
+  };
+  return pop_enter_container (message, iter, iter_sub, DBUS_TYPE_ARRAY, arg_name);
+}
+
+DBusMessage *
+GNUNET_DBUS_pop_enter_struct (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    DBusMessageIter *iter_sub,
+    const char *arg_name)
+{
+  return pop_enter_container (message, iter, iter_sub, DBUS_TYPE_STRUCT, arg_name);
+}
+
+DBusMessage *
+GNUNET_DBUS_pop_enter_variant (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    DBusMessageIter *iter_sub,
+    const char *arg_name)
+{
+  return pop_enter_container (message, iter, iter_sub, DBUS_TYPE_VARIANT, arg_name);
+}
+
+DBusMessage *
+GNUNET_DBUS_pop_enter_dict_entry (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    DBusMessageIter *iter_sub,
+    const char *arg_name)
+{
+  return pop_enter_container (message, iter, iter_sub, DBUS_TYPE_DICT_ENTRY, arg_name);
+}
+
+static DBusMessage *
+pop_fixed_array (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    int expected_type,
+    void *value,
+    int *n_elements)
+{
+  int arg_type = dbus_message_iter_get_arg_type (iter);
+  if (DBUS_TYPE_ARRAY != arg_type)
+  {
+    return dbus_message_new_error_printf (
+        message,
+        DBUS_ERROR_INVALID_ARGS,
+        "Bad argument for '%s'. Expected array of %s. Got %s.",
+          arg_name,
+          GNUNET_DBUS_signature_typecode_to_string (expected_type),
+          GNUNET_DBUS_signature_typecode_to_string (arg_type));
+  };
+
+  int element_type = dbus_message_iter_get_element_type (iter);
+  if (expected_type != element_type)
+  {
+    return dbus_message_new_error_printf (
+        message,
+        DBUS_ERROR_INVALID_ARGS,
+        "Bad argument for '%s'. Expected array of %s. Got array of %s",
+          arg_name,
+          GNUNET_DBUS_signature_typecode_to_string (expected_type),
+          GNUNET_DBUS_signature_typecode_to_string (element_type));
+  };
+
+  DBusMessageIter iter_sub;
+  dbus_message_iter_recurse (iter, &iter_sub);
+  dbus_message_iter_get_fixed_array (&iter_sub, value, n_elements);
+  dbus_message_iter_next (iter);
+
+  return NULL;
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_byte_array (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    const unsigned char **value,
+    int *n_elements)
+{
+  return pop_fixed_array (
+      message,
+      iter,
+      arg_name,
+      DBUS_TYPE_BYTE,
+      (void *)value,
+      n_elements);
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_boolean_array (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    const dbus_bool_t **value,
+    int *n_elements)
+{
+  return pop_fixed_array (
+      message,
+      iter,
+      arg_name,
+      DBUS_TYPE_BOOLEAN,
+      (void *)value,
+      n_elements);
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_int16_array (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    const int16_t **value,
+    int *n_elements)
+{
+  return pop_fixed_array (
+      message,
+      iter,
+      arg_name,
+      DBUS_TYPE_INT16,
+      (void *)value,
+      n_elements);
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_uint16_array (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    const uint16_t **value,
+    int *n_elements)
+{
+  return pop_fixed_array (
+      message,
+      iter,
+      arg_name,
+      DBUS_TYPE_UINT16,
+      (void *)value,
+      n_elements);
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_int32_array (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    const int32_t **value,
+    int *n_elements)
+{
+  return pop_fixed_array (
+      message,
+      iter,
+      arg_name,
+      DBUS_TYPE_INT32,
+      (void *)value,
+      n_elements);
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_uint32_array (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    const uint32_t **value,
+    int *n_elements)
+{
+  return pop_fixed_array (
+      message,
+      iter,
+      arg_name,
+      DBUS_TYPE_UINT32,
+      (void *)value,
+      n_elements);
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_int64_array (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    const int64_t **value,
+    int *n_elements)
+{
+  return pop_fixed_array (
+      message,
+      iter,
+      arg_name,
+      DBUS_TYPE_INT64,
+      (void *)value,
+      n_elements);
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_uint64_array (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    const uint64_t **value,
+    int *n_elements)
+{
+  return pop_fixed_array (
+      message,
+      iter,
+      arg_name,
+      DBUS_TYPE_UINT64,
+      (void *)value,
+      n_elements);
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_double_array (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    const double **value,
+    int *n_elements)
+{
+  return pop_fixed_array (
+      message,
+      iter,
+      arg_name,
+      DBUS_TYPE_DOUBLE,
+      (void *)value,
+      n_elements);
+};
+
+/*
+ * bitfield enums can be sent across the wire in either their integer form (as
+ * an array of bit flags) or as an array of strings. Sending an int is more
+ * efficient and is what libraries built around the DBus API would use, people
+ * using the DBus API directly may want to pass human-readable strings for
+ * convenience.
+ */
+DBusMessage *
+GNUNET_DBUS_pop_bitfield (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    int *value,
+    const struct GNUNET_DBUS_StringEnumPair *fields)
+{
+  DBusMessageIter iter_sub;
+  DBusMessage *ret = GNUNET_DBUS_pop_enter_variant (message, iter, &iter_sub, arg_name);
+  if (ret)
+    return ret;
+
+  int arg_type = dbus_message_iter_get_arg_type (&iter_sub);
+  switch (arg_type)
+  {
+  case DBUS_TYPE_ARRAY: {
+    int element_type = dbus_message_iter_get_element_type (&iter_sub);
+    if (DBUS_TYPE_STRING != element_type)
+    {
+      return dbus_message_new_error_printf (
+          message,
+          DBUS_ERROR_INVALID_ARGS,
+          "Bad argument for '%s'. Variant should contain a uint32 or an array of strings.",
+            arg_name);
+    };
+    DBusMessageIter iter_sub_sub;
+    dbus_message_iter_recurse (&iter_sub, &iter_sub_sub);
+    *value = 0;
+    while (dbus_message_iter_get_arg_type (&iter_sub_sub) != DBUS_TYPE_INVALID)
+    {
+      char *option;
+      dbus_message_iter_get_basic (&iter_sub_sub, &option);
+      const struct GNUNET_DBUS_StringEnumPair *field;
+      for (field = fields; field->name; field++)
+      {
+        if (! strcmp (field->name, option))
+        {
+          *value |= field->value;
+          break;
+        };
+      };
+      if (! field->name)
+      {
+        char *errmsg;
+        GNUNET_asprintf (&errmsg, "Bad argument for '%s'. Unrecognised option '%s'. Valid options are [", arg_name, option);
+        for (field = fields; field->name; field++)
+        {
+          char *errmsg_new;
+          GNUNET_asprintf (&errmsg_new, "%s'%s'%s", errmsg, field->name, (field + 1)->name ? ", " : "].");
+          GNUNET_free (errmsg);
+          errmsg = errmsg_new;
+        };
+        DBusMessage *ret = dbus_message_new_error (
+            message,
+            DBUS_ERROR_INVALID_ARGS,
+            errmsg);
+        GNUNET_free (errmsg);
+        return ret;
+      };
+      dbus_message_iter_next (&iter_sub_sub);
+    };
+    GNUNET_DBUS_message_set_pretty (message, true);
+    return NULL;
+  };
+  case DBUS_TYPE_UINT32: {
+    uint32_t flags;
+    dbus_message_iter_get_basic (&iter_sub, &flags);
+    *value = (int)flags;
+    return NULL;
+  };
+  default:
+    return dbus_message_new_error_printf (
+        message,
+        DBUS_ERROR_INVALID_ARGS,
+        "Bad argument for '%s'. Variant contains a %s. Should contain a uint32 or array of strings.",
+          arg_name);
+  };
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_enum (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    int *value,
+    const struct GNUNET_DBUS_StringEnumPair *names)
+{
+  DBusMessageIter iter_sub;
+  DBusMessage *ret = GNUNET_DBUS_pop_enter_variant (message, iter, &iter_sub, arg_name);
+  if (ret)
+    return ret;
+
+  int arg_type = dbus_message_iter_get_arg_type (&iter_sub);
+  switch (arg_type)
+  {
+  case DBUS_TYPE_STRING: {
+    char *option;
+    dbus_message_iter_get_basic (&iter_sub, &option);
+    const struct GNUNET_DBUS_StringEnumPair *name;
+    for (name = names; name->name; name++)
+    {
+      if (! strcmp (name->name, option))
+      {
+        *value = name->value;
+        return NULL;
+      };
+    };
+    char *errmsg;
+    GNUNET_asprintf (&errmsg, "Bad argument for '%s'. Unrecognised option '%s'. Valid options are [", arg_name, option);
+    for (name = names; name->name; name++)
+    {
+      char *errmsg_new;
+      GNUNET_asprintf (&errmsg_new, "%s'%s'%s", errmsg, name->name, (name + 1)->name ? ", " : "].");
+      GNUNET_free (errmsg);
+      errmsg = errmsg_new;
+    };
+
+    DBusMessage *ret = dbus_message_new_error (
+        message,
+        DBUS_ERROR_INVALID_ARGS,
+        errmsg);
+    GNUNET_free (errmsg);
+    return ret;
+  };
+  case DBUS_TYPE_UINT32: {
+    uint32_t option;
+    dbus_message_iter_get_basic (&iter_sub, &option);
+    *value = (int)option;
+    return NULL;
+  };
+  default:
+    return dbus_message_new_error_printf (
+        message,
+        DBUS_ERROR_INVALID_ARGS,
+        "Bad argument for '%s'. Variant contains a %s. Should contain a uint32 or strings.",
+          arg_name,
+          GNUNET_DBUS_signature_typecode_to_string (arg_type));
+  };
+};
+
+DBusMessage *
+GNUNET_DBUS_pop_hashcode (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    struct GNUNET_HashCode *value)
+{
+  DBusMessageIter iter_sub;
+  DBusMessage *ret = GNUNET_DBUS_pop_enter_variant (message, iter, &iter_sub, arg_name);
+  if (ret)
+    return ret;
+
+  int arg_type = dbus_message_iter_get_arg_type (&iter_sub);
+  switch (arg_type)
+  {
+  case DBUS_TYPE_STRING: {
+    char *encoded;
+    dbus_message_iter_get_basic (&iter_sub, &encoded);
+    int success = GNUNET_CRYPTO_hash_from_string2 (encoded, strlen (encoded), value);
+    if (GNUNET_OK != success)
+    {
+      return dbus_message_new_error_printf (
+          message,
+          DBUS_ERROR_INVALID_ARGS,
+          "Bad argument for '%s'. Malformed hash string. GNUNET_CRYPTO_hash_from_string2 returned %d",
+            arg_name,
+            success);
+    };
+    GNUNET_DBUS_message_set_pretty (message, true);
+    return NULL;
+  }
+  case DBUS_TYPE_ARRAY: {
+    DBusMessageIter iter_sub_sub;
+    unsigned char *data;
+    int n_elements;
+    int element_type = dbus_message_iter_get_element_type (&iter_sub);
+    if (DBUS_TYPE_BYTE != element_type)
+    {
+      return dbus_message_new_error_printf (
+          message,
+          DBUS_ERROR_INVALID_ARGS,
+          "Bad argument for '%s'. Variant contains an array of %s. Should contain a base32 encoded string or array of 64 bytes.",
+            arg_name,
+            GNUNET_DBUS_signature_typecode_to_string (element_type));
+    };
+    dbus_message_iter_recurse (&iter_sub, &iter_sub_sub);
+    dbus_message_iter_get_fixed_array (&iter_sub_sub, &data, &n_elements);
+    if (sizeof (value->bits) != n_elements)
+    {
+      return dbus_message_new_error_printf (
+          message,
+          DBUS_ERROR_INVALID_ARGS,
+          "Bad argument for '%s'. Hash code consists of 64 bytes (512 bits). Array contains %d bytes.",
+            arg_name,
+            n_elements);
+    };
+    memcpy (value->bits, data, n_elements);
+    return NULL;
+  };
+  default:
+    return dbus_message_new_error_printf (
+        message,
+        DBUS_ERROR_INVALID_ARGS,
+        "Bad argument for '%s'. Variant contains a %s. Should contain a base32 encoded string or array of 64 bytes.",
+          arg_name,
+          GNUNET_DBUS_signature_typecode_to_string (arg_type));
+  };
+}
+  
+DBusMessage *
+GNUNET_DBUS_pop_peer_identity (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    struct GNUNET_PeerIdentity *value)
+{
+  DBusMessageIter iter_sub;
+  DBusMessage *ret = GNUNET_DBUS_pop_enter_struct (message, iter, &iter_sub, arg_name);
+  if (ret)
+    return ret;
+
+  return GNUNET_CRYPTO_DBUS_pop_eddsa_public_key (message, &iter_sub, "public_key", &value->public_key);
+}
+