7 files changed, 318 insertions, 26 deletions

diff --git a/src/include/gnunet_namestore_plugin.h b/src/include/gnunet_namestore_plugin.h
index c31926a49..b7bcc4eb6 100644
--- a/src/include/gnunet_namestore_plugin.h
+++ b/src/include/gnunet_namestore_plugin.h
@@ -181,6 +181,28 @@ struct GNUNET_NAMESTORE_PluginFunctions
                   void *iter_cls);
 
   /**
+   * This clears the editor hint, unless it does not match the
+   * given editor hint, in which case this is a NOP.
+   * If a replacement hint is given, it hint is not cleared, but
+   * set to the replacement.
+   *
+   * @param cls closure (internal context for the plugin)
+   * @param zone private key of the zone
+   * @param editor_hint the new value for the advisory lock field
+   * @param editor_hint_replacement an optional value to use instead of a clear
+   * @param label name of the record in the zone
+   * @param iter function to call with the result
+   * @param iter_cls closure for @a iter
+   * @return #GNUNET_OK on success, #GNUNET_NO for no results, else #GNUNET_SYSERR
+   */
+  enum GNUNET_GenericReturnValue
+  (*clear_editor_hint)(void *cls,
+                  const char *editor_hint,
+                  const char *editor_hint_replacement,
+                  const struct GNUNET_CRYPTO_PrivateKey *zone,
+                       const char *label);
+
+  /**
    * Setup the database.
    *
    * @param cls closure (internal context for the plugin)
diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h
index 5d79ebd13..0f9be8b10 100644
--- a/src/include/gnunet_namestore_service.h
+++ b/src/include/gnunet_namestore_service.h
@@ -662,7 +662,7 @@ GNUNET_NAMESTORE_record_set_edit_cancel (struct GNUNET_NAMESTORE_Handle *h,
                                          const char *label,
                                          const char *editor_hint,
                                          const char *editor_hint_replacement,
-                                         GNUNET_SCHEDULER_TaskCallback
+                                         GNUNET_NAMESTORE_ContinuationWithStatus
                                          finished_cb,
                                          void *finished_cls);
 
diff --git a/src/plugin/namestore/plugin_namestore_postgres.c b/src/plugin/namestore/plugin_namestore_postgres.c
index e4c350a3e..0bc98a98a 100644
--- a/src/plugin/namestore/plugin_namestore_postgres.c
+++ b/src/plugin/namestore/plugin_namestore_postgres.c
@@ -144,9 +144,15 @@ database_prepare (struct Plugin *plugin)
                               "FROM namestore.ns098records WHERE zone_private_key=$1 AND label=$2"),
       GNUNET_PQ_make_prepare ("edit_set",
                               "UPDATE namestore.ns098records"
-                              "SET editor_hint=$3"
-                              "WHERE zone_private_key=$1 AND label=$2"
-                              "RETURNING seq,record_count,record_data,label,editor_hint "),
+                              " SET editor_hint=$3"
+                              " FROM ns098records AS old_ns098records"
+                              " WHERE ns098records.zone_private_key=$1 AND ns098records.label=$2"
+                              " RETURNING ns098records.seq,ns098records.record_count,ns098records.record_data,ns098records.label,old_ns098records.editor_hint "),
+      GNUNET_PQ_make_prepare ("clear_editor_hint",
+                              "UPDATE namestore.ns098records"
+                              " SET editor_hint=$4"
+                              " FROM namestore.ns098records"
+                              " WHERE zone_private_key=$1 AND label=$2 AND editor_hint=$3"),
       GNUNET_PQ_PREPARED_STATEMENT_END
     };
 
@@ -521,6 +527,51 @@ namestore_postgres_lookup_records (void *cls,
 
 
 /**
+ *
+ * @param cls closure (internal context for the plugin)
+ * @param zone private key of the zone
+ * @param label name of the record in the zone
+ * @param iter function to call with the result
+ * @param iter_cls closure for @a iter
+ * @return #GNUNET_OK on success, #GNUNET_NO for no results, else #GNUNET_SYSERR
+ */
+static int
+namestore_postgres_clear_editor_hint (void *cls,
+                                      const char *editor_hint,
+                                      const char *editor_hint_replacement,
+                                      const struct
+                                      GNUNET_CRYPTO_PrivateKey *zone,
+                                      const char *label)
+{
+
+  struct Plugin *plugin = cls;
+  struct GNUNET_CRYPTO_PublicKey pkey;
+
+  GNUNET_assert (GNUNET_OK == database_prepare (plugin));
+  memset (&pkey,
+          0,
+          sizeof(pkey));
+  {
+    struct GNUNET_PQ_QueryParam params[] = {
+      GNUNET_PQ_query_param_auto_from_type (zone),
+      GNUNET_PQ_query_param_string (label),
+      GNUNET_PQ_query_param_string (editor_hint),
+      GNUNET_PQ_query_param_string (editor_hint_replacement),
+      GNUNET_PQ_query_param_end
+    };
+    enum GNUNET_DB_QueryStatus res;
+
+    res = GNUNET_PQ_eval_prepared_non_select (plugin->dbh,
+                                              "clear_editor_hint",
+                                              params);
+    if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != res)
+      return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+/**
  * Edit records in the datastore for which we are the authority.
  *
  * @param cls closure (internal context for the plugin)
@@ -701,6 +752,7 @@ libgnunet_plugin_namestore_postgres_init (void *cls)
   api->zone_to_name = &namestore_postgres_zone_to_name;
   api->lookup_records = &namestore_postgres_lookup_records;
   api->edit_records = &namestore_postgres_edit_records;
+  api->clear_editor_hint = &namestore_postgres_clear_editor_hint;
   LOG (GNUNET_ERROR_TYPE_INFO,
        "Postgres namestore plugin running\n");
   return api;
diff --git a/src/plugin/namestore/plugin_namestore_sqlite.c b/src/plugin/namestore/plugin_namestore_sqlite.c
index c38e9e08f..50c2f5728 100644
--- a/src/plugin/namestore/plugin_namestore_sqlite.c
+++ b/src/plugin/namestore/plugin_namestore_sqlite.c
@@ -112,6 +112,11 @@ struct Plugin
    * Precompiled SQL to lookup records based on label.
    */
   sqlite3_stmt *lookup_label;
+
+  /**
+   * Precompiled SQL to clear editor hint.
+   */
+  sqlite3_stmt *editor_hint_clear;
 };
 
 
