June 2016 - tor-commits - lists.torproject.org

[stem/master] Basic auth support for ADD_ONION
by atagar＠torproject.org 16 Jun '16

16 Jun '16

commit 38aa76c0216e083b4eb5eb6cfc1deba03cf44988 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 16 10:03:26 2016 -0700 Basic auth support for ADD_ONION Support for basic authentiction special recently added to ADD_ONION... https://gitweb.torproject.org/torspec.git/commit/?id=c2865d9 --- docs/change_log.rst | 1 + stem/control.py | 42 +++++++++++++++++++++++++++++++++++++++- stem/response/add_onion.py | 9 +++++++++ stem/version.py | 2 ++ test/integ/control/controller.py | 21 ++++++++++++++++++++ test/unit/doctest.py | 11 +++++++++++ test/unit/response/add_onion.py | 20 +++++++++++++++++++ 7 files changed, 105 insertions(+), 1 deletion(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index ecfc49a..291bca2 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -49,6 +49,7 @@ The following are only available within Stem's `git repository * :func:`~stem.connection.connect` and :func:`~stem.control.Controller.from_port` now connect to both port 9051 (relay's default) and 9151 (Tor Browser's default) (:trac:`16075`) * :class:`~stem.exit_policy.ExitPolicy` support for *accept6/reject6* and *\*4/6* wildcards (:trac:`16053`) * Added `support for NETWORK_LIVENESS events <api/response.html#stem.response.events.NetworkLivenessEvent>`_ (:spec:`44aac63`) + * Added support for basic authentication to :func:`~stem.control.Controller.create_ephemeral_hidden_service` (:spec:`c2865d9`) * Added :func:`~stem.control.event_description` for getting human-friendly descriptions of tor events (:trac:`19061`) * Added :func:`~stem.control.Controller.reconnect` to the :class:`~stem.control.Controller` * Added :func:`~stem.control.Controller.is_set` to the :class:`~stem.control.Controller` diff --git a/stem/control.py b/stem/control.py index 31e19d5..f29fb71 100644 --- a/stem/control.py +++ b/stem/control.py @@ -2764,7 +2764,7 @@ class Controller(BaseController): return result - def create_ephemeral_hidden_service(self, ports, key_type = 'NEW', key_content = 'BEST', discard_key = False, detached = False, await_publication = False): + def create_ephemeral_hidden_service(self, ports, key_type = 'NEW', key_content = 'BEST', discard_key = False, detached = False, await_publication = False, basic_auth = None): """ Creates a new hidden service. Unlike :func:`~stem.control.Controller.create_hidden_service` this style of @@ -2789,8 +2789,34 @@ class Controller(BaseController): create_ephemeral_hidden_service({80: 80, 443: '173.194.33.133:443'}) + If **basic_auth** is provided this service will require basic + authentication to access. This means users must set HidServAuth in their + torrc with credentials to access it. + + **basic_auth** is a mapping of usernames to their credentials. If the + credential is **None** one is generated and returned as part of the + response. For instance, only bob can access using the given newly generated + credentials... + + :: + + >>> response = controller.create_ephemeral_hidden_service(80, basic_auth = {'bob': None}) + >>> print(response.client_auth) + {'bob': 'nKwfvVPmTNr2k2pG0pzV4g'} + + ... while both alice and bob can access with existing credentials in the + following... + + controller.create_ephemeral_hidden_service(80, basic_auth = { + 'alice': 'l4BT016McqV2Oail+Bwe6w', + 'bob': 'vGnNRpWYiMBFTWD2gbBlcA', + }) + .. versionadded:: 1.4.0 + .. versionchanged:: 1.5.0 + Added the basic_auth argument. + :param int,list,dict ports: hidden service port(s) or mapping of hidden service ports to their targets :param str key_type: type of key being provided, generates a new key if @@ -2803,6 +2829,7 @@ class Controller(BaseController): connection is closed if **True** :param bool await_publication: blocks until our descriptor is successfully published if **True** + :param dict basic_auth: required user credentials to access this service :returns: :class:`~stem.response.add_onion.AddOnionResponse` with the response @@ -2830,6 +2857,12 @@ class Controller(BaseController): if detached: flags.append('Detach') + if basic_auth is not None: + if self.get_version() < stem.version.Requirement.ADD_ONION_BASIC_AUTH: + raise stem.UnsatisfiableRequest(message = 'Basic authentication support was added to ADD_ONION in tor version %s' % stem.version.Requirement.ADD_ONION_BASIC_AUTH) + + flags.append('BasicAuth') + if flags: request += ' Flags=%s' % ','.join(flags) @@ -2844,6 +2877,13 @@ class Controller(BaseController): else: raise ValueError("The 'ports' argument of create_ephemeral_hidden_service() needs to be an int, list, or dict") + if basic_auth is not None: + for client_name, client_blob in basic_auth.items(): + if client_blob: + request += ' ClientAuth=%s:%s' % (client_name, client_blob) + else: + request += ' ClientAuth=%s' % client_name + response = self.msg(request) stem.response.convert('ADD_ONION', response) diff --git a/stem/response/add_onion.py b/stem/response/add_onion.py index 2b87755..cbf7594 100644 --- a/stem/response/add_onion.py +++ b/stem/response/add_onion.py @@ -12,17 +12,20 @@ class AddOnionResponse(stem.response.ControlMessage): :var str private_key: base64 encoded hidden service private key :var str private_key_type: crypto used to generate the hidden service private key (such as RSA1024) + :var dict client_auth: newly generated client credentials the service accepts """ def _parse_message(self): # Example: # 250-ServiceID=gfzprpioee3hoppz # 250-PrivateKey=RSA1024:MIICXgIBAAKBgQDZvYVxv... + # 250-ClientAuth=bob:l4BT016McqV2Oail+Bwe6w # 250 OK self.service_id = None self.private_key = None self.private_key_type = None + self.client_auth = {} if not self.is_ok(): raise stem.ProtocolError("ADD_ONION response didn't have an OK status: %s" % self) @@ -41,3 +44,9 @@ class AddOnionResponse(stem.response.ControlMessage): raise stem.ProtocolError("ADD_ONION PrivateKey lines should be of the form 'PrivateKey=[type]:[key]: %s" % self) self.private_key_type, self.private_key = value.split(':', 1) + elif key == 'ClientAuth': + if ':' not in value: + raise stem.ProtocolError("ADD_ONION ClientAuth lines should be of the form 'ClientAuth=[username]:[credential]: %s" % self) + + username, credential = value.split(':', 1) + self.client_auth[username] = credential diff --git a/stem/version.py b/stem/version.py index df89d28..2dbcff2 100644 --- a/stem/version.py +++ b/stem/version.py @@ -58,6 +58,7 @@ easily parsed and compared, for instance... **HSFETCH** HSFETCH requests **HSPOST** HSPOST requests **ADD_ONION** ADD_ONION and DEL_ONION requests + **ADD_ONION_BASIC_AUTH** ADD_ONION supports basic authentication **LOADCONF** LOADCONF requests **MICRODESCRIPTOR_IS_DEFAULT** Tor gets microdescriptors by default rather than server descriptors **TAKEOWNERSHIP** TAKEOWNERSHIP requests @@ -372,6 +373,7 @@ Requirement = stem.util.enum.Enum( ('HSFETCH', Version('0.2.7.1-alpha')), ('HSPOST', Version('0.2.7.1-alpha')), ('ADD_ONION', Version('0.2.7.1-alpha')), + ('ADD_ONION_BASIC_AUTH', Version('0.2.9.1-alpha')), ('LOADCONF', Version('0.2.1.1')), ('MICRODESCRIPTOR_IS_DEFAULT', Version('0.2.3.3')), ('TAKEOWNERSHIP', Version('0.2.2.28-beta')), diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index d5c2ec1..2bd06a6 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -641,6 +641,7 @@ class TestController(unittest.TestCase): response = controller.create_ephemeral_hidden_service(4567) self.assertEqual([response.service_id], controller.list_ephemeral_hidden_services()) self.assertTrue(response.private_key is not None) + self.assertEqual({}, response.client_auth) # drop the service @@ -672,6 +673,26 @@ class TestController(unittest.TestCase): self.assertEqual(0, len(second_controller.list_ephemeral_hidden_services())) @require_controller + @require_version(Requirement.ADD_ONION_BASIC_AUTH) + def test_with_ephemeral_hidden_services_with_basic_auth(self): + """ + Exercises creating ephemeral hidden services that uses basic authentication. + """ + + runner = test.runner.get_runner() + + with runner.get_tor_controller() as controller: + response = controller.create_ephemeral_hidden_service(4567, basic_auth = {'alice': 'nKwfvVPmTNr2k2pG0pzV4g', 'bob': None}) + self.assertEqual([response.service_id], controller.list_ephemeral_hidden_services()) + self.assertTrue(response.private_key is not None) + self.assertEqual(['bob'], response.client_auth.keys()) # newly created credentials were only created for bob + + # drop the service + + self.assertEqual(True, controller.remove_ephemeral_hidden_service(response.service_id)) + self.assertEqual([], controller.list_ephemeral_hidden_services()) + + @require_controller @require_version(Requirement.ADD_ONION) def test_with_detached_ephemeral_hidden_services(self): """ diff --git a/test/unit/doctest.py b/test/unit/doctest.py index e3e53d8..548831a 100644 --- a/test/unit/doctest.py +++ b/test/unit/doctest.py @@ -14,6 +14,7 @@ import stem.util.str_tools import stem.util.system import stem.version +import test.mocking import test.util try: @@ -27,6 +28,12 @@ EXPECTED_CIRCUIT_STATUS = """\ 19 BUILT $718BCEA286B531757ACAFF93AE04910EA73DE617=KsmoinOK,$30BAB8EE7606CBD12F3CC269AE976E0153E7A58D=Pascal1,$2765D8A8C4BBA3F89585A9FFE0E8575615880BEB=Anthracite PURPOSE=GENERAL TIME_CREATED=2012-12-06T13:50:56.969938\ """ +ADD_ONION_RESPONSE = """\ +250-ServiceID=oekn5sqrvcu4wote +250-ClientAuth=bob:nKwfvVPmTNr2k2pG0pzV4g +250 OK +""" + class TestDocumentation(unittest.TestCase): def test_examples(self): @@ -77,6 +84,10 @@ class TestDocumentation(unittest.TestCase): 'circuit-status': EXPECTED_CIRCUIT_STATUS, }[arg] + response = test.mocking.get_message(ADD_ONION_RESPONSE) + stem.response.convert('ADD_ONION', response) + controller.create_ephemeral_hidden_service.return_value = response + args['globs'] = {'controller': controller} test_run = doctest.testfile(path, **args) elif path.endswith('/stem/version.py'): diff --git a/test/unit/response/add_onion.py b/test/unit/response/add_onion.py index b58fe3b..64e3688 100644 --- a/test/unit/response/add_onion.py +++ b/test/unit/response/add_onion.py @@ -14,6 +14,12 @@ WITH_PRIVATE_KEY = """250-ServiceID=gfzprpioee3hoppz 250-PrivateKey=RSA1024:MIICXgIBAAKBgQDZvYVxvKPTWhId/8Ss9fVxjAoFDsrJ3pk6HjHrEFRm3ypkK/vArbG9BrupzzYcyms+lO06O8b/iOSHuZI5mUEGkrYqQ+hpB2SkPUEzW7vcp8SQQivna3+LfkWH4JDqfiwZutU6MMEvU6g1OqK4Hll6uHbLpsfxkS/mGjyu1C9a9wIDAQABAoGBAJxsC3a25xZJqaRFfxwmIiptSTFy+/nj4T4gPQo6k/fHMKP/+P7liT9bm+uUwbITNNIjmPzxvrcKt+pNRR/92fizxr8QXr8l0ciVOLerbvdqvVUaQ/K1IVsblOLbactMvXcHactmqqLFUaZU9PPSDla7YkzikLDIUtHXQBEt4HEhAkEA/c4n+kpwi4odCaF49ESPbZC/Qejh7U9Tq10vAHzfrrGgQjnLw2UGDxJQXc9P12fGTvD2q3Q3VaMI8TKKFqZXsQJBANufh1zfP+xX/UfxJ4QzDUCHCu2gnyTDj3nG9Bc80E5g7NwR2VBXF1R+QQCK9GZcXd2y6vBYgrHOSUiLbVjGrycCQQDpOcs0zbjUEUuTsQUT+fiO50dJSrZpus6ZFxz85sMppeItWSzsVeYWbW7adYnZ2Gu72OPjM/0xPYsXEakhHSRRAkAxlVauNQjthv/72god4pi/VL224GiNmEkwKSa6iFRPHbrcBHuXk9IElWx/ft+mrHvUraw1DwaStgv9gNzzCghJAkEA08RegCRnIzuGvgeejLk4suIeCMD/11AvmSvxbRWS5rq1leSVo7uGLSnqDbwlzE4dGb5kH15NNAp14/l2Fu/yZg== 250 OK""" +WITH_CLIENT_AUTH = """250-ServiceID=oekn5sqrvcu4wote +250-ClientAuth=bob:lhwLVFt0Kd5/0Gy9DkKoyA +250-ClientAuth=alice:T9UADxtrvqx2HnLKWp/fWQ +250 OK +""" + WITHOUT_PRIVATE_KEY = """250-ServiceID=gfzprpioee3hoppz 250 OK""" @@ -57,6 +63,20 @@ class TestAddOnionResponse(unittest.TestCase): self.assertEqual('gfzprpioee3hoppz', response.service_id) self.assertTrue(response.private_key.startswith('MIICXgIBAAKB')) self.assertEqual('RSA1024', response.private_key_type) + self.assertEqual({}, response.client_auth) + + def test_with_client_auth(self): + """ + Checks a response when there's client credentials. + """ + + response = mocking.get_message(WITH_CLIENT_AUTH) + stem.response.convert('ADD_ONION', response) + + self.assertEqual('oekn5sqrvcu4wote', response.service_id) + self.assertEqual(None, response.private_key) + self.assertEqual(None, response.private_key_type) + self.assertEqual({'bob': 'lhwLVFt0Kd5/0Gy9DkKoyA', 'alice': 'T9UADxtrvqx2HnLKWp/fWQ'}, response.client_auth) def test_without_private_key(self): """

