nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-11 05:03:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
35,166 Commits 53 Branches 631 Tags 130 MiB
cee58b7f92
Commit Graph

35166 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson
55cb6c3fcd Merge branch 'bug33545_043_squashed' into maint-0.4.3 2020-04-13 14:13:44 -04:00
George Kadianakis
f2f718bca5 hs-v3: Change all-zeroes hard-assert to a BUG-and-err. 
And also disallow all-zeroes keys from the filesystem; add a test for it too.
 2020-04-13 14:13:33 -04:00
George Kadianakis
37bcc9f3d2 hs-v3: Don't allow registration of an all-zeroes client auth key. 
The client auth protocol allows attacker-controlled x25519 private keys being
passed around, which allows an attacker to potentially trigger the all-zeroes
assert for client_auth_sk in hs_descriptor.c:decrypt_descriptor_cookie().

We fixed that by making sure that an all-zeroes client auth key will not be
used.

There are no guidelines for validating x25519 private keys, and the assert was
there as a sanity check for code flow issues (we don't want to enter that
function with an unitialized key if client auth is being used). To avoid such
crashes in the future, we also changed the assert to a BUG-and-err.
 2020-04-13 14:13:33 -04:00
Nick Mathewson
dd7838cd60 Changelog edits from seborn 2020-04-09 16:50:27 -04:00
Nick Mathewson
36ca7ea377 Start changelog for 0.4.3.4-rc. 2020-04-09 08:45:04 -04:00
Nick Mathewson
b5e0abe186 Merge branch 'maint-0.4.3' into release-0.4.3 2020-04-09 08:39:16 -04:00
Nick Mathewson
bfea7a7326 bump to 0.4.3.4-rc 2020-04-09 08:38:41 -04:00
Nick Mathewson
7aa1e9b61b Merge branch 'maint-0.4.3' into release-0.4.3 2020-04-09 08:33:36 -04:00
Nick Mathewson
c4da0a5094 Add fsync to list of syscalls permitted by sandbox 
(Our fix for 33087 requires this, I believe.)
 2020-04-09 08:33:19 -04:00
Nick Mathewson
c2aea6134a Merge remote-tracking branch 'tor-github/pr/1723/head' into maint-0.4.3 2020-04-09 08:30:14 -04:00
teor
c502ce0762
Merge branch 'maint-0.4.3' into release-0.4.3 2020-04-09 19:43:28 +10:00
teor
1ae0839ef2
Merge branch 'maint-0.4.2' into maint-0.4.3 
Remove check-best-practices from check-local in maint-0.4.3.
(The check-local jobs are all on separate lines in 0.4.3.)
 2020-04-09 19:41:19 +10:00
Nick Mathewson
2d34d4d1af
remove practracker from check-local (0.4.2 and 0.4.3 only) 
practracker shouldn't be running in release or maint branches.
 2020-04-09 19:39:28 +10:00
teor
456337a8dd
Merge branch 'maint-0.4.3' into release-0.4.3 2020-04-09 11:07:47 +10:00
teor
f6efb3a184
Merge branch 'pr1854_squashed' into maint-0.4.3 
Squashed PR 1854, and fixed a minor typo (IPv4 -> IPv6).
 2020-04-09 11:05:59 +10:00
David Goulet
cd2121a126
client: Revert setting PreferIPv6 on by default 
This change broke torsocks that by default is expecting an IPv4 for hostname
resolution because it can't ask tor for a specific IP version with the SOCKS5
extension.

PreferIPv6 made it that sometimes the IPv6 could be returned to torsocks that
was expecting an IPv4.

Torsocks is probably a very unique case because the runtime flow is that it
hijacks DNS resolution (ex: getaddrinfo()), gets an IP and then sends it back
for the connect() to happen.

The libc has DNS resolution functions that allows the caller to request a
specific INET family but torsocks can't tell tor to resolve the hostname only
to an IPv4 or IPv6 and thus by default fallsback to IPv4.

Reverting this change into 0.4.3.x series but we'll keep it in the 0.4.4.x
series in the hope that we add this SOCKS5 extension to tor for DNS resolution
and then change torsocks to use that.

Fixes #33804

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-04-09 11:05:32 +10:00
teor
72e4ed8634
Merge branch 'maint-0.4.3' into release-0.4.3 2020-04-09 11:03:37 +10:00
teor
2d6f00e45b
Merge branch 'maint-0.4.2' into maint-0.4.3 2020-04-09 11:03:34 +10:00
teor
2d7e08d57e
Merge branch 'maint-0.4.1' into maint-0.4.2 2020-04-09 11:03:27 +10:00
teor
987f2fa50a
Merge branch 'maint-0.3.5' into maint-0.4.1 2020-04-09 11:03:20 +10:00
teor
d380acaeca
Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5 2020-04-09 11:02:49 +10:00
David Goulet
a985f554c4 Merge branch 'maint-0.4.3' into release-0.4.3 2020-04-08 09:42:13 -04:00
Mrigyen Sawant
34faee0600 Correct 'was not internal' to 'was internal' in test_external_ip() 2020-04-08 09:41:58 -04:00
teor
e8bbdc69d1
Merge branch 'maint-0.4.3' into release-0.4.3 2020-04-05 17:17:47 +10:00
teor
80a306c6e7
doc: Fix another man page typo 
The default value of the option is "auto", not "default".
 2020-04-05 17:17:03 +10:00
