continue start_gns_escrow, add user secret string

7 files changed, 183 insertions, 33 deletions

diff --git a/src/escrow/escrow_api.c b/src/escrow/escrow_api.c
index acf17c500..26a11ca18 100644
--- a/src/escrow/escrow_api.c
+++ b/src/escrow/escrow_api.c
@@ -231,6 +231,7 @@ handle_start_escrow_result (void *cls)
  * 
  * @param h the handle for the escrow component
  * @param ego the identity ego to put in escrow
+ * @param userSecret the user secret (e.g. for derivation of escrow identities)
  * @param method the escrow method to use
  * @param cb function to call with the escrow anchor on completion
  * @param cb_cls closure for @a cb
@@ -240,6 +241,7 @@ handle_start_escrow_result (void *cls)
 struct GNUNET_ESCROW_Operation *
 GNUNET_ESCROW_put (struct GNUNET_ESCROW_Handle *h,
                    struct GNUNET_IDENTITY_Ego *ego,
+                   char *userSecret,
                    enum GNUNET_ESCROW_Key_Escrow_Method method,
                    GNUNET_ESCROW_AnchorContinuation cb,
                    void *cb_cls)
@@ -256,7 +258,11 @@ GNUNET_ESCROW_put (struct GNUNET_ESCROW_Handle *h,
   GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, op);
 
   api = init_plugin (h, method);
-  op->plugin_op_wrap = api->start_key_escrow (h, ego, &handle_start_escrow_result, op->id);
+  op->plugin_op_wrap = api->start_key_escrow (h,
+                                              ego,
+                                              userSecret,
+                                              &handle_start_escrow_result,
+                                              op->id);
 
   return op;
 }
diff --git a/src/escrow/gnunet-escrow.c b/src/escrow/gnunet-escrow.c
index f8dc835a8..2eda19788 100644
--- a/src/escrow/gnunet-escrow.c
+++ b/src/escrow/gnunet-escrow.c
@@ -66,7 +66,7 @@ static char *verify_ego;
 static char *get_ego;
 
 /**
- * -s option
+ * -S option
  */
 static char *status_ego;
 
@@ -76,6 +76,11 @@ static char *status_ego;
 struct GNUNET_IDENTITY_Ego *ego;
 
 /**
+ * User secret string
+ */
+static char *user_secret_string;
+
+/**
  * Anchor string
  */
 static char *anchor_string;
@@ -142,6 +147,11 @@ do_cleanup (void *cls)
     GNUNET_free (method_name);
     method_name = NULL;
   }
+  if (NULL != user_secret_string)
+  {
+    GNUNET_free (user_secret_string);
+    user_secret_string = NULL;
+  }
   if (NULL != anchor_string)
   {
     GNUNET_free (anchor_string);
@@ -260,6 +270,7 @@ start_process ()
     }
     escrow_op = GNUNET_ESCROW_put (escrow_handle,
                                    ego,
+                                   user_secret_string,
                                    method,
                                    &put_cb,
                                    NULL);
@@ -480,10 +491,15 @@ main (int argc, char *const argv[])
                                  "NAME",
                                  gettext_noop ("Get the status of the escrow of ego NAME"),
                                  &status_ego),
