mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-28 08:54:24 +01:00
Code Issues Projects Releases Wiki Activity
35158 commits 53 branches 632 tags 102 MiB
Commit graph

4680 commits

Author SHA1 Message Date
teor
ced434c586 test/parseconf: Update conf_examples to use expected_log 
Part of 32451.
 2019-11-14 12:57:34 +10:00
teor
c7838c71fb test/parseconf: Add failure cases in conf_failures/ 
These failure cases can be used to test the failure behaviour
and failure logs of test_parseconf.sh.

See the README for details.

Part of 32451.
 2019-11-14 11:57:50 +10:00
teor
51a6c0c8fd test/parseconf: Stop adding newlines to *_printf 
Cleanup after 32451.
 2019-11-14 11:57:50 +10:00
teor
2c4ada729e test/parseconf: Show tor command lines on failure 
Part of 32451.
 2019-11-14 11:57:50 +10:00
teor
a5628cf5b3 test/parseconf: Refactor and simplify, stage 2 
Remove more duplicate code.
Eliminate some arguments.
Rewrite some comments.

Cleanup after 32451.
 2019-11-14 10:55:21 +10:00
teor
39046019ec test/parseconf: Refactor and standardise, stage 1 
Remove duplicate code, and standardise similar behaviour.
Add some additional error checking.

Cleanup after 32451.
 2019-11-14 10:55:21 +10:00
teor
b4b3060f69 test/parseconf: Rename some functions, and reformat 
Part of 32451.
 2019-11-14 10:55:21 +10:00
teor
e6ca32fae3 test/parseconf: Use consistent formatting 
Make spacing, quotes, and env vars consistent.

Cleanup after 32451 and 32468.
 2019-11-14 10:55:21 +10:00
teor
4514bfe9c2 test/parseconf: Stop ignoring --dump-config failures 
When we added the $FILTER for Windows newlines, we made
the pipeline always exit successfully, even if tor failed.

Fixes bug 32468; bugfix on 0.4.2.1-alpha.
 2019-11-14 10:55:21 +10:00
teor
7ef44100c4 test/parseconf: Standardise output messages 
Part of 32451.
 2019-11-14 10:55:21 +10:00
teor
3df6432006 test/parseconf: Add an expected_log file 
The "expected_log" file is a set of patterns that matches the
output of "tor --verify-config". Unlike "error", it expects a
successful exit status.

Part of 32451.
 2019-11-14 10:55:21 +10:00
teor
4cf5d4cb3c test/parseconf: Rewrite the included files section 
Part of 32451.
 2019-11-14 10:55:21 +10:00
teor
735d5f5b7e test/parseconf: Split the file list into sections 
There are lots of different files now, so having Config and Result
sections is helpful.

Part of 32451.
 2019-11-14 10:55:21 +10:00
JeremyRand
f487da518a
Bug 19859: Fix double-free in unit test 2019-11-12 17:13:04 +00:00
teor
233ccef6d8
Merge branch 'maint-0.4.2' 2019-11-12 10:10:01 +10:00
teor
9be51e8a8e
test/parseconf: Add tests for ignored options 
These tests will also pass on 0.4.3, with the original implementation,
and with the new implementation in 32404.

Part of 32295 and 32404.
 2019-11-12 10:09:40 +10:00
Nick Mathewson
7c3378fb8d Merge remote-tracking branch 'tor-github/pr/1338' 2019-11-11 12:20:14 -05:00
liberat
4ae77e15d0 Test case for SOCKS5 RESOLVE_PTR with IPv6 address in brackets. 
This was not supported previously, but provides symmetry with other
SOCKS requests, which also support addresses written in brackets.
 2019-11-11 15:41:56 +00:00
liberat
b7c7474130 Test case for SOCKS5 RESOLVE_PTR with binary IPv6 address. 
This tests the handling of binary v6 addresses, which works correctly
in older versions but was broken in 0.3.5.1-alpha.
 2019-11-11 15:35:21 +00:00
teor
2d651f4f6a test/parseconf: Add basic parsing tests 
And document the "%include" behaviour.

Closes 32450.
 2019-11-11 13:04:28 +10:00
