Commit Graph

35868 Commits

Author SHA1 Message Date
Nick Mathewson e780277c4d Merge branch 'maint-0.4.4' into release-0.4.4 2020-09-18 19:06:16 -04:00
Nick Mathewson 09813fe31e Merge branch 'maint-0.4.3' into maint-0.4.4 2020-09-18 19:06:16 -04:00
Nick Mathewson b643ced022 Merge branch 'maint-0.3.5' into maint-0.4.3 2020-09-18 19:06:16 -04:00
Nick Mathewson 0b77c706a1 Make debian-trace job conditional on src/lib/trace/trace_sys.c 2020-09-18 19:05:51 -04:00
Nick Mathewson f8f3e57016 .gitlab.yml: missing comments 2020-09-18 15:55:06 -04:00
Nick Mathewson 122b297a20 Copy tracing things back to maint-0.3.5, for consistency. 2020-09-18 15:53:06 -04:00
David Goulet 453d5c2547 Merge branch 'maint-0.4.4' into release-0.4.4 2020-09-18 09:45:25 -04:00
David Goulet 2e3603d96d Merge branch 'maint-0.4.3' into maint-0.4.4 2020-09-18 09:45:25 -04:00
David Goulet 2ddbfc64af Merge branch 'maint-0.3.5' into maint-0.4.3 2020-09-18 09:45:25 -04:00
Nick Mathewson 7945e075a4 Fix underflow in rend_cache/free_all test.
We already fixed these in #40099 and #40125.

This patch fixes #40126.  Bugfix on 0.2.8.1-alpha.
2020-09-17 14:04:54 -04:00
Nick Mathewson 6c42099f6e Merge branch 'maint-0.4.4' into release-0.4.4 2020-09-17 13:56:40 -04:00
Nick Mathewson 54cd2578ef Merge branch 'maint-0.4.3' into maint-0.4.4 2020-09-17 13:56:40 -04:00
Nick Mathewson 078194ecaf Merge branch 'maint-0.3.5' into maint-0.4.3 2020-09-17 13:56:40 -04:00
David Goulet 47f1d19f8e test: Increment rend cache allocation before freeing
The rend_cache/entry_free was missing the rend cache allocation increment
before freeing the object.

Without it, it had an underflow bug:

  Sep 17 08:40:13.845 [warn] rend_cache_decrement_allocation(): Bug: Underflow
  in rend_cache_decrement_allocation (on Tor 0.4.5.0-alpha-dev
  7eef9ced61)

Fixes #40125

Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-09-17 13:00:23 -04:00
Nick Mathewson bed245bd1e Merge branch 'maint-0.4.4' into release-0.4.4 2020-09-15 08:53:02 -04:00
Nick Mathewson bf5bf33661 Bump version to 0.4.4.5-dev. 2020-09-15 08:52:37 -04:00
Nick Mathewson 24e808e946 0.4.4.5 releasenotes: more sorting. tor-0.4.4.5 2020-09-14 13:45:05 -04:00
Nick Mathewson 8800421a7c 0.4.4.5 ReleaseNotes: remove items that appeared in 0.4.3.6 2020-09-14 13:40:48 -04:00
Nick Mathewson ed8e03e681 0.4.4.5 ReleaseNotes: remove items that are bugfixes on 044. 2020-09-14 13:38:27 -04:00
Nick Mathewson 0d9088605b 0.4.4.5 ReleaseNotes: initial collation. 2020-09-14 13:37:05 -04:00
Nick Mathewson 32a571c70e 0.4.4.5: draft blurb 2020-09-14 13:35:06 -04:00
Nick Mathewson d1e305d918 Start an 0.4.4.5 changelog 2020-09-14 13:27:19 -04:00
Nick Mathewson 9124845e24 Merge branch 'maint-0.4.4' into release-0.4.4 2020-09-14 13:18:05 -04:00
Nick Mathewson f6b8894726 Bump version to 0.4.4.5 2020-09-14 13:17:37 -04:00
David Goulet 94fef11c24 Merge branch 'maint-0.4.4' into release-0.4.4 2020-09-08 11:14:12 -04:00
George Kadianakis 85a1e6c601 statistics: Properly count all rendezvous cells (avoid undercounting).
tl;dr We were not counting cells flying from the client to the service, but we
were counting cells flying from the service to the client.

When a rendezvous cell arrives from the client to the RP, the RP forwards it to
the service.

For this to happen, the cell first passes through command_process_relay_cell()
which normally does the statistics counting. However because the `rend_circ`
circuit was not flagged with `circuit_carries_hs_traffic_stats` in
rend_mid_rendezvous(), the cell is not counted there.

Then the cell goes to circuit_receive_relay_cell() which has a special code
block based on `rend_splice` specifically for rendezvous cells, and the cell
gets directly passed to `rend_circ` via a direct call to
circuit_receive_relay_cell(). The cell never passes through
command_process_relay_cell() ever again and hence is never counted by our
rephist module.