@@ -148,16 +153,18 @@ database_prepare (struct Plugin *plugin)
     GNUNET_SQ_make_prepare ("DELETE FROM ns098records "
                             "WHERE zone_private_key=? AND label=?",
                             &plugin->delete_records),
-    GNUNET_SQ_make_prepare ("SELECT uid,record_count,record_data,label,editor_hint"
-                            " FROM ns098records"
-                            " WHERE zone_private_key=? AND pkey=?",
-                            &plugin->zone_to_name),
-    GNUNET_SQ_make_prepare ("SELECT uid,record_count,record_data,label,editor_hint"
-                            " FROM ns098records"
-                            " WHERE zone_private_key=? AND uid > ?"
-                            " ORDER BY uid ASC"
-                            " LIMIT ?",
-                            &plugin->iterate_zone),
+    GNUNET_SQ_make_prepare (
+      "SELECT uid,record_count,record_data,label,editor_hint"
+      " FROM ns098records"
+      " WHERE zone_private_key=? AND pkey=?",
+      &plugin->zone_to_name),
+    GNUNET_SQ_make_prepare (
+      "SELECT uid,record_count,record_data,label,editor_hint"
+      " FROM ns098records"
+      " WHERE zone_private_key=? AND uid > ?"
+      " ORDER BY uid ASC"
+      " LIMIT ?",
+      &plugin->iterate_zone),
     GNUNET_SQ_make_prepare (
       "SELECT uid,record_count,record_data,label,editor_hint,zone_private_key"
       " FROM ns098records"
@@ -171,6 +178,11 @@ database_prepare (struct Plugin *plugin)
                             " WHERE ns098records.zone_private_key=? AND ns098records.label=?"
                             " RETURNING ns098records.uid,ns098records.record_count,ns098records.record_data,ns098records.label,editor_hint ",
                             &plugin->lookup_label),
+    GNUNET_SQ_make_prepare ("UPDATE ns098records"
+                            " SET editor_hint=?"
+                            " FROM ns098records AS old_ns098records"
+                            " WHERE ns098records.zone_private_key=? AND ns098records.label=? AND ns098records.editor_hint=?",
+                            &plugin->editor_hint_clear),
     GNUNET_SQ_PREPARE_END
   };
 
@@ -221,6 +233,8 @@ database_shutdown (struct Plugin *plugin)
     sqlite3_finalize (plugin->zone_to_name);
   if (NULL != plugin->lookup_label)
     sqlite3_finalize (plugin->lookup_label);