+    GNUNET_GETOPT_option_string ('u',
+                                 "userSecret",
+                                 "USER_SECRET",
+                                 gettext_noop ("The user secret string"),
+                                 &user_secret_string),
     GNUNET_GETOPT_option_string ('a',
                                  "anchor",
                                  "ANCHOR",
-                                 gettext_noop ("The the escrow anchor"),
+                                 gettext_noop ("The escrow anchor"),
                                  &anchor_string),
     GNUNET_GETOPT_option_string ('m',
                                  "method",
diff --git a/src/escrow/plugin_escrow_anastasis.c b/src/escrow/plugin_escrow_anastasis.c
index 92fc75ae6..495ce7089 100644
--- a/src/escrow/plugin_escrow_anastasis.c
+++ b/src/escrow/plugin_escrow_anastasis.c
@@ -47,6 +47,7 @@ struct ESCROW_PluginHandle ph;
  * 
  * @param h the handle for the escrow component
  * @param ego the identity ego containing the private key
+ * @param userSecret the user secret (e.g. for derivation of escrow identities)
  * @param cb the function called upon completion
  * @param op_id unique ID of the respective ESCROW_Operation
  * 
@@ -55,6 +56,7 @@ struct ESCROW_PluginHandle ph;
 struct ESCROW_PluginOperationWrapper *
 start_anastasis_key_escrow (struct GNUNET_ESCROW_Handle *h,
                             struct GNUNET_IDENTITY_Ego *ego,
+                            char *userSecret,
                             GNUNET_SCHEDULER_TaskCallback cb,
                             uint32_t op_id)
 {
diff --git a/src/escrow/plugin_escrow_gns.c b/src/escrow/plugin_escrow_gns.c
index 8859275c6..2d3343389 100644
--- a/src/escrow/plugin_escrow_gns.c
+++ b/src/escrow/plugin_escrow_gns.c
@@ -30,6 +30,7 @@
 #include "gnunet_escrow_plugin.h"
 #include "escrow_plugin_helper.h"
 #include "gnunet_namestore_service.h"
+#include "gnunet_gnsrecord_lib.h"
 #include "../identity/identity.h"
 #include <sss.h>
 #include <inttypes.h>
@@ -75,6 +76,30 @@ struct PkEntry
    * private key
    */
   const struct GNUNET_CRYPTO_EcdsaPrivateKey *pk;
+
+  /**
+   * index of the respective share
+   */
+  uint8_t i;
+};
+
+
+struct NamestoreQueueEntry
+{
+  /**
+   * DLL
+   */
+  struct NamestoreQueueEntry *prev;
+
+  /**
+   * DLL
+   */
+  struct NamestoreQueueEntry *next;
+
+  /**
+   * Namestore queue entry
+   */
+  struct GNUNET_NAMESTORE_QueueEntry *ns_qe;
 };
 
 
@@ -137,6 +162,11 @@ struct ESCROW_GnsPluginOperation
   const struct GNUNET_CRYPTO_EcdsaPrivateKey *pk;
 
   /**
+   * User secret string
+   */
+  char *userSecret;
+
+  /**
    * DLL head for identity operations
    */
   struct IdentityOperationEntry *id_ops_head;
@@ -155,6 +185,16 @@ struct ESCROW_GnsPluginOperation
    * DLL tail for escrow private keys
    */
   struct PkEntry *escrow_pks_tail;
+
+  /**
+   * DLL head for namestore queue entries
+   */
+  struct NamestoreQueueEntry *ns_qes_head;
+
+  /**
+   * DLL tail for namestore queue entries
+   */
+  struct NamestoreQueueEntry *ns_qes_tail;
 };
 
 /**
@@ -178,6 +218,7 @@ cleanup_plugin_operation (struct ESCROW_PluginOperationWrapper *plugin_op_wrap)
   struct ESCROW_GnsPluginOperation *p_op;
   struct IdentityOperationEntry *curr_id_op;
   struct PkEntry *curr_pk;
+  struct NamestoreQueueEntry *curr_ns_qe;
 
   p_op = (struct ESCROW_GnsPluginOperation*)plugin_op_wrap->plugin_op;
 
@@ -190,6 +231,8 @@ cleanup_plugin_operation (struct ESCROW_PluginOperationWrapper *plugin_op_wrap)
     GNUNET_free (p_op->ego_wrap);
   if (NULL != p_op->verify_wrap)
     GNUNET_free (p_op->verify_wrap);
+  if (NULL != p_op->userSecret)
+    GNUNET_free (p_op->userSecret);
   /* clean up identity operation list */
   for (curr_id_op = p_op->id_ops_head; NULL != curr_id_op; curr_id_op = curr_id_op->next)
   {
@@ -208,6 +251,16 @@ cleanup_plugin_operation (struct ESCROW_PluginOperationWrapper *plugin_op_wrap)
                                  curr_pk);
     GNUNET_free (curr_pk);
   }
+  /* clean up namestore operation list */
+  for (curr_ns_qe = p_op->ns_qes_head; NULL != curr_ns_qe; curr_ns_qe = curr_ns_qe->next)
+  {
+    GNUNET_CONTAINER_DLL_remove (p_op->ns_qes_head,
+                                 p_op->ns_qes_tail,
+                                 curr_ns_qe);
+    // also frees the curr_ns_qe->ns_qe
+    GNUNET_NAMESTORE_cancel (curr_ns_qe->ns_qe);
+    GNUNET_free (curr_ns_qe);
+  }
   /* disconnect from namestore service */
   GNUNET_NAMESTORE_disconnect (p_op->ns_h);
   GNUNET_free (p_op);