1 0

[tor/master] Try to fix memarea test on 32-bit systems
by nickm＠torproject.org 16 Jun '16

16 Jun '16

commit 6ceb37971ef863af8971ee69c1717ca8dbcda00b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 16 11:59:51 2016 -0400 Try to fix memarea test on 32-bit systems --- src/test/test_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index d99cedf..6090dbd 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2876,7 +2876,7 @@ test_util_memarea(void *arg) memarea_get_stats(area, &initial_allocation, &dummy); /* Check for running over an area's size. */ - for (i = 0; i < 512; ++i) { + for (i = 0; i < 4096; ++i) { size_t n = crypto_rand_int(6); p1 = memarea_alloc(area, n); total += n;

1 0

[tor/master] Tests for message rate-limiting
by nickm＠torproject.org 16 Jun '16

16 Jun '16

commit 5c596cdbc086698c52824a4cc9f93753f7d7a24b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 16 11:54:50 2016 -0400 Tests for message rate-limiting Also note a bug in the rate-limiting message. --- src/common/util.c | 2 ++ src/test/test_logging.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/src/common/util.c b/src/common/util.c index 0589cec..2775dae 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1921,6 +1921,8 @@ rate_limit_log(ratelim_t *lim, time_t now) return tor_strdup(""); } else { char *cp=NULL; + /* XXXX this is not exactly correct: the messages could have occurred + * any time between the old value of lim->allowed and now. */ tor_asprintf(&cp, " [%d similar message(s) suppressed in last %d seconds]", n-1, lim->rate); diff --git a/src/test/test_logging.c b/src/test/test_logging.c index eb294fe..15471e4 100644 --- a/src/test/test_logging.c +++ b/src/test/test_logging.c @@ -127,9 +127,47 @@ test_sigsafe_err(void *arg) smartlist_free(lines); } +static void +test_ratelim(void *arg) +{ + (void) arg; + ratelim_t ten_min = RATELIM_INIT(10*60); + + const time_t start = 1466091600; + time_t now = start; + /* Initially, we're ready. */ + + char *msg = NULL; + + msg = rate_limit_log(&ten_min, now); + tt_assert(msg != NULL); + tt_str_op(msg, OP_EQ, ""); /* nothing was suppressed. */ + + tt_int_op(ten_min.last_allowed, OP_EQ, now); + tor_free(msg); + + int i; + for (i = 0; i < 9; ++i) { + now += 60; /* one minute has passed. */ + msg = rate_limit_log(&ten_min, now); + tt_assert(msg == NULL); + tt_int_op(ten_min.last_allowed, OP_EQ, start); + tt_int_op(ten_min.n_calls_since_last_time, OP_EQ, i + 1); + } + + now += 240; /* Okay, we can be done. */ + msg = rate_limit_log(&ten_min, now); + tt_assert(msg != NULL); + tt_str_op(msg, OP_EQ, + " [9 similar message(s) suppressed in last 600 seconds]"); + done: + tor_free(msg); +} + struct testcase_t logging_tests[] = { { "sigsafe_err_fds", test_get_sigsafe_err_fds, TT_FORK, NULL, NULL }, { "sigsafe_err", test_sigsafe_err, TT_FORK, NULL, NULL }, + { "ratelim", test_ratelim, 0, NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/master] I believe I found some dead code in our time parsing functions
by nickm＠torproject.org 16 Jun '16

16 Jun '16

commit 9b0bd65f220854b7335acca020c73dc075b379a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 16 11:14:12 2016 -0400 I believe I found some dead code in our time parsing functions --- src/common/util.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/common/util.c b/src/common/util.c index 884d74f..0589cec 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1629,11 +1629,16 @@ parse_rfc1123_time(const char *buf, time_t *t) tm.tm_sec = (int)tm_sec; if (tm.tm_year < 1970) { + /* LCOV_EXCL_START + * XXXX I think this is dead code; we already checked for + * invalid_year above. */ + tor_assert_nonfatal_unreached(); char *esc = esc_for_log(buf); log_warn(LD_GENERAL, "Got invalid RFC1123 time %s. (Before 1970)", esc); tor_free(esc); return -1; + /* LCOV_EXCL_STOP */ } tm.tm_year -= 1900; @@ -1717,10 +1722,15 @@ parse_iso_time_(const char *cp, time_t *t, int strict) st_tm.tm_wday = 0; /* Should be ignored. */ if (st_tm.tm_year < 70) { + /* LCOV_EXCL_START + * XXXX I think this is dead code; we already checked for + * year < 1970 above. */ + tor_assert_nonfatal_unreached(); char *esc = esc_for_log(cp); log_warn(LD_GENERAL, "Got invalid ISO time %s. (Before 1970)", esc); tor_free(esc); return -1; + /* LCOV_EXCL_STOP */ } return tor_timegm(&st_tm, t); }

1 0

[tor/master] tests for size_mul_check__()
by nickm＠torproject.org 16 Jun '16

16 Jun '16

commit 79370914d1a88adde03dc514bf94fc3e6c3c030c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 16 10:43:01 2016 -0400 tests for size_mul_check__() it's important, and we should make sure we got it right. --- src/common/util.c | 9 +++++++++ src/common/util.h | 4 ++++ src/test/test_util.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+) diff --git a/src/common/util.c b/src/common/util.c index d005dad..884d74f 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -206,6 +206,15 @@ size_mul_check(const size_t x, const size_t y) x <= SIZE_MAX / y); } +#ifdef TOR_UNIT_TESTS +/** Exposed for unit tests only */ +int +size_mul_check__(const size_t x, const size_t y) +{ + return size_mul_check(x,y); +} +#endif + /** Allocate a chunk of <b>nmemb</b>*<b>size</b> bytes of memory, fill * the memory with zero bytes, and return a pointer to the result. * Log and terminate the process on error. (Same as diff --git a/src/common/util.h b/src/common/util.h index 4c5070e..3a056bc 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -535,6 +535,10 @@ STATIC int format_helper_exit_status(unsigned char child_state, #endif +#ifdef TOR_UNIT_TESTS +int size_mul_check__(const size_t x, const size_t y); +#endif + #define ARRAY_LENGTH(x) ((sizeof(x)) / sizeof(x[0])) #endif diff --git a/src/test/test_util.c b/src/test/test_util.c index 83b48c9..d99cedf 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -634,9 +634,16 @@ test_util_time(void *arg) parse_rfc1123_time("Wed, 30 Ene 2011 23:59:59 GMT", &t_res)); tt_int_op(-1,OP_EQ, parse_rfc1123_time("Wed, 30 Mar 2011 23:59:59 GM", &t_res)); + tt_int_op(-1,OP_EQ, + parse_rfc1123_time("Wed, 30 Mar 1900 23:59:59 GMT", &t_res)); + /* Leap year. */ tt_int_op(-1,OP_EQ, parse_rfc1123_time("Wed, 29 Feb 2011 16:00:00 GMT", &t_res)); + tt_int_op(0,OP_EQ, + parse_rfc1123_time("Wed, 29 Feb 2012 16:00:00 GMT", &t_res)); + + /* Leap second plus one */ tt_int_op(-1,OP_EQ, parse_rfc1123_time("Wed, 30 Mar 2011 23:59:61 GMT", &t_res)); @@ -4815,6 +4822,36 @@ test_util_pwdb(void *arg) } #endif +static void +test_util_calloc_check(void *arg) +{ + (void) arg; + /* Easy cases that are good. */ + tt_assert(size_mul_check__(0,0)); + tt_assert(size_mul_check__(0,100)); + tt_assert(size_mul_check__(100,0)); + tt_assert(size_mul_check__(100,100)); + + /* Harder cases that are still good. */ + tt_assert(size_mul_check__(SIZE_MAX, 1)); + tt_assert(size_mul_check__(1, SIZE_MAX)); + tt_assert(size_mul_check__(SIZE_MAX / 10, 9)); + tt_assert(size_mul_check__(11, SIZE_MAX / 12)); + const size_t sqrt_size_max_p1 = ((size_t)1) << (sizeof(size_t) * 4); + tt_assert(size_mul_check__(sqrt_size_max_p1, sqrt_size_max_p1 - 1)); + + /* Cases that overflow */ + tt_assert(! size_mul_check__(SIZE_MAX, 2)); + tt_assert(! size_mul_check__(2, SIZE_MAX)); + tt_assert(! size_mul_check__(SIZE_MAX / 10, 11)); + tt_assert(! size_mul_check__(11, SIZE_MAX / 10)); + tt_assert(! size_mul_check__(SIZE_MAX / 8, 9)); + tt_assert(! size_mul_check__(sqrt_size_max_p1, sqrt_size_max_p1)); + + done: + ; +} + #define UTIL_LEGACY(name) \ { #name, test_util_ ## name , 0, NULL, NULL } @@ -4900,6 +4937,7 @@ struct testcase_t util_tests[] = { UTIL_TEST(get_avail_disk_space, 0), UTIL_TEST(touch_file, 0), UTIL_TEST_NO_WIN(pwdb, TT_FORK), + UTIL_TEST(calloc_check, 0), END_OF_TESTCASES };

1 0

[tor/master] Correct the rounding behavior on tv_mdiff.
by nickm＠torproject.org 16 Jun '16

16 Jun '16

commit 41cb26c1696b2e91f6ffe28c98ab471b925de9e8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 16 10:16:04 2016 -0400 Correct the rounding behavior on tv_mdiff. Fix for bug 19428. --- changes/bug19428 | 5 +++++ src/common/util.c | 12 +++++++++--- src/test/test_util.c | 4 ++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/changes/bug19428 b/changes/bug19428 new file mode 100644 index 0000000..32d293e --- /dev/null +++ b/changes/bug19428 @@ -0,0 +1,5 @@ + - Minor bugfixes (timing): + o When computing the difference between two times in milliseconds, + we now round to the nearest millisecond correctly. Previously, + we could sometimes round in the wrong direction. Fixes bug 19428; + bugfix on 0.2.2.2-alpha. diff --git a/src/common/util.c b/src/common/util.c index 2a3aec5..d005dad 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1386,7 +1386,7 @@ tv_udiff(const struct timeval *start, const struct timeval *end) long udiff; long secdiff = end->tv_sec - start->tv_sec; - if (labs(secdiff+1) > LONG_MAX/1000000) { + if (labs(secdiff)+1 > LONG_MAX/1000000) { log_warn(LD_GENERAL, "comparing times on microsecond detail too far " "apart: %ld seconds", secdiff); return LONG_MAX; @@ -1404,7 +1404,7 @@ tv_mdiff(const struct timeval *start, const struct timeval *end) long mdiff; long secdiff = end->tv_sec - start->tv_sec; - if (labs(secdiff+1) > LONG_MAX/1000) { + if (labs(secdiff)+1 > LONG_MAX/1000) { log_warn(LD_GENERAL, "comparing times on millisecond detail too far " "apart: %ld seconds", secdiff); return LONG_MAX; @@ -1412,7 +1412,13 @@ tv_mdiff(const struct timeval *start, const struct timeval *end) /* Subtract and round */ mdiff = secdiff*1000L + - ((long)end->tv_usec - (long)start->tv_usec + 500L) / 1000L; + /* We add a million usec here to ensure that the result is positive, + * so that the round-towards-zero behavior of the division will give + * the right result for rounding to the nearest msec. Later we subtract + * 1000 in order to get the correct result. + */ + ((long)end->tv_usec - (long)start->tv_usec + 500L + 1000000L) / 1000L + - 1000; return mdiff; } diff --git a/src/test/test_util.c b/src/test/test_util.c index dd600d9..83b48c9 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -286,12 +286,12 @@ test_util_time(void *arg) end.tv_usec = 0; tt_int_op(995000L,OP_EQ, tv_udiff(&start, &end)); - // tt_int_op(996L,OP_EQ, tv_mdiff(&start, &end)); // XXXX fails + tt_int_op(995L,OP_EQ, tv_mdiff(&start, &end)); end.tv_sec = 4; tt_int_op(-1005000L,OP_EQ, tv_udiff(&start, &end)); - // tt_int_op(-1005L,OP_EQ, tv_udiff(&start, &end)); // XXXX Fails + tt_int_op(-1005L,OP_EQ, tv_mdiff(&start, &end)); end.tv_sec = TIME_MAX; tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end));

1 0

[tor/master] Improve coverage on tv_udiff, and tv_mdiff.
by nickm＠torproject.org 16 Jun '16

16 Jun '16

commit f05a213fe1706ce3ba76e12dc8e6f36f74c92794 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 16 10:07:44 2016 -0400 Improve coverage on tv_udiff, and tv_mdiff. I found some bugs in tv_mdiff; separate commit for that --- src/test/test_util.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index c643fea..dd600d9 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -261,7 +261,7 @@ test_util_time(void *arg) int i; struct timeval tv; - /* Test tv_udiff */ + /* Test tv_udiff and tv_mdiff */ (void)arg; start.tv_sec = 5; @@ -271,22 +271,31 @@ test_util_time(void *arg) end.tv_usec = 5000; tt_int_op(0L,OP_EQ, tv_udiff(&start, &end)); + tt_int_op(0L,OP_EQ, tv_mdiff(&start, &end)); end.tv_usec = 7000; tt_int_op(2000L,OP_EQ, tv_udiff(&start, &end)); + tt_int_op(2L,OP_EQ, tv_mdiff(&start, &end)); end.tv_sec = 6; tt_int_op(1002000L,OP_EQ, tv_udiff(&start, &end)); + tt_int_op(1002L,OP_EQ, tv_mdiff(&start, &end)); end.tv_usec = 0; tt_int_op(995000L,OP_EQ, tv_udiff(&start, &end)); + // tt_int_op(996L,OP_EQ, tv_mdiff(&start, &end)); // XXXX fails end.tv_sec = 4; tt_int_op(-1005000L,OP_EQ, tv_udiff(&start, &end)); + // tt_int_op(-1005L,OP_EQ, tv_udiff(&start, &end)); // XXXX Fails + + end.tv_sec = TIME_MAX; + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&start, &end)); /* Test tor_timegm & tor_gmtime_r */

1 0

[tor/master] Improve coverage on esc_for_log, esc_for_log_len
by nickm＠torproject.org 16 Jun '16

16 Jun '16

commit 6dc2b605b878e590d7dc3478d71fd5a4ba0af118 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 16 09:58:53 2016 -0400 Improve coverage on esc_for_log, esc_for_log_len --- src/test/test_util.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index abb400c..c643fea 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1586,6 +1586,17 @@ test_util_strmisc(void *arg) tt_str_op("\"z\\001abc\\277d\"",OP_EQ, escaped("z\001abc\277d")); tt_str_op("\"z\\336\\255 ;foo\"",OP_EQ, escaped("z\xde\xad\x20;foo")); + /* Other cases of esc_for_log{,_len} */ + cp_tmp = esc_for_log(NULL); + tt_str_op(cp_tmp, OP_EQ, "(null)"); + tor_free(cp_tmp); + cp_tmp = esc_for_log_len("abcdefg", 3); + tt_str_op(cp_tmp, OP_EQ, "\"abc\""); + tor_free(cp_tmp); + cp_tmp = esc_for_log_len("abcdefg", 100); + tt_str_op(cp_tmp, OP_EQ, "\"abcdefg\""); + tor_free(cp_tmp); + /* Test strndup and memdup */ { const char *s = "abcdefghijklmnopqrstuvwxyz";

1 0

[tor/master] add LCOV_EXCL for unreachable exit() blocks in src/common
by nickm＠torproject.org 16 Jun '16

16 Jun '16

commit d1ab295d7b2c4c8bd3da5e1774bc352f8cfe72ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 16 09:50:52 2016 -0400 add LCOV_EXCL for unreachable exit() blocks in src/common --- src/common/aes.c | 2 ++ src/common/compat.c | 4 ++++ src/common/compat_libevent.c | 2 ++ src/common/util.c | 16 +++++++++++++++- 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/common/aes.c b/src/common/aes.c index db250c8..2b8a68c 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -238,9 +238,11 @@ evaluate_ctr_for_aes(void) if (fast_memneq(output, encrypt_zero, 16)) { /* Counter mode is buggy */ + /* LCOV_EXCL_START */ log_err(LD_CRYPTO, "This OpenSSL has a buggy version of counter mode; " "quitting tor."); exit(1); + /* LCOV_EXCL_STOP */ } return 0; } diff --git a/src/common/compat.c b/src/common/compat.c index 023325b..370881b 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2876,18 +2876,22 @@ tor_gettimeofday(struct timeval *timeval) /* number of 100-nsec units since Jan 1, 1601 */ GetSystemTimeAsFileTime(&ft.ft_ft); if (ft.ft_64 < EPOCH_BIAS) { + /* LCOV_EXCL_START */ log_err(LD_GENERAL,"System time is before 1970; failing."); exit(1); + /* LCOV_EXCL_STOP */ } ft.ft_64 -= EPOCH_BIAS; timeval->tv_sec = (unsigned) (ft.ft_64 / UNITS_PER_SEC); timeval->tv_usec = (unsigned) ((ft.ft_64 / UNITS_PER_USEC) % USEC_PER_SEC); #elif defined(HAVE_GETTIMEOFDAY) if (gettimeofday(timeval, NULL)) { + /* LCOV_EXCL_START */ log_err(LD_GENERAL,"gettimeofday failed."); /* If gettimeofday dies, we have either given a bad timezone (we didn't), or segfaulted.*/ exit(1); + /* LCOV_EXCL_STOP */ } #elif defined(HAVE_FTIME) struct timeb tb; diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 96fcec5..4469f15 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -228,8 +228,10 @@ tor_libevent_initialize(tor_libevent_cfg *torcfg) #endif if (!the_event_base) { + /* LCOV_EXCL_START */ log_err(LD_GENERAL, "Unable to initialize Libevent: cannot continue."); exit(1); + /* LCOV_EXCL_STOP */ } /* Making this a NOTICE for now so we can link bugs to a libevent versions diff --git a/src/common/util.c b/src/common/util.c index b773aa7..2a3aec5 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -155,11 +155,13 @@ tor_malloc_(size_t size DMALLOC_PARAMS) #endif if (PREDICT_UNLIKELY(result == NULL)) { + /* LCOV_EXCL_START */ log_err(LD_MM,"Out of memory on malloc(). Dying."); /* If these functions die within a worker process, they won't call * spawn_exit, but that's ok, since the parent will run out of memory soon * anyway. */ exit(1); + /* LCOV_EXCL_STOP */ } return result; } @@ -243,8 +245,10 @@ tor_realloc_(void *ptr, size_t size DMALLOC_PARAMS) #endif if (PREDICT_UNLIKELY(result == NULL)) { + /* LCOV_EXCL_START */ log_err(LD_MM,"Out of memory on realloc(). Dying."); exit(1); + /* LCOV_EXCL_STOP */ } return result; } @@ -279,8 +283,10 @@ tor_strdup_(const char *s DMALLOC_PARAMS) dup = strdup(s); #endif if (PREDICT_UNLIKELY(dup == NULL)) { + /* LCOV_EXCL_START */ log_err(LD_MM,"Out of memory on strdup(). Dying."); exit(1); + /* LCOV_EXCL_STOP */ } return dup; } @@ -3470,13 +3476,17 @@ start_daemon(void) start_daemon_called = 1; if (pipe(daemon_filedes)) { + /* LCOV_EXCL_START */ log_err(LD_GENERAL,"pipe failed; exiting. Error was %s", strerror(errno)); exit(1); + /* LCOV_EXCL_STOP */ } pid = fork(); if (pid < 0) { + /* LCOV_EXCL_START */ log_err(LD_GENERAL,"fork failed. Exiting."); exit(1); + /* LCOV_EXCL_STOP */ } if (pid) { /* Parent */ int ok; @@ -3538,8 +3548,10 @@ finish_daemon(const char *desired_cwd) nullfd = tor_open_cloexec("/dev/null", O_RDWR, 0); if (nullfd < 0) { + /* LCOV_EXCL_START */ log_err(LD_GENERAL,"/dev/null can't be opened. Exiting."); exit(1); + /* LCOV_EXCL_STOP */ } /* close fds linking to invoking terminal, but * close usual incoming fds, but redirect them somewhere @@ -3548,8 +3560,10 @@ finish_daemon(const char *desired_cwd) if (dup2(nullfd,0) < 0 || dup2(nullfd,1) < 0 || dup2(nullfd,2) < 0) { + /* LCOV_EXCL_START */ log_err(LD_GENERAL,"dup2 failed. Exiting."); exit(1); + /* LCOV_EXCL_STOP */ } if (nullfd > 2) close(nullfd); @@ -4324,7 +4338,7 @@ tor_spawn_background(const char *const filename, const char **argv, _exit(255); /* Never reached, but avoids compiler warning */ - return status; + return status; // LCOV_EXCL_LINE } /* In parent */

1 0

[tor/master] Mark src/common tor_assert(0)/tor_fragile_assert() unreached for coverage
by nickm＠torproject.org 16 Jun '16

16 Jun '16

commit 7b54d7ebbd963a0a40b6ff5109ea0e3eedde534d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 15 17:25:53 2016 -0400 Mark src/common tor_assert(0)/tor_fragile_assert() unreached for coverage I audited this to make sure I was only marking ones that really should be unreachable. --- src/common/address.c | 11 +++++++++-- src/common/aes.c | 2 +- src/common/compat.c | 5 ++++- src/common/log.c | 4 ++-- src/common/util.c | 2 ++ src/common/util_format.c | 2 +- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index 127e6a9..5cd7a8d 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -335,7 +335,7 @@ tor_addr_lookup(const char *name, uint16_t family, tor_addr_t *addr) } else if (ent->h_addrtype == AF_INET6) { tor_addr_from_in6(addr, (struct in6_addr*) ent->h_addr); } else { - tor_assert(0); /* gethostbyname() returned a bizarre addrtype */ + tor_assert(0); // LCOV_EXCL_LINE: gethostbyname() returned bizarre type } return 0; } @@ -906,8 +906,10 @@ tor_addr_is_loopback(const tor_addr_t *addr) case AF_UNSPEC: return 0; default: + /* LCOV_EXCL_START */ tor_fragile_assert(); return 0; + /* LCOV_EXCL_STOP */ } } @@ -1028,7 +1030,7 @@ tor_addr_copy_tight(tor_addr_t *dest, const tor_addr_t *src) case AF_UNSPEC: break; default: - tor_fragile_assert(); + tor_fragile_assert(); // LCOV_EXCL_LINE } } @@ -1097,6 +1099,7 @@ tor_addr_compare_masked(const tor_addr_t *addr1, const tor_addr_t *addr2, case AF_INET6: { if (mbits > 128) mbits = 128; + const uint8_t *a1 = tor_addr_to_in6_addr8(addr1); const uint8_t *a2 = tor_addr_to_in6_addr8(addr2); const int bytes = mbits >> 3; @@ -1112,8 +1115,10 @@ tor_addr_compare_masked(const tor_addr_t *addr1, const tor_addr_t *addr2, } } default: + /* LCOV_EXCL_START */ tor_fragile_assert(); return 0; + /* LCOV_EXCL_STOP */ } } else if (how == CMP_EXACT) { /* Unequal families and an exact comparison? Stop now! */ @@ -1166,8 +1171,10 @@ tor_addr_hash(const tor_addr_t *addr) case AF_INET6: return siphash24g(&addr->addr.in6_addr.s6_addr, 16); default: + /* LCOV_EXCL_START */ tor_fragile_assert(); return 0; + /* LCOV_EXCL_END */ } } diff --git a/src/common/aes.c b/src/common/aes.c index e9f78f4..db250c8 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -283,7 +283,7 @@ aes_set_key(aes_cnt_cipher_t *cipher, const char *key, int key_bits) case 128: c = EVP_aes_128_ecb(); break; case 192: c = EVP_aes_192_ecb(); break; case 256: c = EVP_aes_256_ecb(); break; - default: tor_assert(0); + default: tor_assert(0); // LCOV_EXCL_LINE } EVP_EncryptInit(&cipher->key.evp, c, (const unsigned char*)key, NULL); cipher->using_evp = 1; diff --git a/src/common/compat.c b/src/common/compat.c index 9d49b8f..023325b 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -526,8 +526,10 @@ tor_asprintf(char **strp, const char *fmt, ...) r = tor_vasprintf(strp, fmt, args); va_end(args); if (!*strp || r < 0) { + /* LCOV_EXCL_START */ log_err(LD_BUG, "Internal error in asprintf"); tor_assert(0); + /* LCOV_EXCL_STOP */ } return r; } @@ -2976,11 +2978,12 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, /* If we get here, then gmtime/localtime failed without getting an extreme * value for *timep */ - + /* LCOV_EXCL_START */ tor_fragile_assert(); r = resultbuf; memset(resultbuf, 0, sizeof(struct tm)); outcome="can't recover"; + /* LCOV_EXCL_STOP */ done: log_warn(LD_BUG, "%s("I64_FORMAT") failed with error %s: %s", islocal?"localtime":"gmtime", diff --git a/src/common/log.c b/src/common/log.c index e948ccf..51309aa 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -75,7 +75,7 @@ sev_to_string(int severity) case LOG_ERR: return "err"; default: /* Call assert, not tor_assert, since tor_assert * calls log on failure. */ - assert(0); return "UNKNOWN"; + assert(0); return "UNKNOWN"; // LCOV_EXCL_LINE } } @@ -95,7 +95,7 @@ should_log_function_name(log_domain_mask_t domain, int severity) return (domain & (LD_BUG|LD_NOFUNCNAME)) == LD_BUG; default: /* Call assert, not tor_assert, since tor_assert calls log on failure. */ - assert(0); return 0; + assert(0); return 0; // LCOV_EXCL_LINE } } diff --git a/src/common/util.c b/src/common/util.c index 1546fd1..b773aa7 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2790,9 +2790,11 @@ unescape_string(const char *s, char **result, size_t *size_out) if (size_out) *size_out = out - *result; return cp+1; case '\0': + /* LCOV_EXCL_START */ tor_fragile_assert(); tor_free(*result); return NULL; + /* LCOV_EXCL_STOP */ case '\\': switch (cp[1]) { diff --git a/src/common/util_format.c b/src/common/util_format.c index 8aae9e8..2dea187 100644 --- a/src/common/util_format.c +++ b/src/common/util_format.c @@ -249,7 +249,7 @@ base64_encode(char *dest, size_t destlen, const char *src, size_t srclen, break; default: /* Something went catastrophically wrong. */ - tor_fragile_assert(); + tor_fragile_assert(); // LCOV_EXCL_LINE return -1; }

1 0