REST/NAMESTORE: rework API

1 files changed, 21 insertions, 207 deletions

diff --git a/src/namestore/plugin_rest_namestore.c b/src/namestore/plugin_rest_namestore.c
index 46e5a590f..39b21c233 100644
--- a/src/namestore/plugin_rest_namestore.c
+++ b/src/namestore/plugin_rest_namestore.c
@@ -49,10 +49,6 @@
  */
 #define GNUNET_REST_IDENTITY_NOT_FOUND "No identity found"
 
-/**
- * Error message No default zone specified
- */
-#define GNUNET_REST_NAMESTORE_NO_DEFAULT_ZONE "No default zone specified"
 
 /**
  * Error message Failed request
@@ -143,6 +139,11 @@ struct RequestHandle
   struct GNUNET_GNSRECORD_Data *rd;
 
   /**
+   * Number of records in rd
+   */
+  unsigned int rd_count;
+
+  /**
    * NAMESTORE Operation
    */
   struct GNUNET_NAMESTORE_QueueEntry *add_qe;
@@ -263,8 +264,11 @@ cleanup_handle (void *cls)
     GNUNET_free (handle->emsg);
   if (NULL != handle->rd)
   {
-    if (NULL != handle->rd->data)
-      GNUNET_free ((void *) handle->rd->data);
+    for (int i = 0; i < handle->rd_count; i++)
+    {
+      if (NULL != handle->rd[i].data)
+        GNUNET_free ((void *) handle->rd[i].data);
+    }
     GNUNET_free (handle->rd);
   }
   if (NULL != handle->timeout_task)
@@ -484,68 +488,13 @@ namestore_list_iteration (void *cls,
 
   if (NULL == handle->resp_object)
     handle->resp_object = json_array ();
-
-  for (unsigned int i = 0; i < rd_len; i++)
-  {
-    if ((GNUNET_GNSRECORD_TYPE_NICK == rd[i].record_type) &&
-        (0 != strcmp (rname, GNUNET_GNS_EMPTY_LABEL_AT)))
-      continue;
-
-    record_obj = GNUNET_JSON_from_gns_record (rname, &rd[i]);
-
-    if (NULL == record_obj)
-      continue;
-
-    json_array_append (handle->resp_object, record_obj);
-    json_decref (record_obj);
-  }
-
+  record_obj = GNUNET_JSON_from_gnsrecord (rname,
+                                           rd,
+                                           rd_len);
+  json_array_append_new (handle->resp_object, record_obj);
   GNUNET_NAMESTORE_zone_iterator_next (handle->list_it, 1);
 }
 
