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

1473 commits

Author SHA1 Message Date
teor
caab67d0c2 nodelist: Distinguish client and relay reachability 
Change some function names to distinguish between:
* client first hop reachability (ReachableAddresses)
* relay port reachability self-tests

This is an automated commit, generated by this command:

./scripts/maint/rename_c_identifier.py \
        router_skip_or_reachability router_connect_assume_or_reachable \
        router_skip_dir_reachability router_connect_assume_dir_reachable

It was generated with --no-verify, so it probably breaks some commit hooks.
The commiter should be sure to fix them up in a subsequent commit.

Part of 33222.
 2020-04-30 15:12:27 +10:00
teor
3eca667ae4
relay: Fix a comment typo in the selftest.c header 2020-04-30 13:54:40 +10:00
teor
15a4180a7e relay: Refactor can extend over IPv6 checks 
Split "can extend over IPv6" and "has advertised IPv6 ORPort" into
separate functions. They currently have the same result, but this may
change in 33818 with ExtendAllowIPv6Addresses.

Part of 33817.
 2020-04-30 06:54:42 +10:00
teor
496ddd2877 relay: Refactor extend address validity function 
Rename the function, and give it a boolean return value.

No behaviour change.

Part of 33817.
 2020-04-30 06:54:42 +10:00
teor
cd7e2fc210 net: Make all address bytes functions take uint8_t * 
Part of 33817.
 2020-04-30 06:54:42 +10:00
teor
bcec1ec071 relay: Refactor choosing extend IPs 
Flatten the logic in circuit_choose_ip_ap_for_extend().

Part of 33817.
 2020-04-29 22:43:09 +10:00
teor
9a6186c267 relay: Refactor circuit_open_connection_for_extend() 
Refactor circuit_open_connection_for_extend(), splitting out the IP
address choice code into a new function.

Adds unit tests. No behaviour changes in tor.

Part of 33817.
 2020-04-29 22:43:09 +10:00
teor
cab05a84cd relay: Add IP version tests for circuit extends 
Add IPv4-only and IPv6-only tests for
circuit_open_connection_for_extend().

Part of 33817.
 2020-04-29 22:43:09 +10:00
teor
c3e058dfac relay: Choose between IPv4 and IPv6 extends at random 
When an EXTEND2 cell has an IPv4 and an IPv6 address, choose one of them
uniformly at random.

Part of 33817.
 2020-04-29 22:43:09 +10:00
teor
a0b12f3cd4 relay/circuitbuild: Refactor open connection for extend 
Re-use the newly created extend_info to launch the connection in
circuit_open_connection_for_extend().

No behaviour change.

Part of 33817.
 2020-04-29 22:43:09 +10:00
teor
16f3f6a1af relay/circuitbuild: Re-use IPv6 connections for circuits 
Search for existing connections using the remote IPv4 and IPv6
addresses.

Part of 33817.
 2020-04-29 22:43:09 +10:00
teor
ec5f4f3c5a relay/circuitbuild: Report IPv6 addresses in a debug log 
Part of 33817.
 2020-04-29 22:43:09 +10:00
teor
bad1181b5d relay/circuitbuild: Consider IPv6-only extends valid 
Allow extend cells with IPv6-only link specifiers.
Warn and fail if both IPv4 and IPv6 are invalid.

Also warn if the IPv4 or IPv6 addresses are unexpectedly internal,
but continue with the valid address.

Part of 33817.
 2020-04-29 22:43:09 +10:00
teor
44f71e08c4 relay: Log the address in circuit protocol warnings 
Always log the address family in extend protocol warnings.

If SafeLogging is 0, also log the address and port.

Diagnostics for 33817.
 2020-04-29 22:43:09 +10:00
teor
ffc2fd001a relay: Refactor address checks into a function 
No behaviour change.

Part of 33817.
 2020-04-29 22:43:09 +10:00
teor
07c008c672 relay: Refactor address and port checks 
tor_addr_port_is_valid_ap(ap, 0) checks if the address or port are
zero, exactly like the previous code.

Preparation for 33817.
 2020-04-29 22:43:09 +10:00
teor
3253c357ee
Run "make autostyle" 2020-04-29 22:08:33 +10:00
teor
398e0e0247
nodelist: Remove an outdated comment 
Part of 33817.
 2020-04-29 21:50:26 +10:00
