mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
Merge remote branch 'origin/master' into bug2046
This commit is contained in:
Steven Murdoch
+295
-1
@@ -569,6 +569,71 @@ test_socks_5_auth_before_negotiation(void *ptr)
|
||||
;
|
||||
}
|
||||
|
||||
static void
|
||||
test_buffer_copy(void *arg)
|
||||
{
|
||||
generic_buffer_t *buf=NULL, *buf2=NULL;
|
||||
const char *s;
|
||||
size_t len;
|
||||
char b[256];
|
||||
int i;
|
||||
(void)arg;
|
||||
|
||||
buf = generic_buffer_new();
|
||||
tt_assert(buf);
|
||||
|
||||
/* Copy an empty buffer. */
|
||||
tt_int_op(0, ==, generic_buffer_set_to_copy(&buf2, buf));
|
||||
tt_assert(buf2);
|
||||
tt_int_op(0, ==, generic_buffer_len(buf2));
|
||||
|
||||
/* Now try with a short buffer. */
|
||||
s = "And now comes an act of enormous enormance!";
|
||||
len = strlen(s);
|
||||
generic_buffer_add(buf, s, len);
|
||||
tt_int_op(len, ==, generic_buffer_len(buf));
|
||||
/* Add junk to buf2 so we can test replacing.*/
|
||||
generic_buffer_add(buf2, "BLARG", 5);
|
||||
tt_int_op(0, ==, generic_buffer_set_to_copy(&buf2, buf));
|
||||
tt_int_op(len, ==, generic_buffer_len(buf2));
|
||||
generic_buffer_get(buf2, b, len);
|
||||
test_mem_op(b, ==, s, len);
|
||||
/* Now free buf2 and retry so we can test allocating */
|
||||
generic_buffer_free(buf2);
|
||||
buf2 = NULL;
|
||||
tt_int_op(0, ==, generic_buffer_set_to_copy(&buf2, buf));
|
||||
tt_int_op(len, ==, generic_buffer_len(buf2));
|
||||
generic_buffer_get(buf2, b, len);
|
||||
test_mem_op(b, ==, s, len);
|
||||
/* Clear buf for next test */
|
||||
generic_buffer_get(buf, b, len);
|
||||
tt_int_op(generic_buffer_len(buf),==,0);
|
||||
|
||||
/* Okay, now let's try a bigger buffer. */
|
||||
s = "Quis autem vel eum iure reprehenderit qui in ea voluptate velit "
|
||||
"esse quam nihil molestiae consequatur, vel illum qui dolorem eum "
|
||||
"fugiat quo voluptas nulla pariatur?";
|
||||
len = strlen(s);
|
||||
for (i = 0; i < 256; ++i) {
|
||||
b[0]=i;
|
||||
generic_buffer_add(buf, b, 1);
|
||||
generic_buffer_add(buf, s, len);
|
||||
}
|
||||
tt_int_op(0, ==, generic_buffer_set_to_copy(&buf2, buf));
|
||||
tt_int_op(generic_buffer_len(buf2), ==, generic_buffer_len(buf));
|
||||
for (i = 0; i < 256; ++i) {
|
||||
generic_buffer_get(buf2, b, len+1);
|
||||
tt_int_op((unsigned char)b[0],==,i);
|
||||
test_mem_op(b+1, ==, s, len);
|
||||
}
|
||||
|
||||
done:
|
||||
if (buf)
|
||||
generic_buffer_free(buf);
|
||||
if (buf2)
|
||||
generic_buffer_free(buf2);
|
||||
}
|
||||
|
||||
/** Run unit tests for buffers.c */
|
||||
static void
|
||||
test_buffers(void)
|
||||
@@ -1416,8 +1481,73 @@ static void
|
||||
test_geoip(void)
|
||||
{
|
||||
int i, j;
|
||||
time_t now = time(NULL);
|
||||
time_t now = 1281533250; /* 2010-08-11 13:27:30 UTC */
|
||||
char *s = NULL;
|
||||
const char *bridge_stats_1 =
|
||||
"bridge-stats-end 2010-08-12 13:27:30 (86400 s)\n"
|
||||
"bridge-ips zz=24,xy=8\n",
|
||||
*dirreq_stats_1 =
|
||||
"dirreq-stats-end 2010-08-12 13:27:30 (86400 s)\n"
|
||||
"dirreq-v3-ips ab=8\n"
|
||||
"dirreq-v2-ips \n"
|
||||
"dirreq-v3-reqs ab=8\n"
|
||||
"dirreq-v2-reqs \n"
|
||||
"dirreq-v3-resp ok=0,not-enough-sigs=0,unavailable=0,not-found=0,"
|
||||
"not-modified=0,busy=0\n"
|
||||
"dirreq-v2-resp ok=0,unavailable=0,not-found=0,not-modified=0,"
|
||||
"busy=0\n"
|
||||
"dirreq-v3-direct-dl complete=0,timeout=0,running=0\n"
|
||||
"dirreq-v2-direct-dl complete=0,timeout=0,running=0\n"
|
||||
"dirreq-v3-tunneled-dl complete=0,timeout=0,running=0\n"
|
||||
"dirreq-v2-tunneled-dl complete=0,timeout=0,running=0\n",
|
||||
*dirreq_stats_2 =
|
||||
"dirreq-stats-end 2010-08-12 13:27:30 (86400 s)\n"
|
||||
"dirreq-v3-ips \n"
|
||||
"dirreq-v2-ips \n"
|
||||
"dirreq-v3-reqs \n"
|
||||
"dirreq-v2-reqs \n"
|
||||
"dirreq-v3-resp ok=0,not-enough-sigs=0,unavailable=0,not-found=0,"
|
||||
"not-modified=0,busy=0\n"
|
||||
"dirreq-v2-resp ok=0,unavailable=0,not-found=0,not-modified=0,"
|
||||
"busy=0\n"
|
||||
"dirreq-v3-direct-dl complete=0,timeout=0,running=0\n"
|
||||
"dirreq-v2-direct-dl complete=0,timeout=0,running=0\n"
|
||||
"dirreq-v3-tunneled-dl complete=0,timeout=0,running=0\n"
|
||||
"dirreq-v2-tunneled-dl complete=0,timeout=0,running=0\n",
|
||||
*dirreq_stats_3 =
|
||||
"dirreq-stats-end 2010-08-12 13:27:30 (86400 s)\n"
|
||||
"dirreq-v3-ips \n"
|
||||
"dirreq-v2-ips \n"
|
||||
"dirreq-v3-reqs \n"
|
||||
"dirreq-v2-reqs \n"
|
||||
"dirreq-v3-resp ok=8,not-enough-sigs=0,unavailable=0,not-found=0,"
|
||||
"not-modified=0,busy=0\n"
|
||||
"dirreq-v2-resp ok=0,unavailable=0,not-found=0,not-modified=0,"
|
||||
"busy=0\n"
|
||||
"dirreq-v3-direct-dl complete=0,timeout=0,running=0\n"
|
||||
"dirreq-v2-direct-dl complete=0,timeout=0,running=0\n"
|
||||
"dirreq-v3-tunneled-dl complete=0,timeout=0,running=0\n"
|
||||
"dirreq-v2-tunneled-dl complete=0,timeout=0,running=0\n",
|
||||
*dirreq_stats_4 =
|
||||
"dirreq-stats-end 2010-08-12 13:27:30 (86400 s)\n"
|
||||
"dirreq-v3-ips \n"
|
||||
"dirreq-v2-ips \n"
|
||||
"dirreq-v3-reqs \n"
|
||||
"dirreq-v2-reqs \n"
|
||||
"dirreq-v3-resp ok=8,not-enough-sigs=0,unavailable=0,not-found=0,"
|
||||
"not-modified=0,busy=0\n"
|
||||
"dirreq-v2-resp ok=0,unavailable=0,not-found=0,not-modified=0,"
|
||||
"busy=0\n"
|
||||
"dirreq-v3-direct-dl complete=0,timeout=0,running=0\n"
|
||||
"dirreq-v2-direct-dl complete=0,timeout=0,running=0\n"
|
||||
"dirreq-v3-tunneled-dl complete=0,timeout=0,running=4\n"
|
||||
"dirreq-v2-tunneled-dl complete=0,timeout=0,running=0\n",
|
||||
*entry_stats_1 =
|
||||
"entry-stats-end 2010-08-12 13:27:30 (86400 s)\n"
|
||||
"entry-ips ab=8\n",
|
||||
*entry_stats_2 =
|
||||
"entry-stats-end 2010-08-12 13:27:30 (86400 s)\n"
|
||||
"entry-ips \n";
|
||||
|
||||
/* Populate the DB a bit. Add these in order, since we can't do the final
|
||||
* 'sort' step. These aren't very good IP addresses, but they're perfectly
|
||||
@@ -1467,6 +1597,114 @@ test_geoip(void)
|
||||
test_assert(s);
|
||||
test_streq("zz=24,xy=8", s);
|
||||
|
||||
/* Start testing bridge statistics by making sure that we don't output
|
||||
* bridge stats without initializing them. */
|
||||
s = geoip_format_bridge_stats(now + 86400);
|
||||
test_assert(!s);
|
||||
|
||||
/* Initialize stats and generate the bridge-stats history string out of
|
||||
* the connecting clients added above. */
|
||||
geoip_bridge_stats_init(now);
|
||||
s = geoip_format_bridge_stats(now + 86400);
|
||||
test_streq(bridge_stats_1, s);
|
||||
tor_free(s);
|
||||
|
||||
/* Stop collecting bridge stats and make sure we don't write a history
|
||||
* string anymore. */
|
||||
geoip_bridge_stats_term();
|
||||
s = geoip_format_bridge_stats(now + 86400);
|
||||
test_assert(!s);
|
||||
|
||||
/* Stop being a bridge and start being a directory mirror that gathers
|
||||
* directory request statistics. */
|
||||
geoip_bridge_stats_term();
|
||||
get_options_mutable()->BridgeRelay = 0;
|
||||
get_options_mutable()->BridgeRecordUsageByCountry = 0;
|
||||
get_options_mutable()->DirReqStatistics = 1;
|
||||
|
||||
/* Start testing dirreq statistics by making sure that we don't collect
|
||||
* dirreq stats without initializing them. */
|
||||
geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, 100, now);
|
||||
s = geoip_format_dirreq_stats(now + 86400);
|
||||
test_assert(!s);
|
||||
|
||||
/* Initialize stats, note one connecting client, and generate the
|
||||
* dirreq-stats history string. */
|
||||
geoip_dirreq_stats_init(now);
|
||||
geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, 100, now);
|
||||
s = geoip_format_dirreq_stats(now + 86400);
|
||||
test_streq(dirreq_stats_1, s);
|
||||
tor_free(s);
|
||||
|
||||
/* Stop collecting stats, add another connecting client, and ensure we
|
||||
* don't generate a history string. */
|
||||
geoip_dirreq_stats_term();
|
||||
geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, 101, now);
|
||||
s = geoip_format_dirreq_stats(now + 86400);
|
||||
test_assert(!s);
|
||||
|
||||
/* Re-start stats, add a connecting client, reset stats, and make sure
|
||||
* that we get an all empty history string. */
|
||||
geoip_dirreq_stats_init(now);
|
||||
geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, 100, now);
|
||||
geoip_reset_dirreq_stats(now);
|
||||
s = geoip_format_dirreq_stats(now + 86400);
|
||||
test_streq(dirreq_stats_2, s);
|
||||
tor_free(s);
|
||||
|
||||
/* Note a successful network status response and make sure that it
|
||||
* appears in the history string. */
|
||||
geoip_note_ns_response(GEOIP_CLIENT_NETWORKSTATUS, GEOIP_SUCCESS);
|
||||
s = geoip_format_dirreq_stats(now + 86400);
|
||||
test_streq(dirreq_stats_3, s);
|
||||
tor_free(s);
|
||||
|
||||
/* Start a tunneled directory request. */
|
||||
geoip_start_dirreq((uint64_t) 1, 1024, GEOIP_CLIENT_NETWORKSTATUS,
|
||||
DIRREQ_TUNNELED);
|
||||
s = geoip_format_dirreq_stats(now + 86400);
|
||||
test_streq(dirreq_stats_4, s);
|
||||
|
||||
/* Stop collecting directory request statistics and start gathering
|
||||
* entry stats. */
|
||||
geoip_dirreq_stats_term();
|
||||
get_options_mutable()->DirReqStatistics = 0;
|
||||
get_options_mutable()->EntryStatistics = 1;
|
||||
|
||||
/* Start testing entry statistics by making sure that we don't collect
|
||||
* anything without initializing entry stats. */
|
||||
geoip_note_client_seen(GEOIP_CLIENT_CONNECT, 100, now);
|
||||
s = geoip_format_entry_stats(now + 86400);
|
||||
test_assert(!s);
|
||||
|
||||
/* Initialize stats, note one connecting client, and generate the
|
||||
* entry-stats history string. */
|
||||
geoip_entry_stats_init(now);
|
||||
geoip_note_client_seen(GEOIP_CLIENT_CONNECT, 100, now);
|
||||
s = geoip_format_entry_stats(now + 86400);
|
||||
test_streq(entry_stats_1, s);
|
||||
tor_free(s);
|
||||
|
||||
/* Stop collecting stats, add another connecting client, and ensure we
|
||||
* don't generate a history string. */
|
||||
geoip_entry_stats_term();
|
||||
geoip_note_client_seen(GEOIP_CLIENT_CONNECT, 101, now);
|
||||
s = geoip_format_entry_stats(now + 86400);
|
||||
test_assert(!s);
|
||||
|
||||
/* Re-start stats, add a connecting client, reset stats, and make sure
|
||||
* that we get an all empty history string. */
|
||||
geoip_entry_stats_init(now);
|
||||
geoip_note_client_seen(GEOIP_CLIENT_CONNECT, 100, now);
|
||||
geoip_reset_entry_stats(now);
|
||||
s = geoip_format_entry_stats(now + 86400);
|
||||
test_streq(entry_stats_2, s);
|
||||
tor_free(s);
|
||||
|
||||
/* Stop collecting entry statistics. */
|
||||
geoip_entry_stats_term();
|
||||
get_options_mutable()->EntryStatistics = 0;
|
||||
|
||||
done:
|
||||
tor_free(s);
|
||||
}
|
||||
@@ -1570,6 +1808,61 @@ test_stats(void)
|
||||
rep_hist_reset_conn_stats(now);
|
||||
s = rep_hist_format_conn_stats(now + 86400);
|
||||
test_streq("conn-bi-direct 2010-08-12 13:27:30 (86400 s) 0,0,0,0\n", s);
|
||||
tor_free(s);
|
||||
|
||||
/* Continue with testing buffer statistics; we shouldn't collect buffer
|
||||
* stats without initializing them. */
|
||||
rep_hist_add_buffer_stats(2.0, 2.0, 20);
|
||||
s = rep_hist_format_buffer_stats(now + 86400);
|
||||
test_assert(!s);
|
||||
|
||||
/* Initialize stats, add statistics for a single circuit, and generate
|
||||
* the history string. */
|
||||
rep_hist_buffer_stats_init(now);
|
||||
rep_hist_add_buffer_stats(2.0, 2.0, 20);
|
||||
s = rep_hist_format_buffer_stats(now + 86400);
|
||||
test_streq("cell-stats-end 2010-08-12 13:27:30 (86400 s)\n"
|
||||
"cell-processed-cells 20,0,0,0,0,0,0,0,0,0\n"
|
||||
"cell-queued-cells 2.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,"
|
||||
"0.00,0.00\n"
|
||||
"cell-time-in-queue 2,0,0,0,0,0,0,0,0,0\n"
|
||||
"cell-circuits-per-decile 1\n", s);
|
||||
tor_free(s);
|
||||
|
||||
/* Add nineteen more circuit statistics to the one that's already in the
|
||||
* history to see that the math works correctly. */
|
||||
for (i = 21; i < 30; i++)
|
||||
rep_hist_add_buffer_stats(2.0, 2.0, i);
|
||||
for (i = 20; i < 30; i++)
|
||||
rep_hist_add_buffer_stats(3.5, 3.5, i);
|
||||
s = rep_hist_format_buffer_stats(now + 86400);
|
||||
test_streq("cell-stats-end 2010-08-12 13:27:30 (86400 s)\n"
|
||||
"cell-processed-cells 29,28,27,26,25,24,23,22,21,20\n"
|
||||
"cell-queued-cells 2.75,2.75,2.75,2.75,2.75,2.75,2.75,2.75,"
|
||||
"2.75,2.75\n"
|
||||
"cell-time-in-queue 3,3,3,3,3,3,3,3,3,3\n"
|
||||
"cell-circuits-per-decile 2\n", s);
|
||||
tor_free(s);
|
||||
|
||||
/* Stop collecting stats, add statistics for one circuit, and ensure we
|
||||
* don't generate a history string. */
|
||||
rep_hist_buffer_stats_term();
|
||||
rep_hist_add_buffer_stats(2.0, 2.0, 20);
|
||||
s = rep_hist_format_buffer_stats(now + 86400);
|
||||
test_assert(!s);
|
||||
|
||||
/* Re-start stats, add statistics for one circuit, reset stats, and make
|
||||
* sure that the history has all zeros. */
|
||||
rep_hist_buffer_stats_init(now);
|
||||
rep_hist_add_buffer_stats(2.0, 2.0, 20);
|
||||
rep_hist_reset_buffer_stats(now);
|
||||
s = rep_hist_format_buffer_stats(now + 86400);
|
||||
test_streq("cell-stats-end 2010-08-12 13:27:30 (86400 s)\n"
|
||||
"cell-processed-cells 0,0,0,0,0,0,0,0,0,0\n"
|
||||
"cell-queued-cells 0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,"
|
||||
"0.00,0.00\n"
|
||||
"cell-time-in-queue 0,0,0,0,0,0,0,0,0,0\n"
|
||||
"cell-circuits-per-decile 0\n", s);
|
||||
|
||||
done:
|
||||
tor_free(s);
|
||||
@@ -1612,6 +1905,7 @@ const struct testcase_setup_t legacy_setup = {
|
||||
|
||||
static struct testcase_t test_array[] = {
|
||||
ENT(buffers),
|
||||
{ "buffer_copy", test_buffer_copy, 0, NULL, NULL },
|
||||
ENT(onion_handshake),
|
||||
ENT(circuit_timeout),
|
||||
ENT(policies),
|
||||
|
||||
Reference in New Issue
Block a user