From 9e5512b48d072e3fd21f1f1884f706c5330e0935 Mon Sep 17 00:00:00 2001 From: Neel Chauhan Date: Thu, 12 Jan 2017 09:35:27 -0500 Subject: Disallow setting UseBridges to 1 and UseEntryGuards to 0 --- src/or/config.c | 5 +++++ src/test/test_options.c | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/or/config.c b/src/or/config.c index b8ca14e85b..c4e9ca2403 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3372,6 +3372,11 @@ options_validate(or_options_t *old_options, or_options_t *options, if (options->UseBridges && options->EntryNodes) REJECT("You cannot set both UseBridges and EntryNodes."); + /* If we have UseBridges as 1 and UseEntryGuards as 0, we end up bypassing + * the use of bridges */ + if (options->UseBridges && !options->UseEntryGuards) + REJECT("Setting UseBridges requires also setting UseEntryGuards."); + options->MaxMemInQueues = compute_real_max_mem_in_queues(options->MaxMemInQueues_raw, server_mode(options)); diff --git a/src/test/test_options.c b/src/test/test_options.c index ce5e1ed62c..41c015bdd4 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -333,7 +333,8 @@ fixed_get_uname(void) "VirtualAddrNetworkIPv4 127.192.0.0/10\n" \ "VirtualAddrNetworkIPv6 [FE80::]/10\n" \ "SchedulerHighWaterMark__ 42\n" \ - "SchedulerLowWaterMark__ 10\n" + "SchedulerLowWaterMark__ 10\n" \ + "UseEntryGuards 1\n" typedef struct { or_options_t *old_opt; @@ -1934,6 +1935,19 @@ test_options_validate__use_bridges(void *ignored) "If you set UseBridges, you must specify at least one bridge."); tor_free(msg); + free_options_test_data(tdata); + tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES + "UseBridges 1\n" + "Bridge 10.0.0.1\n" + "UseEntryGuards 0\n" + ); + + ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); + tt_int_op(ret, OP_EQ, -1); + tt_str_op(msg, OP_EQ, + "Setting UseBridges requires also setting UseEntryGuards."); + tor_free(msg); + free_options_test_data(tdata); tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES "UseBridges 1\n" -- cgit v1.2.3-54-g00ecf