bwauth: Add function to get the digest of a bw file (fc3e90a7) · Commits · Benjamin J. Thompson / Tor

src/app/config/config.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -3554,7 +3554,8 @@ options_validate(or_options_t old_options, or_options_t options,
		"(Bridge/V3)AuthoritativeDir is set.");
		/* If we have a v3bandwidthsfile and it's broken, complain on startup */
		if (options->V3BandwidthsFile && !old_options) {
		dirserv_read_measured_bandwidths(options->V3BandwidthsFile, NULL, NULL);
		dirserv_read_measured_bandwidths(options->V3BandwidthsFile, NULL, NULL,
		NULL);
		}
		/* same for guardfraction file */
		if (options->GuardfractionFile && !old_options) {

src/feature/dirauth/bwauth.c

+22 −4

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		#include "feature/nodelist/routerinfo_st.h"
		#include "feature/nodelist/vote_routerstatus_st.h"

		#include "lib/crypt_ops/crypto_format.h"
		#include "lib/encoding/keyval.h"

		/** Total number of routers with measured bandwidth; this is set by
		@@ -205,7 +206,8 @@ dirserv_get_credible_bandwidth_kb(const routerinfo_t *ri)
		int
		dirserv_read_measured_bandwidths(const char *from_file,
		smartlist_t *routerstatuses,
		smartlist_t *bw_file_headers)
		smartlist_t *bw_file_headers,
		uint8_t *digest_out)
		{
		FILE *fp = tor_fopen_cloexec(from_file, "r");
		int applied_lines = 0;
		@@ -219,6 +221,7 @@ dirserv_read_measured_bandwidths(const char *from_file,
		int rv = -1;
		char *line = NULL;
		size_t n = 0;
		crypto_digest_t *digest = crypto_digest256_new(DIGEST_SHA256);

		/* Initialise line, so that we can't possibly run off the end. */

		@@ -233,11 +236,14 @@ dirserv_read_measured_bandwidths(const char *from_file,
		log_warn(LD_DIRSERV, "Empty bandwidth file");
		goto err;
		}
		/* If the line could be gotten, add it to the digest */
		crypto_digest_add_bytes(digest, (const char *) line, strlen(line));

		if (!strlen(line) \|\| line[strlen(line)-1] != '\n') {
		log_warn(LD_DIRSERV, "Long or truncated time in bandwidth file: %s",
		escaped(line));
		goto err;
		/* Continue adding lines to the digest. */
		goto continue_digest;
		}

		line[strlen(line)-1] = '\0';
		@@ -245,14 +251,14 @@ dirserv_read_measured_bandwidths(const char *from_file,
		if (!ok) {
		log_warn(LD_DIRSERV, "Non-integer time in bandwidth file: %s",
		escaped(line));
		goto err;
		goto continue_digest;
		}

		now = time(NULL);
		if ((now - file_time) > MAX_MEASUREMENT_AGE) {
		log_warn(LD_DIRSERV, "Bandwidth measurement file stale. Age: %u",
		(unsigned)(time(NULL) - file_time));
		goto err;
		goto continue_digest;
		}

		/* If timestamp was correct and bw_file_headers is not NULL,
		@@ -267,6 +273,7 @@ dirserv_read_measured_bandwidths(const char *from_file,
		while (!feof(fp)) {
		measured_bw_line_t parsed_line;
		if (tor_getline(&line, &n, fp) >= 0) {
		crypto_digest_add_bytes(digest, (const char *) line, strlen(line));
		if (measured_bw_line_parse(&parsed_line, line,
		line_is_after_headers) != -1) {
		/* This condition will be true when the first complete valid bw line
		@@ -305,6 +312,14 @@ dirserv_read_measured_bandwidths(const char *from_file,
		"Applied %d measurements.", applied_lines);
		rv = 0;

		continue_digest:
		/* Continue parsing lines to return the digest of the Bandwidth File. */
		while (!feof(fp)) {
		if (tor_getline(&line, &n, fp) >= 0) {
		crypto_digest_add_bytes(digest, (const char *) line, strlen(line));
		}
		}

		err:
		if (line) {
		// we need to raw_free this buffer because we got it from tor_getdelim()
		@@ -312,6 +327,9 @@ dirserv_read_measured_bandwidths(const char *from_file,
		}
		if (fp)
		fclose(fp);
		if (digest_out)
		crypto_digest_get_digest(digest, (char *) digest_out, DIGEST256_LEN);
		crypto_digest_free(digest);
		return rv;
		}

src/feature/dirauth/bwauth.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,8 +21,8 @@

		int dirserv_read_measured_bandwidths(const char *from_file,
		smartlist_t *routerstatuses,
		smartlist_t *bw_file_headers);

		smartlist_t *bw_file_headers,
		uint8_t *digest_out);
		int dirserv_query_measured_bw_cache_kb(const char *node_id,
		long *bw_out,
		time_t *as_of_out);

src/test/test_dir.c

+46 −16

Original line number	Diff line number	Diff line
		@@ -1765,7 +1765,8 @@ test_dir_dirserv_read_measured_bandwidths(void *arg)
		write_str_to_file(fname, "", 0);
		setup_capture_of_logs(LOG_WARN);
		tt_int_op(-1, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
		bw_file_headers));
		bw_file_headers,
		NULL));
		expect_log_msg("Empty bandwidth file\n");
		teardown_capture_of_logs();
		bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
		@@ -1781,7 +1782,9 @@ test_dir_dirserv_read_measured_bandwidths(void *arg)
		write_str_to_file(fname, content, 0);
		tor_free(content);
		tt_int_op(-1, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
		bw_file_headers));
		bw_file_headers,
		NULL));

		bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
		tt_str_op("", OP_EQ, bw_file_headers_str);
		SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
		@@ -1792,7 +1795,9 @@ test_dir_dirserv_read_measured_bandwidths(void *arg)
		write_str_to_file(fname, header_lines_v100, 0);
		bw_file_headers = smartlist_new();
		tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
		bw_file_headers));
		bw_file_headers,
		NULL));

		bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
		tt_str_op(bw_file_headers_str_v100, OP_EQ, bw_file_headers_str);
		SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
		@@ -1805,7 +1810,9 @@ test_dir_dirserv_read_measured_bandwidths(void *arg)
		write_str_to_file(fname, content, 0);
		tor_free(content);
		tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
		bw_file_headers));
		bw_file_headers,
		NULL));

		bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
		tt_str_op(bw_file_headers_str_v100, OP_EQ, bw_file_headers_str);
		SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
		@@ -1816,7 +1823,8 @@ test_dir_dirserv_read_measured_bandwidths(void *arg)
		tor_asprintf(&content, "%s%s", header_lines_v100, relay_lines_v100);
		write_str_to_file(fname, content, 0);
		tor_free(content);
		tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL));
		tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL,
		NULL));

		/* Test bandwidth file including v1.1.0 bandwidth headers and
		* v1.0.0 relay lines. bw_file_headers will contain the v1.1.0 headers. */
		@@ -1826,7 +1834,9 @@ test_dir_dirserv_read_measured_bandwidths(void *arg)
		write_str_to_file(fname, content, 0);
		tor_free(content);
		tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
		bw_file_headers));
		bw_file_headers,
		NULL));

		bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
		tt_str_op(bw_file_headers_str_v110, OP_EQ, bw_file_headers_str);
		SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
		@@ -1842,7 +1852,9 @@ test_dir_dirserv_read_measured_bandwidths(void *arg)
		write_str_to_file(fname, content, 0);
		tor_free(content);
		tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
		bw_file_headers));
		bw_file_headers,
		NULL));

		bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
		tt_str_op(bw_file_headers_str_v100, OP_EQ, bw_file_headers_str);
		SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
		@@ -1859,7 +1871,9 @@ test_dir_dirserv_read_measured_bandwidths(void *arg)
		write_str_to_file(fname, content, 0);
		tor_free(content);
		tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
		bw_file_headers));
		bw_file_headers,
		NULL));

		bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
		tt_str_op(bw_file_headers_str_v100, OP_EQ, bw_file_headers_str);
		SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
		@@ -1870,7 +1884,9 @@ test_dir_dirserv_read_measured_bandwidths(void *arg)
		bw_file_headers = smartlist_new();
		write_str_to_file(fname, header_lines_v110_no_terminator, 0);
		tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
		bw_file_headers));
		bw_file_headers,
		NULL));

		bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
		tt_str_op(bw_file_headers_str_v110, OP_EQ, bw_file_headers_str);
		SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
		@@ -1881,7 +1897,9 @@ test_dir_dirserv_read_measured_bandwidths(void *arg)
		bw_file_headers = smartlist_new();
		write_str_to_file(fname, header_lines_v110, 0);
		tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
		bw_file_headers));
		bw_file_headers,
		NULL));

		bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
		tt_str_op(bw_file_headers_str_v110, OP_EQ, bw_file_headers_str);
		SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
		@@ -1896,7 +1914,9 @@ test_dir_dirserv_read_measured_bandwidths(void *arg)
		write_str_to_file(fname, content, 0);
		tor_free(content);
		tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
		bw_file_headers));
		bw_file_headers,
		NULL));

		bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
		tt_str_op(bw_file_headers_str_v110, OP_EQ, bw_file_headers_str);
		SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
		@@ -1911,7 +1931,9 @@ test_dir_dirserv_read_measured_bandwidths(void *arg)
		write_str_to_file(fname, content, 0);
		tor_free(content);
		tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
		bw_file_headers));
		bw_file_headers,
		NULL));

		bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
		tt_str_op(bw_file_headers_str_v110, OP_EQ, bw_file_headers_str);
		SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
		@@ -1927,7 +1949,9 @@ test_dir_dirserv_read_measured_bandwidths(void *arg)
		write_str_to_file(fname, content, 0);
		tor_free(content);
		tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
		bw_file_headers));
		bw_file_headers,
		NULL));

		bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
		tt_str_op(bw_file_headers_str_v110, OP_EQ, bw_file_headers_str);
		SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
		@@ -1944,7 +1968,9 @@ test_dir_dirserv_read_measured_bandwidths(void *arg)
		write_str_to_file(fname, content, 0);
		tor_free(content);
		tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
		bw_file_headers));
		bw_file_headers,
		NULL));

		bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
		tt_str_op(bw_file_headers_str_bad, OP_EQ, bw_file_headers_str);
		SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
		@@ -1962,7 +1988,9 @@ test_dir_dirserv_read_measured_bandwidths(void *arg)
		write_str_to_file(fname, content, 0);
		tor_free(content);
		tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
		bw_file_headers));
		bw_file_headers,
		NULL));

		tt_int_op(MAX_BW_FILE_HEADER_COUNT_IN_VOTE, OP_EQ,
		smartlist_len(bw_file_headers));
		bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
		@@ -1983,7 +2011,9 @@ test_dir_dirserv_read_measured_bandwidths(void *arg)
		write_str_to_file(fname, content, 0);
		tor_free(content);
		tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
		bw_file_headers));
		bw_file_headers,
		NULL));

		tt_int_op(MAX_BW_FILE_HEADER_COUNT_IN_VOTE, OP_EQ,
		smartlist_len(bw_file_headers));
		/* force bw_file_headers to be bigger than