- Identity token support

2 files changed, 346 insertions, 128 deletions

diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am
index b0e7645b0..89f755fd9 100644
--- a/src/identity/Makefile.am
+++ b/src/identity/Makefile.am
@@ -56,7 +56,10 @@ bin_PROGRAMS = \
 
 libexec_PROGRAMS = \
  gnunet-service-identity 
-
+if HAVE_REST
+bin_PROGRAMS += \
+                                                                gnunet-identity-token
+endif
 gnunet_service_identity_SOURCES = \
  gnunet-service-identity.c         
 gnunet_service_identity_LDADD = \
@@ -72,6 +75,12 @@ gnunet_identity_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
 
+gnunet_identity_token_SOURCES = \
+ check_token.c         
+gnunet_identity_token_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  -ljansson -lmicrohttpd
+  $(GN_LIBINTL)
 
 if HAVE_TESTING
 check_PROGRAMS = \
diff --git a/src/identity/plugin_rest_identity.c b/src/identity/plugin_rest_identity.c
index 11df90a70..870ed3446 100644
--- a/src/identity/plugin_rest_identity.c
+++ b/src/identity/plugin_rest_identity.c
@@ -30,21 +30,77 @@
 #include "gnunet_rest_lib.h"
 #include "microhttpd.h"
 #include <jansson.h>
+#include "gnunet_signatures.h"
 
+/**
+ * REST root namespace
+ */
 #define GNUNET_REST_API_NS_IDENTITY "/identity"
 
+/**
+ * State while collecting all egos
+ */
 #define ID_REST_STATE_INIT 0
 
+/**
+ * Done collecting egos
+ */
 #define ID_REST_STATE_POST_INIT 1
 
+/**
+ * Resource type
+ */
 #define GNUNET_REST_JSONAPI_IDENTITY_EGO "ego"
 
-#define GNUNET_REST_JSONAPI_IDENTITY_KEY "key"
+/**
+ * Name attribute
+ */
+#define GNUNET_REST_JSONAPI_IDENTITY_NAME "name"
 
+/**
+ * Attribute to rename "name" TODO we changed id to the pubkey
+ * so this can be unified with "name"
+ */
 #define GNUNET_REST_JSONAPI_IDENTITY_NEWNAME "newname"
 
+/**
+ * URL parameter to change the subsytem for ego
+ */
 #define GNUNET_REST_JSONAPI_IDENTITY_SUBSYSTEM "subsystem"
 
+
+/**
+ * URL parameter to create a GNUid token for a specific audience
+ */
+#define GNUNET_REST_JSONAPI_IDENTITY_CREATE_TOKEN "create_token_for"
+
+/**
+ * Attribute containing the GNUid token if
+ * GNUNET_REST_JSONAPI_IDENTITY_CREATE_TOKEN was requested
+ */
+#define GNUNET_REST_JSONAPI_IDENTITY_GNUID "gnuid_token"
+
+/**
+ * Error messages
+ */
+#define GNUNET_REST_ERROR_RESOURCE_INVALID "Resource location invalid"
+#define GNUNET_REST_ERROR_NO_DATA "No data"
+
+/**
+ * GNUid token lifetime
+ */
+#define GNUNET_GNUID_TOKEN_EXPIRATION_SECONDS 360
+
+/**
+ * The configuration handle
+ */
+const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+/**
+ * HTTP methods allows for this plugin
+ */
+static char* allow_methods;
+
 /**
  * @brief struct returned by the initialization function of the plugin
  */
@@ -53,10 +109,9 @@ struct Plugin
   const struct GNUNET_CONFIGURATION_Handle *cfg;
 };
 