@@ -243,29 +296,92 @@ split_private_key (struct ESCROW_GnsPluginOperation *p_op)
 }
 
 
-void
-distribute_keyshares (struct ESCROW_GnsPluginOperation *p_op,
+static void
+keyshare_distribution_finished (struct ESCROW_PluginOperationWrapper *plugin_op_wrap)
+{
+  struct ESCROW_GnsPluginOperation *p_op;
+  struct GNUNET_ESCROW_Anchor *anchor;
+  int anchorDataSize;
+
+  p_op = (struct ESCROW_GnsPluginOperation *)plugin_op_wrap->plugin_op;
+
+  // TODO: implement
+  anchorDataSize = 0; // TODO!
+  anchor = GNUNET_malloc (sizeof (struct GNUNET_ESCROW_Anchor) + anchorDataSize);
+  
+  p_op->anchor_wrap->escrowAnchor = anchor;
+
+  /* call the continuation */
+  start_cont (plugin_op_wrap);
+}
+
+
+static void
+keyshare_distributed (void *cls,
+                      int32_t success,
+                      const char *emsg)
+{
+  struct ESCROW_PluginOperationWrapper *plugin_op_wrap = cls;
+  struct ESCROW_GnsPluginOperation *p_op;
+
+  p_op = (struct ESCROW_GnsPluginOperation *)plugin_op_wrap->plugin_op;
+
+  if (GNUNET_SYSERR == success)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to store keyshare %s\n",
+                emsg);
+    p_op->anchor_wrap->escrowAnchor = NULL;
+    p_op->cont (p_op->anchor_wrap);
+    // this also cancels all running namestore operations
+    cleanup_plugin_operation (plugin_op_wrap);
+  }
+
+  // TODO: remove qe from list, check if all namestore operations are finished
+  keyshare_distribution_finished (plugin_op_wrap);
+}
+
+
+static int
+distribute_keyshares (struct ESCROW_PluginOperationWrapper *plugin_op_wrap,
                       sss_Keyshare *keyshares)
 {
+  struct ESCROW_GnsPluginOperation *p_op;
   struct GNUNET_NAMESTORE_Handle *ns_h;
+  struct NamestoreQueueEntry *curr_ns_qe;
   struct PkEntry *curr_pk;
   char *curr_label;
+  struct GNUNET_GNSRECORD_Data curr_rd[1];
+
+  p_op = (struct ESCROW_GnsPluginOperation *)plugin_op_wrap->plugin_op;
 
   ns_h = GNUNET_NAMESTORE_connect (p_op->h->cfg);
   p_op->ns_h = ns_h;
 
   for (curr_pk = p_op->escrow_pks_head; NULL != curr_pk; curr_pk = curr_pk->next)
   {
-    // TODO: implement
-    curr_label = NULL;
-    GNUNET_NAMESTORE_records_store (ns_h,
-                                    curr_pk->pk,
-                                    curr_label,
-                                    0,
-                                    NULL,
-                                    NULL,
-                                    NULL);
+    curr_label = NULL; // TODO: which label
+    curr_ns_qe = GNUNET_new (struct NamestoreQueueEntry);
+
+    curr_rd[0].data_size = sizeof (sss_Keyshare);
+    curr_rd[0].data = keyshares[curr_pk->i];
+    curr_rd[0].record_type = GNUNET_GNSRECORD_TYPE_ATTRIBUTE; // TODO: type
+    curr_rd[0].flags = GNUNET_GNSRECORD_RF_NONE; // TODO: flags
+    curr_rd[0].expiration_time = 0; // TODO: expiration time
+
+    curr_ns_qe->ns_qe = GNUNET_NAMESTORE_records_store (ns_h,
+                                                        curr_pk->pk,
+                                                        curr_label,
+                                                        1,
+                                                        curr_rd,
+                                                        &keyshare_distributed,
+                                                        plugin_op_wrap);
+    GNUNET_CONTAINER_DLL_insert_tail (p_op->ns_qes_head,
+                                      p_op->ns_qes_tail,
+                                      curr_ns_qe);
   }
+
+  return GNUNET_OK;
 }
 
 
