eda81ea27e
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-02-03 08:56:38 -05:00
cc5d5a5d1e
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-02-03 08:56:38 -05:00
a3cef41fc3
Merge branch 'ticket40270_035_01' into maint-0.3.5
2021-02-03 08:56:30 -05:00
903bfc4eca
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-02-03 08:54:40 -05:00
e50648582b
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-02-03 08:54:40 -05:00
c2cee6c780
node: Move reentry set to use a digestmap_t
...
Any lookup now will be certain and not probabilistic as the bloomfilter.
Closes #40269
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-02-03 08:54:02 -05:00
59f1a41a7f
relay: Send back CONNECTION_REFUSED on reentry
...
The TORPROTOCOL reason causes the client to close the circuit which is not
what we want because other valid streams might be on it.
Instead, CONNECTION_REFUSED will leave it open but will not allow more streams
to be attached to it. The client then open a new circuit to the destination.
Closes #40270
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-02-03 08:52:48 -05:00
36b51a1c71
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-02-03 08:51:37 -05:00
0f8195406e
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-02-03 08:51:36 -05:00
98590621bb
relay: Double the size of the relay reentry set
...
This is to minimize false positive and thus deny reentry to Exit connections
that were in reality not re-entering. Helps with overall UX.
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-02-03 08:51:00 -05:00
ce3af5dd59
relay: Follow consensus parameter for network reentry
...
Obey the "allow-network-reentry" consensus parameters in order to decide to
allow it or not at the Exit.
Closes #40268
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-02-03 08:50:56 -05:00
b2434d30d2
Merge branch 'tor-gitlab/mr/285' into ticket2667_044_01
2021-01-29 14:54:21 -05:00
705fd37875
Merge branch 'tor-gitlab/mr/284' into ticket2667_043_01
2021-01-29 14:51:38 -05:00
9eba65bd8b
test: Add test for exits blocking reentry to the network
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-01-29 14:19:17 -05:00
93ac6ec4d3
exit: Deny re-entry into the network
...
Exit relays now reject exit attempts to known relay addresses + ORPort and
also to authorities on the ORPort and DirPort.
Closes #2667
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-01-29 14:19:17 -05:00
f26950fa7a
relay: Add bloomfiter of relay address + {OR|Dir}Port
...
In order to deny re-entry in the network, we now keep a bloomfilter of relay
ORPort + address and authorities ORPort + address and DirPort + address
combinations.
So when an Exit stream is handled, we deny anything connecting back into the
network on the ORPorts for relays and on the ORPort+DirPort for the
authorities.
Related to #2667
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-01-29 14:19:17 -05:00
ea38016202
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-28 12:46:31 -05:00
79cb47cfc2
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:46:31 -05:00
9556276f07
Merge branch 'tor-gitlab/mr/50' into maint-0.3.5
2021-01-28 12:46:24 -05:00
be81ecba3a
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-28 12:42:31 -05:00
f058db1f3d
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:42:31 -05:00
290007e3c4
Merge branch 'tor-gitlab/mr/239' into maint-0.3.5
2021-01-28 12:42:26 -05:00
a3f2bc8f13
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-28 12:36:42 -05:00
f3da5f88d7
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:36:42 -05:00
02bd135cb1
Merge branch 'tor-gitlab/mr/243' into maint-0.3.5
2021-01-28 12:36:35 -05:00
2c4a2a93d3
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-28 12:14:10 -05:00
dd5fbc1bd9
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:14:10 -05:00
1887231afb
Merge branch 'tor-gitlab/mr/256' into maint-0.4.4
2021-01-28 12:12:01 -05:00
5c89197c9f
Merge branch 'tor-gitlab/mr/255' into maint-0.4.3
2021-01-28 12:11:33 -05:00
1bdccc03a9
Merge branch 'tor-gitlab/mr/254' into maint-0.3.5
2021-01-28 12:10:39 -05:00
ed0fcfd2b8
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-28 12:08:21 -05:00
6186288eb6
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:08:20 -05:00
045db909c2
Merge remote-tracking branch 'tor-gitlab/mr/140' into maint-0.3.5
2021-01-28 12:08:14 -05:00
737cd79c42
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-28 12:04:42 -05:00
a17be1b5b6
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:04:42 -05:00
c6fb26695b
Merge remote-tracking branch 'tor-gitlab/mr/186' into maint-0.3.5
2021-01-28 12:04:37 -05:00
f8fea8b979
Bump to 0.4.4.7
2021-01-28 11:19:00 -05:00
bcb8afe38e
Merge branch 'maint-0.4.3' into maint-0.4.4
...
"ours" to avoid version bump.
2021-01-28 11:18:30 -05:00
c3ed4b2e56
Bump to 0.4.3.8.
2021-01-28 11:18:13 -05:00
7ed0fbd885
Merge branch 'maint-0.3.5' into maint-0.4.3
...
"ours" to avoid version bump.
2021-01-28 11:17:43 -05:00
3ebf75993f
Bump to 0.3.5.13.
2021-01-28 11:17:32 -05:00
09a1a34ad1
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-21 16:18:43 -05:00
641dce2d6b
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-21 16:18:43 -05:00
65087903d9
gitignore: don't ignore core directory
...
otherwise src/core is ignored.
2021-01-21 16:18:22 -05:00
2a3cf37450
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-21 16:06:54 -05:00
c09f8da8a9
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-21 16:06:54 -05:00
8500700aa4
build: Add "make lsp" command
...
Generates the compile_commands.json file using the "bear" application so the
ccls server can be more efficient with our code base.
Closes #40227
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-01-21 16:06:31 -05:00
d54cd853ad
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-19 12:53:52 -05:00
9b390a556e
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-19 12:53:52 -05:00
b7f886beb4
Merge remote-tracking branch 'tor-gitlab/mr/163' into maint-0.4.3
2021-01-19 12:53:44 -05:00
David Goulet
George Kadianakis
Roger Dingledine
Nick Mathewson
Alex Xu (Hello71)