-const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-static char* allow_methods;
-
+/**
+ * The ego list
+ */
 struct EgoEntry
 {
   /**
@@ -73,12 +128,12 @@ struct EgoEntry
    * Ego Identifier
    */
   char *identifier;
-  
+
   /**
-   * Ego Pkey
+   * Public key string
    */
-  struct GNUNET_CRYPTO_EcdsaPublicKey pk;
-
+  char *keystring;
+  
   /**
    * The Ego
    */
@@ -98,6 +153,9 @@ struct RequestHandle
    */
   struct EgoEntry *ego_tail;
 
+  /**
+   * Handle to the rest connection
+   */
   struct RestConnectionDataHandle *conndata_handle;
   
   /**
@@ -126,11 +184,6 @@ struct RequestHandle
   struct GNUNET_SCHEDULER_Task * timeout_task;    
 
   /**
-   * The root of the received JSON or NULL
-   */
-  json_t *json_root;
-
-  /**
    * The plugin result processor
    */
   GNUNET_REST_ResultProcessor proc;
@@ -170,6 +223,11 @@ struct RequestHandle
    */
   const char* method;
 
+  /**
+   * Error response message
+   */
+  char *emsg;
+
 };
 
 
@@ -194,12 +252,15 @@ cleanup_handle (struct RequestHandle *handle)
     GNUNET_free (handle->subsys);
   if (NULL != handle->url)
     GNUNET_free (handle->url);
+  if (NULL != handle->emsg)
+    GNUNET_free (handle->emsg);
   for (ego_entry = handle->ego_head;
        NULL != ego_entry;)
   {
     ego_tmp = ego_entry;
     ego_entry = ego_entry->next;
     GNUNET_free (ego_tmp->identifier);
+    GNUNET_free (ego_tmp->keystring);
     GNUNET_free (ego_tmp);
   }
   GNUNET_free (handle);
