torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
38,216 Commits 53 Branches 631 Tags
64cebf4e1b448b308d94f5cdf081c1789f5e6c64
Commit Graph
2093 Commits
Author SHA1 Message Date
David Goulet f2e9ce72d6 dirauth: Reject 0.4.6.x series at the authority level 
Closes #40664

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2023-01-12 09:07:52 -05:00
David Goulet 1d1eb29443 metrics: Fix typo in a label 
Fixes #40727

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-12-07 08:43:41 -05:00
Mike Perry a51cd9a569 Ticket 40724: Add metrics for CC circuit counts 2022-12-02 21:50:59 +00:00
Mike Perry 07b521560f Ticket 40724: Additional congestion control metrics 2022-12-01 22:19:08 +00:00
David Goulet fbc9e92fdb relay: Use the configured number of threads for worker work calculation 
We cap our number of CPU worker threads to at least 2 even if we have a
single core. But also, before we used to always add one extra thread
regardless of the number of core.

This meant that we were off when re-using the get_num_cpus() function
when calculating our onionskin work overhead because we were always off
by one.

This commit makes it that we always use the number of thread our actual
thread pool was configured with.

Fixes #40719

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-11-23 14:05:10 -05:00
David Goulet e94c27c0ab metrics: Split cc with counters and gauges 
Part of #40712

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-11-10 08:57:39 -05:00
David Goulet 2737037ccd metrics: Split connections with a counter and gauge 
Created and Rejected connections are ever going up counters. While
Opened connections are gauges going up and down.

