diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-04-27 14:38:46 +0200 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-04-27 14:38:46 +0200 |
commit | f55721359af11939257a757453130e3887226534 (patch) | |
tree | 11ee7bab5bd81b745143444409727fa50314501f | |
parent | c17d94f2c43df8fcfb3dd75ea7157eb43fa59c33 (diff) | |
download | gnunet-f55721359af11939257a757453130e3887226534.tar.gz gnunet-f55721359af11939257a757453130e3887226534.zip |
RECLAIM/OIDC: better logging
-rw-r--r-- | src/reclaim/gnunet-service-reclaim.c | 11 | ||||
-rw-r--r-- | src/reclaim/gnunet-service-reclaim_tickets.c | 8 | ||||
-rw-r--r-- | src/reclaim/oidc_helper.c | 2 |
3 files changed, 15 insertions, 6 deletions
diff --git a/src/reclaim/gnunet-service-reclaim.c b/src/reclaim/gnunet-service-reclaim.c index 014d87586..d5aeff8d7 100644 --- a/src/reclaim/gnunet-service-reclaim.c +++ b/src/reclaim/gnunet-service-reclaim.c | |||
@@ -551,6 +551,7 @@ send_ticket_result (const struct IdpClient *client, | |||
551 | } | 551 | } |
552 | // TODO add success member | 552 | // TODO add success member |
553 | irm->id = htonl (r_id); | 553 | irm->id = htonl (r_id); |
554 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending TICKET_RESULT message\n"); | ||
554 | GNUNET_MQ_send (client->mq, env); | 555 | GNUNET_MQ_send (client->mq, env); |
555 | } | 556 | } |
556 | 557 | ||
@@ -598,6 +599,7 @@ handle_issue_ticket_message (void *cls, const struct IssueTicketMessage *im) | |||
598 | struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs; | 599 | struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs; |
599 | size_t attrs_len; | 600 | size_t attrs_len; |
600 | 601 | ||
602 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received ISSUE_TICKET message\n"); | ||
601 | tio = GNUNET_new (struct TicketIssueOperation); | 603 | tio = GNUNET_new (struct TicketIssueOperation); |
602 | attrs_len = ntohs (im->attr_len); | 604 | attrs_len = ntohs (im->attr_len); |
603 | attrs = GNUNET_RECLAIM_ATTRIBUTE_list_deserialize ((char *)&im[1], attrs_len); | 605 | attrs = GNUNET_RECLAIM_ATTRIBUTE_list_deserialize ((char *)&im[1], attrs_len); |
@@ -624,6 +626,7 @@ revoke_result_cb (void *cls, int32_t success) | |||
624 | struct GNUNET_MQ_Envelope *env; | 626 | struct GNUNET_MQ_Envelope *env; |
625 | struct RevokeTicketResultMessage *trm; | 627 | struct RevokeTicketResultMessage *trm; |
626 | 628 | ||
629 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending REVOKE_TICKET_RESULT message\n"); | ||
627 | rop->rh = NULL; | 630 | rop->rh = NULL; |
628 | env = GNUNET_MQ_msg (trm, GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET_RESULT); | 631 | env = GNUNET_MQ_msg (trm, GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET_RESULT); |
629 | trm->id = htonl (rop->r_id); | 632 | trm->id = htonl (rop->r_id); |
@@ -656,6 +659,7 @@ handle_revoke_ticket_message (void *cls, const struct RevokeTicketMessage *rm) | |||
656 | struct IdpClient *idp = cls; | 659 | struct IdpClient *idp = cls; |
657 | struct GNUNET_RECLAIM_Ticket *ticket; | 660 | struct GNUNET_RECLAIM_Ticket *ticket; |
658 | 661 | ||
662 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received REVOKE_TICKET message\n"); | ||
659 | rop = GNUNET_new (struct TicketRevocationOperation); | 663 | rop = GNUNET_new (struct TicketRevocationOperation); |
660 | ticket = (struct GNUNET_RECLAIM_Ticket *)&rm[1]; | 664 | ticket = (struct GNUNET_RECLAIM_Ticket *)&rm[1]; |
661 | rop->r_id = ntohl (rm->id); | 665 | rop->r_id = ntohl (rm->id); |
@@ -695,6 +699,7 @@ consume_result_cb (void *cls, | |||
695 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error consuming ticket: %s\n", emsg); | 699 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error consuming ticket: %s\n", emsg); |
696 | } | 700 | } |
697 | attrs_len = GNUNET_RECLAIM_ATTRIBUTE_list_serialize_get_size (attrs); | 701 | attrs_len = GNUNET_RECLAIM_ATTRIBUTE_list_serialize_get_size (attrs); |
702 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending CONSUME_TICKET_RESULT message\n"); | ||
698 | env = GNUNET_MQ_msg_extra (crm, | 703 | env = GNUNET_MQ_msg_extra (crm, |
699 | attrs_len, | 704 | attrs_len, |
700 | GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET_RESULT); | 705 | GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET_RESULT); |
@@ -718,6 +723,7 @@ handle_consume_ticket_message (void *cls, const struct ConsumeTicketMessage *cm) | |||
718 | struct GNUNET_RECLAIM_Ticket *ticket; | 723 | struct GNUNET_RECLAIM_Ticket *ticket; |
719 | struct IdpClient *idp = cls; | 724 | struct IdpClient *idp = cls; |
720 | 725 | ||
726 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received CONSUME_TICKET message\n"); | ||
721 | cop = GNUNET_new (struct ConsumeTicketOperation); | 727 | cop = GNUNET_new (struct ConsumeTicketOperation); |
722 | cop->r_id = ntohl (cm->id); | 728 | cop->r_id = ntohl (cm->id); |
723 | cop->client = idp; | 729 | cop->client = idp; |
@@ -1073,7 +1079,7 @@ handle_attribute_delete_message (void *cls, | |||
1073 | struct AttributeDeleteHandle *adh; | 1079 | struct AttributeDeleteHandle *adh; |
1074 | struct IdpClient *idp = cls; | 1080 | struct IdpClient *idp = cls; |
1075 | size_t data_len; | 1081 | size_t data_len; |
1076 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Received ATTRIBUTE_DELETE message\n"); | 1082 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received ATTRIBUTE_DELETE message\n"); |
1077 | 1083 | ||
1078 | data_len = ntohs (dam->attr_len); | 1084 | data_len = ntohs (dam->attr_len); |
1079 | 1085 | ||
@@ -1126,6 +1132,7 @@ attr_iter_finished (void *cls) | |||
1126 | struct GNUNET_MQ_Envelope *env; | 1132 | struct GNUNET_MQ_Envelope *env; |
1127 | struct AttributeResultMessage *arm; | 1133 | struct AttributeResultMessage *arm; |
1128 | 1134 | ||
1135 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending ATTRIBUTE_RESULT message\n"); | ||
1129 | env = GNUNET_MQ_msg (arm, GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_RESULT); | 1136 | env = GNUNET_MQ_msg (arm, GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_RESULT); |
1130 | arm->id = htonl (ai->request_id); | 1137 | arm->id = htonl (ai->request_id); |
1131 | arm->attr_len = htons (0); | 1138 | arm->attr_len = htons (0); |
@@ -1158,6 +1165,7 @@ attr_iter_cb (void *cls, | |||
1158 | return; | 1165 | return; |
1159 | } | 1166 | } |
1160 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found attribute under: %s\n", label); | 1167 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found attribute under: %s\n", label); |
1168 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending ATTRIBUTE_RESULT message\n"); | ||
1161 | env = GNUNET_MQ_msg_extra (arm, | 1169 | env = GNUNET_MQ_msg_extra (arm, |
1162 | rd->data_size, | 1170 | rd->data_size, |
1163 | GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_RESULT); | 1171 | GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_RESULT); |
@@ -1267,6 +1275,7 @@ ticket_iter_cb (void *cls, struct GNUNET_RECLAIM_Ticket *ticket) | |||
1267 | memcpy (&trm[1], ticket, sizeof (struct GNUNET_RECLAIM_Ticket)); | 1275 | memcpy (&trm[1], ticket, sizeof (struct GNUNET_RECLAIM_Ticket)); |
1268 | } | 1276 | } |
1269 | trm->id = htonl (ti->r_id); | 1277 | trm->id = htonl (ti->r_id); |
1278 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending TICKET_RESULT message\n"); | ||
1270 | GNUNET_MQ_send (ti->client->mq, env); | 1279 | GNUNET_MQ_send (ti->client->mq, env); |
1271 | if (NULL == ticket) | 1280 | if (NULL == ticket) |
1272 | GNUNET_free (ti); | 1281 | GNUNET_free (ti); |
diff --git a/src/reclaim/gnunet-service-reclaim_tickets.c b/src/reclaim/gnunet-service-reclaim_tickets.c index 1cdd4268d..75d9d3940 100644 --- a/src/reclaim/gnunet-service-reclaim_tickets.c +++ b/src/reclaim/gnunet-service-reclaim_tickets.c | |||
@@ -403,7 +403,7 @@ rvk_move_attr_cb (void *cls, const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | |||
403 | GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG, UINT64_MAX); | 403 | GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG, UINT64_MAX); |
404 | new_rd = *rd; | 404 | new_rd = *rd; |
405 | claim = GNUNET_RECLAIM_ATTRIBUTE_deserialize (rd->data, rd->data_size); | 405 | claim = GNUNET_RECLAIM_ATTRIBUTE_deserialize (rd->data, rd->data_size); |
406 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 406 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
407 | "Attribute to update: Name=%s, ID=%" PRIu64 "\n", claim->name, | 407 | "Attribute to update: Name=%s, ID=%" PRIu64 "\n", claim->name, |
408 | claim->id); | 408 | claim->id); |
409 | claim->id = rvk->move_attr->new_id; | 409 | claim->id = rvk->move_attr->new_id; |
@@ -686,7 +686,7 @@ process_parallel_lookup_result (void *cls, uint32_t rd_count, | |||
686 | struct ParallelLookup *parallel_lookup = cls; | 686 | struct ParallelLookup *parallel_lookup = cls; |
687 | struct RECLAIM_TICKETS_ConsumeHandle *cth = parallel_lookup->handle; | 687 | struct RECLAIM_TICKETS_ConsumeHandle *cth = parallel_lookup->handle; |
688 | struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *attr_le; | 688 | struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *attr_le; |
689 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Parallel lookup finished (count=%u)\n", | 689 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Parallel lookup finished (count=%u)\n", |
690 | rd_count); | 690 | rd_count); |
691 | 691 | ||
692 | GNUNET_CONTAINER_DLL_remove (cth->parallel_lookups_head, | 692 | GNUNET_CONTAINER_DLL_remove (cth->parallel_lookups_head, |
@@ -763,7 +763,7 @@ lookup_authz_cb (void *cls, uint32_t rd_count, | |||
763 | if (GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF != rd[i].record_type) | 763 | if (GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF != rd[i].record_type) |
764 | continue; | 764 | continue; |
765 | lbl = GNUNET_STRINGS_data_to_string_alloc (rd[i].data, rd[i].data_size); | 765 | lbl = GNUNET_STRINGS_data_to_string_alloc (rd[i].data, rd[i].data_size); |
766 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Attribute ref found %s\n", lbl); | 766 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Attribute ref found %s\n", lbl); |
767 | parallel_lookup = GNUNET_new (struct ParallelLookup); | 767 | parallel_lookup = GNUNET_new (struct ParallelLookup); |
768 | parallel_lookup->handle = cth; | 768 | parallel_lookup->handle = cth; |
769 | parallel_lookup->label = lbl; | 769 | parallel_lookup->label = lbl; |
@@ -803,7 +803,7 @@ RECLAIM_TICKETS_consume (const struct GNUNET_CRYPTO_EcdsaPrivateKey *id, | |||
803 | cth->cb_cls = cb_cls; | 803 | cth->cb_cls = cb_cls; |
804 | label = | 804 | label = |
805 | GNUNET_STRINGS_data_to_string_alloc (&cth->ticket.rnd, sizeof (uint64_t)); | 805 | GNUNET_STRINGS_data_to_string_alloc (&cth->ticket.rnd, sizeof (uint64_t)); |
806 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Looking for AuthZ info under %s\n", | 806 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Looking for AuthZ info under %s\n", |
807 | label); | 807 | label); |
808 | cth->lookup_start_time = GNUNET_TIME_absolute_get (); | 808 | cth->lookup_start_time = GNUNET_TIME_absolute_get (); |
809 | cth->lookup_request = GNUNET_GNS_lookup ( | 809 | cth->lookup_request = GNUNET_GNS_lookup ( |
diff --git a/src/reclaim/oidc_helper.c b/src/reclaim/oidc_helper.c index abe7fa623..56a4b17a4 100644 --- a/src/reclaim/oidc_helper.c +++ b/src/reclaim/oidc_helper.c | |||
@@ -419,7 +419,7 @@ OIDC_parse_authz_code (const struct GNUNET_CRYPTO_EcdsaPublicKey *audience, | |||
419 | size_t signature_offset; | 419 | size_t signature_offset; |
420 | uint32_t nonce = 0; | 420 | uint32_t nonce = 0; |
421 | 421 | ||
422 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Trying to decode `%s'", code); | 422 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Trying to decode `%s'\n", code); |
423 | code_payload = NULL; | 423 | code_payload = NULL; |
424 | code_payload_len = | 424 | code_payload_len = |
425 | GNUNET_STRINGS_base64_decode (code, strlen (code), (void **) &code_payload); | 425 | GNUNET_STRINGS_base64_decode (code, strlen (code), (void **) &code_payload); |