RECLAIM: Forgot to modify consume API to new issue behaviour

8 files changed, 56 insertions, 7 deletions

diff --git a/src/cli/reclaim/gnunet-reclaim.c b/src/cli/reclaim/gnunet-reclaim.c
index 38d29ac09..b7342d3ff 100644
--- a/src/cli/reclaim/gnunet-reclaim.c
+++ b/src/cli/reclaim/gnunet-reclaim.c
@@ -53,6 +53,11 @@ static int list_credentials;
 static char *credential_id;
 
 /**
+ * The expected RP URI
+ */
+static char *ex_rp_uri;
+
+/**
  * Credential ID
  */
 static struct GNUNET_RECLAIM_Identifier credential;
@@ -445,8 +450,15 @@ iter_finished (void *cls)
   }
   if (consume_ticket)
   {
+    if (NULL == ex_rp_uri)
+    {
+      fprintf (stderr, "Expected an RP URI to consume ticket\n");
+      GNUNET_SCHEDULER_add_now(&do_cleanup, NULL);
+      return;
+    }
     reclaim_op = GNUNET_RECLAIM_ticket_consume (reclaim_handle,
                                                 &ticket,
+                                                ex_rp_uri,
                                                 &process_attrs,
                                                 NULL);
     timeout = GNUNET_SCHEDULER_add_delayed (
@@ -858,6 +870,12 @@ main (int argc, char *const argv[])
                                  gettext_noop (
                                    "Specify the relying party for issue"),
                                  &rp),
+    GNUNET_GETOPT_option_string ('u',
+                                 "rpuri",
+                                 "RPURI",
+                                 gettext_noop (
+                                   "Specify the relying party URI for a ticket to consume"),
+                                 &ex_rp_uri),
     GNUNET_GETOPT_option_flag ('D',
                                "dump",
                                gettext_noop ("List attributes for EGO"),
diff --git a/src/include/gnunet_reclaim_service.h b/src/include/gnunet_reclaim_service.h
index 15472fb9f..086c3f021 100644
--- a/src/include/gnunet_reclaim_service.h
+++ b/src/include/gnunet_reclaim_service.h
@@ -392,7 +392,7 @@ GNUNET_RECLAIM_get_credentials_stop (
  *
  * @param h the identity provider to use
  * @param iss the issuing identity (= the user)
- * @param rp the subject of the ticket (= the relying party) see #GNUNET_RECLAIM_Ticket
+ * @param rp_uri the subject of the ticket (= the relying party) see #GNUNET_RECLAIM_Ticket
  * @param attrs the attributes that the relying party is given access to
  * @param cb the callback
  * @param cb_cls the callback closure
@@ -402,7 +402,7 @@ struct GNUNET_RECLAIM_Operation *
 GNUNET_RECLAIM_ticket_issue (
   struct GNUNET_RECLAIM_Handle *h,
   const struct GNUNET_CRYPTO_PrivateKey *iss,
-  const char *rp,
+  const char *rp_uri,
   const struct GNUNET_RECLAIM_AttributeList *attrs,
   GNUNET_RECLAIM_IssueTicketCallback cb, void *cb_cls);
 
@@ -434,6 +434,7 @@ GNUNET_RECLAIM_ticket_revoke (
  *
  * @param h the identity provider to use
  * @param ticket the issued ticket to consume
+ * @param rp_uri the RP URI
  * @param cb the callback to call
  * @param cb_cls the callback closure
  * @return handle to abort the operation
@@ -442,6 +443,7 @@ struct GNUNET_RECLAIM_Operation *
 GNUNET_RECLAIM_ticket_consume (
   struct GNUNET_RECLAIM_Handle *h,
   const struct GNUNET_RECLAIM_Ticket *ticket,
+  const char *rp_uri,
   GNUNET_RECLAIM_AttributeTicketResult cb, void *cb_cls);
 
 
diff --git a/src/service/reclaim/gnunet-service-reclaim.c b/src/service/reclaim/gnunet-service-reclaim.c
index f5762c83d..c381a5aaf 100644
--- a/src/service/reclaim/gnunet-service-reclaim.c
+++ b/src/service/reclaim/gnunet-service-reclaim.c
@@ -984,9 +984,13 @@ static int
 check_consume_ticket_message (void *cls, const struct ConsumeTicketMessage *cm)
 {
   uint16_t size;
+  uint16_t tkt_size;
+  uint16_t rp_uri_size;
 
   size = ntohs (cm->header.size);
-  if (size <= sizeof(struct ConsumeTicketMessage))
+  tkt_size = ntohs (cm->tkt_len);
+  rp_uri_size = ntohs (cm->rp_uri_len);
+  if (size < sizeof(struct ConsumeTicketMessage) + tkt_size + rp_uri_size)
   {
     GNUNET_break (0);
     return GNUNET_SYSERR;
@@ -1008,15 +1012,19 @@ handle_consume_ticket_message (void *cls, const struct ConsumeTicketMessage *cm)
   struct IdpClient *idp = cls;
   struct GNUNET_RECLAIM_Ticket *ticket;
   char *buf;
+  const char *rp_uri;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received CONSUME_TICKET message\n");
   buf = (char*) &cm[1];
   ticket = (struct GNUNET_RECLAIM_Ticket *) buf;
+  rp_uri = buf + ntohs (cm->tkt_len);
   cop = GNUNET_new (struct ConsumeTicketOperation);
   cop->r_id = ntohl (cm->id);
   cop->client = idp;
   cop->ch
-    = RECLAIM_TICKETS_consume (ticket, &consume_result_cb,
+    = RECLAIM_TICKETS_consume (ticket,
+                               rp_uri,
+                               &consume_result_cb,
                                cop);
   GNUNET_CONTAINER_DLL_insert (idp->consume_op_head, idp->consume_op_tail, cop);
   GNUNET_SERVICE_client_continue (idp->client);
diff --git a/src/service/reclaim/gnunet-service-reclaim_tickets.c b/src/service/reclaim/gnunet-service-reclaim_tickets.c
index 0d0cc5cc5..23ce8ad92 100644
--- a/src/service/reclaim/gnunet-service-reclaim_tickets.c
+++ b/src/service/reclaim/gnunet-service-reclaim_tickets.c
@@ -1047,7 +1047,8 @@ process_parallel_lookup_result (void *cls,
   if (NULL != cth->parallel_lookups_head)
     return; // Wait for more
   /* Else we are done */
-  GNUNET_assert (GNUNET_OK == GNUNET_GNS_parse_ztld (cth->ticket.gns_name, &iss));
+  GNUNET_assert (GNUNET_OK == GNUNET_GNS_parse_ztld (cth->ticket.gns_name, &iss)
+                 );
   cth->cb (cth->cb_cls, &iss,
            cth->attrs, cth->presentations, GNUNET_OK, NULL);
   cleanup_cth (cth);
@@ -1152,7 +1153,8 @@ lookup_authz_cb (void *cls,
                   "Ignoring unknown record type %d", rd[i].record_type);
     }
   }
-  GNUNET_assert (GNUNET_OK == GNUNET_GNS_parse_ztld (cth->ticket.gns_name, &iss));
+  GNUNET_assert (GNUNET_OK == GNUNET_GNS_parse_ztld (cth->ticket.gns_name, &iss)
+                 );
   if (NULL == rp_uri)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -1212,6 +1214,7 @@ lookup_authz_cb (void *cls,
  */
 struct RECLAIM_TICKETS_ConsumeHandle *
 RECLAIM_TICKETS_consume (const struct GNUNET_RECLAIM_Ticket *ticket,
+                         const char *rp_uri,
                          RECLAIM_TICKETS_ConsumeCallback cb,
                          void *cb_cls)
 {
@@ -1224,6 +1227,7 @@ RECLAIM_TICKETS_consume (const struct GNUNET_RECLAIM_Ticket *ticket,
   cth->attrs = GNUNET_new (struct GNUNET_RECLAIM_AttributeList);
   cth->presentations = GNUNET_new (struct GNUNET_RECLAIM_PresentationList);
   cth->ticket = *ticket;
+  memcpy (cth->rp_uri, rp_uri, strlen (rp_uri) + 1);
   cth->cb = cb;
   cth->cb_cls = cb_cls;
   tmp = GNUNET_strdup (ticket->gns_name);
diff --git a/src/service/reclaim/gnunet-service-reclaim_tickets.h b/src/service/reclaim/gnunet-service-reclaim_tickets.h
index 6e610493b..b425a3dba 100644
--- a/src/service/reclaim/gnunet-service-reclaim_tickets.h
+++ b/src/service/reclaim/gnunet-service-reclaim_tickets.h
@@ -189,12 +189,14 @@ RECLAIM_TICKETS_revoke_cancel (struct RECLAIM_TICKETS_RevokeHandle *rh);
  * ticket.rnd in GNS.
  *
  * @param ticket the ticket to consume
+ * @param rp_uri the expected RP URI
  * @param cb callback to call with attributes of ticket
  * @param cb_cls callback closure
  * @return handle to the operation
  */
 struct RECLAIM_TICKETS_ConsumeHandle *
 RECLAIM_TICKETS_consume (const struct GNUNET_RECLAIM_Ticket *ticket,
+                         const char *rp_uri,
                          RECLAIM_TICKETS_ConsumeCallback cb,
                          void *cb_cls);
 
diff --git a/src/service/reclaim/reclaim.h b/src/service/reclaim/reclaim.h
index 33764c831..1fb50eafe 100644
--- a/src/service/reclaim/reclaim.h
+++ b/src/service/reclaim/reclaim.h
@@ -543,7 +543,13 @@ struct ConsumeTicketMessage
   uint16_t tkt_len GNUNET_PACKED;
 
   /**
+   * RP URI length
+   */
+  uint16_t rp_uri_len GNUNET_PACKED;
+
+  /**
    * Followed by the serialized ticket.
+   * Followed by the RP URI
    */
 };
 
diff --git a/src/service/reclaim/reclaim_api.c b/src/service/reclaim/reclaim_api.c
index a9d9bdada..001e69095 100644
--- a/src/service/reclaim/reclaim_api.c
+++ b/src/service/reclaim/reclaim_api.c
@@ -1546,6 +1546,7 @@ struct GNUNET_RECLAIM_Operation *
 GNUNET_RECLAIM_ticket_consume (
   struct GNUNET_RECLAIM_Handle *h,
   const struct GNUNET_RECLAIM_Ticket *ticket,
+  const char *rp_uri,
   GNUNET_RECLAIM_AttributeTicketResult cb,
   void *cb_cls)
 {
@@ -1565,8 +1566,11 @@ GNUNET_RECLAIM_ticket_consume (
                                  tkt_len,
                                  GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET);
   buf = (char*) &ctm[1];
+  ctm->rp_uri_len = htons (strlen (rp_uri) + 1);
   ctm->tkt_len = htons (tkt_len);
   memcpy (buf, ticket, tkt_len);
+  buf += tkt_len;
+  memcpy (buf, rp_uri, strlen (rp_uri) + 1);
   ctm->id = htonl (op->r_id);
   if (NULL != h->mq)
     GNUNET_MQ_send_copy (h->mq, op->env);
diff --git a/src/service/rest/reclaim_plugin.c b/src/service/rest/reclaim_plugin.c
index adddab5c6..ed86601d1 100644
--- a/src/service/rest/reclaim_plugin.c
+++ b/src/service/rest/reclaim_plugin.c
@@ -24,6 +24,7 @@
  * @brief GNUnet reclaim REST plugin
  *
  */
+#include "gnunet_json_lib.h"
 #include "platform.h"
 #include "microhttpd.h"
 #include <inttypes.h>
@@ -1225,10 +1226,13 @@ consume_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle,
   struct RequestHandle *handle = cls;
   struct GNUNET_RECLAIM_Ticket *ticket;
   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)
   {
@@ -1260,6 +1264,7 @@ consume_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle,
   handle->resp_object = json_object ();
   handle->idp_op = GNUNET_RECLAIM_ticket_consume (idp,
                                                   ticket,
+                                                  rp_uri,
                                                   &consume_cont,
                                                   handle);
   GNUNET_JSON_parse_free (tktspec);