|
@@ -7,7 +7,9 @@
|
|
|
**/
|
|
|
|
|
|
#include "or.h"
|
|
|
+#include "networkstatus.h"
|
|
|
#include "nodelist.h"
|
|
|
+#include "torcert.h"
|
|
|
#include "test.h"
|
|
|
|
|
|
/** Test the case when node_get_by_id() returns NULL,
|
|
@@ -100,6 +102,107 @@ test_nodelist_node_is_dir(void *arg)
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
+static networkstatus_t *dummy_ns = NULL;
|
|
|
+static networkstatus_t *
|
|
|
+mock_networkstatus_get_latest_consensus(void)
|
|
|
+{
|
|
|
+ return dummy_ns;
|
|
|
+}
|
|
|
+static networkstatus_t *
|
|
|
+mock_networkstatus_get_latest_consensus_by_flavor(consensus_flavor_t f)
|
|
|
+{
|
|
|
+ tor_assert(f == FLAV_MICRODESC);
|
|
|
+ return dummy_ns;
|
|
|
+}
|
|
|
+
|
|
|
+static void
|
|
|
+test_nodelist_ed_id(void *arg)
|
|
|
+{
|
|
|
+ routerstatus_t *rs[4];
|
|
|
+ microdesc_t *md[4];
|
|
|
+ routerinfo_t *ri[4];
|
|
|
+ networkstatus_t *ns;
|
|
|
+ int i;
|
|
|
+ (void)arg;
|
|
|
+
|
|
|
+ ns = tor_malloc_zero(sizeof(networkstatus_t));
|
|
|
+ ns->flavor = FLAV_MICRODESC;
|
|
|
+ ns->routerstatus_list = smartlist_new();
|
|
|
+ dummy_ns = ns;
|
|
|
+ MOCK(networkstatus_get_latest_consensus,
|
|
|
+ mock_networkstatus_get_latest_consensus);
|
|
|
+ MOCK(networkstatus_get_latest_consensus_by_flavor,
|
|
|
+ mock_networkstatus_get_latest_consensus_by_flavor);
|
|
|
+
|
|
|
+ /* Make a bunch of dummy objects that we can play around with. Only set the
|
|
|
+ necessary fields */
|
|
|
+
|
|
|
+ for (i = 0; i < 4; ++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]));
|
|
|
+
|
|
|
+ crypto_rand(md[i]->digest, sizeof(md[i]->digest));
|
|
|
+ md[i]->ed25519_identity_pkey = tor_malloc(sizeof(ed25519_public_key_t));
|
|
|
+ crypto_rand((char*)md[i]->ed25519_identity_pkey,
|
|
|
+ sizeof(ed25519_public_key_t));
|
|
|
+ crypto_rand(rs[i]->identity_digest, sizeof(rs[i]->identity_digest));
|
|
|
+ memcpy(ri[i]->cache_info.identity_digest, rs[i]->identity_digest,
|
|
|
+ DIGEST_LEN);
|
|
|
+ memcpy(rs[i]->descriptor_digest, md[i]->digest, DIGEST256_LEN);
|
|
|
+ ri[i]->cache_info.signing_key_cert = tor_malloc_zero(sizeof(tor_cert_t));
|
|
|
+ memcpy(&ri[i]->cache_info.signing_key_cert->signing_key,
|
|
|
+ md[i]->ed25519_identity_pkey, sizeof(ed25519_public_key_t));
|
|
|
+
|
|
|
+ if (i != 3)
|
|
|
+ smartlist_add(ns->routerstatus_list, rs[i]);
|
|
|
+ }
|
|
|
+
|
|
|
+ tt_int_op(0, OP_EQ, smartlist_len(nodelist_get_list()));
|
|
|
+
|
|
|
+ nodelist_set_consensus(ns);
|
|
|
+
|
|
|
+ tt_int_op(3, OP_EQ, smartlist_len(nodelist_get_list()));
|
|
|
+
|
|
|
+ /* No Ed25519 info yet, so nothing has an ED id. */
|
|
|
+ tt_ptr_op(NULL, OP_EQ, node_get_by_ed25519_id(md[0]->ed25519_identity_pkey));
|
|
|
+
|
|
|
+ /* Register the first one by md, then look it up. */
|
|
|
+ node_t *n = nodelist_add_microdesc(md[0]);
|
|
|
+ tt_ptr_op(n, OP_EQ, node_get_by_ed25519_id(md[0]->ed25519_identity_pkey));
|
|
|
+
|
|
|
+ /* Register the second by ri, then look it up. */
|
|
|
+ routerinfo_t *ri_old = NULL;
|
|
|
+ n = nodelist_set_routerinfo(ri[1], &ri_old);
|
|
|
+ tt_ptr_op(n, OP_EQ, node_get_by_ed25519_id(md[1]->ed25519_identity_pkey));
|
|
|
+ tt_ptr_op(ri_old, OP_EQ, NULL);
|
|
|
+
|
|
|
+ /* Register it by md too. */
|
|
|
+ node_t *n2 = nodelist_add_microdesc(md[1]);
|
|
|
+ tt_ptr_op(n2, OP_EQ, n);
|
|
|
+ tt_ptr_op(n, OP_EQ, node_get_by_ed25519_id(md[1]->ed25519_identity_pkey));
|
|
|
+
|
|
|
+ /* 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));
|
|
|
+ tt_ptr_op(ri_old, OP_EQ, NULL);
|
|
|
+ tt_int_op(4, OP_EQ, smartlist_len(nodelist_get_list()));
|
|
|
+
|
|
|
+ done:
|
|
|
+ for (i = 0; i < 4; ++i) {
|
|
|
+ tor_free(rs[i]);
|
|
|
+ tor_free(md[i]->ed25519_identity_pkey);
|
|
|
+ tor_free(md[i]);
|
|
|
+ tor_free(ri[i]->cache_info.signing_key_cert);
|
|
|
+ tor_free(ri[i]);
|
|
|
+ }
|
|
|
+ smartlist_free(ns->routerstatus_list);
|
|
|
+ tor_free(ns);
|
|
|
+ UNMOCK(networkstatus_get_latest_consensus);
|
|
|
+ UNMOCK(networkstatus_get_latest_consensus_by_flavor);
|
|
|
+}
|
|
|
+
|
|
|
#define NODE(name, flags) \
|
|
|
{ #name, test_nodelist_##name, (flags), NULL, NULL }
|
|
|
|
|
@@ -107,6 +210,7 @@ struct testcase_t nodelist_tests[] = {
|
|
|
NODE(node_get_verbose_nickname_by_id_null_node, TT_FORK),
|
|
|
NODE(node_get_verbose_nickname_not_named, TT_FORK),
|
|
|
NODE(node_is_dir, TT_FORK),
|
|
|
+ NODE(ed_id, TT_FORK),
|
|
|
END_OF_TESTCASES
|
|
|
};
|
|
|
|