Nick Mathewson
31a6a6512f Rename probability distribution names to end with "_t". 
I needed to do this by hand, since we also use these for function
names, variable names, macro expansion, and a little token pasting.
 2019-11-07 08:56:07 -05:00
Nick Mathewson
4845ab53f0 Make all our struct names end with "_t". 
This is an automated commit, generated by this command:

./scripts/maint/rename_c_identifier.py \
        address_ttl_s address_ttl_t \
        aes_cnt_cipher aes_cnt_cipher_t \
        authchallenge_data_s authchallenge_data_t \
        authenticate_data_s authenticate_data_t \
        cached_bw_event_s cached_bw_event_t \
        cbuf cbuf_t \
        cell_ewma_s cell_ewma_t \
        certs_data_s certs_data_t \
        channel_idmap_entry_s channel_idmap_entry_t \
        channel_listener_s channel_listener_t \
        channel_s channel_t \
        channel_tls_s channel_tls_t \
        circuit_build_times_s circuit_build_times_t \
        circuit_muxinfo_s circuit_muxinfo_t \
        circuitmux_policy_circ_data_s circuitmux_policy_circ_data_t \
        circuitmux_policy_data_s circuitmux_policy_data_t \
        circuitmux_policy_s circuitmux_policy_t \
        circuitmux_s circuitmux_t \
        coord coord_t \
        cpuworker_job_u cpuworker_job_u_t \
        cv_testinfo_s cv_testinfo_t \
        ddmap_entry_s ddmap_entry_t \
        dircollator_s dircollator_t \
        dist_ops dist_ops_t \
        ecdh_work_s ecdh_work_t \
        ewma_policy_circ_data_s ewma_policy_circ_data_t \
        ewma_policy_data_s ewma_policy_data_t \
        fp_pair_map_entry_s fp_pair_map_entry_t \
        fp_pair_map_s fp_pair_map_t \
        guard_selection_s guard_selection_t \
        mbw_cache_entry_s mbw_cache_entry_t \
        outbuf_table_ent_s outbuf_table_ent_t \
        queued_event_s queued_event_t \
        replyqueue_s replyqueue_t \
        rsa_work_s rsa_work_t \
        sandbox_cfg_elem sandbox_cfg_elem_t \
        scheduler_s scheduler_t \
        smp_param smp_param_t \
        socket_table_ent_s socket_table_ent_t \
        state_s state_t \
        threadpool_s threadpool_t \
        timeout_cb timeout_cb_t \
        tor_libevent_cfg tor_libevent_cfg_t \
        tor_threadlocal_s tor_threadlocal_t \
        url_table_ent_s url_table_ent_t \
        worker_state_s worker_state_t \
        workerthread_s workerthread_t \
        workqueue_entry_s workqueue_entry_t
 2019-11-07 08:41:22 -05:00
Nick Mathewson
de7053b896 Adjustments to 32406 per review 
When we are failing because of a lack of a _required_ engine, note
that the engine was "required".

When engines are disabled, any required engine should cause a
failure.
 2019-11-07 07:42:58 -05:00
Nick Mathewson
c550990400 Add a test for 32406 (AccelName with "!"). 
This also lets us test a failing set_options().
 2019-11-07 07:28:43 -05:00
Nick Mathewson
27a4438805 conf_examples test for crypto_accel 2019-11-07 07:28:43 -05:00
Nick Mathewson
280a9a4760 Move netstatus (mainloop) state fields into mainloop's state. 2019-11-07 07:28:43 -05:00
Nick Mathewson
0f0a9bdf33 Stop using "config_suite_offset=-1" to indicate "no config suite." 
Instead, create a separate "has_config_suite" boolean, so that only
top-level formats with config_suites need to declare an offset at
all.
 2019-11-07 07:28:43 -05:00
Nick Mathewson
0d8504e70b crypto config: do not change the user's value of HardwareAccel. 
We still interpret "AccelName" as turning on the "HardwareAccel"
feature, but we no longer modify the user's options here.

Fixes bug 32382; bugfix on 0.2.2.1-alpha when we added openssl
engine support.
 2019-11-07 07:28:43 -05:00
Nick Mathewson
8cd3e66d93 Use new configuration architecture for crypto options 
This is a comparatively simple change.
 2019-11-07 07:28:43 -05:00