-/**
- * @param cls closure
- * @param ego ego handle
- * @param ctx context for application to store data for this ego
- *                 (during the lifetime of this process, initially NULL)
- * @param identifier identifier assigned by the user for this ego,
- *                   NULL if the user just deleted the ego and it
- *                   must thus no longer be used
- */
-static void
-default_ego_get (void *cls,
-                 struct GNUNET_IDENTITY_Ego *ego,
-                 void **ctx,
-                 const char *identifier)
-{
-  struct RequestHandle *handle = cls;
-  handle->op = NULL;
-
-  if (ego == NULL)
-  {
-    handle->emsg = GNUNET_strdup (GNUNET_REST_NAMESTORE_NO_DEFAULT_ZONE);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  handle->zone_pkey = GNUNET_IDENTITY_ego_get_private_key (ego);
-
-  handle->list_it =
-    GNUNET_NAMESTORE_zone_iteration_start (handle->ns_handle,
-                                           handle->zone_pkey,
-                                           &namestore_iteration_error,
-                                           handle,
-                                           &namestore_list_iteration,
-                                           handle,
-                                           &namestore_list_finished,
-                                           handle);
-  if (NULL == handle->list_it)
-  {
-    handle->emsg = GNUNET_strdup (GNUNET_REST_NAMESTORE_FAILED);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-}
-
 
 /**
  * Handle namestore GET request
@@ -581,18 +530,8 @@ namestore_get (struct GNUNET_REST_RequestHandle *con_handle,
     }
   }
   if (NULL != ego_entry)
-  {
     handle->zone_pkey = GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego);
-  }
 
-  if (NULL == handle->zone_pkey)
-  {
-    handle->op = GNUNET_IDENTITY_get (handle->identity_handle,
-                                      "namestore",
-                                      &default_ego_get,
-                                      handle);
-    return;
-  }
   handle->list_it =
     GNUNET_NAMESTORE_zone_iteration_start (handle->ns_handle,
                                            handle->zone_pkey,
@@ -611,48 +550,6 @@ namestore_get (struct GNUNET_REST_RequestHandle *con_handle,
 }
 
 
-/**
- * @param cls closure
- * @param ego ego handle
- * @param ctx context for application to store data for this ego
- *                 (during the lifetime of this process, initially NULL)
- * @param identifier identifier assigned by the user for this ego,
- *                   NULL if the user just deleted the ego and it
- *                   must thus no longer be used
- */
-static void
-default_ego_post (void *cls,
-                  struct GNUNET_IDENTITY_Ego *ego,
-                  void **ctx,
-                  const char *identifier)
-{
-  struct RequestHandle *handle = cls;
-  handle->op = NULL;
-
-  if (ego == NULL)
-  {
-    handle->emsg = GNUNET_strdup (GNUNET_REST_NAMESTORE_NO_DEFAULT_ZONE);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  handle->zone_pkey = GNUNET_IDENTITY_ego_get_private_key (ego);
-
-  handle->add_qe = GNUNET_NAMESTORE_records_store (handle->ns_handle,
-                                                   handle->zone_pkey,
-                                                   handle->record_name,
-                                                   1,
-                                                   handle->rd,
-                                                   &create_finished,
-                                                   handle);
-  if (NULL == handle->add_qe)
-  {
-    handle->emsg = GNUNET_strdup (GNUNET_REST_NAMESTORE_FAILED);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-}
-
-
 static void
 ns_lookup_error_cb (void *cls)
 {
@@ -670,14 +567,15 @@ ns_lookup_cb (void *cls,
               const struct GNUNET_GNSRECORD_Data *rd)
 {
   struct RequestHandle *handle = cls;
-  struct GNUNET_GNSRECORD_Data rd_new[rd_count + 1];
+  struct GNUNET_GNSRECORD_Data rd_new[rd_count + handle->rd_count];
   for (int i = 0; i < rd_count; i++)
     rd_new[i] = rd[i];
-  rd_new[rd_count] = *handle->rd;
+  for (int j = 0; j < handle->rd_count; j++)
+    rd_new[rd_count + j] = handle->rd[j];
   handle->add_qe = GNUNET_NAMESTORE_records_store (handle->ns_handle,
                                                    handle->zone_pkey,
                                                    handle->record_name,
-                                                   rd_count + 1,
+                                                   rd_count + handle->rd_count,
                                                    rd_new,
                                                    &create_finished,
                                                    handle);
@@ -703,16 +601,12 @@ namestore_add (struct GNUNET_REST_RequestHandle *con_handle,
                void *cls)
 {
   struct RequestHandle *handle = cls;
-  struct GNUNET_GNSRECORD_Data *gns_record;
   struct EgoEntry *ego_entry;
   char *egoname;
   json_t *data_js;
-  json_t *name_json;
   json_error_t err;
-  char term_data[handle->rest_handle->data_size + 1];
 
-  struct GNUNET_JSON_Specification gnsspec[] =
-    {GNUNET_JSON_spec_gnsrecord_data (&gns_record), GNUNET_JSON_spec_end ()};
+  char term_data[handle->rest_handle->data_size + 1];
 
   if (0 >= handle->rest_handle->data_size)
   {
@@ -725,29 +619,12 @@ namestore_add (struct GNUNET_REST_RequestHandle *con_handle,
                  handle->rest_handle->data,
                  handle->rest_handle->data_size);
   data_js = json_loads (term_data, JSON_DECODE_ANY, &err);
+  struct GNUNET_JSON_Specification gnsspec[] =
+    {GNUNET_JSON_spec_gnsrecord (&handle->rd, &handle->rd_count, &handle->record_name), GNUNET_JSON_spec_end ()};
   if (GNUNET_OK != GNUNET_JSON_parse (data_js, gnsspec, NULL, NULL))
   {
     handle->emsg = GNUNET_strdup (GNUNET_REST_NAMESTORE_INVALID_DATA);
     GNUNET_SCHEDULER_add_now (&do_error, handle);
-    GNUNET_JSON_parse_free (gnsspec);
-    json_decref (data_js);
-    return;
-  }
-  handle->rd = gns_record;
-
-  name_json = json_object_get (data_js, "record_name");
-  if (! json_is_string (name_json))
-  {
-    handle->emsg = GNUNET_strdup (GNUNET_REST_NAMESTORE_INVALID_DATA);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    json_decref (data_js);
-    return;
-  }
-  handle->record_name = GNUNET_strdup (json_string_value (name_json));
-  if (NULL == handle->record_name)
-  {
-    handle->emsg = GNUNET_strdup (GNUNET_REST_NAMESTORE_INVALID_DATA);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
     json_decref (data_js);
     return;
   }
@@ -778,17 +655,7 @@ namestore_add (struct GNUNET_REST_RequestHandle *con_handle,
     }
   }
   if (NULL != ego_entry)
-  {
     handle->zone_pkey = GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego);
-  }
-  if (NULL == handle->zone_pkey)
-  {
-    handle->op = GNUNET_IDENTITY_get (handle->identity_handle,
-                                      "namestore",
-                                      &default_ego_post,
-                                      handle);
-    return;
-  }
   handle->add_qe = GNUNET_NAMESTORE_records_lookup (handle->ns_handle,
                                                     handle->zone_pkey,
                                                     handle->record_name,
@@ -806,48 +673,6 @@ namestore_add (struct GNUNET_REST_RequestHandle *con_handle,
 
 
 /**
- * @param cls closure
- * @param ego ego handle
- * @param ctx context for application to store data for this ego
- *                 (during the lifetime of this process, initially NULL)
- * @param identifier identifier assigned by the user for this ego,
- *                   NULL if the user just deleted the ego and it
- *                   must thus no longer be used
- */
-static void
-default_ego_delete (void *cls,
-                    struct GNUNET_IDENTITY_Ego *ego,
-                    void **ctx,
-                    const char *identifier)
-{
-  struct RequestHandle *handle = cls;
-  handle->op = NULL;
-
-  if (ego == NULL)
-  {
-    handle->emsg = GNUNET_strdup (GNUNET_REST_NAMESTORE_NO_DEFAULT_ZONE);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  handle->zone_pkey = GNUNET_IDENTITY_ego_get_private_key (ego);
-
-  handle->add_qe = GNUNET_NAMESTORE_records_store (handle->ns_handle,
-                                                   handle->zone_pkey,
-                                                   handle->record_name,
-                                                   0,
-                                                   NULL,
-                                                   &del_finished,
-                                                   handle);
-  if (NULL == handle->add_qe)
-  {
-    handle->emsg = GNUNET_strdup (GNUNET_REST_NAMESTORE_FAILED);
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-}
-
-
-/**
  * Handle namestore DELETE request
  *
  * @param con_handle the connection handle
@@ -882,9 +707,7 @@ namestore_delete (struct GNUNET_REST_RequestHandle *con_handle,
     }
   }
   if (NULL != ego_entry)
-  {
     handle->zone_pkey = GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego);
-  }
 
   GNUNET_CRYPTO_hash ("record_name", strlen ("record_name"), &key);
   if (GNUNET_NO ==
@@ -897,15 +720,6 @@ namestore_delete (struct GNUNET_REST_RequestHandle *con_handle,
   handle->record_name = GNUNET_strdup (
     GNUNET_CONTAINER_multihashmap_get (con_handle->url_param_map, &key));
 
-  if (NULL == handle->zone_pkey)
-  {
-    handle->op = GNUNET_IDENTITY_get (handle->identity_handle,
-                                      "namestore",
-                                      &default_ego_delete,
-                                      handle);
-    return;
-  }
-
   handle->add_qe = GNUNET_NAMESTORE_records_store (handle->ns_handle,
                                                    handle->zone_pkey,
                                                    handle->record_name,