The fix here is to flag the `rend_circ` circuit with
`circuit_carries_hs_traffic_stats` so that the cell is counted as soon as it
hits command_process_relay_cell().

Furthermore we avoid double-counting cells since the special code block of
circuit_receive_relay_cell() makes us count rendezvous cells only as they enter
the RP and not as they exit it.

Fixes #40117.
2020-09-07 13:30:21 +03:00
David Goulet 6bd94c8a47 Merge branch 'maint-0.4.4' into release-0.4.4 2020-08-25 08:23:06 -04:00
George Kadianakis 53cd1c9710 Avoid guard-related warning when upgrading from 043 to 044.
Fixes #40105.
2020-08-25 15:09:57 +03:00
George Kadianakis f50e21b5a7 Merge branch 'maint-0.4.4' into release-0.4.4 2020-08-25 14:51:23 +03:00
George Kadianakis 1397a86bbd Merge remote-tracking branch 'tor-gitlab/mr/130' into maint-0.4.4 2020-08-25 14:51:05 +03:00
George Kadianakis ff99089d41 Merge branch 'maint-0.4.4' into release-0.4.4 2020-08-20 14:34:56 +03:00
Neel Chauhan 6e37086f85 v3 control: Persist ONION_CLIENT_AUTH_ADD client name 2020-08-20 14:34:21 +03:00
David Goulet f5c9f6d432 hs: Don't overwrite DoS parameters on circuit with consensus params
Turns out that the HS DoS defenses parameters were overwritten by the
consensus parameters everytime a new consensus would arrive.

This means that a service operator can still enable the defenses but as soon
as the intro point relay would get a new consensus, they would be overwritten.
And at this commit, the network is entirely disabling DoS defenses.

Fix this by introducing an "explicit" flag that indicate if the
ESTABLISH_INTRO cell DoS extension set those parameters or not. If set, avoid
using the consenus at once.

We are not bumping the protover HSIntro value for this because 0.4.2.x series
is EOL in 1 month and thus 0.4.3.x would be the only series with this bug. We
are confident that a backport and then upgrade path to the latest 0.4.4.x
stable coming up soon is enough to mitigate this problem in the coming months.

It avoids the upgrade path on the service side by keeping the requirement for
protover HSIntro=5.

Fixes #40109

Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-08-19 09:47:34 -04:00
George Kadianakis c9e4ccf99b Merge branch 'maint-0.4.4' into release-0.4.4 2020-08-19 13:56:33 +03:00
George Kadianakis b1b0079675 Merge branch 'mr/124' into maint-0.4.4 2020-08-19 13:55:07 +03:00
Nick Mathewson 974abdf632 Parallelize src/test/test into chunks.
First, we introduce a flag to teach src/test/test to split its work
into chunks.  Then we replace our invocation of src/test/test in our
"make check" target with a set of 8 scripts that invoke the first
8th of the tests, the second 8th, and so on.

This change makes our "make -kj4 check" target in our hardened
gitlab build more than twice as fast, since src/test/test was taking
the longest to finish.

Closes 40098.
2020-08-19 13:46:50 +03:00
David Goulet 622b0f2fb1 Merge branch 'maint-0.4.4' into release-0.4.4 2020-08-18 08:49:07 -04:00
David Goulet deea196370 Merge branch 'tor-gitlab/mr/121' into maint-0.4.4 2020-08-18 08:49:01 -04:00
Nick Mathewson 7915b651d9 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-13 14:20:39 -04:00
Nick Mathewson 8ca4782340 Merge branch 'maint-0.4.4' into release-0.4.4 2020-08-13 14:20:39 -04:00
Nick Mathewson ef18fb56c9 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-08-13 14:20:39 -04:00
Nick Mathewson 45d9830493 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-13 14:20:39 -04:00
Nick Mathewson 72484a4953 Merge remote-tracking branch 'tor-gitlab/mr/125' into maint-0.3.5 2020-08-13 14:20:27 -04:00
Nick Mathewson a7cbbdbbda Merge branch 'maint-0.4.4' into release-0.4.4 2020-08-13 09:44:30 -04:00
Nick Mathewson 26b257757b Bump to 0.4.4.4-rc-dev 2020-08-13 09:43:54 -04:00
Nick Mathewson 34919368ce Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-12 20:21:04 -04:00
Nick Mathewson 07f0210a05 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-12 20:21:04 -04:00
Nick Mathewson 8bd79bd75e Merge branch 'maint-0.4.4' into release-0.4.4 tor-0.4.4.4-rc 2020-08-12 20:21:04 -04:00
Nick Mathewson 9d77ed7be2 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-08-12 20:21:04 -04:00
Nick Mathewson aeafb7f44f Improve comments in .gitlab-ci.yml 2020-08-12 20:20:58 -04:00