David Goulet
f50de3a918
hs-v3: Do not remove intro point if circuit exists
...
When considering introduction point of a service's descriptor, do not remove
an intro point that has an established or pending circuit.
Fixes #31652
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-08 17:02:47 -04:00
George Kadianakis
081bd37315
Fix flapping of test_service_intro_point() unittest.
2019-10-08 19:00:43 +03:00
Nick Mathewson
7a26f14a37
Merge remote-tracking branch 'tor-github/pr/1317'
2019-10-07 10:23:44 -04:00
Nick Mathewson
fdfb4b196b
Use {mock,unmock}_hostname_resolver() in relevant tests
...
These tests all invoke the hostname resolver in one way or another,
and therefore potentially block if our DNS server is missing,
absent, or extremely slow. Closes ticket 31841.
2019-10-04 08:03:19 -04:00
Nick Mathewson
4a0749596c
Add a mock replacement for blocking hostname resolution
...
Based on examination of our tests, this mock function accepts
"localhost" and "torproject.org", and rejects everything else.
2019-10-04 08:03:19 -04:00
teor
e5b8bd38ab
Merge remote-tracking branch 'tor-github/pr/1392'
2019-10-04 11:26:43 +10:00
David Goulet
52b7ae71b3
hs: ADD_ONION NEW:BEST now defaults to ED25519-V3
...
From RSA1024 (v2) to v3 now.
Closes #29669
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-03 15:43:03 -04:00
George Kadianakis
9309eaf8ea
Merge branch 'tor-github/pr/1377'
2019-10-03 19:13:57 +03:00
George Kadianakis
3778b97cab
Merge branch 'tor-github/pr/1276'
2019-10-03 19:13:02 +03:00
Nick Mathewson
49d6990cae
Unit tests for dirserv_reject_tor_version().
2019-10-03 19:12:52 +03:00
Nick Mathewson
b2802ae3c3
util/map_anon_nofork: Add a cast to avoid passing -48 to memset
...
This fixes coverity CID 1454593, and bug 31948. Bug not in any
released version of Tor.
2019-10-03 07:21:25 -04:00
Nick Mathewson
bca30bcb90
Merge remote-tracking branch 'tor-github/pr/1374'
2019-10-02 19:19:11 -04:00
David Goulet
ca1f18c159
Merge branch 'tor-github/pr/1385'
2019-10-02 14:15:31 -04:00
Nick Mathewson
34bbdaf5d4
Add a test for max_u16_in_sl().
...
This test does not currently pass, because of bug 31898.
2019-10-01 13:01:20 -04:00
Nick Mathewson
53116ca0b7
Re-run "make autostyle" with improved annotate_ifdef_directives
2019-09-30 08:57:37 -04:00
teor
db329522ef
log: When initialising log domain masks, only set known log domains
...
And add a runtime test that checks for unknown domains and flags.
Fixes bug 31854; bugfix on 0.2.1.1-alpha.
2019-09-30 22:05:00 +10:00
George Kadianakis
fc760c5088
Merge branch 'tor-github/pr/1356'
2019-09-30 13:47:06 +03:00
teor
2420c8c936
test: Avoid a map_anon_nofork test failure on SunOS
...
This test failure happened due to a signed/unsigned integer
comparison.
This bug occurred on SunOS, it may also occur on other systems that
use signed char as the default. (And cast 1-byte integer constants
to an unsigned integer.)
Fixes bug 31897; bugfix on 0.4.1.1-alpha.
2019-09-30 14:54:56 +10:00
Nick Mathewson
ffd857bbe1
Merge remote-tracking branch 'tor-github/pr/1308'
2019-09-26 14:36:37 -04:00
Nick Mathewson
40a22fb707
Merge remote-tracking branch 'tor-github/pr/1349'
2019-09-25 13:07:19 -04:00
George Kadianakis
2199629648
Merge branch 'tor-github/pr/1345'
2019-09-25 14:14:30 +03:00
George Kadianakis
99f75373de
Merge branch 'tor-github/pr/1309'
2019-09-25 14:12:42 +03:00
teor
d30a042fa8
test: Use SEVERITY_MASK_IDX() to find the LOG_* mask indexes
...
In the unit tests and fuzzers.
Fixes bug 31334; bugfix on 0.2.5.2-alpha.
2019-09-25 16:40:09 +10:00
teor
83fa962c1a
test: a file with no config options, at the end of an %include directory
...
(The file must contain whitespace or comments to trigger the bug.)
Regression test for 31408.
2019-09-24 11:10:50 +10:00
teor
876b3e2775
Merge branch 'bug31408_035' into bug31408_master
2019-09-24 11:07:38 +10:00
AmreshVenugopal
3e45260594
fix: Ticket #31589
...
- The function `decrypt_desc_layer` has a cleaner interface.
- `is_superencrypted_layer` changed from `int` -> `bool`
[ticket details](https://trac.torproject.org/projects/tor/ticket/31589 )
add(changes/*): changes file
fix(src/features/hs): is_superencrypted changed from `int` -> `bool`
fix(changes/ticket31589): header
add(changes/ticket31589): subsystem(onion services) to change
2019-09-23 23:52:01 +05:30
Daniel Pinto
15490816da
Fix bug when %including folder with comment only files. #31408
...
When processing a %included folder, a bug caused the pointer to
the last element of the options list to be set to NULL when
processing a file with only comments or whitepace. This could
cause options from other files on the same folder to be
discarded depending on the lines after the affected %include.
2019-09-23 10:39:08 +10:00
teor
69a1f9c8a7
test: test dirserv_router_has_valid_address() with DirAllowPrivateAddresses
...
Part of 31793.
2019-09-19 16:19:19 +10:00
teor
c2ceede376
test: refactor dirserv_router_has_valid_address() tests
...
Cleanup after 31793.
2019-09-19 16:19:16 +10:00
teor
46fea1dfee
test: dirserv_router_has_valid_address() with zero-family addresses
...
Sometimes tor doesn't initialise an address, so its family is zero.
Failing test for 31793. Future commits will fix the code.
2019-09-19 16:19:04 +10:00
Nick Mathewson
5f00c03ed0
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-09-17 21:28:38 -04:00
Nick Mathewson
9e674d0eb4
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-09-17 21:28:37 -04:00
Nick Mathewson
68a0106bf3
Run "make autostyle" and fix wide lines.
2019-09-16 13:27:42 -04:00
Nick Mathewson
8ad419744f
On windows, allow failures in test_parseconf.sh
...
There seems to be some unreliability issue with this test on
appveyor.
Addresses ticket 31757; This isn't a final fix for this issue, but
it should make CI pass.
2019-09-16 11:01:03 -04:00
Nick Mathewson
a1694b7363
Fix a shellcheck warning in test_parseconf.sh.
...
I wonder why this didn't show up before.
2019-09-16 09:22:43 -04:00
George Kadianakis
cd72850e08
Merge branch 'tor-github/pr/1316'
2019-09-16 15:22:18 +03:00
George Kadianakis
5ec751b38b
Merge branch 'tor-github/pr/1324'
2019-09-16 15:21:28 +03:00
Nick Mathewson
11cf4d9c3a
test_parseconf.sh: On --dump-config failure, --verify-config
2019-09-14 19:00:41 -04:00
Nick Mathewson
7e9ee3a58d
Add a test with many non-default options.
2019-09-14 19:00:41 -04:00
Nick Mathewson
617679df42
Add a few error test cases
2019-09-14 19:00:41 -04:00
Nick Mathewson
80e858e3e6
Add an integration test for %include.
2019-09-14 19:00:41 -04:00
Nick Mathewson
28025698a1
test_parseconf: run each test from inside its directory.
...
We need this to test includes and relative paths.
2019-09-14 19:00:41 -04:00
Nick Mathewson
850a00dc07
Add test for +Option, /Option, and Option
...
Here we use these directives to replace, extend, or clear values in
torrc.defaults and in torrc.
2019-09-14 19:00:41 -04:00
Nick Mathewson
2f7be9620b
Move our first 3 example conf_examples to named directories
...
I'm not planning to use "example" as the name for all of them, but
these first three _are_ simple examples.
2019-09-14 19:00:41 -04:00
Nick Mathewson
7c7e8402b5
Add a test script to try parsing and encoding Tor configurations
...
This script takes a set of example torrcs and command-lines from
src/test/conf_examples. If a success is expected, it runs "tor
--dump-config" and compares the result with the one we expect. If a
failure is expected, it runs "tor --verify-config" and greps for the
error we expect.
2019-09-14 19:00:41 -04:00
Nick Mathewson
bfc5f09979
Detect overflow or underflow on double config values.
...
Any floating point value too positive or negative to distinguish
from +/-Inf, or too small to distinguish from +/-0, is an
over/underflow.
2019-09-13 18:26:16 -04:00
David Goulet
286b129b09
Merge branch 'tor-github/pr/1319'
2019-09-12 13:53:59 -04:00
George Kadianakis
3aaa4d416b
Merge branch 'tor-github/pr/1299'
2019-09-12 18:08:00 +03:00
Nick Mathewson
c3b1a25d46
Workaround for GCC "note" about "variable tracking size limit"
...
GCC complains that we are using too many variables here, probably
because of the sheer number of locals used for our tinytest macros.
Eventually we should fix that (see 30968), but this commit just
makes the "note" go away by splitting the test function into two.
2019-09-12 18:07:47 +03:00
Nick Mathewson
261ec900db
Remove variable declarations from macros in test_addr_parse()
...
Instead, put them in the function itself.
This is an attempt to fix the gcc warning about the "variable
tracking size limit exceeded".
2019-09-12 18:07:47 +03:00