David Goulet
184c76e339
hs-v3: Cleanup usage of consensus param in hs_dos.c
...
This commit makes it that the hs_dos.c file only uses the consensus parameter
variables set when we initialize and when the consensus changes.
There is no need to call each time networkstatus_get_param(), which is
expensive, when we want access to a consensus value.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-08-26 15:53:46 +03:00
David Goulet
82639a8c7b
hs-v3: Move to hs_dos.c INTRO2 defenses initialization
...
A bit cleaner especially that the next commit(s) will make the consensus param
interface private to hs_dos.c so we expose as little as we can outside of the
subsystem.
Part of #30924
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-08-26 15:53:46 +03:00
David Goulet
f95b5d07c1
hs-v3: Add changes file for prop305 implementation
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-08-26 15:53:46 +03:00
David Goulet
e5cf1423fd
man: Entry for the HS intro DoS defenses
...
This also adds a "subsection" to the HIDDEN SERVICE OPTIONS section to
seperate per-service and per-instance options. It is a bit less messy this
way.
The HS DoS options are added to the per-service section.
Part of #30924
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-08-26 15:53:46 +03:00
David Goulet
1c554334ac
test: Adapt HS DoS test to use latest parameter
...
We added a flag on the circuit to know if the DoS defenses are enabled or not.
Before, it was solely the consensus parameter.
Part of #30924
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-08-26 15:53:46 +03:00
David Goulet
4c71accc49
test: Handling of ESTABLISH_INTRO DoS extension
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-08-26 15:53:46 +03:00
David Goulet
dde073764c
test: Build DoS cell extension
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-08-26 15:53:46 +03:00
David Goulet
aee66c80bd
hs-v3: Don't apply DoS defenses if circuit has not been flagged
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-08-26 15:53:46 +03:00
David Goulet
724d9eb84b
hs-v3: Parse ESTABLISH_INTRO cell extension
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-08-26 15:53:46 +03:00
David Goulet
d692c5fd03
hs-v3: Encode DoS ESTABLISH_INTRO cell extension
...
This commit makes tor add the DoS cell extension to the ESTABLISH_INTRO cell
if the defense is enabled on the service side with a torrc option.
Furthermore, the cell extension is only added if the introduction point
supports it. The protover version HSIntro=5 is looked for.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-08-26 15:53:46 +03:00
David Goulet
7faf10495f
hs-v3: Rename INTRO2 consensus param getters
...
Make it clear that these functions return the consensus param only.
Introduction point can not set those values with a torrc option.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-08-26 15:53:46 +03:00
David Goulet
6c79172924
hs-v3: Add protover HSIntro=5
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-08-26 15:53:46 +03:00
David Goulet
5419fd5d9f
hs-v3: Implement torrc DoS defenses options
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-08-26 15:53:46 +03:00
David Goulet
e4856d1bbf
trunnel: Add prop305 ESTABLISH_INTRO DoS cell extension
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-08-26 15:53:46 +03:00
David Goulet
414e90025d
trunnel: Remove typo in cell extention field name
...
There can be multiple fields in a cell extension but individually, it is
singular.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-08-26 15:53:46 +03:00
Nick Mathewson
6ba05eea8e
Merge remote-tracking branch 'tor-github/pr/1247'
2019-08-24 16:32:50 -04:00
Nick Mathewson
7a45c9c1d2
Merge remote-tracking branch 'tor-github/pr/1215'
2019-08-24 16:30:55 -04:00
Nick Mathewson
f1707f7db3
Merge branch 'maint-0.4.1'
2019-08-24 16:29:23 -04:00
David Goulet
d475d7c2fb
Merge branch 'tor-github/pr/1244'
2019-08-22 17:10:22 -04:00
teor
7c92f4faa2
Merge branch 'bug31463_040' into bug31463_041
2019-08-22 22:10:06 +10:00
teor
8b32d22a07
Merge branch 'bug31463_035' into bug31463_040
2019-08-22 22:10:00 +10:00
Sebastian Hahn
190386f1c4
Fix gcc build exclude on travis
...
The main build doesn't use HARDENING_OPTIONS, so the exclude shouldn't,
either. Reduces the number of builders by one.
2019-08-22 22:09:32 +10:00
Antoine Veuiller
3bf90e704c
doc(hacking): update = to # on sections
2019-08-21 16:22:37 +02:00
Antoine Veuiller
0d6c8eed49
doc(hacking): enhance markdown style
2019-08-21 16:22:08 +02:00
Nick Mathewson
cc48eff2d3
Merge branch 'ticket31176' into ticket31176_merged
2019-08-21 09:46:20 -04:00
Nick Mathewson
edf5a327c5
Merge branch 'ticket30914' into ticket30914_merged
2019-08-20 13:57:05 -04:00
Nick Mathewson
4b1e0dd5b5
remove changes files already contained in 0.4.1.5
2019-08-20 11:16:45 -04:00
Nick Mathewson
6b180703a2
Merge branch 'maint-0.4.1'
...
"ours" to avoid 0.4.1 bump.
2019-08-20 11:15:57 -04:00
Nick Mathewson
3b2a732073
bump to 0.4.1.5-dev
2019-08-20 11:15:45 -04:00
Nick Mathewson
d0b62fff05
forward-port the changelog and release notes for 0.4.1.5
2019-08-20 11:15:17 -04:00
Nick Mathewson
36a27fa2d3
Merge branch 'maint-0.4.1'
...
"ours" to avoid version bump.
2019-08-19 11:36:55 -04:00
Nick Mathewson
ab92881d9a
Update version to 0.4.1.5
2019-08-19 11:35:48 -04:00
Nick Mathewson
e5812c91d6
Merge remote-tracking branch 'tor-github/pr/1231'
2019-08-19 11:34:27 -04:00
Nick Mathewson
29bd43ab03
Merge remote-tracking branch 'tor-github/pr/1224'
2019-08-19 11:26:58 -04:00
Nick Mathewson
b51a822a80
Merge remote-tracking branch 'tor-github/pr/1160'
2019-08-19 11:25:45 -04:00
Nick Mathewson
78d2559d85
Merge branch 'maint-0.4.1'
2019-08-19 11:11:39 -04:00
Nick Mathewson
6a89b01049
Merge remote-tracking branch 'tor-github/pr/1230' into maint-0.4.1
2019-08-19 11:11:32 -04:00
Nick Mathewson
e7aabfce61
Merge remote-tracking branch 'tor-github/pr/1235'
2019-08-19 11:10:21 -04:00
Nick Mathewson
deccd3aa6a
Merge remote-tracking branch 'tor-github/pr/1225'
2019-08-19 11:08:44 -04:00
George Kadianakis
60adebc499
Merge branch 'tor-github/pr/1217'
2019-08-19 18:07:48 +03:00
George Kadianakis
4185ef29fd
Merge branch 'tor-github/pr/1122'
2019-08-19 18:06:05 +03:00
George Kadianakis
af7cf7d5c1
Merge branch 'tor-github/pr/1233'
2019-08-19 18:05:22 +03:00
George Kadianakis
dfc8c0b536
Merge branch 'tor-github/pr/1214'
2019-08-19 18:04:35 +03:00
George Kadianakis
19e19c1fa8
Merge branch 'tor-github/pr/1154'
2019-08-19 18:03:51 +03:00
George Kadianakis
e411fcabd7
Merge branch 'tor-github/pr/1220'
2019-08-19 18:02:44 +03:00
George Kadianakis
b257e8e553
Merge remote-tracking branch 'mike/bug31356+logs-rebased2' into bug31356_final
2019-08-19 17:53:00 +03:00
Nick Mathewson
c214402a56
Merge branch 'maint-0.4.1'
2019-08-19 10:37:22 -04:00
Nick Mathewson
90f4ed2335
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-19 10:37:21 -04:00
Nick Mathewson
5653b93a1d
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-08-19 10:37:21 -04:00
Nick Mathewson
bba64c9882
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-08-19 10:37:21 -04:00