prop224 test: Enrich the client_service_hsdir_set_sync() test.
Do two major improvements: a) Make the client pick 6 HSDirs instead of just 1 and make sure they all match the service's HSDirs. b) Test two additional missing scenarios borrowed from the test_reachability() test.
This commit is contained in:
George Kadianakis
parent
d6568bad5e
commit
715a8ea81c
|
|
@ -1453,31 +1453,57 @@ helper_client_pick_hsdir(const ed25519_public_key_t *onion_identity_pk,
|
|||
;
|
||||
}
|
||||
|
||||
/** Set the consensus and system time based on <b>between_srv_and_tp</b>. If
|
||||
* <b>between_srv_and_tp</b> is set, then set the time to be inside the time
|
||||
* segment between SRV#N and TP#N. */
|
||||
#define EARLY_IN_SRV_TO_TP 0
|
||||
#define LATE_IN_SRV_TO_TP 1
|
||||
#define EARLY_IN_TP_TO_SRV 2
|
||||
#define LATE_IN_TP_TO_SRV 3
|
||||
|
||||
/** Set the consensus and system time based on <b>position</b>. See the
|
||||
* following diagram for details:
|
||||
*
|
||||
* +------------------------------------------------------------------+
|
||||
* | |
|
||||
* | 00:00 12:00 00:00 12:00 00:00 12:00 |
|
||||
* | SRV#1 TP#1 SRV#2 TP#2 SRV#3 TP#3 |
|
||||
* | |
|
||||
* | $==========|-----------$===========|----------$===========| |
|
||||
* | |
|
||||
* | |
|
||||
* +------------------------------------------------------------------+
|
||||
*/
|
||||
static time_t
|
||||
helper_set_consensus_and_system_time(networkstatus_t *ns,
|
||||
int between_srv_and_tp)
|
||||
helper_set_consensus_and_system_time(networkstatus_t *ns, int position)
|
||||
{
|
||||
time_t real_time;
|
||||
time_t real_time = 0;
|
||||
|
||||
/* The period between SRV#N and TP#N is from 00:00 to 12:00 UTC. Consensus
|
||||
* valid_after is what matters here, the rest is just to specify the voting
|
||||
* period correctly. */
|
||||
if (between_srv_and_tp) {
|
||||
if (position == LATE_IN_SRV_TO_TP) {
|
||||
parse_rfc1123_time("Wed, 13 Apr 2016 11:00:00 UTC", &ns->valid_after);
|
||||
parse_rfc1123_time("Wed, 13 Apr 2016 12:00:00 UTC", &ns->fresh_until);
|
||||
parse_rfc1123_time("Wed, 13 Apr 2016 14:00:00 UTC", &ns->valid_until);
|
||||
} else {
|
||||
} else if (position == EARLY_IN_TP_TO_SRV) {
|
||||
parse_rfc1123_time("Wed, 13 Apr 2016 13:00:00 UTC", &ns->valid_after);
|
||||
parse_rfc1123_time("Wed, 13 Apr 2016 14:00:00 UTC", &ns->fresh_until);
|
||||
parse_rfc1123_time("Wed, 13 Apr 2016 16:00:00 UTC", &ns->valid_until);
|
||||
} else if (position == LATE_IN_TP_TO_SRV) {
|
||||
parse_rfc1123_time("Wed, 13 Apr 2016 23:00:00 UTC", &ns->valid_after);
|
||||
parse_rfc1123_time("Wed, 14 Apr 2016 00:00:00 UTC", &ns->fresh_until);
|
||||
parse_rfc1123_time("Wed, 14 Apr 2016 02:00:00 UTC", &ns->valid_until);
|
||||
} else if (position == EARLY_IN_SRV_TO_TP) {
|
||||
parse_rfc1123_time("Wed, 14 Apr 2016 01:00:00 UTC", &ns->valid_after);
|
||||
parse_rfc1123_time("Wed, 14 Apr 2016 02:00:00 UTC", &ns->fresh_until);
|
||||
parse_rfc1123_time("Wed, 14 Apr 2016 04:00:00 UTC", &ns->valid_until);
|
||||
} else {
|
||||
tt_assert(0);
|
||||
}
|
||||
|
||||
/* Set system time: pretend to be just 2 minutes before consensus expiry */
|
||||
real_time = ns->valid_until - 120;
|
||||
update_approx_time(real_time);
|
||||
|
||||
done:
|
||||
return real_time;
|
||||
}
|
||||
|
||||
|
|
@ -1485,8 +1511,7 @@ helper_set_consensus_and_system_time(networkstatus_t *ns,
|
|||
* test_client_service_sync() */
|
||||
static void
|
||||
helper_test_hsdir_sync(networkstatus_t *ns,
|
||||
int service_between_srv_and_tp,
|
||||
int client_between_srv_and_tp,
|
||||
int service_position, int client_position,
|
||||
int client_fetches_next_desc)
|
||||
{
|
||||
hs_service_descriptor_t *desc;
|
||||
|
|
@ -1503,8 +1528,7 @@ helper_test_hsdir_sync(networkstatus_t *ns,
|
|||
*/
|
||||
|
||||
/* 1) Initialize service time: consensus and real time */
|
||||
time_t now = helper_set_consensus_and_system_time(ns,
|
||||
service_between_srv_and_tp);
|
||||
time_t now = helper_set_consensus_and_system_time(ns, service_position);
|
||||
helper_initialize_big_hash_ring(ns);
|
||||
|
||||
/* 2) Initialize service */
|
||||
|
|
@ -1519,7 +1543,7 @@ helper_test_hsdir_sync(networkstatus_t *ns,
|
|||
tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 6);
|
||||
|
||||
/* 3) Initialize client time */
|
||||
now = helper_set_consensus_and_system_time(ns, client_between_srv_and_tp);
|
||||
now = helper_set_consensus_and_system_time(ns, client_position);
|
||||
|
||||
cleanup_nodelist();
|
||||
SMARTLIST_FOREACH(ns->routerstatus_list,
|
||||
|
|
@ -1527,22 +1551,29 @@ helper_test_hsdir_sync(networkstatus_t *ns,
|
|||
smartlist_clear(ns->routerstatus_list);
|
||||
helper_initialize_big_hash_ring(ns);
|
||||
|
||||
/* 4) Fetch desc as client */
|
||||
char client_hsdir_b64_digest[BASE64_DIGEST_LEN+1] = {0};
|
||||
helper_client_pick_hsdir(&service->keys.identity_pk,
|
||||
client_hsdir_b64_digest);
|
||||
/* Cleanup right now so we don't memleak on error. */
|
||||
cleanup_nodelist();
|
||||
/* 4) Pick 6 HSDirs as a client and check that they were also chosen by the
|
||||
service. */
|
||||
for (int y = 0 ; y < 6 ; y++) {
|
||||
char client_hsdir_b64_digest[BASE64_DIGEST_LEN+1] = {0};
|
||||
helper_client_pick_hsdir(&service->keys.identity_pk,
|
||||
client_hsdir_b64_digest);
|
||||
|
||||
/* CHECK: Go through the hsdirs chosen by the service and make sure that it
|
||||
* contains the one picked by the client! */
|
||||
retval = smartlist_contains_string(desc->previous_hsdirs,
|
||||
client_hsdir_b64_digest);
|
||||
tt_int_op(retval, OP_EQ, 1);
|
||||
}
|
||||
|
||||
/* Finally, try to pick a 7th hsdir and see that NULL is returned since we
|
||||
* exhausted all of them: */
|
||||
tt_assert(!pick_hsdir_v3(&service->keys.identity_pk));
|
||||
|
||||
/* CHECK: Go through the hsdirs chosen by the service and make sure that it
|
||||
* contains the one picked by the client! */
|
||||
retval = smartlist_contains_string(desc->previous_hsdirs,
|
||||
client_hsdir_b64_digest);
|
||||
tt_int_op(retval, OP_EQ, 1);
|
||||
|
||||
done:
|
||||
/* At the end: free all services and initialize the subsystem again, we will
|
||||
* need it for next scenario. */
|
||||
cleanup_nodelist();
|
||||
hs_service_free_all();
|
||||
hs_service_init();
|
||||
SMARTLIST_FOREACH(ns->routerstatus_list,
|
||||
|
|
@ -1606,7 +1637,7 @@ test_client_service_hsdir_set_sync(void *arg)
|
|||
* | S C |
|
||||
* +------------------------------------------------------------------+
|
||||
*/
|
||||
helper_test_hsdir_sync(ns, 1, 1, 0);
|
||||
helper_test_hsdir_sync(ns, LATE_IN_SRV_TO_TP, LATE_IN_SRV_TO_TP, 0);
|
||||
|
||||
/* b) Scenario where both client and service are in the time segment between
|
||||
* TP#N and SRV#N+1. At this time the client fetches the second HS
|
||||
|
|
@ -1622,7 +1653,7 @@ test_client_service_hsdir_set_sync(void *arg)
|
|||
* | S C |
|
||||
* +------------------------------------------------------------------+
|
||||
*/
|
||||
helper_test_hsdir_sync(ns, 0, 0, 1);
|
||||
helper_test_hsdir_sync(ns, LATE_IN_TP_TO_SRV, LATE_IN_TP_TO_SRV, 1);
|
||||
|
||||
/* c) Scenario where service is between SRV#N and TP#N, but client is
|
||||
* between TP#N and SRV#N+1. Client is forward in time so it fetches the
|
||||
|
|
@ -1638,7 +1669,7 @@ test_client_service_hsdir_set_sync(void *arg)
|
|||
* | S C |
|
||||
* +------------------------------------------------------------------+
|
||||
*/
|
||||
helper_test_hsdir_sync(ns, 1, 0, 1);
|
||||
helper_test_hsdir_sync(ns, LATE_IN_SRV_TO_TP, EARLY_IN_TP_TO_SRV, 1);
|
||||
|
||||
/* d) Scenario where service is between TP#N and SRV#N+1, but client is
|
||||
* between SRV#N and TP#N. Client is backwards in time so it fetches the
|
||||
|
|
@ -1654,7 +1685,40 @@ test_client_service_hsdir_set_sync(void *arg)
|
|||
* | C S |
|
||||
* +------------------------------------------------------------------+
|
||||
*/
|
||||
helper_test_hsdir_sync(ns, 0, 1, 0);
|
||||
helper_test_hsdir_sync(ns, EARLY_IN_TP_TO_SRV, LATE_IN_SRV_TO_TP, 0);
|
||||
|
||||
/* e) Scenario where service is between SRV#N and TP#N, but client is
|
||||
* between TP#N-1 and SRV#3. Client is backwards in time so it fetches
|
||||
* the first HS desc.
|
||||
*
|
||||
* +------------------------------------------------------------------+
|
||||
* | |
|
||||
* | 00:00 12:00 00:00 12:00 00:00 12:00 |
|
||||
* | SRV#1 TP#1 SRV#2 TP#2 SRV#3 TP#3 |
|
||||
* | |
|
||||
* | $==========|-----------$===========|-----------$===========| |
|
||||
* | ^ ^ |
|
||||
* | C S |
|
||||
* +------------------------------------------------------------------+
|
||||
*/
|
||||
helper_test_hsdir_sync(ns, EARLY_IN_SRV_TO_TP, LATE_IN_TP_TO_SRV, 0);
|
||||
|
||||
/* f) Scenario where service is between TP#N and SRV#N+1, but client is
|
||||
* between SRV#N+1 and TP#N+1. Client is forward in time so it fetches
|
||||
* the second HS desc.
|
||||
*
|
||||
* +------------------------------------------------------------------+
|
||||
* | |
|
||||
* | 00:00 12:00 00:00 12:00 00:00 12:00 |
|
||||
* | SRV#1 TP#1 SRV#2 TP#2 SRV#3 TP#3 |
|
||||
* | |
|
||||
* | $==========|-----------$===========|-----------$===========| |
|
||||
* | ^ ^ |
|
||||
* | S C |
|
||||
* +------------------------------------------------------------------+
|
||||
*/
|
||||
helper_test_hsdir_sync(ns, LATE_IN_TP_TO_SRV, EARLY_IN_SRV_TO_TP, 1);
|
||||
|
||||
|
||||
done:
|
||||
networkstatus_vote_free(ns);
|
||||
|
|
|
|||
Loading…
Reference in New Issue