+  if (NULL != plugin->editor_hint_clear)
+    sqlite3_finalize (plugin->editor_hint_clear);
   result = sqlite3_close (plugin->dbh);
   if (result == SQLITE_BUSY)
   {
@@ -610,6 +624,79 @@ namestore_sqlite_lookup_records (void *cls,
 
 
 /**
+ * Clear editor hint.
+ *
+ * @param cls closure (internal context for the plugin)
+ * @param zone private key of the zone
+ * @param label name of the record in the zone
+ * @param editor_hint editor hint to clear
+ * @param editor_hint_repl editor hint to replace the old with (optional)
+ * @param iter function to call with the result
+ * @param iter_cls closure for @a iter
+ * @return #GNUNET_OK on success, #GNUNET_NO for no results, else #GNUNET_SYSERR
+ */
+static enum GNUNET_GenericReturnValue
+namestore_sqlite_editor_hint_clear (void *cls,
+                                    const char *editor_hint,
+                                    const char *editor_hint_replacement,
+                                    const struct
+                                    GNUNET_CRYPTO_PrivateKey *zone,
+                                    const char *label)
+{
+  struct Plugin *plugin = cls;
+  int n;
+  GNUNET_assert (GNUNET_OK == database_prepare (plugin));
+  struct GNUNET_SQ_QueryParam params[] = {
+    GNUNET_SQ_query_param_string ((NULL == editor_hint_replacement) ? "":
+                                  editor_hint_replacement),
+    GNUNET_SQ_query_param_auto_from_type (zone),
+    GNUNET_SQ_query_param_string (label),
+    GNUNET_SQ_query_param_string (editor_hint),
+    GNUNET_SQ_query_param_end
+  };
+
+  if (NULL == zone)
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      GNUNET_SQ_bind (plugin->editor_hint_clear,
+                      params))
+  {
+    LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                "sqlite3_bind_XXXX");
+    GNUNET_SQ_reset (plugin->dbh,
+                     plugin->editor_hint_clear);
+    return GNUNET_SYSERR;
+  }
+  n = sqlite3_step (plugin->editor_hint_clear);
+  GNUNET_SQ_reset (plugin->dbh,
+                   plugin->store_records);
+  switch (n)
+  {
+  case SQLITE_DONE:
+    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+                     "sqlite",
+                     "Editor hint cleared\n");
+    return GNUNET_OK;
+
+  case SQLITE_BUSY:
+    LOG_SQLITE (plugin,
+                GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
+                "sqlite3_step");
+    return GNUNET_NO;
+
+  default:
+    LOG_SQLITE (plugin,
+                GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                "sqlite3_step");
+    return GNUNET_SYSERR;
+  }
+}
+
+
+/**
  * Lookup records in the datastore for which we are the authority.
  *
  * @param cls closure (internal context for the plugin)
@@ -911,6 +998,7 @@ libgnunet_plugin_namestore_sqlite_init (void *cls)
   api->create_tables = &namestore_sqlite_create_tables;
   api->drop_tables = &namestore_sqlite_drop_tables;
   api->edit_records = &namestore_sqlite_edit_records;
+  api->clear_editor_hint = &namestore_sqlite_editor_hint_clear;
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        _ ("SQlite database running\n"));
   return api;
diff --git a/src/service/namestore/gnunet-service-namestore.c b/src/service/namestore/gnunet-service-namestore.c
index 230583936..f375828dc 100644
--- a/src/service/namestore/gnunet-service-namestore.c
+++ b/src/service/namestore/gnunet-service-namestore.c
@@ -1275,7 +1275,7 @@ check_edit_record_set (void *cls, const struct EditRecordSetMessage *er_msg)
   key_len = ntohs (er_msg->key_len);
   src_size = ntohs (er_msg->gns_header.header.size);
   if (name_len + editor_hint_len + key_len != src_size - sizeof(struct
-                                                                LabelLookupMessage))
+                                                                EditRecordSetMessage))
   {
     GNUNET_break (0);
     return GNUNET_SYSERR;
@@ -1285,10 +1285,10 @@ check_edit_record_set (void *cls, const struct EditRecordSetMessage *er_msg)
 
 
 /**
- * Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP message
+ * Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_SET_EDIT message
  *
  * @param cls client sending the message
- * @param ll_msg message of type `struct LabelLookupMessage`
+ * @param ll_msg message of type `struct EditRecordSetMessage`
  */
 static void
 handle_edit_record_set (void *cls, const struct EditRecordSetMessage *er_msg)