teor
a0820bc00d test/parseconf: Update config parsing tests for 32410 2019-11-07 11:44:51 +10:00
teor
57f43bcb03 Run "make autostyle" 2019-11-07 10:56:17 +10:00
David Goulet
49cb7d6ec4 Merge branch 'tor-github/pr/1491' 2019-11-06 10:23:33 -05:00
David Goulet
1407e2b169 test: Fix DoS heartbeat unit test after adding INTRO2 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2019-11-06 08:09:35 -05:00
teor
22482fd454
test/parseconf: Add support for optional library variants 
test_parseconf.sh now supports:
* {error,expected}{,_lzma,_nss,_zstd}{,_no_dirauth,_no_relay_dirauth}
Or any combination of two or more optional libraries.

Closes ticket 32397.
 2019-11-06 21:36:42 +10:00
teor
e6b5a1ff93
shellcheck: Fix minor issues in some scripts 
Fix minor issues in git-push-all.sh, git-setup-dirs.sh and
test_parseconf.sh.

Fixes bug 32402; not in any released version of tor.
Obviously correct changes to already reviewed code.
 2019-11-06 16:21:01 +10:00
teor
de6ceb0bee
Merge branch 'maint-0.4.0' into maint-0.4.1 2019-11-06 11:19:46 +10:00
teor
03e77ef036
Merge branch 'maint-0.3.5' into maint-0.4.0 2019-11-06 11:19:38 +10:00
teor
4f9a003392
Merge remote-tracking branch 'tor-github/pr/1374' into maint-0.4.1 2019-11-06 11:19:13 +10:00
teor
4abfcb7997
Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.3.5 2019-11-06 11:18:09 +10:00
David Goulet
cd7812b470 test: Handle NULL circuit pointer in new_fake_orcirc 
Coverity CID: 1455207

Closes #32376

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2019-11-05 08:05:22 -05:00
teor
6169469546
Merge remote-tracking branch 'tor-github/pr/1477' 2019-11-05 14:23:10 +10:00
teor
8b91fa7075 config: Run "make autostyle" 
Part of 32213.
 2019-11-05 12:01:29 +10:00
teor
cb8ebc0b4c config: Rename new global functions with a prefix 
This is an automated commit, generated by this command:

./scripts/maint/rename_c_identifier.py \
        get_dirportfrontpage relay_get_dirportfrontpage \
        parse_port_config port_parse_config \
        count_real_listeners port_count_real_listeners \
        parse_transport_line pt_parse_transport_line \
        ensure_bandwidth_cap config_ensure_bandwidth_cap \
        get_effective_bwrate relay_get_effective_bwrate \
        get_effective_bwburst relay_get_effective_bwburst \
        warn_nonlocal_ext_orports port_warn_nonlocal_ext_orports \
        parse_ports_relay port_parse_ports_relay \
        update_port_set_relay port_update_port_set_relay \
        get_transport_bindaddr_from_config pt_get_bindaddr_from_config \
        get_options_for_server_transport pt_get_options_for_server_transport

It was generated with --no-verify, because it has some long lines.

Part of 32213.
 2019-11-05 11:28:57 +10:00
teor
7504711510 test/parseconf: Add conf_examples for relays 
Tests relay/relay_config.c.

Part of 32213.
 2019-11-05 11:12:59 +10:00
teor
6d52b5ce91 test/parseconf: Add conf_examples for PTs 
Tests relay/transport_config.c.

Part of 32213.
 2019-11-05 11:12:59 +10:00
teor
233b96d83a test/parseconf: Always show the result file name on failure 
Obviously correct fixes on already reviewed code.
 2019-11-05 11:12:50 +10:00
teor
3763dd9987 test/parseconf: Run all the tests, even if one fails 
Obviously correct fixes on already reviewed code.
 2019-11-05 11:08:36 +10:00
teor
1dd6717db5 test/parseconf: Consistenly use FAIL 
Obviously correct fixes on already reviewed code.
 2019-11-05 11:08:36 +10:00
teor
03618e0d68 test/parseconf: Don't specify a path for 'true' 
Obviously correct fixes on already reviewed code.
 2019-11-05 11:08:36 +10:00
teor
98637a4782 test/parseconf: Send all errors to stderr 
Obviously correct fixes on already reviewed code.
 2019-11-05 11:08:36 +10:00