Merge branch 'master' into dev/thejackimonster/messengerHEADmasterdev/thejackimonster/messenger

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

1 files changed, 17 insertions, 46 deletions

diff --git a/src/service/rest/reclaim_plugin.c b/src/service/rest/reclaim_plugin.c
index e1afce00b..10b6b7bdc 100644
--- a/src/service/rest/reclaim_plugin.c
+++ b/src/service/rest/reclaim_plugin.c
@@ -25,6 +25,7 @@
  *
  */
 #include "platform.h"
+#include "gnunet_json_lib.h"
 #include "microhttpd.h"
 #include <inttypes.h>
 #include <jansson.h>
@@ -434,37 +435,19 @@ collect_finished_cb (void *cls)
  *
  */
 static void
-ticket_collect (void *cls, const struct GNUNET_RECLAIM_Ticket *ticket)
+ticket_collect (void *cls, const struct GNUNET_RECLAIM_Ticket *ticket,
+                const char *rp_uri)
 {
   json_t *json_resource;
   struct RequestHandle *handle = cls;
-  json_t *value;
-  char *tmp;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding ticket\n");
-  tmp = GNUNET_STRINGS_data_to_string_alloc (&ticket->rnd, sizeof(ticket->rnd));
   json_resource = json_object ();
-  GNUNET_free (tmp);
   json_array_append (handle->resp_object, json_resource);
 
-  tmp =
-    GNUNET_STRINGS_data_to_string_alloc (&ticket->identity,
-                                         sizeof(struct
-                                                GNUNET_CRYPTO_PublicKey));
-  value = json_string (tmp);
-  json_object_set_new (json_resource, "issuer", value);
-  GNUNET_free (tmp);
-  tmp =
-    GNUNET_STRINGS_data_to_string_alloc (&ticket->audience,
-                                         sizeof(struct
-                                                GNUNET_CRYPTO_PublicKey));
-  value = json_string (tmp);
-  json_object_set_new (json_resource, "audience", value);
-  GNUNET_free (tmp);
-  tmp = GNUNET_STRINGS_data_to_string_alloc (&ticket->rnd, sizeof(ticket->rnd));
-  value = json_string (tmp);
-  json_object_set_new (json_resource, "rnd", value);
-  GNUNET_free (tmp);
+  json_object_set_new (json_resource, "gns_name", json_string (ticket->gns_name)
+                       );
+  json_object_set_new (json_resource, "rp_uri", json_string (rp_uri));
   GNUNET_RECLAIM_ticket_iteration_next (handle->ticket_it);
 }
 
@@ -937,7 +920,8 @@ parse_jwt (const struct GNUNET_RECLAIM_Credential *cred,
   type_str = "String";
   type = GNUNET_RECLAIM_attribute_typename_to_number (type_str);
   if (GNUNET_SYSERR == GNUNET_RECLAIM_attribute_string_to_value (type,val_str,
-                                                                 (void **) &data,
+                                                                 (void **) &data
+                                                                 ,
                                                                  &data_size))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -1133,6 +1117,7 @@ revoke_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle,
   struct RequestHandle *handle = cls;
   struct EgoEntry *ego_entry;
   struct GNUNET_RECLAIM_Ticket *ticket = NULL;
+  struct GNUNET_CRYPTO_PublicKey iss;
   struct GNUNET_CRYPTO_PublicKey tmp_pk;
   char term_data[handle->rest_handle->data_size + 1];
   json_t *data_json;
@@ -1171,11 +1156,13 @@ revoke_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle,
     return;
   }
 
+  GNUNET_assert (GNUNET_OK == GNUNET_GNS_parse_ztld (ticket->gns_name, &iss));
+
   for (ego_entry = ego_head; NULL != ego_entry;
        ego_entry = ego_entry->next)
   {
     GNUNET_IDENTITY_ego_get_public_key (ego_entry->ego, &tmp_pk);
-    if (0 == memcmp (&ticket->identity,
+    if (0 == memcmp (&iss,
                      &tmp_pk,
                      sizeof(struct GNUNET_CRYPTO_PublicKey)))
       break;
@@ -1236,16 +1223,16 @@ consume_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle,
                      const char *url,
                      void *cls)
 {
-  const struct GNUNET_CRYPTO_PrivateKey *identity_priv;
   struct RequestHandle *handle = cls;
-  struct EgoEntry *ego_entry;
   struct GNUNET_RECLAIM_Ticket *ticket;
-  struct GNUNET_CRYPTO_PublicKey tmp_pk;
   char term_data[handle->rest_handle->data_size + 1];
+  const char *rp_uri;
   json_t *data_json;
   json_error_t err;
   struct GNUNET_JSON_Specification tktspec[] =
-  { GNUNET_RECLAIM_JSON_spec_ticket (&ticket), GNUNET_JSON_spec_end () };
+  { GNUNET_RECLAIM_JSON_spec_ticket (&ticket),
+    GNUNET_JSON_spec_string ("rp_uri", &rp_uri),
+    GNUNET_JSON_spec_end () };
 
   if (0 >= handle->rest_handle->data_size)
   {
@@ -1274,26 +1261,10 @@ consume_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle,
     json_decref (data_json);
     return;
   }
-  for (ego_entry = ego_head; NULL != ego_entry;
-       ego_entry = ego_entry->next)
-  {
-    GNUNET_IDENTITY_ego_get_public_key (ego_entry->ego, &tmp_pk);
-    if (0 == memcmp (&ticket->audience,
-                     &tmp_pk,
-                     sizeof(struct GNUNET_CRYPTO_PublicKey)))
-      break;
-  }
-  if (NULL == ego_entry)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Identity unknown\n");
-    GNUNET_JSON_parse_free (tktspec);
-    return;
-  }
-  identity_priv = GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego);
   handle->resp_object = json_object ();
   handle->idp_op = GNUNET_RECLAIM_ticket_consume (idp,
-                                                  identity_priv,
                                                   ticket,
+                                                  rp_uri,
                                                   &consume_cont,
                                                   handle);
   GNUNET_JSON_parse_free (tktspec);