torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'bug27800-033' into tor-034

Browse Source
This commit is contained in:
Taylor Yu
2018-10-17 15:42:58 -05:00
parent 2000d04cb6 93fd924bdb
commit 4e7f65ee5d
3 changed files with 65 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test_nodelist.c
+28 -8
View File
@@ -12,6 +12,7 @@
#include "nodelist.h"
#include "torcert.h"
#include "test.h"
#include "log_test_helpers.h"
/** Test the case when node_get_by_id() returns NULL,
* node_get_verbose_nickname_by_id should return the base 16 encoding
@@ -119,9 +120,10 @@ mock_networkstatus_get_latest_consensus_by_flavor(consensus_flavor_t f)
static void
test_nodelist_ed_id(void *arg)
{
routerstatus_t *rs[4];
microdesc_t *md[4];
routerinfo_t *ri[4];
#define N_NODES 5
routerstatus_t *rs[N_NODES];
microdesc_t *md[N_NODES];
routerinfo_t *ri[N_NODES];
networkstatus_t *ns;
int i;
(void)arg;
@@ -138,7 +140,7 @@ test_nodelist_ed_id(void *arg)
/* Make a bunch of dummy objects that we can play around with. Only set the
necessary fields */
for (i = 0; i < 4; ++i) {
for (i = 0; i < N_NODES; ++i) {
rs[i] = tor_malloc_zero(sizeof(*rs[i]));
md[i] = tor_malloc_zero(sizeof(*md[i]));
ri[i] = tor_malloc_zero(sizeof(*ri[i]));
@@ -155,7 +157,7 @@ test_nodelist_ed_id(void *arg)
memcpy(&ri[i]->cache_info.signing_key_cert->signing_key,
md[i]->ed25519_identity_pkey, sizeof(ed25519_public_key_t));
if (i != 3)
if (i < 3)
smartlist_add(ns->routerstatus_list, rs[i]);
}
@@ -185,13 +187,30 @@ test_nodelist_ed_id(void *arg)
/* Register the 4th by ri only -- we never put it into the networkstatus,
* so it has to be independent */
n = nodelist_set_routerinfo(ri[3], &ri_old);
tt_ptr_op(n, OP_EQ, node_get_by_ed25519_id(md[3]->ed25519_identity_pkey));
node_t *n3 = nodelist_set_routerinfo(ri[3], &ri_old);
tt_ptr_op(n3, OP_EQ, node_get_by_ed25519_id(md[3]->ed25519_identity_pkey));
tt_ptr_op(ri_old, OP_EQ, NULL);
tt_int_op(4, OP_EQ, smartlist_len(nodelist_get_list()));
/* Register the 5th by ri only, and rewrite its ed25519 pubkey to be
* the same as the 4th, to test the duplicate ed25519 key logging in
* nodelist.c */
memcpy(md[4]->ed25519_identity_pkey, md[3]->ed25519_identity_pkey,
sizeof(ed25519_public_key_t));
memcpy(&ri[4]->cache_info.signing_key_cert->signing_key,
md[3]->ed25519_identity_pkey, sizeof(ed25519_public_key_t));
setup_capture_of_logs(LOG_NOTICE);
node_t *n4 = nodelist_set_routerinfo(ri[4], &ri_old);
tt_ptr_op(ri_old, OP_EQ, NULL);
tt_int_op(5, OP_EQ, smartlist_len(nodelist_get_list()));
tt_ptr_op(n4, OP_NE, node_get_by_ed25519_id(md[3]->ed25519_identity_pkey));
tt_ptr_op(n3, OP_EQ, node_get_by_ed25519_id(md[3]->ed25519_identity_pkey));
expect_log_msg_containing("Reused ed25519_id");
done:
for (i = 0; i < 4; ++i) {
teardown_capture_of_logs();
for (i = 0; i < N_NODES; ++i) {
tor_free(rs[i]);
tor_free(md[i]->ed25519_identity_pkey);
tor_free(md[i]);
@@ -202,6 +221,7 @@ test_nodelist_ed_id(void *arg)
networkstatus_vote_free(ns);
UNMOCK(networkstatus_get_latest_consensus);
UNMOCK(networkstatus_get_latest_consensus_by_flavor);
#undef N_NODES
}
#define NODE(name, flags) \