c441853cb8
Merge branch 'log_guard_status' into 'main'
...
GuardMgr: Log significant guard/bridge status changes at info/warn
Closes #627
See merge request tpo/core/arti!869
2022-11-18 13:51:42 +00:00
c0fa78fd4d
Merge branch 'display_chan_target' into 'main'
...
ChanTarget: Add a display function, with better output.
Closes #647
See merge request tpo/core/arti!868
2022-11-18 13:19:10 +00:00
fc047b4b3c
Merge branch 'inst_as_arg' into 'main'
...
GuardMgr: Resolve a `TODO pt-client` by having `update` take an `Instant`.
See merge request tpo/core/arti!863
2022-11-18 12:42:02 +00:00
cb3a790084
netdoc: Add a test for routerdesc family parsing.
2022-11-17 14:40:15 -05:00
5655b95b54
netdoc: Correct and test some tricky routerdesc errors
...
These required hex-editing identity certificates :P
2022-11-17 14:35:40 -05:00
c0bc7bb11e
netdoc: Add tests for routerdesc accessors.
2022-11-17 13:43:32 -05:00
9f53a79ddf
Netdoc: use a different desc in tests.
...
This is from Akka, which ahf runs.
2022-11-17 13:25:05 -05:00
8dfbbca4e5
GuardMgr: Log when a guard status changes (significantly).
...
We previously had a trace message on _every_ change. That's fine,
but we also want to log more important changes where the user
can see them. Namely:
* If we go from any other status to Reachable, we want to tell
the user. (We don't want to spam them if it was already
reachable.)
* If we go from Untried or Reachable to Unreachable, we want to
tell the user. (We don't tell them about changes from Retriable
to Unreachable, since that just means that a retry attempt
was not successful.)
Closes #627 .
2022-11-17 12:32:57 -05:00
6c5dd05698
GuardMgr: split Reachable::Unknown into Untried and Retriable
...
There are two cases here, and we will want to log them
differently.
(By removing the "Unknown" variant entirely, we ensure that we
didn't miss any code that formerly checked for Unknown.)
2022-11-17 12:21:06 -05:00
effd53510d
ChanMgr: Log every conection attempt at debug.
2022-11-17 12:01:57 -05:00
95081198e5
Remove impl Display for OwnedCircTarget
...
Nothing used this; if anything wants it, it would be better off
calling `.display_chan_target()`.
2022-11-17 09:12:57 -05:00
25702ccd9e
ChanTarget: Add a display function, with better output.
...
This change lets us display a ChanTarget's members without first
cloning them into an OwnedChanTarget.
It also resolves a reliability issue by outputting better info when
talking about connections via pluggable transports.
Closes #647
2022-11-17 09:06:08 -05:00
cf152c5ed6
linkspec: Make "pt-client" non-experimental.
2022-11-16 12:26:31 -05:00
7d4691e402
chanmgr: rename new_test_channel_map to new_test_state.
2022-11-16 12:07:47 -05:00
b466e24235
chanmgr::mgr::*: misc spelling fixes and normali[sz]ations
2022-11-16 12:05:20 -05:00
53c401af65
Fix up documentation that referred to a ChannelMap.
2022-11-16 12:02:02 -05:00
5804f0f350
ChanMgr: Rename map.rs to state.rs
...
This is another pure renaming.
2022-11-16 11:46:11 -05:00
8271037d37
ChanMgr: Rename ChannelMap to MgrState
...
We're doing this because the type now holds "all the mutable state
in a ChanMgr", not just the map.
This is a pure renaming; no documentation has been updated.
Part of #606 .
2022-11-16 11:32:49 -05:00
76a89fb178
GuardMgr: Add Instant to update().
...
This lets us avoid calling `Instant::now()`, when `Runtime::now()`
is what we want.
Unfortunately, there are a bunch of functions that called `update()`
that needed to change. Fortunately, none of the changes were very
complicated.
Fixes a `TODO pt-client` comment.
2022-11-16 09:56:51 -05:00
fd2253cd44
GuardMgr: Rename "now" arg in update() to "wallclock"
...
I'm about to add an `Instant` argument. By convention, when we have
both, we call the Instant "now".
This commit is a pure renaming.
2022-11-16 09:40:25 -05:00
4a1b3d8954
guardmgr: Remove a now-unneeded "allow(dead_code)"
2022-11-16 09:22:23 -05:00
09b918515c
Merge branch 'ptmgr-config' into 'main'
...
tor-ptmgr: make configuration use builders, plumb into arti-client
See merge request tpo/core/arti!823
2022-11-16 12:12:35 +00:00
b46d1600e7
Merge branch 'real_netdoc_pos' into 'main'
...
Replace `Option<Pos>` with `Pos` in `ParseError`.
Closes #640
See merge request tpo/core/arti!859
2022-11-16 11:50:20 +00:00
d7dc02968f
pt config, arti cfg test: Expect bridges.transports to be missing
...
As per
https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/823#note_2854365
2022-11-16 11:39:25 +00:00
4fe5e8fcaa
arti cfg test: Coalesce expect_missing
...
If there are subkeys which are covered by also expected_missing
superkeys, delete them, since we expect the superkey to be missing, so
the subkey won't show up.
2022-11-16 11:39:25 +00:00
1c9f6fb179
tor-ptmgr: make configuration use builders, plumb into arti-client
...
This brings the draft configuration mechanisms in tor-ptmgr in line with
the config in other crates, using builders. It also plumbs the config
type through into the main `arti-client` config, and adds some example
lines to `arti-example-config.toml`.
2022-11-16 11:39:25 +00:00
7a42cb0e45
Remove a `TODO pt-client` in netdoc.
...
This issue is now torspec!94.
2022-11-15 17:19:26 -05:00
39615516fd
Replace `Option<Pos>` with `Pos` in `ParseError`.
...
We already have `Pos::Unknown` for an error at an unknown
location and `Pos::None` for an error where no location is
sensible. There's no reason to have an additional `Option` here.
Additionally, the use of `Option` gave us a bug where our old
`ParseError::at_pos()` method didn't actually set the position
unless the position was already set. That's not what we want!
Fixes #640 .
Finally, we have to fix a test that was a bit broken because it was
working around #640 .
2022-11-15 16:58:23 -05:00
0378a14014
Merge branch 'fix_bridgeconf_lookup' into 'main'
...
Allow a subset-only ChanMethod match when looking up a BridgeConfig
Closes #642
See merge request tpo/core/arti!858
2022-11-15 19:18:51 +00:00
86c7a2da7f
Merge branch 'cfg-doc' into 'main'
...
arti cfg test: Add more documentation
See merge request tpo/core/arti!856
2022-11-15 19:05:12 +00:00
2bd422663e
Resolve a dead-code warning.
2022-11-15 13:53:14 -05:00
d78cde7dea
Allow a subset-only ChanMethod match when looking up a BridgeConfig
...
If we have a bridge guard that is using Direct connection and it
knows multiple addresses, our code to match it with a BridgeConfig
is wrong, because the BridgeConfig has only one address, and our
code looks for an exact match.
Fixes #642 .
2022-11-15 13:53:14 -05:00
67242a2986
arti cfg test: Document exhaustive_1 and comment exhaustive
2022-11-15 18:25:39 +00:00
db9440464b
Remove a spurious log that I committed by mistake. Whoops.
2022-11-15 13:15:32 -05:00
5eccaf008b
Merge branch 'fix_parse' into 'main'
...
netdoc: Allow empty lines at the end of router descriptors
Closes #637
See merge request tpo/core/arti!857
2022-11-15 17:41:29 +00:00
050eab9bba
Implement more cases for `DirSpecificTarget`.
...
Without this fix, any attempt to actually use a circuit for a
`DirSpecificTarget` will fail, since supports() will say false, and
`restrict_mut()` will say `NotSupported`.
2022-11-15 11:42:54 -05:00
89be046466
netdoc: Allow empty lines at the end of a router descriptor.
2022-11-15 11:27:43 -05:00
bc7780bffd
tor-netdoc: Add a new ErrorKind for EmptyLine.
...
Empty lines were previously reported as BadKeyword, which is
confusing.
2022-11-15 11:27:43 -05:00
46c272e293
arti cfg test: Break out CONFIG_KEYS_EXPECT_NO_EXAMPLE
...
Giving this a name will allow us to refer to it docs in a moment.
2022-11-15 15:38:47 +00:00
c7087d3679
arti cfg test: Drop a redundant allow
...
This allow is also present in the standard lint block at the start of
the test inline module.
2022-11-15 15:11:25 +00:00
232e82491d
guardmgr: Document that guardmgr only holds a Weak
2022-11-15 14:39:00 +00:00
fdeb2db1c2
arti-client: Retain a strong reference to the inner Arc<BridgeDescMgr>
...
Fixes #636 .
2022-11-15 14:36:02 +00:00
b7441c9804
bridges: Create and install a BridgeDescMgr when we bootstrap
2022-11-15 12:08:21 +00:00
a565e3381f
arti-client: Store a handle to the DirMgrStore in TorClient (fmt)
...
rustfmt only.
2022-11-15 12:08:21 +00:00
63c463944d
arti-client: Store a handle to the DirMgrStore in TorClient
...
We'll need this shortly.
2022-11-15 12:08:21 +00:00
647610f2f9
arti-client: Store a handle to the guardmgr in TorClient
...
We'll need this shortly.
2022-11-15 12:08:20 +00:00
79a09ae379
Merge branch 'make_bridges_work' into 'main'
...
Bugfix: preserve active_set when loading guards
See merge request tpo/core/arti!848
2022-11-14 19:40:26 +00:00
2f5f066d85
Merge branch 'report_missing_descs' into 'main'
...
GuardMgr: Update desired bridge descs from 'update' function.
Closes #622
See merge request tpo/core/arti!847
2022-11-14 19:15:12 +00:00
ec2e432bee
Preserve active_set when loading guards.
2022-11-14 13:50:59 -05:00
92115aa366
GuardMgr: Update desired bridge descs from 'update' function.
...
There are some new TODOs here for us to think about, but I think
this will give us something to test.
2022-11-14 13:36:10 -05:00
0f4c7a477a
GuardSet: Add a method to report which bridge descs we want.
2022-11-14 13:36:10 -05:00
b41becec56
Merge branch 'guardmgr' into 'main'
...
Move guardmgr creation to arti-client, rather than within circmgr
See merge request tpo/core/arti!850
2022-11-14 17:01:31 +00:00
58fc19dc8d
Merge branch 'store3' into 'main'
...
dirmgr: Expopse DirMgrStore
See merge request tpo/core/arti!851
2022-11-14 17:01:10 +00:00
7efbc600c0
Merge branch 'bdm-dormant' into 'main'
...
bridge descriptor dormancy: Define an enum and semantics
See merge request tpo/core/arti!845
2022-11-14 17:00:40 +00:00
ed4006c87c
Move GuardMgr::new call to arti_client::TorClient (fmt)
...
rustfmt only, broken out to ease review.
2022-11-14 15:52:30 +00:00
525c452e77
Move GuardMgr::new call to arti_client::TorClient
...
Having this done within circmgr was irregular - most of our other key
buildup functions are done in TorClient::create_inner.
It is also inconvenient, as it buries the guardmgr within the circmgr.
2022-11-14 15:50:07 +00:00
92939439a6
dirmgr Store: Have constructors take DirMgrStore
...
Now the Store is constructed by arti_client, solving the problem
described here
https://gitlab.torproject.org/tpo/core/arti/-/issues/631#note_2853665
but in a different way.
2022-11-14 15:48:17 +00:00
5e16c55f9e
dirmgr Store: Introduce DirMgrStore and use for BridgeDescMgr (fmt)
...
rustfmt only, broken out to ease review.
2022-11-14 15:48:17 +00:00
cf362f9806
dirmgr Store: Introduce DirMgrStore and use for BridgeDescMgr
...
We are going to change DirMgr's constructors to also take a DirMgrStore.
2022-11-14 15:48:17 +00:00
d9f231e099
dirmgr Store: Abolish redundant trait impl
2022-11-14 15:47:04 +00:00
527ab06376
dirmgr Store: Use `**` syntax and deref to trait objects
...
This will allow us to get rid of a needless trait impl.
2022-11-14 15:47:04 +00:00
bf7d45b7b9
dirmgr Store: Move Send and 'static bounds to Store trait
...
This seems tidier to me.
(It saved a lot of typing when I was trying to make some complicated
pub supertrait with sealed private supertrait, but apparently not
now.)
2022-11-14 15:33:58 +00:00
91be995588
Fix Windows shortcut target
2022-11-13 16:05:24 +00:00
9ecda958a4
Document Clone semantics of GuardMgr and DirMgr
2022-11-11 16:55:56 +00:00
9a979cf2c4
cfg-ify an import
2022-11-11 16:54:01 +00:00
c6234428e3
bridge descriptor dormancy: Accept the dormancy value
...
But right now, don't do anything with it. That will come in a future MR.
2022-11-11 15:34:35 +00:00
eeb6d52678
bridge descriptor dormancy: Add a TODO for this enum
2022-11-11 15:26:42 +00:00
b1cc1e2065
Merge branch 'workaround_545' into 'main'
...
Temporarily disable it_cancels_delayed_firings.
See merge request tpo/core/arti!846
2022-11-11 11:16:33 +00:00
9c9f9bbd25
Merge branch 'guardmgr-todo-misc' into 'main'
...
Resolve most "TODO pt-client" comments in GuardMgr
See merge request tpo/core/arti!840
2022-11-10 17:50:34 +00:00
b91f7d61b3
GuardMgr: Explain why we timestamp BridgeSets as we do.
2022-11-10 12:11:28 -05:00
f5a5e310a8
GuardMgr: Downgrade a pt-client TODO about an internal API
2022-11-10 12:11:28 -05:00
8cf04d2a38
GuardMgr Document why a BridgeSet has trivial weight thresholds.
...
This is the only way I could find in which parameter interpretation
differs between bridge guards and relay guards; with it documented,
I can remove a TODO about identifying such ways.
2022-11-10 12:11:28 -05:00
01def7cf86
GuardMgr: once more, fix our n_primary_dir_info check.
...
Have the check only apply to non-bridge universes, and explain why
in a bunch more comments.
2022-11-10 12:11:28 -05:00
11e83d8069
GuardMgr: remove redundant call to extend_sample_as_needed
...
Previously we would call extend_sample_as_needed in only two places,
one of which called the other unconditionally. That's obviously not
necessary.
I've selected just one of them (`update_guardset_internal`) since it
fits better with the theme if that function. I've added comments
explaining what is going on.
This commit also introduces a yes/no enum for "were any guards added
while extending this set". Formerly we had a boolean, but it got
passed around so many times that I think its intent became obscure.
2022-11-10 12:11:28 -05:00
1d4db04e4e
GuardMgr: rename n_primary_without_dir_info
...
What this function actually does is return the number of primary
guards whose presence (by identity) is ambiguous in a current
universe. The new name and documentation should help avoid
confusion.
The method's old name had led me astray when identifying whether it
should apply to bridges in one case. This commit also removes the
corresponding `TODO pt-client`.
2022-11-10 12:11:28 -05:00
1ad45f164e
Remove TODO to rename for_circuit_usage in favor of #623
2022-11-10 12:11:28 -05:00
b8792307ac
GuardMgr: Remove TODO to move `mod bridge` to another crate
...
The code seems happy enough here for now.
2022-11-10 12:11:28 -05:00
942dfc8487
Resolve todo!()s and TODOs around BridgeRelay::HasAddrs.
...
Also, add a bunch of reminders around these implementations that
`HasAddrs` returns all the address associated with you for GeoIp or
family purposes, even if they are _not_ ones that we should actually
contact you at.
2022-11-10 12:11:28 -05:00
dcfb4d0956
RouterDesc: Add an or_ports method.
2022-11-10 12:11:28 -05:00
71510fbd96
Temporarily disable it_cancels_delayed_firings.
...
This test is timing-dependent in a way that seems to fail on heavily
loaded CI machines. See #545 .
2022-11-10 11:58:35 -05:00
e5c26a123f
Actually, require rsa 0.7.1.
...
rsa 0.7.0 has been yanked.
2022-11-10 11:26:35 -05:00
0a1141db32
tor-persist: use map_while
...
It was introduced in Rust 1.57.
2022-11-10 11:04:20 -05:00
06e4e91614
Remove allow() for a false-positive warn on Rust 1.56.
2022-11-10 11:04:20 -05:00
e19ff0ec21
Upgrade rsa to 0.7. Closes #613 .
2022-11-10 11:04:20 -05:00
34ae02e75f
Upgrade to serde_with 2, phf 0.11. Closes #526 .
2022-11-10 11:04:18 -05:00
2c13a78c57
Upgrade to tinystr 0.7. Closes #591 .
2022-11-10 10:57:33 -05:00
936920b26e
bump rust-version to 1.60 in every crate.
2022-11-10 10:57:33 -05:00
eacb5dc2e3
bridge descriptor dormancy: Define an enum and semantics
...
This is part of #630 .
2022-11-10 15:17:36 +00:00
d9788c16b3
Merge branch 'bridge-error' into 'main'
...
Use ErrorKind::TorAccessFailed for misbehaving bridges
See merge request tpo/core/arti!842
2022-11-10 13:50:47 +00:00
3c29dfd99d
Merge branch 'bdm-process-doc-test' into 'main'
...
bridge descs: Add tests for process_document
See merge request tpo/core/arti!841
2022-11-10 13:50:23 +00:00
6454896d95
Merge branch 'bdm-params' into 'main'
...
Remove TODO re BridgeDescDownloadConfig defaults
See merge request tpo/core/arti!839
2022-11-10 13:49:54 +00:00
614cf34284
Check more targets
2022-11-10 13:34:17 +00:00
42dd5d7746
bridge desc: Drop a done TODO
...
We have a separate BridgeDescMgr, rather than reusing DirMgr, so we
will not be implementing BridgeDescProvider for DirMgr.
2022-11-08 18:54:31 +00:00
8fbff3a27f
Use ErrorKind::TorAccessFailed for misbehaving bridges
...
(Use semantic linefeed for the doc comment.)
2022-11-08 18:52:57 +00:00
d808f70a13
bridge descs: Add tests for process_document
2022-11-08 18:42:34 +00:00
f1f4ca56a8
Remove TODO re BridgeDescDownloadConfig defaults
2022-11-08 17:34:25 +00:00
05cad7c0eb
bridge desc: todo re config: weaken and reference a new ticket
2022-11-08 17:34:13 +00:00
4f893648b8
Merge branch 'clap-v3' into 'main'
...
Upgrade to clap 3
Closes #616
See merge request tpo/core/arti!830
2022-11-08 17:11:04 +00:00
9dcfc2bb65
GuardMgr: Docs for BridgeDescProvider
2022-11-08 11:35:35 -05:00
91cfd7ea4a
GuardMgr: Remove a TODO pt-client comment.
...
The BridgeSet type does not necessarily need further changes... and
if it gets them, it won't be because of this comment.
2022-11-08 11:35:35 -05:00
8efcfb64af
Merge branch 'misc-todo-ptclient' into 'main'
...
Downgrade and/or remove a few misc "TODO pt-client" comments
See merge request tpo/core/arti!838
2022-11-08 16:21:30 +00:00
ec9e9c86e7
Merge branch 'store' into 'main'
...
Persistently cache bridge descriptors
Closes #619
See merge request tpo/core/arti!831
2022-11-08 15:10:21 +00:00
46286dddd4
Merge branch 'todo-ptclient-linkspec-1' into 'main'
...
Resolve `TODO pt-client` entries in linkspec
See merge request tpo/core/arti!836
2022-11-08 15:01:02 +00:00
ea369e8385
bridge descs: Rename BridgeDescMgr from BridgeDescManager
...
This is more consistent with our naming elsewhere.
Suggested-by: Nick Mathewson <nickm@torproject.org>
2022-11-08 14:40:28 +00:00
53f62eb8be
Merge branch 'store-yak-misc' into 'main'
...
Small misc yaks for bridge descriptor persistence
See merge request tpo/core/arti!828
2022-11-08 14:28:14 +00:00
3bcb85bd59
Merge branch 'guards_as_bridges_part4' into 'main'
...
GuardMgr: Almost finish wiring Bridges in as a guard substitute
See merge request tpo/core/arti!832
2022-11-08 13:48:27 +00:00
6b422b1c4d
circmgr: downgrade TODO pt-client comments
...
These are structure-internal things we can solve later, if ever.
2022-11-08 08:31:59 -05:00
c99976fabc
ChanMgr: downgrade and remove a few TODO-ptclient comments
...
renamings are now #623 . Code movement can happen later.
2022-11-08 08:27:19 -05:00
d9d9cdeac9
bridge descs: Apply sensitive() to bridge identity in error log msg
2022-11-08 13:19:42 +00:00
ada3acf6b8
Try to explain exactly what lookup_bridge_circ_target does
2022-11-08 08:10:15 -05:00
0fd41a7faf
GuardMgr: Try to explain what is going on with update()
...
This explanation is slightly complicated by the fact that I think
that one of the calls to update_guardset_internal() is possibly
unnecessary, and that one of the calls that it makes is potentially
ill-advised.
I'm not going to make those changes right now, however, because they
are potentially a little destabilizing.
2022-11-08 08:10:15 -05:00
6591842458
Refactor configured_bridges
...
Now it is an Option, and is set to None if bridges aren't enabled.
This simplifies `replace_bridge_config` a bit, and forces us to
check for `None` in a few more places.
2022-11-08 08:10:15 -05:00
2a5b4d21e3
GuardMgr: Document that providers should only be installed once.
...
Enforce this with assert!() and a documented panics section.
2022-11-08 08:10:15 -05:00
9fda8d17c4
GuardMgr: Fix build with bridge-client disabled.
2022-11-08 08:10:15 -05:00
6bcce19655
GuardMgr: Remove no-longer-relevant `TODO pt-client` comments
...
Also remove a bunch of now-unnecessary `allow(dead_code)`
annotations.
2022-11-08 08:10:15 -05:00
1418ec13a8
GuardMgr: Rename an error variant
2022-11-08 08:10:15 -05:00
3943c6cd1e
GuardMgr: Spelling fixes and normalizations.
2022-11-08 08:10:15 -05:00
3f3d82ee48
GuardMgr: do not use fallbacks when in bridge mode.
2022-11-08 08:10:15 -05:00
5c3bb3d7e1
GuardMgr: When possible, return a FirstHop that can be a CircTarget
...
We do this by checking the FirstHops we're about to return, and when
they correspond to bridges, looking up an appropriate BridgeRelay
in the current BridgeSet (if we can).
2022-11-08 08:10:15 -05:00
25d7924832
GuardMgr: Refactor UniverseRef to contains Arcs.
...
We already _have_ these Arc<>s whenever we construct a UniverseRef,
so there's no real point in using &refs and making these so
hard to construct.
2022-11-08 08:10:15 -05:00
7fa08140cf
GuardMgr: Remove an outdated "Limitations" comment.
...
Found while grepping for NetDir.
2022-11-08 08:10:15 -05:00
e1ef939ebd
GuardMgr: do not block netdir if we are using bridges
...
The `GuardMgr` code has functionality to tell the DirMgr "Hey,
don't switch to the new NetDir yet: we still need more guard
information!" But we never want to do that if we're selecting
bridges, since they don't come from the NetDir.
2022-11-08 08:10:15 -05:00
1a4fbb2c3f
GuardMgr: Add UniverseType to make code more explicit.
...
Instead of duplicating the logic about which guard sample uses which
universe, we explicitly ask it, and then use that universe. This
will avoid trouble if/when we introduce more samples.
2022-11-08 08:10:15 -05:00
d395ae75a5
GuardMgr: Launch a background task to keep the list of bridge
...
descriptors updated as appropriate.
2022-11-08 08:10:15 -05:00
e93ee14270
GuardMgr: Exit keep-netdir-updated task early if GuardMgr disappears.
2022-11-08 08:10:15 -05:00
697a355a21
GuardMgr: Pass correct universe to "Bridges" `GuardSet`.
...
This can probably be done in a simpler way, but for the moment I
would prefer to try to minimize the amount of code I'm changing
here.
2022-11-08 08:10:15 -05:00
f4149cd133
GuardMgr: Change BridgeSet, BridgeRelay to use more references
...
This will match our needs better and help avoid some `Arc<>`s.
It will be especially helpful for avoiding `Arc`s we don't
actually have.
2022-11-08 08:10:15 -05:00
51a98883c8
GuardMgr: Store bridge configuration.
...
I'm using an Arc<[]> here though I think that there's a chance
that a simple Vec<> would suffice. Since it's an internal type,
nothing will break if we change it later.
Also, we now switch into and out of the Bridges guard sample
as needed. However, that selection is not (yet) built from the
list of bridges. That will come soon.
2022-11-08 08:10:15 -05:00
188b9c0f86
GuardMgr: Remove duplicate code in set_filter
2022-11-08 08:10:15 -05:00
04bcf69749
GuardMgr: Clarify intent with update_active_set.
...
Also fix its behavior when using bridges.
2022-11-08 08:10:15 -05:00
ad47b28f2f
GuardMgr: Split `update_internal` into two functions.
...
The first part changes which guard set is active based on based on
the parameters, which always come from a NetDir; the second changes
the contents of the active guard set, based on a Universe.
2022-11-08 08:10:15 -05:00
95a95076a7
Refactor external guardmgr APIs: Stop taking NetDir arguments.
...
These arguments were used only for legacy (testing) purposes; the
tests now use `TestNetDirProvider`. This lets us simplify our
internal logic for passing a `NetDir` to our samples, and prepare
for having a `BridgeSet` to pass there instead.
This is a breaking change to `guardmgr` and `circmgr`.
2022-11-08 08:10:15 -05:00
339bd8bde0
Mock implementation of a NetDirProvider for testing.
...
I'm about to remove the old testing APIs from GurdMgr that took in a
NetDir in each function: adding this will make that possible.
2022-11-08 08:10:15 -05:00
6b94bc5e4c
Add an accessor for the latest BridgeDescList.
2022-11-08 08:10:15 -05:00
faf51702ac
Implement GuardMgr::install_bridge_desc_provider
2022-11-08 08:10:15 -05:00
5cb9e1987e
Require Send+Sync for BridgeDescProvider
...
We require these for NetDirProvider, so this shouldn't be a big reach.
2022-11-08 08:10:11 -05:00
93a150229a
sqlite cache: Document reasoning about timestamps
...
As per
https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/831#note_2851764
2022-11-08 13:00:51 +00:00
897bac680f
linkspec: Rename "maybe rename this?" TODOs in favor of #623
2022-11-07 12:27:50 -05:00
f5364065f3
PtTargetSettings: Enforce correctness at lower level.
...
This resolves a number of TODOs.
2022-11-07 12:21:22 -05:00
06972f171d
Remove a blank line
2022-11-07 12:19:02 -05:00
bc28793166
Downgrade TODO on chan_method
...
This is not something we need to solve for 1.1.0 (and it might not
need to be solved ever).
2022-11-07 11:49:49 -05:00
d448809e49
Merge branch 'hilev_spelling' into 'main'
...
Spelling fixes and normalizations on some high-level crates
See merge request tpo/core/arti!835
2022-11-07 15:48:06 +00:00
b423a40478
Remove TODO about third ChannelMethod variant.
...
We didn't find a use for this.
2022-11-07 10:39:13 -05:00
e832a90c4b
Remove TODO about inlining PtTargetSettings.
...
Since there are (or soon will be) parsing restrictions on this type,
we don't want to inline it as a simple Vec.
2022-11-07 10:36:20 -05:00
b295518a42
Spelling fixes and normalizations on some high-level crates
2022-11-07 10:21:58 -05:00
85035c7c5a
bridge desc: Make BridgeDescProvider DynClone
...
This allows the use of Box<dyn BridgeDescProvider> in callers,
since Box<dyn BridgeDescProvider> is now Clone.
2022-11-07 11:56:41 +00:00
9c7d1802f5
Fix typos
2022-11-06 06:51:58 +02:00
5b66a5e199
bridge desc tests: Test caching and if-modified-since
2022-11-04 19:08:32 +00:00
78f7916a88
bridge desc tests: Break out queues_are_empty helper
2022-11-04 19:08:32 +00:00
40c21b7d19
bridge desc tests: Provide a sqlite connection
...
The current test case doesn't use this.
2022-11-04 19:08:32 +00:00
636bff3193
bridge desc: Implement storage functions at the DB layer
2022-11-04 19:08:32 +00:00
6bb2eb9902
bridge desc: Make Downloaded be Debug
2022-11-04 19:08:32 +00:00
5bc1d40a2b
bridge desc: Implement cache reuse logic and if-modified-since
...
This introduces the new API functions to Store.
But currently they are all no-ops.
So all this machinery doesn't actually do anything.
Also, it changes the API to the mockable downloader, to allow it to
support if-modified-since. So this isn't used either. But it is more
convenient to do this all at once in BridgeDescManager, since care
needs to be taken about the intraction between if-modified-since and
the persistent cache.
2022-11-04 19:08:32 +00:00
279a169031
bridge desc: Rename one more variable to text
2022-11-04 19:02:23 +00:00
eaaa61a8e2
bridge desc: Catch panics in the download functionality
2022-11-04 19:02:23 +00:00
3f3f27193c
bridge desc: Provide a Store to the bridge desc manager
...
We use the one in the dirmgr. That means that our constructor now has
to take a dirmgr. And, the dirmgr must have a circmgr.
This is all rather odd, TBH.
Add .. to the binding of the return values from setup, as
future-proofing.
The tests now need to provide a Store too. Make the sqlite::new_empty
function pub(crate) so we can use it.
We must retain the _db_tmp_dir, since when it goes away the tmp
directory is deleted and the db goes readonly.
2022-11-04 19:02:23 +00:00
1fa9dd62b3
bridge desc tests: Apply tracing_test::traced_test
...
This lets us see the log messages. They look fine, as it happens.
2022-11-04 19:02:23 +00:00
9424b0970d
tor-dirmgr: impl AsRef<dyn Error> for Error
...
This allows use with tor_error::Report.
2022-11-04 19:01:24 +00:00
f3957a50b6
tor-netdoc: RouterDesc: Add published accessor
...
The bridge descriptor manager is going to want this.
2022-11-04 19:01:24 +00:00
dcdd8053b4
dirmgr: Make store be in an Arc
...
This will let us share it with the bridge descriptor manager.
(As discussed with Nick.)
2022-11-04 19:01:24 +00:00
9a285ec4ad
dirmgr sqlite store: Improve schema updates
...
* Centralise applying the schema updates, in a closure
* Make the schema update SQL texts be in an array so we can loop
* Make the version update statement generic, not cloned-and-hacked
This will make it possible to add another schema version without
error-prone conditions etc.
2022-11-04 19:01:24 +00:00
21a3808684
Upgrade to clap 3: replace deprecated functions
...
Also replace Arg::takes_value with Arg::action to configure flags
that don't take parameters vs options that do.
This makes it easy to upgrade to clap 4.
Tested deprecations with:
cargo check --workspace --all-features --features clap/deprecated
2022-11-04 19:28:40 +01:00
bc08ea48f7
Upgrade to clap 3 with minimal changes
...
This removes the last cargo audit override (for the unmaintained
ansi_term).
Don't mark options as required when they have default values:
see <https://github.com/clap-rs/clap/pull/3793 >.
2022-11-04 19:28:38 +01:00
bf563f3bdf
bridgedesc: Rename "text" from "output"
...
This was confusing, because it's the output of the donwload, but
nowhere near the output of the whole process. And it's going to
become even less so.
2022-11-03 19:00:47 +00:00
17ceae724e
bridgedesc: Make process_document into a free function
...
It deserves this treatment, I think.
2022-11-03 18:59:50 +00:00
c7a7ce5c20
bridgedesc: Introduce Downloaded
...
This gives names to things and makes things clearer, and this will be
even more true in a moemnt.
2022-11-03 18:59:50 +00:00
d2b31f7796
bridgedesc: download: Break out process_document
...
We're going to want to reuse this for handling cached stuff.
2022-11-03 18:57:40 +00:00
6fbf3059cd
bridgedesc: Prepare Mockable trait for if-modified-since
2022-11-03 18:57:40 +00:00
7d079ade3b
Merge branch 'warning' into 'main'
...
tor-guardmgr: use imported WeightThreshold in one place
See merge request tpo/core/arti!825
2022-11-03 16:25:37 +00:00
7d6f5d5eab
guardmgr config: Provide bridge information to new and reconfigure
2022-11-03 15:48:07 +00:00
aa375e2e09
tor-guardmgr: use imported WeightThreshold in one place
...
Without this, an unused import warning is generated when building
without features.
2022-11-03 15:44:32 +00:00
5bc3934fb4
bridges config: Provide uninhabited placeholder
...
This will avoid having to make bridge-related trait features in
GuardMgr conditional, which would be non-additive.
2022-11-03 15:43:41 +00:00
3dde9f8a05
bridges config: Check that bridges aren't enabled with no bridges
...
This is the validation which is called for by the documentation.
2022-11-03 15:43:41 +00:00
6c64be06a6
guardmgr config: Introduce and require new GuardMgrConfig trait
...
It doesn't seem to me like it makes sense to provide the backward
compatibility here.
2022-11-03 15:43:41 +00:00
f50da3efa1
define_accessor_trait: Allow specification of other items
2022-11-03 15:43:41 +00:00
64de9f74be
define_accessor_trait: Allow specification of supertraits
2022-11-03 15:43:41 +00:00
2bfce54959
guardmgr config: Pass fallback list from config by reference
...
This does involve additional cloning. However, soon it will mean that
we can pass the whole `TorClientConfig` by reference.
2022-11-03 15:43:41 +00:00
1179c39859
Suppress two clippy::large_enum_variant warnings
...
These are newly present on 1.65. We can address them later.
2022-11-03 11:09:51 -04:00
932fe48eaf
Run add_warnings.
2022-11-03 11:06:02 -04:00
c77cecd5b3
Merge branch 'edition-2021' into 'main'
...
set all crate edition to 2021
See merge request tpo/core/arti!822
2022-11-03 14:39:24 +00:00
70b420adf8
bridge descriptors tests: Fix flaky test
2022-11-03 11:46:20 +00:00
daf7eac60a
bridge descriptors tests: Test set_bridges more thoroughly (fix)
...
The RetryDelays are being triggered for the 2nd time here, so their
timeouts can be longer. We must bump the sleep to make sure we don't
have a flaky test.
2022-11-03 11:37:30 +00:00
7a99601721
bridge descriptors: logging: Log addition and removal (fmt)
...
Worsify formatting as demanded by rustfmt.
2022-11-03 11:37:30 +00:00
269808336e
bridge descriptors: logging: Log addition and removal
...
This involves breaking the calls to `new_bridges.remove` into a helper
that does the logging.
2022-11-03 11:37:30 +00:00
17c766fde4
bridge descriptors: logging: Log download start and outcome
2022-11-03 11:37:30 +00:00
1ccd9db9af
bridge descriptors tests: Test set_bridges more thoroughly
...
Prior to the previous commit, set_bridges would malfunction if there
were bridges which where (i) in current (ii) in queued or running
(iii) in the new bridge set.
This test failed then and passes now.
2022-11-03 11:37:30 +00:00
4a830e1ac2
bridge descriptors: Rewrite set_bridges
...
This was fundamentally confused and irregular. Now it is more
regular: it does the same things to all the elements of Tracked,
and a simple filtering on current.
This fixes a bug, for which I'm about to add a test case.
2022-11-03 11:37:30 +00:00
0571674a64
bridge descriptors tests: Add another couple of test cases
2022-11-03 11:37:30 +00:00
6db3403820
bridge descriptors tests: stream_drain_ready returns event count
...
We'll use this in a moment.
2022-11-03 11:37:30 +00:00
53c1cf0c6d
bridge descriptors tests: Break out bad_bridge helper function
2022-11-03 11:37:30 +00:00
42b1b08fdf
bridge descriptors: Change default max_refetch
...
As per
https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/820#note_2850269
2022-11-03 11:37:30 +00:00
2ae8a52371
bridge descriptors: Add clarification about bridge states
2022-11-03 11:37:30 +00:00
ad39873782
bridge descriptors: Improve and fix docs for consider_launching
2022-11-03 11:37:30 +00:00
d44bc1d0f8
bridge descriptors: Add comments where StateGuard is dropped
2022-11-03 11:37:30 +00:00
54e51cdba5
bridge descriptors: Document `changed` and `earliest_timeout` Options
2022-11-03 11:37:30 +00:00
fb4ffb76fd
bridge descriptors: Document updates argument to timeout_task
2022-11-03 11:37:30 +00:00
48f48841e1
Require derive_more 0.99.3
...
0.99.[012] have a bug https://github.com/JelteF/derive_more/issues/114
which makes the Deref derive for bridgedesc::StateGuard not work
and therefore breaks minimal-versions CI.
It seems simpler to require the newer version everywhere.
2022-11-03 11:37:23 +00:00
8eb7c731a2
bridge descriptors: Tests
2022-11-03 11:37:05 +00:00
3a185d61df
bridge descriptors: Provide a consistency check function
...
This is really part of the tests, but I put it here so that it can be
compiled-in if someone wants it during debugging.
2022-11-03 11:37:05 +00:00
51b4588cc0
bridge descriptors: Provide an implementation of BridgeDescProvider
...
Tests will come in a moment.
2022-11-03 11:37:05 +00:00
Nick Mathewson
Ian Jackson
eta
Ian Jackson
arnabanimesh
trinity-1686a
Dimitris Apostolou
Gabriel de Perthuis