Fixes #40712

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-11-10 07:29:18 -05:00
David Goulet c13dc8b08a Merge branch 'ticket40674_047_01' into maint-0.4.7 2022-11-09 15:32:18 -05:00
Rasmus Dahlberg 21eac1e8d8 dns: Make TTLs fuzzy at exit relays 
This change mitigates DNS-based website oracles by making the time that
a domain name is cached uncertain (+- 4 minutes of what's measurable).

Resolves TROVE-2021-009.

Fixes #40674
 2022-11-09 15:30:43 -05:00
David Goulet 780ca741f3 relay: Cache onion queue parameters on consensus change 
This is part of the fast path so we need to cache consensus parameters
instead of querying it everytime we need to learn a value.

Part of #40704

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-11-09 15:12:51 -05:00
David Goulet e3f6908984 relay: Make the max pending tasks per CPU a consensus parameter 
Until now, there was this magic number (64) used as the maximum number
of tasks a CPU worker can take at once.

This commit makes it a consensus parameter so our future selves can
think of a better value depending on network conditions.

Part of #40704

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-11-09 13:13:21 -05:00
David Goulet 9c8c7804d5 relay: Add the onion_queue_wait_cutoff consensus param 
Transform the hardcoded value ONIONQUEUE_WAIT_CUTOFF into a consensus
parameter so we can control it network wide.

Closes #40704

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-11-09 11:57:32 -05:00
David Goulet 93523ed0d6 relay: Make MaxOnionQueueDelay into a consensus param 
Part of #40704

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-11-09 11:57:32 -05:00
David Goulet 4db03ac360 Merge branch 'tor-gitlab/mr/654' into maint-0.4.7 2022-11-09 11:51:46 -05:00
Mike Perry 04fafeb2dd metrics: Reorganize state labels so rate() can be applied 
Part of #40708.
 2022-11-09 11:48:42 -05:00
David Goulet 5b0103cfb4 Merge branch 'tor-gitlab/mr/651' into maint-0.4.7 2022-11-08 15:25:08 -05:00
Mike Perry 59bef48490 metrics: Record percentage of blocked channels 
Part of #40708.
 2022-11-08 18:25:07 +00:00
Mike Perry 00633bc619 metrics: Report amount of cwnd drop from delta and gamma 
Part of #40708.
 2022-11-08 12:47:14 -05:00
David Goulet fde87096c3 Merge branch 'tor-gitlab/mr/650' into maint-0.4.7 2022-11-08 12:36:19 -05:00
David Goulet d634a5ebc7 relay: Remove unused conn->ext_or_conn_id 
This also incidently removes a use of uninitialized stack data from the
connection_or_set_ext_or_identifier() function.

Fixes #40648

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-11-08 12:35:09 -05:00
Mike Perry fec9757a37 metrics: Add flow control metrics. 
Part of #40708.
 2022-11-07 09:55:06 -05:00
Mike Perry 2f7e05d89d metrics: Add stats when the clock stalls. 
Part of #40708.
 2022-11-07 09:55:06 -05:00
Mike Perry 83fdaff7c0 metrics: Add running average of CC cwnd in slow start when closing circuit 
Count slow start separately.

Part of #40708

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-11-07 09:55:06 -05:00
David Goulet 62ce557b0b metrics: Add stats when reaching vegas delta or ss_cwnd_max 
Part of #40708

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-11-07 09:55:06 -05:00
David Goulet a0e72fcb97 metrics: Add running average of CC cwnd when closing circuit 
Part of #40708

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-11-07 09:55:06 -05:00
David Goulet c565ef9c58 metrics: Add running average of CC cwnd when exiting slow start 
Part of #40708

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-11-07 09:55:06 -05:00
David Goulet 6196e9596a metrics: Add connection socket family to metrics 
Adds either ipv4 or ipv6 to the "tor_relay_connections_total" stats.

Closes #40710

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-11-03 13:05:21 -04:00
David Goulet 87e820a0c5 metrics: Add stats for num circ reaching max cell outq 
Part of #40708

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-11-03 09:37:38 -04:00
Rasmus Dahlberg 0fe2096144 Clip DNS TTL values once in event callback 
This change ensures that other parts of the code base always operate on
the same clipped TTL values, notably without being aware of clipping.
 2022-11-01 09:29:19 -04:00
David Goulet 72f52d2c85 Merge branch 'tor-gitlab/mr/644' into maint-0.4.7 2022-10-27 11:41:43 -04:00
David Goulet 6d40e980fb metrics: Treat relay connections as gauge, not counter 
Fixes #40699

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-10-27 11:37:21 -04:00
David Goulet 177f3a40eb metrics: Add number of opened circuits to MetricsPort 
Related to #40194

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-10-27 10:48:52 -04:00
David Goulet 1a2d93f72a relay: Add our consensus relay flag to MetricsPort 
Related to #40194

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-10-27 10:48:52 -04:00
David Goulet 48ab17cc72 metrics: Add traffic related stats to MetricsPort 
At this commit, bytes read and written are exported.

Related to #40194

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-10-27 10:48:48 -04:00
David Goulet cd7be492d1 relay: Add DoS subsystem stats to MetricsPort 
Related to #40194

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-10-27 10:47:56 -04:00
David Goulet a1c40c8511 metrics: Fix naming and documentation 
After nickm's review, minor changes to names and comments.

Related to #40194

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-10-27 10:45:08 -04:00
David Goulet 06a26f1872 relay: Change the connection metrics name 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-10-26 15:16:48 -04:00
David Goulet 00f714b374 relay: Add CC RTT reset stats to MetricsPort 
Related to #40194

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-10-26 15:16:48 -04:00
David Goulet e7e18ae914 relay: Add total number of streams seen on MetricsPort 
Related to #40194

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-10-26 15:16:48 -04:00
David Goulet 98b98fd3ce rephist: Track number of streams seen per type 
Related to #40194

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-10-26 15:16:48 -04:00
David Goulet 78c184d2fe hs: Retry service rendezvous on circuit close 
Move the retry from circuit_expire_building() to when the offending
circuit is being closed.

Fixes #40695

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-10-26 15:10:39 -04:00
David Goulet 5b44a32c59 circ: Get rid of hs_circ_has_timed_out 
Logic is too convoluted and we can't efficiently apply a specific
timeout depending on the purpose.

Remove it and instead rely on the right circuit cutoff instead of
keeping this flagged circuit open forever.

Part of #40694

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-10-26 15:10:37 -04:00
David Goulet a7aa22a4e7 hs: Retry rdv circuit if repurposed 
This can happen if our measurement subsystem decides to snatch it.

Fixes #40696

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-10-26 15:05:44 -04:00
David Goulet 0a49e04691 Merge branch 'tor-gitlab/mr/635' into maint-0.4.7 2022-10-26 15:01:40 -04:00
David Goulet 59008c6f51 hs: Change the error for a collapsing client circuit 
Change it to an "unreachable" error so the intro point can be retried
and not flagged as a failure and never retried again.

Closes #40692

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-10-26 14:56:45 -04:00
Roger Dingledine bab8375ef5 dir auths now omit Measured= if rs->is_authority 
Directory authorities stop voting a consensus "Measured" weight
for relays with the Authority flag. Now these relays will be
considered unmeasured, which should reserve their bandwidth
for their dir auth role and minimize distractions from other roles.

In place of the "Measured" weight, they now include a
"MeasuredButAuthority" weight (not used by anything) so the bandwidth
authority's opinion on this relay can be recorded for posterity.

Resolves ticket 40698.
 2022-10-24 04:34:49 -04:00
Roger Dingledine ea2ba4f5a8 back out most of commit b7992d4f 
The AuthDirDontVoteOnDirAuthBandwidth torrc option never worked, and it
was implemented in a way that could have produced consensus conflicts
if it had.

Resolves bug 40700.
 2022-10-24 04:34:00 -04:00
David Goulet c8d8fa0d36 relay: Add number of rejected connections to MetricsPort 
Related to #40194

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-10-12 09:25:19 -04:00
David Goulet d543db5ac0 relay: Add connection stats to MetricsPort 
This adds the number of created and opened connections to the
MetricsPort for a relay for each connection type and direction.

Output looks like:

  # HELP tor_relay_connections Connections metrics of this relay
  # TYPE tor_relay_connections counter
  tor_relay_connections{type="OR listener",direction="initiated",state="created"} 0
  tor_relay_connections{type="OR listener",direction="received",state="created"} 0
  tor_relay_connections{type="OR listener",direction="initiated",state="opened"} 0
  tor_relay_connections{type="OR listener",direction="received",state="opened"} 0
  tor_relay_connections{type="OR",direction="initiated",state="created"} 5
  tor_relay_connections{type="OR",direction="received",state="created"} 0
  tor_relay_connections{type="OR",direction="initiated",state="opened"} 5
  tor_relay_connections{type="OR",direction="received",state="opened"} 0
  tor_relay_connections{type="Exit",direction="initiated",state="created"} 0
  tor_relay_connections{type="Exit",direction="received",state="created"} 0
  tor_relay_connections{type="Exit",direction="initiated",state="opened"} 0
  tor_relay_connections{type="Exit",direction="received",state="opened"} 0
  tor_relay_connections{type="Socks listener",direction="initiated",state="created"} 0
  tor_relay_connections{type="Socks listener",direction="received",state="created"} 0
  tor_relay_connections{type="Socks listener",direction="initiated",state="opened"} 0
  tor_relay_connections{type="Socks listener",direction="received",state="opened"} 0
  tor_relay_connections{type="Socks",direction="initiated",state="created"} 0
  tor_relay_connections{type="Socks",direction="received",state="created"} 0
  tor_relay_connections{type="Socks",direction="initiated",state="opened"} 0
  tor_relay_connections{type="Socks",direction="received",state="opened"} 0
  tor_relay_connections{type="Directory listener",direction="initiated",state="created"} 0
  tor_relay_connections{type="Directory listener",direction="received",state="created"} 0
  tor_relay_connections{type="Directory listener",direction="initiated",state="opened"} 0
  tor_relay_connections{type="Directory listener",direction="received",state="opened"} 0
  tor_relay_connections{type="Directory",direction="initiated",state="created"} 0
  tor_relay_connections{type="Directory",direction="received",state="created"} 0
  tor_relay_connections{type="Directory",direction="initiated",state="opened"} 0
  tor_relay_connections{type="Directory",direction="received",state="opened"} 0
  tor_relay_connections{type="Control listener",direction="initiated",state="created"} 0
  tor_relay_connections{type="Control listener",direction="received",state="created"} 0
  tor_relay_connections{type="Control listener",direction="initiated",state="opened"} 0
  tor_relay_connections{type="Control listener",direction="received",state="opened"} 0
  tor_relay_connections{type="Control",direction="initiated",state="created"} 0
  tor_relay_connections{type="Control",direction="received",state="created"} 0
  tor_relay_connections{type="Control",direction="initiated",state="opened"} 0
  tor_relay_connections{type="Control",direction="received",state="opened"} 0
  tor_relay_connections{type="Transparent pf/netfilter listener",direction="initiated",state="created"} 0
  tor_relay_connections{type="Transparent pf/netfilter listener",direction="received",state="created"} 0
  tor_relay_connections{type="Transparent pf/netfilter listener",direction="initiated",state="opened"} 0
  tor_relay_connections{type="Transparent pf/netfilter listener",direction="received",state="opened"} 0
  tor_relay_connections{type="Transparent natd listener",direction="initiated",state="created"} 0
  tor_relay_connections{type="Transparent natd listener",direction="received",state="created"} 0
  tor_relay_connections{type="Transparent natd listener",direction="initiated",state="opened"} 0
  tor_relay_connections{type="Transparent natd listener",direction="received",state="opened"} 0
  tor_relay_connections{type="DNS listener",direction="initiated",state="created"} 0
  tor_relay_connections{type="DNS listener",direction="received",state="created"} 0
  tor_relay_connections{type="DNS listener",direction="initiated",state="opened"} 0
  tor_relay_connections{type="DNS listener",direction="received",state="opened"} 0
  tor_relay_connections{type="Extended OR",direction="initiated",state="created"} 0
  tor_relay_connections{type="Extended OR",direction="received",state="created"} 0
  tor_relay_connections{type="Extended OR",direction="initiated",state="opened"} 0
  tor_relay_connections{type="Extended OR",direction="received",state="opened"} 0
  tor_relay_connections{type="Extended OR listener",direction="initiated",state="created"} 0
  tor_relay_connections{type="Extended OR listener",direction="received",state="created"} 0
  tor_relay_connections{type="Extended OR listener",direction="initiated",state="opened"} 0
  tor_relay_connections{type="Extended OR listener",direction="received",state="opened"} 0
  tor_relay_connections{type="HTTP tunnel listener",direction="initiated",state="created"} 0
  tor_relay_connections{type="HTTP tunnel listener",direction="received",state="created"} 0
  tor_relay_connections{type="HTTP tunnel listener",direction="initiated",state="opened"} 0
  tor_relay_connections{type="HTTP tunnel listener",direction="received",state="opened"} 0
  tor_relay_connections{type="Metrics listener",direction="initiated",state="created"} 0
  tor_relay_connections{type="Metrics listener",direction="received",state="created"} 1
  tor_relay_connections{type="Metrics listener",direction="initiated",state="opened"} 0
  tor_relay_connections{type="Metrics listener",direction="received",state="opened"} 1
  tor_relay_connections{type="Metrics",direction="initiated",state="created"} 0
  tor_relay_connections{type="Metrics",direction="received",state="created"} 0
  tor_relay_connections{type="Metrics",direction="initiated",state="opened"} 0
  tor_relay_connections{type="Metrics",direction="received",state="opened"} 0

Related to #40194

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-10-12 09:25:19 -04:00
David Goulet 5603baf257 conn: Keep stats of opened and closed connections 
Related to #40194

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-10-12 09:25:19 -04:00