@@ -274,8 +390,6 @@ escrow_ids_finished (struct ESCROW_PluginOperationWrapper *plugin_op_wrap)
 {
   struct ESCROW_GnsPluginOperation *p_op;
   sss_Keyshare *keyshares;
-  struct GNUNET_ESCROW_Anchor *anchor;
-  int anchorDataSize;
 
   p_op = (struct ESCROW_GnsPluginOperation *)plugin_op_wrap->plugin_op;
 
@@ -284,22 +398,20 @@ escrow_ids_finished (struct ESCROW_PluginOperationWrapper *plugin_op_wrap)
   if (NULL == keyshares)
   {
     p_op->anchor_wrap->escrowAnchor = NULL;
-    p_op->sched_task = GNUNET_SCHEDULER_add_now (&start_cont, p_op);
+    start_cont (plugin_op_wrap);
     return;
   }
 
   /* distribute the shares to the identities */
-  distribute_keyshares (p_op, keyshares);
-
-  // TODO: implement
-  anchorDataSize = 0; // TODO!
-  anchor = GNUNET_malloc (sizeof (struct GNUNET_ESCROW_Anchor) + anchorDataSize);
+  if (GNUNET_OK != distribute_keyshares (plugin_op_wrap, keyshares))
+  {
+    p_op->anchor_wrap->escrowAnchor = NULL;
+    start_cont (plugin_op_wrap);
+    return;
+  }
   
-  p_op->anchor_wrap->escrowAnchor = anchor;
-
-  /* call the continuation */
-  p_op->cont (p_op->anchor_wrap);
-  cleanup_plugin_operation (plugin_op_wrap);
+  /* operation continues in keyshare_distribution_finished
+     after all keyshares have been distributed */
 }
 
 