@@ -217,9 +278,100 @@ do_error (void *cls,
           const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct RequestHandle *handle = cls;
-  struct MHD_Response *resp = GNUNET_REST_create_json_response (NULL);
+  struct MHD_Response *resp;
+  char *json_error;
+
+  GNUNET_asprintf (&json_error,
+                   "{Error while processing request: %s}",
+                   &handle->emsg);
+
+  resp = GNUNET_REST_create_json_response (json_error);
   handle->proc (handle->proc_cls, resp, MHD_HTTP_BAD_REQUEST);
   cleanup_handle (handle);
+  GNUNET_free (json_error);
+}
+
+/**
+ * Build a GNUid token for identity
+ * @param handle the handle
+ * @param ego_entry the ego to build the token for
+ * @param name name of the ego
+ * @param token_aud token audience
+ * @param token the resulting gnuid token
+ */
+static void
+make_gnuid_token (struct RequestHandle *handle,
+                  struct EgoEntry *ego_entry,
+                  const char *name,
+                  const char *token_aud,
+                  char **token)
+{
+  uint64_t time;
+  char *header_str;
+  char *payload_str;
+  char *header_base64;
+  char *payload_base64;
+  char *sig_str;
+  json_t *header;
+  json_t *payload;
+  const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv_key;
+  struct GNUNET_CRYPTO_EcdsaSignature sig;
+  struct GNUNET_CRYPTO_EccSignaturePurpose *purpose;
+
+  time = GNUNET_TIME_absolute_get().abs_value_us;
+  header = json_object ();
+  json_object_set_new (header, "alg", json_string ("ED512"));
+  json_object_set_new (header, "typ", json_string ("JWT"));
+  
+  payload = json_object ();
+  json_object_set_new (payload, "iss", json_string (ego_entry->keystring));
+  json_object_set_new (payload, "sub", json_string (name));
+  json_object_set_new (payload, "nbf", json_integer (time));
+  json_object_set_new (payload, "iat", json_integer (time));
+  json_object_set_new (payload, "exp", json_integer (time+GNUNET_GNUID_TOKEN_EXPIRATION_SECONDS));
+  json_object_set_new (payload, "aud", json_string (token_aud));
+  header_str = json_dumps (header, JSON_COMPACT);
+  GNUNET_STRINGS_base64_encode (header_str,
+                                strlen (header_str),
+                                &header_base64);
+  char* padding = strtok(header_base64, "=");
+  while (NULL != padding)
+    padding = strtok(NULL, "=");
+
+  payload_str = json_dumps (payload, JSON_COMPACT);
+  GNUNET_STRINGS_base64_encode (payload_str,
+                                strlen (payload_str),
+                                &payload_base64);
+  padding = strtok(payload_base64, "=");
+  while (NULL != padding)
+    padding = strtok(NULL, "=");
+
+  GNUNET_asprintf (token, "%s,%s", header_base64, payload_base64);
+  priv_key = GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego);
+  purpose = 
+    GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) + 
+                   strlen (*token));
+  purpose->size = 
+    htonl (strlen (*token) + sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose));
+  purpose->purpose = htonl(GNUNET_SIGNATURE_PURPOSE_GNUID_TOKEN);
+  memcpy (&purpose[1], *token, strlen (*token));
+  if (GNUNET_OK != GNUNET_CRYPTO_ecdsa_sign (priv_key,
+                                             purpose,
+                                             &sig))
+    GNUNET_break(0);
+  GNUNET_free (*token);
+  sig_str = GNUNET_STRINGS_data_to_string_alloc (&sig,
+                                                 sizeof (struct GNUNET_CRYPTO_EcdsaSignature));
+  GNUNET_asprintf (token, "%s.%s.%s",
+                   header_base64, payload_base64, sig_str);
+  GNUNET_free (sig_str);
+  GNUNET_free (header_str);
+  GNUNET_free (header_base64);
+  GNUNET_free (payload_str);
+  GNUNET_free (payload_base64);
+  GNUNET_free (purpose);
+  json_decref (header);
+  json_decref (payload);
 }
 
 /**
@@ -241,12 +393,11 @@ get_ego_for_subsys (void *cls,
   struct JsonApiResource *json_resource;
   struct EgoEntry *ego_entry;
   struct MHD_Response *resp;
-  json_t *key_json;
+  json_t *name_json;
   char *result_str;
-  char *keystring;
 
   json_object = GNUNET_REST_jsonapi_object_new ();
-  
+
   for (ego_entry = handle->ego_head;
        NULL != ego_entry;
        ego_entry = ego_entry->next)
@@ -255,18 +406,20 @@ get_ego_for_subsys (void *cls,
       continue;
     if (NULL == name)
       continue;
-    json_resource = GNUNET_REST_jsonapi_resource_new (GNUNET_REST_JSONAPI_IDENTITY_EGO, ego_entry->identifier);
-    keystring = GNUNET_CRYPTO_ecdsa_public_key_to_string (&ego_entry->pk);
-    key_json = json_string (keystring);
-    GNUNET_REST_jsonapi_resource_add_attr (json_resource, GNUNET_REST_JSONAPI_IDENTITY_KEY, key_json);
-    json_decref (key_json);
-    GNUNET_free (keystring);
+    json_resource = GNUNET_REST_jsonapi_resource_new
+      (GNUNET_REST_JSONAPI_IDENTITY_EGO, ego_entry->keystring);
+    name_json = json_string (ego_entry->identifier);
+    GNUNET_REST_jsonapi_resource_add_attr (json_resource,
+                                           GNUNET_REST_JSONAPI_IDENTITY_NAME,
+                                           name_json);
+    json_decref (name_json);
     GNUNET_REST_jsonapi_object_resource_add (json_object, json_resource);
     break;
   }
   if (0 == GNUNET_REST_jsonapi_object_resource_count (json_object))
   {
     GNUNET_REST_jsonapi_object_delete (json_object);
+    handle->emsg = GNUNET_strdup("No identity matches results!");
     GNUNET_SCHEDULER_add_now (&do_error, handle);
     return;
   }
@@ -282,7 +435,9 @@ get_ego_for_subsys (void *cls,
 /**
  * Create a response with requested ego(s)
  *
- * @param handle the RequestHandle
+ * @param con the Rest handle
+ * @param url the requested url
+ * @param cls the request handle
  */
 static void
 ego_info_response (struct RestConnectionDataHandle *con,
@@ -290,16 +445,20 @@ ego_info_response (struct RestConnectionDataHandle *con,
                    void *cls)
 {
   const char *egoname;
-  char *keystring;
   char *result_str;
   char *subsys_val;
+  char *create_token_for;
+  char *token;
+  char *keystring;
   struct RequestHandle *handle = cls;
   struct EgoEntry *ego_entry;
   struct GNUNET_HashCode key;
   struct MHD_Response *resp;
   struct JsonApiObject *json_object;
   struct JsonApiResource *json_resource;
-  json_t *key_str;
+  json_t *name_str;
+  json_t *token_str;
+
   if (GNUNET_NO == GNUNET_REST_namespace_match (handle->url, GNUNET_REST_API_NS_IDENTITY))
   {
     resp = GNUNET_REST_create_json_response (NULL);
@@ -307,8 +466,26 @@ ego_info_response (struct RestConnectionDataHandle *con,
     cleanup_handle (handle);
     return;
   }
-  if ( (strlen (GNUNET_REST_API_NS_IDENTITY) == strlen (handle->url) )) {
-    GNUNET_CRYPTO_hash (GNUNET_REST_JSONAPI_IDENTITY_SUBSYSTEM, strlen (GNUNET_REST_JSONAPI_IDENTITY_SUBSYSTEM), &key);
+  egoname = NULL;
+  keystring = NULL;
+  if (strlen (GNUNET_REST_API_NS_IDENTITY) < strlen (handle->url))
+  {
+    keystring = &handle->url[strlen (GNUNET_REST_API_NS_IDENTITY)+1];
+    //Return all egos
+    for (ego_entry = handle->ego_head;
+         NULL != ego_entry;
+         ego_entry = ego_entry->next)
+    {
+      if ( (NULL != keystring) && (0 != strcmp (keystring, ego_entry->keystring)) )
+        continue;
+      egoname = ego_entry->identifier;
+    }
+  }
+
+  if ( NULL == egoname ) {
+    GNUNET_CRYPTO_hash (GNUNET_REST_JSONAPI_IDENTITY_SUBSYSTEM,
+                        strlen (GNUNET_REST_JSONAPI_IDENTITY_SUBSYSTEM),
+                        &key);
     if ( GNUNET_YES ==
          GNUNET_CONTAINER_multihashmap_contains (handle->conndata_handle->url_param_map,
                                                  &key) )
@@ -327,13 +504,21 @@ ego_info_response (struct RestConnectionDataHandle *con,
       }
     }
   }
+
+  GNUNET_CRYPTO_hash (GNUNET_REST_JSONAPI_IDENTITY_CREATE_TOKEN,
+                      strlen (GNUNET_REST_JSONAPI_IDENTITY_CREATE_TOKEN),
+                      &key);
+
+  //Token audience
+  create_token_for = NULL;
+  if ( GNUNET_YES ==
+       GNUNET_CONTAINER_multihashmap_contains (handle->conndata_handle->url_param_map,
+                                               &key) )
+    create_token_for = GNUNET_CONTAINER_multihashmap_get (handle->conndata_handle->url_param_map,
+                                                          &key);
+
   json_object = GNUNET_REST_jsonapi_object_new ();
-  egoname = &handle->url[strlen (GNUNET_REST_API_NS_IDENTITY)+1];
 
-  if (strlen (GNUNET_REST_API_NS_IDENTITY) == strlen (handle->url))
-  {
-    egoname = NULL;
-  }
   //Return all egos
   for (ego_entry = handle->ego_head;
        NULL != ego_entry;
@@ -341,19 +526,34 @@ ego_info_response (struct RestConnectionDataHandle *con,
   {
     if ( (NULL != egoname) && (0 != strcmp (egoname, ego_entry->identifier)) )
       continue;
-    keystring = GNUNET_CRYPTO_ecdsa_public_key_to_string (&ego_entry->pk);
-    json_resource = GNUNET_REST_jsonapi_resource_new (GNUNET_REST_JSONAPI_IDENTITY_EGO, ego_entry->identifier);
-    key_str = json_string (keystring);
-    GNUNET_REST_jsonapi_resource_add_attr (json_resource,
-                                           GNUNET_REST_JSONAPI_IDENTITY_KEY,
-                                           key_str);
-    json_decref (key_str);
-    GNUNET_free (keystring);
+    json_resource = GNUNET_REST_jsonapi_resource_new (GNUNET_REST_JSONAPI_IDENTITY_EGO,
+                                                      ego_entry->keystring);
+    name_str = json_string (ego_entry->identifier);
+    GNUNET_REST_jsonapi_resource_add_attr (
+                                           json_resource,
+                                           GNUNET_REST_JSONAPI_IDENTITY_NAME,
+                                           name_str);
+    json_decref (name_str);
+    if (NULL != create_token_for)
+    {
+      make_gnuid_token (handle,
+                        ego_entry,
+                        ego_entry->identifier,
+                        create_token_for,
+                        &token);
+      token_str = json_string (token);
+      GNUNET_free (token);
+      GNUNET_REST_jsonapi_resource_add_attr (json_resource,
+                                             GNUNET_REST_JSONAPI_IDENTITY_GNUID,
+                                             token_str);
+      json_decref (token_str);
+    }
     GNUNET_REST_jsonapi_object_resource_add (json_object, json_resource);
   }
   if (0 == GNUNET_REST_jsonapi_object_resource_count (json_object))
   {
     GNUNET_REST_jsonapi_object_delete (json_object);
+    handle->emsg = GNUNET_strdup ("No identities found!");
     GNUNET_SCHEDULER_add_now (&do_error, handle);
     return;
   }
@@ -366,6 +566,12 @@ ego_info_response (struct RestConnectionDataHandle *con,
   cleanup_handle (handle);
 }
 
+/**
+ * Processing finished
+ *
+ * @param cls request handle
+ * @param emsg error message
+ */
 static void
 do_finished (void *cls, const char *emsg)
 {
@@ -375,6 +581,7 @@ do_finished (void *cls, const char *emsg)
   handle->op = NULL;
   if (NULL != emsg)
   {
+    handle->emsg = GNUNET_strdup (emsg);
     GNUNET_SCHEDULER_add_now (&do_error, handle);
     return;
   }
@@ -383,40 +590,13 @@ do_finished (void *cls, const char *emsg)
   cleanup_handle (handle);
 }
 
-static void
-edit_finished (void *cls, const char *emsg)
-{
-  struct RequestHandle *handle = cls;
-  struct MHD_Response *resp;
-  
-  handle->op = NULL;
-  if (NULL != emsg)
-  {
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  resp = GNUNET_REST_create_json_response (NULL);
-  handle->proc (handle->proc_cls, resp, MHD_HTTP_NO_CONTENT);
-  cleanup_handle (handle);
-}
-
-static void
-create_finished (void *cls, const char *emsg)
-{
-  struct RequestHandle *handle = cls;
-  struct MHD_Response *resp;
-
-  handle->op = NULL;
-  if (NULL != emsg)
-  {
-    GNUNET_SCHEDULER_add_now (&do_error, handle);
-    return;
-  }
-  resp = GNUNET_REST_create_json_response (NULL);
-  handle->proc (handle->proc_cls, resp, MHD_HTTP_NO_CONTENT);
-  cleanup_handle (handle);
-}
-
+/**
+ * Create a new ego
+ *
+ * @param con rest handle
+ * @param url url
+ * @param cls request handle
+ */
 static void
 ego_create_cont (struct RestConnectionDataHandle *con,
                  const char *url,
@@ -433,11 +613,13 @@ ego_create_cont (struct RestConnectionDataHandle *con,
 
   if (strlen (GNUNET_REST_API_NS_IDENTITY) != strlen (handle->url))
   {
+    handle->emsg = GNUNET_strdup (GNUNET_REST_ERROR_RESOURCE_INVALID);
     GNUNET_SCHEDULER_add_now (&do_error, handle);
     return;
   }
   if (0 >= handle->data_size)
   {
+    handle->emsg = GNUNET_strdup (GNUNET_REST_ERROR_NO_DATA);
     GNUNET_SCHEDULER_add_now (&do_error, handle);
     return;
   }
@@ -452,6 +634,7 @@ ego_create_cont (struct RestConnectionDataHandle *con,
   if (1 != GNUNET_REST_jsonapi_object_resource_count (json_obj))
   {
     GNUNET_REST_jsonapi_object_delete (json_obj);
+    handle->emsg = GNUNET_strdup ("Provided resource count invalid");
     GNUNET_SCHEDULER_add_now (&do_error, handle);
     return;
   }
@@ -464,10 +647,11 @@ ego_create_cont (struct RestConnectionDataHandle *con,
     cleanup_handle (handle);
     return;
   }
-  egoname_json = GNUNET_REST_jsonapi_resource_read_attr (json_res, GNUNET_REST_JSONAPI_KEY_ID);
+  egoname_json = GNUNET_REST_jsonapi_resource_read_attr (json_res, GNUNET_REST_JSONAPI_IDENTITY_NAME);
   if (!json_is_string (egoname_json))
   {
     GNUNET_REST_jsonapi_object_delete (json_obj); 
+    handle->emsg = GNUNET_strdup ("No name provided");
     GNUNET_SCHEDULER_add_now (&do_error, handle);
     return;
   }
@@ -489,7 +673,7 @@ ego_create_cont (struct RestConnectionDataHandle *con,
   GNUNET_REST_jsonapi_object_delete (json_obj);
   handle->op = GNUNET_IDENTITY_create (handle->identity_handle,
                                        handle->name,
-                                       &create_finished,
+                                       &do_finished,
                                        handle);
 }
 
@@ -503,8 +687,8 @@ ego_create_cont (struct RestConnectionDataHandle *con,
  */
 static void 
 ego_edit_cont (struct RestConnectionDataHandle *con,
-                 const char *url,
-                 void *cls)
+               const char *url,
+               void *cls)
 {
   struct JsonApiObject *json_obj;
   struct JsonApiResource *json_res;
@@ -513,29 +697,31 @@ ego_edit_cont (struct RestConnectionDataHandle *con,
   struct MHD_Response *resp;
   json_t *subsys_json;
   json_t *name_json;
-  const char *egoname;
+  const char *keystring;
   const char *subsys;
   const char *newname;
   char term_data[handle->data_size+1];
   int ego_exists = GNUNET_NO;
-  
+
   if (strlen (GNUNET_REST_API_NS_IDENTITY) > strlen (handle->url))
   {
+    handle->emsg = GNUNET_strdup (GNUNET_REST_ERROR_RESOURCE_INVALID);
     GNUNET_SCHEDULER_add_now (&do_error, handle);
     return;
   }
 
-  egoname = &handle->url[strlen(GNUNET_REST_API_NS_IDENTITY)+1];
+  keystring = &handle->url[strlen(GNUNET_REST_API_NS_IDENTITY)+1];
+
   for (ego_entry = handle->ego_head;
        NULL != ego_entry;
        ego_entry = ego_entry->next)
   {
-    if (0 == strcasecmp (egoname, ego_entry->identifier))
-    {
-      ego_exists = GNUNET_YES;
-      break;
-    }
+    if (0 != strcasecmp (keystring, ego_entry->keystring))
+      continue;
+    ego_exists = GNUNET_YES;
+    break;
   }
+
   if (GNUNET_NO == ego_exists)
   {
     resp = GNUNET_REST_create_json_response (NULL);
@@ -546,6 +732,7 @@ ego_edit_cont (struct RestConnectionDataHandle *con,
 
   if (0 >= handle->data_size)
   {
+    handle->emsg = GNUNET_strdup (GNUNET_REST_ERROR_NO_DATA);
     GNUNET_SCHEDULER_add_now (&do_error, handle);
     return;
   }
@@ -556,60 +743,75 @@ ego_edit_cont (struct RestConnectionDataHandle *con,
 
   if (NULL == json_obj)
   {
+    handle->emsg = GNUNET_strdup ("Data invalid");
     GNUNET_SCHEDULER_add_now (&do_error, handle);
     return;
   }
+
   if (1 != GNUNET_REST_jsonapi_object_resource_count (json_obj))
   {
     GNUNET_REST_jsonapi_object_delete (json_obj);
+    handle->emsg = GNUNET_strdup ("Resource amount invalid");
     GNUNET_SCHEDULER_add_now (&do_error, handle);
     return;
   }
   json_res = GNUNET_REST_jsonapi_object_get_resource (json_obj, 0); 
+
   if (GNUNET_NO == GNUNET_REST_jsonapi_resource_check_type (json_res, GNUNET_REST_JSONAPI_IDENTITY_EGO))
   {
     GNUNET_REST_jsonapi_object_delete (json_obj);
+    handle->emsg = GNUNET_strdup ("Resource type invalid");
     GNUNET_SCHEDULER_add_now (&do_error, handle);
     return;
   }
-    //This is a rename
-  name_json = GNUNET_REST_jsonapi_resource_read_attr (json_res, GNUNET_REST_JSONAPI_IDENTITY_NEWNAME);
-  if (NULL != name_json)
+
+  //This is a rename
+  name_json = GNUNET_REST_jsonapi_resource_read_attr (json_res,
+                                                      GNUNET_REST_JSONAPI_IDENTITY_NEWNAME);
+  if ((NULL != name_json) && json_is_string (name_json))
   {
-    newname = NULL;
-    if (json_is_string (name_json))
+    newname = json_string_value (name_json);
+    for (ego_entry = handle->ego_head;
+         NULL != ego_entry;
+         ego_entry = ego_entry->next)
     {
-      newname = json_string_value (name_json);
-      handle->op = GNUNET_IDENTITY_rename (handle->identity_handle,
-                                      egoname,
-                                      newname,
-                                      &edit_finished,
-                                      handle);
-      GNUNET_REST_jsonapi_object_delete (json_obj);
-      return;
+      if (0 == strcasecmp (newname, ego_entry->identifier) &&
+          0 != strcasecmp (keystring, ego_entry->keystring))
+      {
+        //Ego with same name not allowed
+        GNUNET_REST_jsonapi_object_delete (json_obj);
+        resp = GNUNET_REST_create_json_response (NULL);
+        handle->proc (handle->proc_cls, resp, MHD_HTTP_CONFLICT);
+        cleanup_handle (handle);
+        return;
+      }
     }
+    handle->op = GNUNET_IDENTITY_rename (handle->identity_handle,
+                                         ego_entry->identifier,
+                                         newname,
+                                         &do_finished,
+                                         handle);
+    GNUNET_REST_jsonapi_object_delete (json_obj);
+    return;
   }
 
+  //Set subsystem
   subsys_json = GNUNET_REST_jsonapi_resource_read_attr (json_res, GNUNET_REST_JSONAPI_IDENTITY_SUBSYSTEM);
-  if (NULL != subsys_json)
+  if ( (NULL != subsys_json) && json_is_string (subsys_json))
   {
-    subsys = NULL;
-    if (json_is_string (subsys_json))
-    {
-      subsys = json_string_value (subsys_json);
-      GNUNET_asprintf (&handle->subsys, "%s", subsys);
-      GNUNET_REST_jsonapi_object_delete (json_obj);
-      handle->op = GNUNET_IDENTITY_set (handle->identity_handle,
-                                        handle->subsys,
-                                        ego_entry->ego,
-                                        &edit_finished,
-                                        handle);
-      return;
-    }
+    subsys = json_string_value (subsys_json);
+    GNUNET_asprintf (&handle->subsys, "%s", subsys);
+    GNUNET_REST_jsonapi_object_delete (json_obj);
+    handle->op = GNUNET_IDENTITY_set (handle->identity_handle,
+                                      handle->subsys,
+                                      ego_entry->ego,
+                                      &do_finished,
+                                      handle);
+    return;
   }
   GNUNET_REST_jsonapi_object_delete (json_obj);
+  handle->emsg = GNUNET_strdup ("Subsystem not provided");
   GNUNET_SCHEDULER_add_now (&do_error, handle);
-  
 }
 
 void 
@@ -617,7 +819,7 @@ ego_delete_cont (struct RestConnectionDataHandle *con_handle,
                  const char* url,
                  void *cls)
 {
-  const char *egoname;
+  const char *keystring;
   struct EgoEntry *ego_entry;
   struct MHD_Response *resp;
   struct RequestHandle *handle = cls;
@@ -625,20 +827,20 @@ ego_delete_cont (struct RestConnectionDataHandle *con_handle,
 
   if (strlen (GNUNET_REST_API_NS_IDENTITY) >= strlen (handle->url))
   {
+    handle->emsg = GNUNET_strdup (GNUNET_REST_ERROR_RESOURCE_INVALID);
     GNUNET_SCHEDULER_add_now (&do_error, handle);
     return;
   }
 
-  egoname = &handle->url[strlen(GNUNET_REST_API_NS_IDENTITY)+1];
+  keystring = &handle->url[strlen(GNUNET_REST_API_NS_IDENTITY)+1];
   for (ego_entry = handle->ego_head;
        NULL != ego_entry;
        ego_entry = ego_entry->next)
   {
-    if (0 == strcasecmp (egoname, ego_entry->identifier))
-    {
-      ego_exists = GNUNET_YES;
-      break;
-    }
+    if (0 != strcasecmp (keystring, ego_entry->keystring))
+      continue;
+    ego_exists = GNUNET_YES;
+    break;
   }
   if (GNUNET_NO == ego_exists)
   {
@@ -648,7 +850,7 @@ ego_delete_cont (struct RestConnectionDataHandle *con_handle,
     return;
   }
   handle->op = GNUNET_IDENTITY_delete (handle->identity_handle,
-                                       egoname,
+                                       ego_entry->identifier,
                                        &do_finished,
                                        handle);
 
@@ -698,7 +900,10 @@ init_cont (struct RequestHandle *handle)
   };
 
   if (GNUNET_NO == GNUNET_REST_handle_request (handle->conndata_handle, handlers, handle))
+  {
+    handle->emsg = GNUNET_strdup ("Request unsupported");
     GNUNET_SCHEDULER_add_now (&do_error, handle);
+  }
 }
 
 /**
@@ -742,6 +947,7 @@ list_ego (void *cls,
 {
   struct RequestHandle *handle = cls;
   struct EgoEntry *ego_entry;
+  struct GNUNET_CRYPTO_EcdsaPublicKey pk;
 
   if ((NULL == ego) && (ID_REST_STATE_INIT == handle->state))
   {
@@ -751,7 +957,9 @@ list_ego (void *cls,
   }
   if (ID_REST_STATE_INIT == handle->state) {
     ego_entry = GNUNET_new (struct EgoEntry);
-    GNUNET_IDENTITY_ego_get_public_key (ego, &(ego_entry->pk));
+    GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
+    ego_entry->keystring = 
+      GNUNET_CRYPTO_ecdsa_public_key_to_string (&pk);
     ego_entry->ego = ego;
     GNUNET_asprintf (&ego_entry->identifier, "%s", identifier);
     GNUNET_CONTAINER_DLL_insert_tail(handle->ego_head,handle->ego_tail, ego_entry);
@@ -795,7 +1003,8 @@ rest_identity_process_request(struct RestConnectionDataHandle *conndata_handle,
               "Connecting...\n");
   handle->identity_handle = GNUNET_IDENTITY_connect (cfg,
                                                      &list_ego,
-                                                     handle); 
+                                                     handle);
+  GNUNET_strdup ("Timeout");
   handle->timeout_task =
     GNUNET_SCHEDULER_add_delayed (handle->timeout,
                                   &do_error,
@@ -816,9 +1025,9 @@ void *
 libgnunet_plugin_rest_identity_init (void *cls)
 {
   static struct Plugin plugin;
-  cfg = cls;
   struct GNUNET_REST_Plugin *api;
 
+  cfg = cls;
   if (NULL != plugin.cfg)
     return NULL;                /* can only initialize once! */
   memset (&plugin, 0, sizeof (struct Plugin));