[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 119/171: -add consume API
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] 119/171: -add consume API |
|
Date: |
Thu, 04 Jan 2018 16:10:27 +0100 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit ca10195d9af33c557b57f16b8bb93df1066ab0ee
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Mon Sep 18 00:23:19 2017 +0200
-add consume API
---
src/identity-provider/gnunet-idp.c | 53 ++-
.../gnunet-service-identity-provider.c | 360 +++++++++++++++++++--
src/identity-provider/identity_attribute.c | 6 +
src/identity-provider/identity_provider.h | 4 +-
src/identity-provider/identity_provider_api.c | 63 +++-
src/identity-provider/test_idp_issue.sh | 8 +-
src/include/gnunet_identity_provider_service.h | 2 +-
src/include/gnunet_protocols.h | 2 +
8 files changed, 442 insertions(+), 56 deletions(-)
diff --git a/src/identity-provider/gnunet-idp.c
b/src/identity-provider/gnunet-idp.c
index f85ede7aa..a8739e6f6 100644
--- a/src/identity-provider/gnunet-idp.c
+++ b/src/identity-provider/gnunet-idp.c
@@ -57,6 +57,11 @@ static char* attr_value;
static char* issue_attrs;
/**
+ * Ticket to consume
+ */
+static char* consume_ticket;
+
+/**
* Ego name
*/
static char* ego_name;
@@ -96,6 +101,10 @@ static const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey;
*/
static struct GNUNET_CRYPTO_EcdsaPublicKey rp_key;
+/**
+ * Ticket to consume
+ */
+static struct GNUNET_IDENTITY_PROVIDER_Ticket2 ticket;
/**
* Attribute list
@@ -123,11 +132,10 @@ ticket_issue_cb (void* cls,
{
char* ticket_str;
if (NULL != ticket) {
- ticket_str = GNUNET_STRINGS_data_to_string_alloc (&ticket->rnd,
- sizeof (uint64_t));
- GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
- "Got ticket, %s\n",
- ticket_str);
+ ticket_str = GNUNET_STRINGS_data_to_string_alloc (ticket,
+ sizeof (struct
GNUNET_IDENTITY_PROVIDER_Ticket2));
+ printf("%s\n",
+ ticket_str);
GNUNET_free (ticket_str);
}
GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
@@ -150,6 +158,21 @@ store_attr_cont (void *cls,
}
static void
+process_attrs (void *cls,
+ const struct GNUNET_CRYPTO_EcdsaPublicKey *identity,
+ const struct GNUNET_IDENTITY_PROVIDER_Attribute *attr)
+{
+ if (NULL == identity)
+ {
+ GNUNET_SCHEDULER_add_now (&do_cleanup, NULL);
+ return;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+ "%s: %s\n", attr->name, (char*)attr->data);
+}
+
+
+static void
iter_error (void *cls)
{
attr_iterator = NULL;
@@ -178,6 +201,14 @@ iter_finished (void *cls)
NULL);
return;
}
+ if (consume_ticket) {
+ idp_op = GNUNET_IDENTITY_PROVIDER_rp_ticket_consume (idp_handle,
+ pkey,
+ &ticket,
+ &process_attrs,
+ NULL);
+ return;
+ }
attr = GNUNET_IDENTITY_PROVIDER_attribute_new (attr_name,
GNUNET_IDENTITY_PROVIDER_AT_STRING,
attr_value,
@@ -193,7 +224,7 @@ iter_finished (void *cls)
static void
iter_cb (void *cls,
- const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity,
+ const struct GNUNET_CRYPTO_EcdsaPublicKey *identity,
const struct GNUNET_IDENTITY_PROVIDER_Attribute *attr)
{
struct GNUNET_IDENTITY_PROVIDER_AttributeListEntry *le;
@@ -243,6 +274,11 @@ ego_cb (void *cls,
GNUNET_CRYPTO_ecdsa_public_key_from_string (rp,
strlen (rp),
&rp_key);
+ if (NULL != consume_ticket)
+ GNUNET_STRINGS_string_to_data (consume_ticket,
+ strlen (consume_ticket),
+ &ticket,
+ sizeof (struct
GNUNET_IDENTITY_PROVIDER_Ticket2));
attr_list = GNUNET_new (struct GNUNET_IDENTITY_PROVIDER_AttributeList);
@@ -317,6 +353,11 @@ main(int argc, char *const argv[])
NULL,
gettext_noop ("Issue a ticket"),
&issue_attrs),
+ GNUNET_GETOPT_option_string ('C',
+ "consume",
+ NULL,
+ gettext_noop ("Consume a ticket"),
+ &consume_ticket),
GNUNET_GETOPT_OPTION_END
};
return GNUNET_PROGRAM_run (argc, argv, "ct",
diff --git a/src/identity-provider/gnunet-service-identity-provider.c
b/src/identity-provider/gnunet-service-identity-provider.c
index 0eb6599e6..9a919102f 100644
--- a/src/identity-provider/gnunet-service-identity-provider.c
+++ b/src/identity-provider/gnunet-service-identity-provider.c
@@ -310,7 +310,65 @@ struct VerifiedAttributeEntry
char* name;
};
-struct ParallelLookups;
+struct ParallelLookup;
+struct ParallelLookup2;
+
+struct ConsumeTicketHandle
+{
+
+ /**
+ * Client connection
+ */
+ struct IdpClient *client;
+
+ /**
+ * Ticket
+ */
+ struct GNUNET_IDENTITY_PROVIDER_Ticket2 ticket;
+
+ /**
+ * LookupRequest
+ */
+ struct GNUNET_GNS_LookupRequest *lookup_request;
+
+ /**
+ * Audience Key
+ */
+ struct GNUNET_CRYPTO_EcdsaPrivateKey identity;
+
+ /**
+ * Audience Key
+ */
+ struct GNUNET_CRYPTO_EcdsaPublicKey identity_pub;
+
+ /**
+ * ParallelLookups DLL
+ */
+ struct ParallelLookup2 *parallel_lookups_head;
+ struct ParallelLookup2 *parallel_lookups_tail;
+
+ struct GNUNET_SCHEDULER_Task *kill_task;
+ struct GNUNET_CRYPTO_AbeKey *key;
+
+ /**
+ * request id
+ */
+ uint32_t r_id;
+};
+
+struct ParallelLookup2
+{
+ struct ParallelLookup2 *next;
+
+ struct ParallelLookup2 *prev;
+
+ struct GNUNET_GNS_LookupRequest *lookup_request;
+
+ struct ConsumeTicketHandle *handle;
+
+ char *label;
+};
+
struct ExchangeHandle
{
@@ -1657,28 +1715,6 @@ store_ticket_issue_cont (void *cls,
-/**
- * Checks a ticket issue message
- *
- * @param cls client sending the message
- * @param im message of type `struct TicketIssueMessage`
- * @return #GNUNET_OK if @a im is well-formed
- */
-static int
-check_ticket_issue_message(void *cls,
- const struct TicketIssueMessage *im)
-{
- uint16_t size;
-
- size = ntohs (im->header.size);
- if (size <= sizeof (struct IssueMessage))
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
- return GNUNET_OK;
-}
-
int
serialize_abe_keyinfo2 (const struct TicketIssueHandle *handle,
const struct GNUNET_CRYPTO_AbeKey *rp_key,
@@ -1707,7 +1743,13 @@ serialize_abe_keyinfo2 (const struct TicketIssueHandle
*handle,
}
buf = GNUNET_malloc (attrs_str_len + size);
write_ptr = buf;
+ GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+ "Writing attributes\n");
for (le = handle->attrs->list_head; NULL != le; le = le->next) {
+ GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+ "%s\n", le->attribute->name);
+
+
GNUNET_memcpy (write_ptr,
le->attribute->name,
strlen (le->attribute->name));
@@ -1750,7 +1792,7 @@ serialize_abe_keyinfo2 (const struct TicketIssueHandle
*handle,
static void
issue_ticket_after_abe_bootstrap (void *cls,
- struct GNUNET_CRYPTO_AbeMasterKey *abe_key)
+ struct GNUNET_CRYPTO_AbeMasterKey *abe_key)
{
struct TicketIssueHandle *ih = cls;
struct GNUNET_IDENTITY_PROVIDER_AttributeListEntry *le;
@@ -1768,15 +1810,16 @@ issue_ticket_after_abe_bootstrap (void *cls,
attrs_len = 0;
for (le = ih->attrs->list_head; NULL != le; le = le->next)
attrs_len++;
- attrs = GNUNET_malloc (attrs_len);
+ attrs = GNUNET_malloc ((attrs_len + 1)*sizeof (char*));
i = 0;
for (le = ih->attrs->list_head; NULL != le; le = le->next) {
attrs[i] = (char*) le->attribute->name;
i++;
}
+ attrs[i] = NULL;
rp_key = GNUNET_CRYPTO_cpabe_create_key (abe_key,
attrs);
-
+
//TODO review this wireformat
code_record_len = serialize_abe_keyinfo2 (ih,
rp_key,
@@ -1805,6 +1848,29 @@ issue_ticket_after_abe_bootstrap (void *cls,
/**
+ * Checks a ticket issue message
+ *
+ * @param cls client sending the message
+ * @param im message of type `struct TicketIssueMessage`
+ * @return #GNUNET_OK if @a im is well-formed
+ */
+static int
+check_ticket_issue_message(void *cls,
+ const struct TicketIssueMessage *im)
+{
+ uint16_t size;
+
+ size = ntohs (im->header.size);
+ if (size <= sizeof (struct TicketIssueMessage))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
+}
+
+
+/**
*
* Handler for ticket issue message
*
@@ -1849,7 +1915,242 @@ cleanup_as_handle (struct AttributeStoreHandle *handle)
GNUNET_free (handle);
}
+/**
+ * Checks a ticket consume message
+ *
+ * @param cls client sending the message
+ * @param im message of type `struct ConsumeTicketMessage`
+ * @return #GNUNET_OK if @a im is well-formed
+ */
+static int
+check_consume_ticket_message(void *cls,
+ const struct ConsumeTicketMessage *cm)
+{
+ uint16_t size;
+
+ size = ntohs (cm->header.size);
+ if (size <= sizeof (struct ConsumeTicketMessage))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
+}
+static void
+process_parallel_lookup2 (void *cls, uint32_t rd_count,
+ const struct GNUNET_GNSRECORD_Data *rd)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+ "Parallel lookup finished (count=%u)\n", rd_count);
+ struct ParallelLookup2 *parallel_lookup = cls;
+ struct ConsumeTicketHandle *handle = parallel_lookup->handle;
+ struct AttributeResultMessage *arm;
+ struct GNUNET_MQ_Envelope *env;
+ char *data;
+ char *data_tmp;
+ size_t msg_extra_len;
+
+ GNUNET_CONTAINER_DLL_remove (handle->parallel_lookups_head,
+ handle->parallel_lookups_tail,
+ parallel_lookup);
+ GNUNET_free (parallel_lookup);
+ if (1 != rd_count)
+ GNUNET_break(0);//TODO
+ if (rd->record_type == GNUNET_GNSRECORD_TYPE_ID_ATTR)
+ {
+ msg_extra_len = GNUNET_CRYPTO_cpabe_decrypt (rd->data,
+ rd->data_size,
+ handle->key,
+ (void**)&data);
+ env = GNUNET_MQ_msg_extra (arm,
+ msg_extra_len,
+
GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_RESULT);
+ arm->id = htonl (handle->r_id);
+ arm->attr_len = htons (msg_extra_len);
+ arm->identity = handle->ticket.identity;
+ data_tmp = (char *) &arm[1];
+ GNUNET_memcpy (data_tmp,
+ data,
+ msg_extra_len);
+ GNUNET_MQ_send (handle->client->mq, env);
+ GNUNET_free (data);
+ }
+ if (NULL != handle->parallel_lookups_head)
+ return; //Wait for more
+ //Else we are done
+ GNUNET_SCHEDULER_cancel (handle->kill_task);
+ env = GNUNET_MQ_msg (arm,
+ GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_RESULT);
+ arm->id = htonl (handle->r_id);
+ arm->attr_len = htons (0);
+ GNUNET_MQ_send (handle->client->mq, env);
+}
+
+void
+abort_parallel_lookups2 (void *cls)
+{
+ struct ConsumeTicketHandle *handle = cls;
+ struct ParallelLookup2 *lu;
+ struct ParallelLookup2 *tmp;
+ struct AttributeResultMessage *arm;
+ struct GNUNET_MQ_Envelope *env;
+
+ for (lu = handle->parallel_lookups_head;
+ NULL != lu;) {
+ GNUNET_GNS_lookup_cancel (lu->lookup_request);
+ GNUNET_free (lu->label);
+ tmp = lu->next;
+ GNUNET_CONTAINER_DLL_remove (handle->parallel_lookups_head,
+ handle->parallel_lookups_tail,
+ lu);
+ GNUNET_free (lu);
+ lu = tmp;
+ }
+ env = GNUNET_MQ_msg (arm,
+ GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_RESULT);
+ arm->id = htonl (handle->r_id);
+ arm->attr_len = htons (0);
+ GNUNET_MQ_send (handle->client->mq, env);
+
+}
+
+static void
+cleanup_consume_ticket_handle (struct ConsumeTicketHandle *handle)
+{
+ if (NULL != handle->key)
+ GNUNET_free (handle->key);
+ GNUNET_free (handle);
+}
+
+
+static void
+process_consume_abe_key (void *cls, uint32_t rd_count,
+ const struct GNUNET_GNSRECORD_Data *rd)
+{
+ struct ConsumeTicketHandle *handle = cls;
+ struct GNUNET_HashCode new_key_hash;
+ struct GNUNET_CRYPTO_SymmetricSessionKey enc_key;
+ struct GNUNET_CRYPTO_SymmetricInitializationVector enc_iv;
+ struct GNUNET_CRYPTO_EcdhePublicKey *ecdh_key;
+ struct ParallelLookup2 *parallel_lookup;
+ size_t size;
+ char *buf;
+ char *scope;
+ char *lookup_query;
+
+ handle->lookup_request = NULL;
+ if (1 != rd_count)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Number of keys %d != 1.",
+ rd_count);
+ cleanup_consume_ticket_handle (handle);
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ return;
+ }
+
+ //Decrypt
+ ecdh_key = (struct GNUNET_CRYPTO_EcdhePublicKey *)rd->data;
+
+ buf = GNUNET_malloc (rd->data_size - sizeof (struct
GNUNET_CRYPTO_EcdhePublicKey));
+
+ //Calculate symmetric key from ecdh parameters
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CRYPTO_ecdsa_ecdh (&handle->identity,
+ ecdh_key,
+ &new_key_hash));
+ create_sym_key_from_ecdh (&new_key_hash,
+ &enc_key,
+ &enc_iv);
+ size = GNUNET_CRYPTO_symmetric_decrypt (rd->data + sizeof (struct
GNUNET_CRYPTO_EcdhePublicKey),
+ rd->data_size - sizeof (struct
GNUNET_CRYPTO_EcdhePublicKey),
+ &enc_key,
+ &enc_iv,
+ buf);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Decrypted bytes: %zd Expected bytes: %zd\n",
+ size, rd->data_size - sizeof (struct
GNUNET_CRYPTO_EcdhePublicKey));
+
+ scopes = GNUNET_strdup (buf);
+ GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+ "Scopes %s\n", scopes);
+ handle->key = GNUNET_CRYPTO_cpabe_deserialize_key ((void*)(buf + strlen
(scopes) + 1),
+ rd->data_size - sizeof
(struct GNUNET_CRYPTO_EcdhePublicKey)
+ - strlen (scopes) - 1);
+
+ for (scope = strtok (scopes, ","); NULL != scope; scope = strtok (NULL, ","))
+ {
+ GNUNET_asprintf (&lookup_query,
+ "%s.gnu",
+ scope);
+ GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+ "Looking up %s\n", lookup_query);
+ parallel_lookup = GNUNET_new (struct ParallelLookup2);
+ parallel_lookup->handle = handle;
+ parallel_lookup->label = GNUNET_strdup (scope);
+ parallel_lookup->lookup_request
+ = GNUNET_GNS_lookup (gns_handle,
+ lookup_query,
+ &handle->ticket.identity,
+ GNUNET_GNSRECORD_TYPE_ID_ATTR,
+ GNUNET_GNS_LO_LOCAL_MASTER,
+ &process_parallel_lookup2,
+ parallel_lookup);
+ GNUNET_CONTAINER_DLL_insert (handle->parallel_lookups_head,
+ handle->parallel_lookups_tail,
+ parallel_lookup);
+ }
+ handle->kill_task = GNUNET_SCHEDULER_add_delayed
(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES,3),
+ &abort_parallel_lookups2,
+ handle);
+}
+
+
+/**
+ *
+ * Handler for ticket issue message
+ *
+ * @param cls unused
+ * @param client who sent the message
+ * @param message the message
+ */
+static void
+handle_consume_ticket_message (void *cls,
+ const struct ConsumeTicketMessage *cm)
+{
+ struct ConsumeTicketHandle *ch;
+ struct IdpClient *idp = cls;
+ char* lookup_query;
+ char* rnd_label;
+
+ ch = GNUNET_new (struct ConsumeTicketHandle);
+ ch->r_id = ntohl (cm->id);
+ ch->client = idp;
+ ch->identity = cm->identity;
+ GNUNET_CRYPTO_ecdsa_key_get_public (&ch->identity,
+ &ch->identity_pub);
+ ch->ticket = *((struct GNUNET_IDENTITY_PROVIDER_Ticket2*)&cm[1]);
+ rnd_label = GNUNET_STRINGS_data_to_string_alloc (&ch->ticket.rnd,
+ sizeof (uint64_t));
+ GNUNET_asprintf (&lookup_query,
+ "%s.gnu",
+ rnd_label);
+ GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+ "Looking for ABE key under %s\n", lookup_query);
+
+ ch->lookup_request
+ = GNUNET_GNS_lookup (gns_handle,
+ lookup_query,
+ &ch->ticket.identity,
+ GNUNET_GNSRECORD_TYPE_ABE_KEY,
+ GNUNET_GNS_LO_LOCAL_MASTER,
+ &process_consume_abe_key,
+ ch);
+ GNUNET_free (lookup_query);
+ GNUNET_SERVICE_client_continue (idp->client);
+}
void
attr_store_cont (void *cls,
@@ -2066,7 +2367,8 @@ attr_iter_cb (void *cls,
GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_RESULT);
arm->id = htonl (ai->request_id);
arm->attr_len = htons (msg_extra_len);
- arm->identity = *zone;
+ GNUNET_CRYPTO_ecdsa_key_get_public (zone,
+ &arm->identity);
data_tmp = (char *) &arm[1];
GNUNET_memcpy (data_tmp,
attr_ser,
@@ -2339,5 +2641,9 @@ GNUNET_SERVICE_MAIN
GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ISSUE,
struct TicketIssueMessage,
NULL),
+ GNUNET_MQ_hd_var_size (consume_ticket_message,
+ GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_CONSUME_TICKET,
+ struct ConsumeTicketMessage,
+ NULL),
GNUNET_MQ_handler_end());
/* end of gnunet-service-identity-provider.c */
diff --git a/src/identity-provider/identity_attribute.c
b/src/identity-provider/identity_attribute.c
index 8cc94a731..916386754 100644
--- a/src/identity-provider/identity_attribute.c
+++ b/src/identity-provider/identity_attribute.c
@@ -110,9 +110,15 @@ attribute_list_deserialize (const char* data,
read_ptr = data;
while (((data + data_size) - read_ptr) >= sizeof (struct Attribute))
{
+
le = GNUNET_new (struct GNUNET_IDENTITY_PROVIDER_AttributeListEntry);
le->attribute = attribute_deserialize (read_ptr,
data_size - (read_ptr - data));
+ GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+ "Deserialized attribute %s\n", le->attribute->name);
+ GNUNET_CONTAINER_DLL_insert (attrs->list_head,
+ attrs->list_tail,
+ le);
attr_len = attribute_serialize_get_size (le->attribute);
read_ptr += attr_len;
}
diff --git a/src/identity-provider/identity_provider.h
b/src/identity-provider/identity_provider.h
index 9b6fe6237..dcad35118 100644
--- a/src/identity-provider/identity_provider.h
+++ b/src/identity-provider/identity_provider.h
@@ -250,9 +250,9 @@ struct AttributeResultMessage
uint16_t reserved GNUNET_PACKED;
/**
- * The private key of the identity.
+ * The public key of the identity.
*/
- struct GNUNET_CRYPTO_EcdsaPrivateKey identity;
+ struct GNUNET_CRYPTO_EcdsaPublicKey identity;
/* followed by:
* serialized attribute data
diff --git a/src/identity-provider/identity_provider_api.c
b/src/identity-provider/identity_provider_api.c
index 25c14793d..7c9576d05 100644
--- a/src/identity-provider/identity_provider_api.c
+++ b/src/identity-provider/identity_provider_api.c
@@ -556,30 +556,52 @@ handle_attribute_result (void *cls,
static struct GNUNET_CRYPTO_EcdsaPrivateKey identity_dummy;
struct GNUNET_IDENTITY_PROVIDER_Handle *h = cls;
struct GNUNET_IDENTITY_PROVIDER_AttributeIterator *it;
+ struct GNUNET_IDENTITY_PROVIDER_Operation *op;
size_t attr_len;
uint32_t r_id = ntohl (msg->id);
attr_len = ntohs (msg->attr_len);
-
- for (it = h->it_head; NULL != it; it = it->next)
+ LOG (GNUNET_ERROR_TYPE_MESSAGE,
+ "Processing attribute result.\n");
+
+
+ for (it = h->it_head; NULL != it; it = it->next)
if (it->r_id == r_id)
break;
- if (NULL == it)
+ for (op = h->op_head; NULL != op; op = op->next)
+ if (op->r_id == r_id)
+ break;
+ if ((NULL == it) && (NULL == op))
return;
if ( (0 == (memcmp (&msg->identity,
- &identity_dummy,
- sizeof (identity_dummy)))) )
+ &identity_dummy,
+ sizeof (identity_dummy)))) )
{
- if (NULL == it)
+ if ((NULL == it) && (NULL == op))
{
GNUNET_break (0);
force_reconnect (h);
return;
}
- if (NULL != it->finish_cb)
- it->finish_cb (it->finish_cb_cls);
- free_it (it);
+ if (NULL != it)
+ {
+ if (NULL != it->finish_cb)
+ it->finish_cb (it->finish_cb_cls);
+ free_it (it);
+ }
+ if (NULL != op)
+ {
+ if (NULL != op->ar_cb)
+ op->ar_cb (op->cls,
+ NULL,
+ NULL);
+ GNUNET_CONTAINER_DLL_remove (h->op_head,
+ h->op_tail,
+ op);
+ GNUNET_free (op);
+
+ }
return;
}
@@ -593,9 +615,16 @@ handle_attribute_result (void *cls,
it->proc (it->proc_cls,
&msg->identity,
attr);
- GNUNET_free (attr);
- return;
+ } else if (NULL != op)
+ {
+ if (NULL != op->ar_cb)
+ op->ar_cb (op->cls,
+ &msg->identity,
+ attr);
+
}
+ GNUNET_free (attr);
+ return;
}
GNUNET_assert (0);
}
@@ -610,7 +639,7 @@ handle_attribute_result (void *cls,
*/
static int
check_ticket_result (void *cls,
- const struct TicketResultMessage *msg)
+ const struct TicketResultMessage *msg)
{
size_t msg_len;
@@ -634,7 +663,7 @@ check_ticket_result (void *cls,
*/
static void
handle_ticket_result (void *cls,
- const struct TicketResultMessage *msg)
+ const struct TicketResultMessage *msg)
{
struct GNUNET_IDENTITY_PROVIDER_Handle *handle = cls;
struct GNUNET_IDENTITY_PROVIDER_Operation *op;
@@ -684,9 +713,9 @@ reconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *h)
struct AttributeResultMessage,
h),
GNUNET_MQ_hd_var_size (ticket_result,
-
GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_RESULT,
- struct TicketResultMessage,
- h),
+ GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_RESULT,
+ struct TicketResultMessage,
+ h),
GNUNET_MQ_handler_end ()
};
struct GNUNET_IDENTITY_PROVIDER_Operation *op;
@@ -1224,7 +1253,7 @@ GNUNET_IDENTITY_PROVIDER_rp_ticket_consume (struct
GNUNET_IDENTITY_PROVIDER_Hand
op);
op->env = GNUNET_MQ_msg_extra (ctm,
sizeof (const struct
GNUNET_IDENTITY_PROVIDER_Ticket2),
-
GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ISSUE);
+
GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_CONSUME_TICKET);
ctm->identity = *identity;
ctm->id = htonl (op->r_id);
diff --git a/src/identity-provider/test_idp_issue.sh
b/src/identity-provider/test_idp_issue.sh
index 306f238d9..aca98e390 100755
--- a/src/identity-provider/test_idp_issue.sh
+++ b/src/identity-provider/test_idp_issue.sh
@@ -27,9 +27,11 @@ gnunet-arm -s -c test_idp.conf
gnunet-identity -C testego -c test_idp.conf
gnunet-identity -C rpego -c test_idp.conf
SUBJECT_KEY=$(gnunet-identity -d -c test_idp.conf | grep rpego | awk '{print
$3}')
+TEST_KEY=$(gnunet-identity -d -c test_idp.conf | grep testego | awk '{print
$3}')
gnunet-idp -e testego -a email -V address@hidden -c test_idp.conf
gnunet-idp -e testego -a name -V John -c test_idp.conf
-gnunet-idp -e testego -D -c test_idp.conf
-gnunet-idp -e testego -i "email,name" -r $SUBJECT_KEY -c test_idp.conf
-gnunet-namestore -z testego -D -c test_idp.conf
+#gnunet-idp -e testego -D -c test_idp.conf
+TICKET=$(gnunet-idp -e testego -i "email,name" -r $SUBJECT_KEY -c
test_idp.conf | awk '{print $1}')
+echo "Consuming $TICKET"
+gnunet-idp -e rpego -C $TICKET -c test_idp.conf
gnunet-arm -e -c test_idp.conf
diff --git a/src/include/gnunet_identity_provider_service.h
b/src/include/gnunet_identity_provider_service.h
index 4b1dcd641..049f891cc 100644
--- a/src/include/gnunet_identity_provider_service.h
+++ b/src/include/gnunet_identity_provider_service.h
@@ -268,7 +268,7 @@ GNUNET_IDENTITY_PROVIDER_attribute_new (const char*
attr_name,
*/
typedef void
(*GNUNET_IDENTITY_PROVIDER_AttributeResult) (void *cls,
- const struct GNUNET_CRYPTO_EcdsaPrivateKey
*identity,
+ const struct GNUNET_CRYPTO_EcdsaPublicKey
*identity,
const struct
GNUNET_IDENTITY_PROVIDER_Attribute *attr);
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 1a7df377c..63afeba8d 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -2644,6 +2644,8 @@ extern "C"
#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_RESULT 972
+#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_CONSUME_TICKET 973
+
/**************************************************
*
* CREDENTIAL MESSAGE TYPES
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] 120/171: Merge remote-tracking branch 'origin/master' into identity_abe, (continued)
- [GNUnet-SVN] [gnunet] 120/171: Merge remote-tracking branch 'origin/master' into identity_abe, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 117/171: -add comments, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 122/171: -fix bugs, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 169/171: update README, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 153/171: -add j to make, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 128/171: -readd new rest plugin, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 171/171: Merge remote-tracking branch 'origin/identity_abe', gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 110/171: Merge remote-tracking branch 'origin/master' into identity_abe, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 113/171: - Add attribute store API to IdP service, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 132/171: -finish revocation in service, cleanup, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 119/171: -add consume API,
gnunet <=
- [GNUnet-SVN] [gnunet] 127/171: -revise API naming; cleanups, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 163/171: -move jwt back into idp, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 144/171: -fixes, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 149/171: -fix make, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 93/171: -more towards idp2, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 133/171: -fixes, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 150/171: -add dockerfile, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 159/171: Merge remote-tracking branch 'origin/master' into identity_abe, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 164/171: Merge remote-tracking branch 'origin/master' into identity_abe, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 166/171: -move idp experimental, gnunet, 2018/01/04