teor
9385020620
Merge branch 'maint-0.4.3' into release-0.4.3 2020-04-05 17:12:07 +10:00
teor
613077229f
doc: Fix a typo in the man page 
"proceeding" means starting an action.
"preceding" means the thing before this thing.

In this context, it's a bit ambiguous.
 2020-04-05 17:10:37 +10:00
teor
2b2e53b7fb
Merge branch 'maint-0.4.3' into release-0.4.3 2020-04-04 13:23:52 +10:00
teor
b1e1c6b505
changes: file for ticket 33782 
Avoid conflicts between the fake sockets in tor's unit tests, and real
file descriptors. Resolves issues running unit tests with GitHub
Actions, where the process that embeds or launches the tests has
already opened a large number of file descriptors.

Fixes bug 33782; bugfix on 0.2.8.1-alpha.

Found and fixed by Putta Khunchalee.
 2020-04-04 13:20:06 +10:00
Putta Khunchalee
f43a841d94 Change starting file descriptor for tests. 2020-04-03 16:47:38 +07:00
teor
628a444242
Merge branch 'maint-0.4.3' into release-0.4.3 2020-04-03 14:44:30 +10:00
teor
7d2b6cacee
doc: Rewrite the approved-routers man page entry 
Obviously correct documentation changes.
 2020-04-03 14:43:48 +10:00
teor
aa94f81add
Merge branch 'maint-0.4.3' into release-0.4.3 2020-04-01 23:03:47 +10:00
David Goulet
6c5c503a4c
configure: Fix enabled module variable expansion 
Fixes #33646

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-04-01 23:02:24 +10:00
David Goulet
7d6e9d7d95 Merge branch 'maint-0.4.3' into release-0.4.3 2020-03-30 13:38:57 -04:00
George Kadianakis
42e56f5bac hs-v3: Relax severity of a log message when decoding descriptors. 
Make it LOG_PROTOCOL_WARN and also add the expiration timestamp in there to
ease debugging in the future.
 2020-03-30 13:38:29 -04:00
David Goulet
78ac7c751c Merge branch 'maint-0.4.3' into release-0.4.3 2020-03-26 09:15:00 -04:00
David Goulet
e472737297 Merge branch 'tor-github/pr/1794' into maint-0.4.3 2020-03-26 09:14:25 -04:00
Nick Mathewson
048714d2ce Merge branch 'maint-0.4.1' into maint-0.4.2 2020-03-25 10:56:27 -04:00
Nick Mathewson
0c7725be84 Merge branch 'maint-0.4.3' into release-0.4.3 2020-03-25 10:56:27 -04:00
Nick Mathewson
03b0d1840a Merge branch 'maint-0.4.2' into maint-0.4.3 2020-03-25 10:56:27 -04:00
George Kadianakis
8f9c04ae73 Merge branch 'maint-0.4.3' into release-0.4.3 2020-03-23 16:57:27 +02:00
George Kadianakis
29420ab396 Merge branch 'tor-github/pr/1788' into maint-0.4.3 2020-03-23 16:56:59 +02:00
teor
52f61ec83e
Merge branch 'bug32588_042' into bug32588_043 
Merge static function declaration deletions from bug32588_042 and
maint-0.4.3 in app/config/config.c.
 2020-03-21 04:01:00 +10:00
teor
5e2f31f177
Merge branch 'bug32588_041' into bug32588_042 2020-03-21 03:52:32 +10:00
teor
2962c32b7a
Merge branch 'bug32588_035' into bug32588_041 
Merge tests from maint-0.4.1 with new tests from bug32588_035
in test_router.c.
 2020-03-21 03:50:36 +10:00
Nick Mathewson
96ca14d989
Add a test for the localhost case. 2020-03-21 03:44:01 +10:00
Nick Mathewson
1251265a0f
Extend test to handle router_get_advertised_ipv6_or_ap 2020-03-21 03:43:58 +10:00
Nick Mathewson
1ba79d4567
Add a test for router_get_advertised_or_port_by_af(). 2020-03-21 03:43:55 +10:00
Nick Mathewson
6ffe073db7
Add tests for get_first_advertised_{addr,port}_by_type_af() 2020-03-21 03:43:52 +10:00