Nick Mathewson
cf92c096ad
Merge remote-tracking branch 'tor-github/pr/1120'
2019-07-02 13:33:37 -04:00
Nick Mathewson
089ef46063
Merge branch 'bug30721_squashed'
2019-06-26 09:57:20 -04:00
teor
6ef555bda0
test/addr: test that tor_addr_port_lookup() handles IP addresses and ports
...
And that it does something sensible with host and host:port.
Also reorder the tests into valid, invalid, and ambiguous.
And add some missing cases.
Note: tor_addr_port_lookup() handles ip, ip:port, host, and host:port.
Tests for 30721.
2019-06-26 09:55:37 -04:00
teor
6079dfd103
test/addr: test that tor_addr_lookup() handles IP addresses
...
And that it fails on IP:port and host:port, and does something sensible with
host.
Tests for 30721.
2019-06-26 09:55:37 -04:00
teor
1c92d7f388
test/addr: test that tor_lookup_hostname() handles IPv4 addresses
...
And that it fails on IPv6 and host:port, and does something sensible with
host.
Tests for 30721.
2019-06-26 09:55:37 -04:00
teor
60ce431c54
test/addr: Add some ambiguous IPv6 cases to test_addr_parse()
...
Test some strings which could be parsed as IPv6 addresses,
or as IPv6:port strings.
Additional tests for 30721.
2019-06-26 09:55:37 -04:00
teor
2dbde3617f
test/addr: Increase coverage in test_addr_parse()
...
Do as many tests as possible for each input string.
Then remove some redundant test cases.
Cleanup after 30721.
2019-06-26 09:55:37 -04:00
teor
5a3770dc6c
test/addr: Stop repeating so much code in test_addr_parse()
...
Cleanup after 30721.
2019-06-26 09:55:37 -04:00
teor
1d3d6bf6b1
test/addr: Add unit tests for the fixes in 30721
2019-06-26 09:55:37 -04:00
Nick Mathewson
0fe9657c8c
Merge remote-tracking branch 'tor-github/pr/1119'
2019-06-26 09:50:00 -04:00
George Kadianakis
72ef4f43d5
Merge branch 'tor-github/pr/1142'
2019-06-26 10:57:24 +03:00
Taylor Yu
5faf54970d
Fix some onion helpers
...
Fix add_onion_helper_clientauth() and add_onion_helper_keyarg() to
explicitly call the appropriate control reply abstractions instead of
allocating a string to pass to their callers.
Part of ticket 30889.
2019-06-25 11:42:34 -05:00
rl1987
a52e00b5b3
Fix shellcheck warning SC2034 in test_rebind.sh.
...
Bugfix on be0a4be276
(not in any Tor release).
2019-06-23 14:00:43 +03:00
David Goulet
8751176687
hs-v3: Close intro circuits when cleaning client cache
...
Fixes #30921
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-19 09:22:07 -04:00
David Goulet
e6579d801f
Merge branch 'tor-github/pr/1113'
2019-06-19 07:47:03 -04:00
David Goulet
16a0b7ed67
guard: Ignore marked for close circuit when changing state to open
...
When we consider all circuits in "waiting for guard" state to be promoted to
an "open" state, we were considering all circuits, even the one marked for
close.
This ultiamtely triggers a "circuit_has_opened()" called on the circuit that
is marked for close which then leads to possible undesirable behaviors within
a subsystem.
For instance, the HS subsystem would be unable to find the authentication key
of the introduction point circuit leading to a BUG() warning and a duplicate
mark for close on the circuit.
This commit also adds a unit test to make sure we never select marked for
close circuits when upgrading its guard state from waiting for guard to open.
Fixes #30871
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-19 07:42:30 -04:00
Nick Mathewson
26436fb1b6
Add more unit tests for confparse.c, so we can refactor.
...
This set of tests gets the line coverage to 100%.
2019-06-15 16:49:18 -04:00
George Kadianakis
319ce22581
Merge branch 'bug30806'
2019-06-14 13:28:32 +03:00
Nick Mathewson
990b434c4f
Make evloop into a subsystem.
...
Note that the event base object is _not_ created from the initialize
function, since it is configuration-dependent. This will wait until
configuration is integrated into subsystems.
Closes ticket 30806.
2019-06-14 13:28:10 +03:00
George Kadianakis
96fade0a7d
Merge branch 'tor-github/pr/1088'
2019-06-12 13:01:53 +03:00
David Goulet
f7e8b3b68c
Merge branch 'tor-github/pr/1040'
2019-06-11 11:59:39 -04:00
Taylor Yu
0bce0c339d
Rework origin circuit tracking to use pubsub
...
Part of ticket 29976.
2019-06-11 11:59:30 -04:00
Taylor Yu
a8c0f4ddfe
Rework orconn tracking to use pubsub
...
Part of ticket 29976.
2019-06-11 11:59:30 -04:00
David Goulet
8e112cecd8
Merge branch 'tor-github/pr/1031'
2019-06-11 11:46:38 -04:00
George Kadianakis
646f7a9a94
Merge branch 'ticket30687_042_01'
2019-06-11 14:02:33 +03:00
David Goulet
7cf9d54e6d
token-bucket: Implement a single counter object
...
Closes #30687 .
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-11 14:02:22 +03:00
George Kadianakis
eab9dc06af
Merge branch 'tor-github/pr/1065' into maint-0.4.1
2019-06-11 13:48:10 +03:00
Nick Mathewson
6a72cc2598
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-06-10 18:33:26 -04:00
teor
b9041e8a63
test: fix a typo in test_rebind.sh
...
Closes 30821.
2019-06-10 20:56:40 +10:00
teor
430dd2da6e
Merge branch 'bug30713_035' into bug30713_040
2019-06-10 20:50:53 +10:00
teor
be0a4be276
Travis: Skip test_rebind on macOS builds
...
Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental variable
is set.
Skip test_rebind on macOS in Travis builds, because it is unreliable
on macOS on Travis.
Fixes bug 30713; bugfix on 0.3.5.1-alpha.
2019-06-10 20:49:59 +10:00
Nick Mathewson
c46e99c43c
Tolerate net-unreachable failures in util/socketpair_ersatz
...
This can happen when we have no network stack configured. Fixes bug
30804; bugfix on 0.2.5.1-alpha.
2019-06-07 13:52:03 -04:00
Nick Mathewson
2300a619a5
Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.4.0
2019-06-05 16:13:53 -04:00
Mike Perry
a42131bf48
Revert "test: Add test_hs_circ.c for HS circuit testing"
...
This reverts commit 41b94722e5
.
2019-06-05 11:37:32 -07:00
Nick Mathewson
60213a3621
Run "make autostyle."
2019-06-05 09:33:35 -04:00
Nick Mathewson
b39a8d315d
Merge remote-tracking branch 'tor-github/pr/1053'
2019-06-05 09:04:09 -04:00
David Goulet
41b94722e5
test: Add test_hs_circ.c for HS circuit testing
...
For now, only tests HS circuit repurpose function.
Part of #29034
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-05-31 10:43:01 -04:00
Nick Mathewson
3c3158f182
Fix some tests for CL_PORT_NO_STREAM_OPTIONS
...
The comment in the tests was correct: this option _was_ inverted wrt
SessionGroup=.
2019-05-31 09:03:20 -04:00
George Kadianakis
d8bd98b2fd
Merge branch 'tor-github/pr/1032'
2019-05-29 21:28:04 +03:00
George Kadianakis
650bdca97f
Merge branch 'maint-0.4.0'
2019-05-29 21:20:02 +03:00
George Kadianakis
00108b75d4
Merge branch 'tor-github/pr/924' into maint-0.4.0
2019-05-29 21:19:56 +03:00
David Goulet
ff9aa32143
Merge branch 'tor-github/pr/1047'
2019-05-28 14:59:07 -04:00
George Kadianakis
130eb227ac
Merge branch 'tor-github/pr/1043'
2019-05-27 14:20:51 +03:00
Nick Mathewson
fcd51fd49f
Tests for deciding how full our relay cells should be
2019-05-27 14:20:36 +03:00
Nick Mathewson
07ccffa989
Coverage: do not include test-rebind in coverage builds.
...
Because it invokes the Tor mainloop, it does unpredictable things to
test coverage of a lot of code that it doesn't actually test at
all. (It is more an integration test than anything else.)
2019-05-23 12:48:51 -04:00
David Goulet
29955f13e5
Merge branch 'tor-github/pr/1022'
2019-05-23 09:50:28 -04:00
Taylor Yu
a8a0144d11
Multiple subscribers or publishers per subsystem
...
Allow a subsystem to register to publish or subscribe a given message
from multiple places.
Part of ticket 29976.
2019-05-22 16:33:19 -05:00
Nick Mathewson
fa410162a3
circuitpadding tests: Use tt_i64_op() to compare int64_t values
...
Bug not in any released Tor.
2019-05-22 15:19:24 -04:00
Nick Mathewson
24c2502070
Merge remote-tracking branch 'dgoulet/ticket30454_035_01'
2019-05-22 11:50:46 -04:00
Nick Mathewson
e6b862e6a8
Merge branch 'ticket30428_041_02_squashed'
2019-05-22 11:48:43 -04:00