@@ -1381,6 +1381,119 @@ handle_edit_record_set (void *cls, const struct EditRecordSetMessage *er_msg)
 
 
 /**
+ * Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_SET_EDIT_CANCEL message
+ *
+ * @param cls client sending the message
+ * @param er_msg message of type `struct EditRecordSetMessage`
+ * @return #GNUNET_OK if @a er_msg is well-formed
+ */
+static int
+check_edit_record_set_cancel (void *cls, const struct
+                              EditRecordSetCancelMessage *er_msg)
+{
+  uint16_t name_len;
+  uint16_t editor_hint_len;
+  uint16_t editor_hint_repl_len;
+  size_t src_size;
+  size_t key_len;
+
+  (void) cls;
+  name_len = ntohs (er_msg->label_len);
+  editor_hint_len = ntohs (er_msg->editor_hint_len);
+  editor_hint_repl_len = ntohs (er_msg->editor_hint_len);
+  key_len = ntohs (er_msg->key_len);
+  src_size = ntohs (er_msg->gns_header.header.size);
+  if (name_len + editor_hint_len + editor_hint_repl_len + key_len != src_size
+      - sizeof(struct
+               EditRecordSetCancelMessage))
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_SET_EDIT_CANCEL message
+ *
+ * @param cls client sending the message
+ * @param ll_msg message of type `struct EditRecordSetCancelMessage`
+ */
+static void
+handle_edit_record_set_cancel (void *cls, const struct
+                               EditRecordSetCancelMessage *er_msg)
+{
+  struct GNUNET_CRYPTO_PrivateKey zone;
+  struct NamestoreClient *nc = cls;
+  struct GNUNET_MQ_Envelope *env;
+  struct NamestoreResponseMessage *rer_msg;
+  const char *name_tmp;
+  const char *editor_hint;
+  const char *editor_hint_repl;
+  char *conv_name;
+  uint16_t name_len;
+  uint16_t editor_hint_len;
+  int res;
+  size_t key_len;
+  size_t kb_read;
+
+  key_len = ntohs (er_msg->key_len);
+  name_len = ntohs (er_msg->label_len);
+  editor_hint_len = ntohs (er_msg->editor_hint_len);
+  if ((GNUNET_SYSERR ==
+       GNUNET_CRYPTO_read_private_key_from_buffer (&er_msg[1],
+                                                   key_len,
+                                                   &zone,
+                                                   &kb_read)) ||
+      (kb_read != key_len))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Error reading private key\n");
+    GNUNET_SERVICE_client_drop (nc->client);
+    return;
+  }
+  name_tmp = (const char *) &er_msg[1] + key_len;
+  editor_hint = (const char *) name_tmp + name_len;
+  editor_hint_repl = (const char *) name_tmp + name_len + editor_hint_len;
+  GNUNET_SERVICE_client_continue (nc->client);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Received NAMESTORE_RECORD_SET_EDIT message for name `%s'\n",
+              name_tmp);
+
+  conv_name = GNUNET_GNSRECORD_string_normalize (name_tmp);
+  if (NULL == conv_name)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Error converting name `%s'\n",
+                name_tmp);
+    GNUNET_SERVICE_client_drop (nc->client);
+    return;
+  }
+  name_len = strlen (conv_name) + 1;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Clearing editor hint\n");
+  res = nc->GSN_database->clear_editor_hint (nc->GSN_database->cls,
+                                             editor_hint,
+                                             editor_hint_repl,
+                                             &zone,
+                                             conv_name);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Clearing editor hint %s\n", (GNUNET_SYSERR == res) ? "failed." :
+              "successful.");
+
+  env =
+    GNUNET_MQ_msg (rer_msg,
+                   GNUNET_MESSAGE_TYPE_NAMESTORE_GENERIC_RESPONSE);
+  rer_msg->gns_header.r_id = er_msg->gns_header.r_id;
+  rer_msg->ec = htons ((GNUNET_OK == res) ? GNUNET_EC_NONE :
+                       GNUNET_EC_NAMESTORE_BACKEND_FAILED);
+  GNUNET_MQ_send (nc->mq, env);
+  GNUNET_free (conv_name);
+}
+
+
+/**
  * Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP message
  *
  * @param cls client sending the message
@@ -2674,6 +2787,10 @@ GNUNET_SERVICE_MAIN (
                          GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_SET_EDIT,
                          struct EditRecordSetMessage,
                          NULL),
+  GNUNET_MQ_hd_var_size (edit_record_set_cancel,
+                         GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_SET_EDIT_CANCEL,
+                         struct EditRecordSetCancelMessage,
+                         NULL),
   GNUNET_MQ_hd_var_size (record_lookup,
                          GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP,
                          struct LabelLookupMessage,
diff --git a/src/service/namestore/namestore_api.c b/src/service/namestore/namestore_api.c
index 435c1622d..45a15c39a 100644
--- a/src/service/namestore/namestore_api.c
+++ b/src/service/namestore/namestore_api.c
@@ -375,8 +375,8 @@ handle_generic_response (void *cls,
   qe = find_qe (h, ntohl (msg->gns_header.r_id));
   res = ntohl (msg->ec);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Received RECORD_STORE_RESPONSE with result %d\n",
-       res);
+       "Received GENERIC_RESPONSE with result %s\n",
+       GNUNET_ErrorCode_get_hint(res));
   if (NULL == qe)
     return;
   if (NULL != qe->cont)
@@ -1617,8 +1617,7 @@ GNUNET_NAMESTORE_record_set_edit_cancel (struct GNUNET_NAMESTORE_Handle *h,
                                          const char *label,
                                          const char *editor_hint,
                                          const char *editor_hint_replacement,
-                                         GNUNET_SCHEDULER_TaskCallback
-                                         finished_cb,
+                                         GNUNET_NAMESTORE_ContinuationWithStatus finished_cb,
                                          void *finished_cls)
 {
   struct GNUNET_NAMESTORE_QueueEntry *qe;
@@ -1641,6 +1640,8 @@ GNUNET_NAMESTORE_record_set_edit_cancel (struct GNUNET_NAMESTORE_Handle *h,
   qe = GNUNET_new (struct GNUNET_NAMESTORE_QueueEntry);
   qe->h = h;
   qe->op_id = get_op_id (h);
+  qe->cont = finished_cb;
+  qe->cont_cls = finished_cls;
   GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, qe);
 
   key_len = GNUNET_CRYPTO_private_key_get_length (pkey);
diff --git a/src/service/namestore/test_namestore_api_edit_records.c b/src/service/namestore/test_namestore_api_edit_records.c
index 9dce13e33..02e821377 100644
--- a/src/service/namestore/test_namestore_api_edit_records.c
+++ b/src/service/namestore/test_namestore_api_edit_records.c
@@ -21,7 +21,9 @@
  * @file namestore/test_namestore_api_edit_records.c
  * @brief testcase for namestore_api.c: Multiple clients work with record set.
  */