@@ -448,7 +560,7 @@ create_escrow_identities (struct ESCROW_PluginOperationWrapper *plugin_op_wrap,
 
   for (uint8_t i = 0; i < p_op->shares; i++)
   {
-    curr_pk = derive_private_key (name, NULL, i); // TODO: password
+    curr_pk = derive_private_key (name, p_op->userSecret, i);
     curr_name = get_escrow_id_name (name, i);
 
     // check if the escrow identity already exists
@@ -466,6 +578,7 @@ create_escrow_identities (struct ESCROW_PluginOperationWrapper *plugin_op_wrap,
       // the escrow id already exists, so insert the pk into our list
       curr_pk_entry = GNUNET_new (struct PkEntry);
       curr_pk_entry->pk = curr_pk;
+      curr_pk_entry->i = i;
       GNUNET_CONTAINER_DLL_insert (p_op->escrow_pks_head,
                                    p_op->escrow_pks_tail,
                                    curr_pk_entry);
@@ -493,6 +606,7 @@ create_escrow_identities (struct ESCROW_PluginOperationWrapper *plugin_op_wrap,
  * 
  * @param h the handle for the escrow component
  * @param ego the identity ego containing the private key
+ * @param userSecret the user secret (e.g. for derivation of escrow identities)
  * @param cb the function called upon completion
  * @param op_id unique ID of the respective ESCROW_Operation
  * 
@@ -501,6 +615,7 @@ create_escrow_identities (struct ESCROW_PluginOperationWrapper *plugin_op_wrap,
 struct ESCROW_PluginOperationWrapper *
 start_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
                       struct GNUNET_IDENTITY_Ego *ego,
+                      char *userSecret,
                       GNUNET_SCHEDULER_TaskCallback cb,
                       uint32_t op_id)
 {
@@ -525,13 +640,14 @@ start_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
   w->op_id = op_id;
   p_op->anchor_wrap = w;
 
-  if (NULL == ego)
+  if (NULL == ego || NULL == userSecret)
   {
     w->escrowAnchor = NULL;
     p_op->sched_task = GNUNET_SCHEDULER_add_now (&start_cont, plugin_op_wrap);
     return plugin_op_wrap;
   }
   p_op->pk = GNUNET_IDENTITY_ego_get_private_key (ego);
+  p_op->userSecret = userSecret;
 
   // get config
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (h->cfg,
diff --git a/src/escrow/plugin_escrow_plaintext.c b/src/escrow/plugin_escrow_plaintext.c
index 9406361d7..390ba901e 100644
--- a/src/escrow/plugin_escrow_plaintext.c
+++ b/src/escrow/plugin_escrow_plaintext.c
@@ -132,6 +132,7 @@ start_cont (void *cls)
  * 
  * @param h the handle for the escrow component
  * @param ego the identity ego containing the private key
+ * @param userSecret the user secret (e.g. for derivation of escrow identities)
  * @param cb the function called upon completion
  * @param op_id unique ID of the respective ESCROW_Operation
  * 
@@ -140,6 +141,7 @@ start_cont (void *cls)
 struct ESCROW_PluginOperationWrapper *
 start_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
                             struct GNUNET_IDENTITY_Ego *ego,
+                            char *userSecret,
                             ESCROW_Plugin_Continuation cb,
                             uint32_t op_id)
 {
diff --git a/src/include/gnunet_escrow_lib.h b/src/include/gnunet_escrow_lib.h
index 07321c9e2..dcd5a15be 100644
--- a/src/include/gnunet_escrow_lib.h
+++ b/src/include/gnunet_escrow_lib.h
@@ -44,7 +44,8 @@ extern "C" {
 /**
  * Enum for the different key escrow methods
  */
-enum GNUNET_ESCROW_Key_Escrow_Method {
+enum GNUNET_ESCROW_Key_Escrow_Method
+{
   GNUNET_ESCROW_KEY_NONE, // error value
   GNUNET_ESCROW_KEY_PLAINTEXT,
   GNUNET_ESCROW_KEY_GNS,
@@ -55,7 +56,8 @@ enum GNUNET_ESCROW_Key_Escrow_Method {
 /**
  * Enum for the different verification results
  */
-enum GNUNET_ESCROW_Verification_Result {
+enum GNUNET_ESCROW_Verification_Result
+{
   GNUNET_ESCROW_VALID,
   GNUNET_ESCROW_INVALID
 };
@@ -64,7 +66,8 @@ enum GNUNET_ESCROW_Verification_Result {
 /**
  * Struct for the escrow anchor
  */
-struct GNUNET_ESCROW_Anchor {
+struct GNUNET_ESCROW_Anchor
+{
   /**
    * The escrow method.
    */
@@ -80,7 +83,8 @@ struct GNUNET_ESCROW_Anchor {
 /**
  * Struct for the escrow status
  */
-struct GNUNET_ESCROW_Status {
+struct GNUNET_ESCROW_Status
+{
   /**
    * The time of the last successful escrow.
    */
@@ -270,6 +274,7 @@ GNUNET_ESCROW_fini (
  * 
  * @param h the handle for the escrow component
  * @param ego the identity ego to put in escrow
+ * @param userSecret the user secret (e.g. for derivation of escrow identities)
  * @param method the escrow method to use
  * @param cb function to call with the escrow anchor on completion
  * @param cb_cls closure for @a cb
@@ -280,6 +285,7 @@ struct GNUNET_ESCROW_Operation *
 GNUNET_ESCROW_put (
   struct GNUNET_ESCROW_Handle *h,
   struct GNUNET_IDENTITY_Ego *ego,
+  char *userSecret,
   enum GNUNET_ESCROW_Key_Escrow_Method method,
   GNUNET_ESCROW_AnchorContinuation cb,
   void *cb_cls);
diff --git a/src/include/gnunet_escrow_plugin.h b/src/include/gnunet_escrow_plugin.h
index 85cc48b89..2d941b651 100644
--- a/src/include/gnunet_escrow_plugin.h
+++ b/src/include/gnunet_escrow_plugin.h
@@ -49,6 +49,7 @@ extern "C" {
  * 
  * @param h the handle for the escrow component
  * @param ego the identity ego containing the private key
+ * @param userSecret the user secret (e.g. for derivation of escrow identities)
  * @param cb the function called upon completion
  * @param op_id unique ID of the respective ESCROW_Operation
  * 
@@ -57,6 +58,7 @@ extern "C" {
 typedef struct ESCROW_PluginOperationWrapper *(*GNUNET_ESCROW_StartKeyEscrowFunction) (
   struct GNUNET_ESCROW_Handle *h,
   struct GNUNET_IDENTITY_Ego *ego,
+  char *userSecret,
   GNUNET_SCHEDULER_TaskCallback cb,
   uint32_t op_id);