From f3c214f61e5654b742b3ea1ea3f49f67d4289301 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Wed, 11 Sep 2013 08:00:45 +0000 Subject: updated zone iteration test --- src/namestore/Makefile.am | 5 +- src/namestore/test_namestore_api_zone_iteration.c | 264 ++++++++++------------ 2 files changed, 128 insertions(+), 141 deletions(-) (limited to 'src/namestore') diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am index 6a3ce7da9..837bb5a39 100644 --- a/src/namestore/Makefile.am +++ b/src/namestore/Makefile.am @@ -43,14 +43,15 @@ if HAVE_TESTING TESTING_TESTS = \ test_namestore_api_store \ test_namestore_api_remove \ - test_namestore_api_lookup + test_namestore_api_zone_iteration +# test_namestore_api_lookup #test_namestore_api_lookup_specific_type #test_namestore_api_create #test_namestore_api_create_update #test_namestore_api_remove_not_existing_record #test_namestore_api_zone_to_name #test_namestore_api_monitoring -#test_namestore_api_zone_iteration + #test_namestore_api_zone_iteration_specific_zone #test_namestore_api_zone_iteration_stop endif diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c index 94515510a..c03ea7cb8 100644 --- a/src/namestore/test_namestore_api_zone_iteration.c +++ b/src/namestore/test_namestore_api_zone_iteration.c @@ -35,40 +35,24 @@ static struct GNUNET_NAMESTORE_Handle * nsh; static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; -static GNUNET_SCHEDULER_TaskIdentifier stopiteration_task; - static struct GNUNET_CRYPTO_EccPrivateKey * privkey; -static struct GNUNET_CRYPTO_EccPublicKey pubkey; - -static struct GNUNET_HashCode zone; - static struct GNUNET_CRYPTO_EccPrivateKey * privkey2; -static struct GNUNET_CRYPTO_EccPublicKey pubkey2; - -static struct GNUNET_HashCode zone2; - static struct GNUNET_NAMESTORE_ZoneIterator *zi; static int res; static int returned_records; -static struct GNUNET_CRYPTO_EccSignature *sig_1; - static char * s_name_1; static struct GNUNET_NAMESTORE_RecordData *s_rd_1; -static struct GNUNET_CRYPTO_EccSignature *sig_2; - static char * s_name_2; static struct GNUNET_NAMESTORE_RecordData *s_rd_2; -static struct GNUNET_CRYPTO_EccSignature *sig_3; - static char * s_name_3; static struct GNUNET_NAMESTORE_RecordData *s_rd_3; @@ -83,19 +67,16 @@ static struct GNUNET_NAMESTORE_RecordData *s_rd_3; static void endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - if (stopiteration_task != GNUNET_SCHEDULER_NO_TASK) - { - GNUNET_SCHEDULER_cancel (stopiteration_task); - stopiteration_task = GNUNET_SCHEDULER_NO_TASK; - } + if (NULL != zi) + { + GNUNET_NAMESTORE_zone_iteration_stop (zi); + zi = NULL; + } if (nsh != NULL) GNUNET_NAMESTORE_disconnect (nsh); nsh = NULL; - GNUNET_free_non_null(sig_1); - GNUNET_free_non_null(sig_2); - GNUNET_free_non_null(sig_3); GNUNET_free_non_null(s_name_1); GNUNET_free_non_null(s_name_2); GNUNET_free_non_null(s_name_3); @@ -130,11 +111,11 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) static void end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - if (stopiteration_task != GNUNET_SCHEDULER_NO_TASK) - { - GNUNET_SCHEDULER_cancel (stopiteration_task); - stopiteration_task = GNUNET_SCHEDULER_NO_TASK; - } + if (NULL != zi) + { + GNUNET_NAMESTORE_zone_iteration_stop (zi); + zi = NULL; + } if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) { @@ -150,9 +131,6 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_free (privkey2); privkey2 = NULL; - GNUNET_free (sig_1); - GNUNET_free (sig_2); - GNUNET_free (sig_3); GNUNET_free (s_name_1); GNUNET_free (s_name_2); GNUNET_free (s_name_3); @@ -179,116 +157,122 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) static void zone_proc (void *cls, - const struct GNUNET_CRYPTO_EccPublicKey *zone_key, - struct GNUNET_TIME_Absolute expire, - const char *name, - unsigned int rd_count, - const struct GNUNET_NAMESTORE_RecordData *rd, - const struct GNUNET_CRYPTO_EccSignature *signature) + const struct GNUNET_CRYPTO_EccPrivateKey *zone, + const char *label, + unsigned int rd_count, + const struct GNUNET_NAMESTORE_RecordData *rd) { int failed = GNUNET_NO; - if ((zone_key == NULL) && (name == NULL)) + if ((zone == NULL) && (label == NULL)) { GNUNET_break (3 == returned_records); if (3 == returned_records) - res = 0; + { + res = 0; /* Last iteraterator callback, we are done */ + zi = NULL; + } else res = 1; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received last result, iteration done after receing %u results\n", - returned_records ); + "Received last result, iteration done after receing %u results\n", + returned_records ); GNUNET_SCHEDULER_add_now (&end, NULL); + return; } else { - /* verify signature returned from name store */ - if (GNUNET_OK != GNUNET_NAMESTORE_verify_signature (zone_key, expire, name, rd_count, rd, signature)) - { - struct GNUNET_HashCode zone_key_hash; - GNUNET_CRYPTO_hash (zone_key, sizeof (struct GNUNET_CRYPTO_EccPublicKey), &zone_key_hash); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Verifying signature for `%s' in zone `%s' with %u records and expiration %s failed\n", - name, GNUNET_h2s(&zone_key_hash), rd_count, - GNUNET_STRINGS_absolute_time_to_string (expire)); - - failed = GNUNET_YES; - GNUNET_break (0); - } - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Comparing results name %s \n", name); - if (0 == strcmp (name, s_name_1)) - { - if (rd_count == 1) + if (0 == memcmp (zone, privkey, sizeof (struct GNUNET_CRYPTO_EccPrivateKey))) + { + if (0 == strcmp (label, s_name_1)) { - if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_1)) + if (rd_count == 1) + { + if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_1)) + { + failed = GNUNET_YES; + GNUNET_break (0); + } + } + else { failed = GNUNET_YES; GNUNET_break (0); } } - else - { - failed = GNUNET_YES; - GNUNET_break (0); - } - } - else if (0 == strcmp (name, s_name_2)) - { - if (rd_count == 1) + else if (0 == strcmp (label, s_name_2)) { - if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_2)) + if (rd_count == 1) + { + if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_2)) + { + failed = GNUNET_YES; + GNUNET_break (0); + } + } + else { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Received invalid record count\n"); failed = GNUNET_YES; GNUNET_break (0); } } else { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Comparing result failed: got name `%s' for first zone\n", label); failed = GNUNET_YES; GNUNET_break (0); } - } - else if (0 == strcmp (name, s_name_3)) - { - if (rd_count == 1) + } + else if (0 == memcmp (zone, privkey2, sizeof (struct GNUNET_CRYPTO_EccPrivateKey))) + { + if (0 == strcmp (label, s_name_3)) { - if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_3)) + if (rd_count == 1) + { + if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_3)) + { + failed = GNUNET_YES; + GNUNET_break (0); + } + } + else { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Received invalid record count\n"); failed = GNUNET_YES; GNUNET_break (0); } } else { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Comparing result failed: got name `%s' for first zone\n", label); failed = GNUNET_YES; GNUNET_break (0); } - if (GNUNET_OK != GNUNET_NAMESTORE_verify_signature(zone_key, expire, name, rd_count, rd, signature)) - { - failed = GNUNET_YES; - GNUNET_break (0); - } - } - else - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Comparing result failed: got name `%s'\n", name); - res = 1; + } + else + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Received invalid zone\n"); + failed = GNUNET_YES; GNUNET_break (0); - GNUNET_SCHEDULER_add_now (&end, NULL); - } + } + } - if (failed == GNUNET_NO) - { - returned_records ++; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Telling namestore to send the next result\n"); - GNUNET_NAMESTORE_zone_iterator_next (zi); - } - else - { - GNUNET_break (0); - GNUNET_SCHEDULER_add_now (&end, NULL); - } + if (failed == GNUNET_NO) + { + returned_records ++; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Telling namestore to send the next result\n"); + GNUNET_NAMESTORE_zone_iterator_next (zi); + } + else + { + GNUNET_break (0); + GNUNET_SCHEDULER_add_now (&end, NULL); } } @@ -305,10 +289,13 @@ put_cont (void *cls, int32_t success, const char *emsg) } else { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to created records\n"); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to created records: `%s'\n", + emsg); GNUNET_break (0); - GNUNET_SCHEDULER_cancel (endbadly_task); + if (GNUNET_SCHEDULER_NO_TASK != endbadly_task) + GNUNET_SCHEDULER_cancel (endbadly_task); endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); + return; } if (c == 3) @@ -318,16 +305,16 @@ put_cont (void *cls, int32_t success, const char *emsg) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All records created, starting iteration over all zones \n"); zi = GNUNET_NAMESTORE_zone_iteration_start(nsh, NULL, - GNUNET_NAMESTORE_RF_NONE, - GNUNET_NAMESTORE_RF_NONE, &zone_proc, - &zone); + NULL); if (zi == NULL) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone iterator\n"); GNUNET_break (0); - GNUNET_SCHEDULER_cancel (endbadly_task); + if (GNUNET_SCHEDULER_NO_TASK != endbadly_task) + GNUNET_SCHEDULER_cancel (endbadly_task); endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); + return; } } } @@ -359,19 +346,36 @@ create_record (unsigned int count) */ static void empty_zone_proc (void *cls, - const struct GNUNET_CRYPTO_EccPublicKey *zone_key, - struct GNUNET_TIME_Absolute expire, - const char *name, + const struct GNUNET_CRYPTO_EccPrivateKey *zone, + const char *label, unsigned int rd_count, - const struct GNUNET_NAMESTORE_RecordData *rd, - const struct GNUNET_CRYPTO_EccSignature *signature) + const struct GNUNET_NAMESTORE_RecordData *rd) { char *hostkey_file; - struct GNUNET_TIME_Absolute et; GNUNET_assert (nsh == cls); - GNUNET_assert (NULL == name); - GNUNET_assert (NULL == zone_key); + if (NULL != zone) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Expected empty zone but received zone private key\n")); + GNUNET_break (0); + if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) + GNUNET_SCHEDULER_cancel (endbadly_task); + endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); + return; + } + if ((NULL != label) || (NULL != rd) || (0 != rd)) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Expected no zone content but received data\n")); + GNUNET_break (0); + if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) + GNUNET_SCHEDULER_cancel (endbadly_task); + endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); + return; + } + + zi = NULL; GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); @@ -379,48 +383,34 @@ empty_zone_proc (void *cls, privkey = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file); GNUNET_free (hostkey_file); GNUNET_assert (privkey != NULL); - GNUNET_CRYPTO_ecc_key_get_public(privkey, &pubkey); - GNUNET_CRYPTO_hash(&pubkey, sizeof (pubkey), &zone); - GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); privkey2 = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file); GNUNET_free (hostkey_file); - GNUNET_assert (privkey2 != NULL); - GNUNET_CRYPTO_ecc_key_get_public(privkey2, &pubkey2); - GNUNET_CRYPTO_hash(&pubkey2, sizeof (pubkey), &zone2); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 1\n"); GNUNET_asprintf(&s_name_1, "dummy1"); s_rd_1 = create_record(1); - et.abs_value_us = s_rd_1->expiration_time; - sig_1 = GNUNET_NAMESTORE_create_signature(privkey, et, s_name_1, s_rd_1, 1); - GNUNET_NAMESTORE_record_put_by_authority (nsh, privkey, s_name_1, - 1, s_rd_1, - &put_cont, NULL); - + GNUNET_NAMESTORE_records_store(nsh, privkey, s_name_1, + 1, s_rd_1, &put_cont, NULL); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 2 \n"); GNUNET_asprintf(&s_name_2, "dummy2"); s_rd_2 = create_record(1); - - et.abs_value_us = s_rd_2->expiration_time; - sig_2 = GNUNET_NAMESTORE_create_signature(privkey, et, s_name_2, s_rd_2, 1); - GNUNET_NAMESTORE_record_put_by_authority (nsh, privkey, s_name_2, - 1, s_rd_2, - &put_cont, NULL); + GNUNET_NAMESTORE_records_store(nsh, privkey, s_name_2, + 1, s_rd_2, &put_cont, NULL); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 3\n"); + /* name in different zone */ GNUNET_asprintf(&s_name_3, "dummy3"); s_rd_3 = create_record(1); - et.abs_value_us = s_rd_3->expiration_time; - sig_3 = GNUNET_NAMESTORE_create_signature(privkey2, et, s_name_3, s_rd_3, 1); - GNUNET_NAMESTORE_record_put (nsh, &pubkey2, s_name_3, GNUNET_TIME_UNIT_FOREVER_ABS, 1, s_rd_3, sig_3, &put_cont, NULL); + GNUNET_NAMESTORE_records_store(nsh, privkey2, s_name_3, + 1, s_rd_3, &put_cont, NULL); } @@ -434,11 +424,7 @@ run (void *cls, GNUNET_break (NULL != nsh); /* first, iterate over empty namestore */ zi = GNUNET_NAMESTORE_zone_iteration_start(nsh, - NULL, - GNUNET_NAMESTORE_RF_NONE, - GNUNET_NAMESTORE_RF_NONE, - &empty_zone_proc, - nsh); + NULL, &empty_zone_proc, nsh); if (NULL == zi) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone iterator\n"); -- cgit v1.2.3