+#include "gnunet_error_codes.h"
 #include "gnunet_namestore_service.h"
+#include "gnunet_scheduler_lib.h"
 #include "gnunet_testing_lib.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
@@ -91,6 +93,15 @@ end (void *cls)
     GNUNET_SCHEDULER_cancel (endbadly_task);
   cleanup ();
   res = 0;
+  GNUNET_SCHEDULER_shutdown ();
+}
+
+
+static void
+cancel_done (void *cls, enum GNUNET_ErrorCode ec)
+{
+  GNUNET_assert (GNUNET_EC_NONE == ec);
+  GNUNET_SCHEDULER_add_now (&end, NULL);
 }
 
 
@@ -102,11 +113,12 @@ begin_cont_b (void *cls,
               GNUNET_GNSRECORD_Data *rd,
               const char *editor_hint)
 {
-  const char *name = cls;
+  char *name = cls;
 
   GNUNET_assert (GNUNET_EC_NONE == ec);
   GNUNET_assert (0 != strcmp (editor_hint, "B"));
-  GNUNET_SCHEDULER_add_now (&end, NULL);
+  nsqe = GNUNET_NAMESTORE_record_set_edit_cancel (nsh2, &privkey, name, "A",
+                                                  "B", &cancel_done, name);
 }
 
 
@@ -118,7 +130,7 @@ begin_cont (void *cls,
             GNUNET_GNSRECORD_Data *rd,
             const char *editor_hint)
 {
-  const char *name = cls;
+  char *name = cls;
 
   GNUNET_assert (GNUNET_EC_NONE == ec);
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -135,7 +147,7 @@ static void
 preload_cont (void *cls,
               enum GNUNET_ErrorCode ec)
 {
-  const char *name = cls;
+  char *name = cls;
 
   GNUNET_assert (NULL != cls);
   nsqe = NULL;
@@ -168,7 +180,7 @@ run (void *cls,
      struct GNUNET_TESTING_Peer *peer)
 {
   struct GNUNET_GNSRECORD_Data rd;
-  const char *name = "dummy";
+  char *name = "dummy";
 
   endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
                                                 &endbadly,