diff options
author | Alexander Færøy <ahf@torproject.org> | 2020-01-15 23:24:18 +0000 |
---|---|---|
committer | Alexander Færøy <ahf@torproject.org> | 2020-01-15 23:41:58 +0000 |
commit | ca9a5390ff56cb809b2afa2645863ebd7b12262d (patch) | |
tree | 8e034b0c61e97e1979e5bce11ed45418c362086a /src/test/test_config.c | |
parent | 399ec3130be818825e01b5ab0c8a8aac1845b29c (diff) | |
download | tor-ca9a5390ff56cb809b2afa2645863ebd7b12262d.tar.gz tor-ca9a5390ff56cb809b2afa2645863ebd7b12262d.zip |
Don't escape the bridge distribution value.
We already check if there are invalid values in
check_bridge_distribution_setting() and reject the value if that is the
case. We can therefore only have strings of [A-Z] | [a-z] | [0-9] | '-'
| '_' here which is according to the directory specification.
See: https://bugs.torproject.org/32753
Diffstat (limited to 'src/test/test_config.c')
-rw-r--r-- | src/test/test_config.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/test/test_config.c b/src/test/test_config.c index 1d152ca971..bb24e9a354 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -5711,11 +5711,27 @@ test_config_check_bridge_distribution_setting_not_a_bridge(void *arg) static void test_config_check_bridge_distribution_setting_valid(void *arg) { - int ret = check_bridge_distribution_setting("https"); - (void)arg; - tt_int_op(ret, OP_EQ, 0); + // Check all the possible values we support right now. + tt_int_op(check_bridge_distribution_setting("none"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("any"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("https"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("email"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("moat"), OP_EQ, 0); + + // Check all the possible values we support right now with weird casing. + tt_int_op(check_bridge_distribution_setting("NoNe"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("anY"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("hTTps"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("emAIl"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("moAt"), OP_EQ, 0); + + // Invalid values. + tt_int_op(check_bridge_distribution_setting("x\rx"), OP_EQ, -1); + tt_int_op(check_bridge_distribution_setting("x\nx"), OP_EQ, -1); + tt_int_op(check_bridge_distribution_setting("\t\t\t"), OP_EQ, -1); + done: return; } |