Nick Mathewson
77e65076ab Merge remote-tracking branch 'tor-github/pr/1860/head' 2020-04-14 11:52:00 -04:00
Nick Mathewson
e22a8d9c95 Merge branch 'maint-0.4.3' 2020-04-13 14:14:41 -04:00
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
Neel Chauhan
8e59b8560a Return a descriptive error for 'GETINFO status/fresh-relay-descs' 2020-04-12 13:13:50 -07:00
Neel Chauhan
a638514783 Fix typo in router_build_fresh_unsigned_routerinfo() comment 2020-04-12 12:43:21 -07:00
Nick Mathewson
80031db32a Merge remote-tracking branch 'tor-github/pr/1801/head' 2020-04-09 11:50:20 -04:00
David Goulet
cca9e1c803 hs-v3: Several fixes after #32542 review 
asn: Accidentally left this commit out when merging #32542, so cherry-picking
it now.

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-04-09 13:59:18 +03:00
teor
cb262930f5 relay: Run "make autostyle" 
But only take the changes from the relay module.

Part of 33633.
 2020-04-09 11:00:04 +10:00
teor
d79e5d52bc relay/circuitbuild: Refactor circuit_extend() 
Make the "else" case explicit at the end of the function.

Part of 33633.
 2020-04-09 11:00:04 +10:00
teor
f8fef609f6 nodelist: Make some functions mockable 
Part of 33633.
 2020-04-09 11:00:04 +10:00
teor
ec632b01db relay: End circuitbuild logs with "." 
Consistent logs make testing easier.

Part of 33633.
 2020-04-09 11:00:04 +10:00
teor
4f9f56be47 relay: Check for NULL arguments in circuitbuild 
Part of 33633.
 2020-04-09 11:00:04 +10:00
teor
b10b287589 relay: Make circuitbuild functions STATIC 
Allow the circuitbuild_relay functions to be accessed by the unit tests.

Part of 33633.
 2020-04-09 11:00:04 +10:00
teor
44f634d0be relay: Remove a redundant function return value 
Part of 33633.
 2020-04-09 11:00:04 +10:00
teor
ca9565b9f7 relay: Split out opening a connection for an extend 
Part of 33633.
 2020-04-09 11:00:04 +10:00
teor
2640030b10 relay: Refactor some long lines from circuit_extend() 
Part of 33633.
 2020-04-09 11:00:04 +10:00
teor
5cb2bbea7d relay: Split link specifier checks from circuit_extend() 
Part of 33633.
 2020-04-09 11:00:04 +10:00
teor
2563d74a5c relay: Split state checks out of circuit_extend() 
Part of 33633.
 2020-04-09 11:00:04 +10:00
teor
beee9ca608 relay: Improve the comments on onionskin_answer() 
Part of 33633.
 2020-04-09 11:00:04 +10:00
teor
c9b674d511 relay: Protocol warn when a client gets an extend 
circuit_extend() may be called when a client receives an extend cell,
even if the relay module is disabled.

Log a protocol warning when the relay module is disabled.

Part of 33633.
 2020-04-09 10:59:51 +10:00
Roger Dingledine
9bd73da7cf fix typos from #32542 2020-04-08 19:13:52 -04:00
George Kadianakis
7a82c972ef Merge branch 'tor-github/pr/1857' 2020-04-08 18:15:37 +03:00
David Goulet
6ab11bbf30 hs-v3: Report SOCKS ExtendedErrors when all intro timed out 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-04-08 07:56:54 -04:00
David Goulet
cf39276f78 hs-v3: Report rendezvous circuit failure SOCKS ExtendedErrors 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-04-08 07:56:54 -04:00
David Goulet
fdd6352506 hs-v3: Report introduction failure SOCKS ExtendedErrors 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-04-08 07:56:54 -04:00
David Goulet
6fbf624b50 hs-v3: Fix typo in log info when PublishHidServDescriptors is set to 0 
Fixes #33779

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-04-07 13:17:21 -04:00
teor
065ccda4f6
Merge branch 'pr1838_squashed' 2020-04-07 17:36:17 +10:00
David Goulet
eecf6c5199 hs-v3: Move to log notice the registration of an OB instance 
This is to allow a visual feedback in the logs for operators setting up Onion
Balance so they can confirm they properly configured the instances.

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-04-01 08:31:20 -04:00
David Goulet
b5412d12f9 Merge branch 'tor-github/pr/1844' 2020-04-01 08:22:36 -04:00
George Kadianakis
8fda94f944 hs-v3: Move ob_subcreds to hs_service_state_t. 
It's more natural there since it's runtime state.
 2020-03-30 23:37:26 +03:00