summaryrefslogtreecommitdiff
path: root/crates/tor-dirmgr/src
Commit message (Collapse)AuthorAgeFilesLines
* DirMgr:: Remove Error::NoChange as redundant.Nick Mathewson2022-05-253-72/+25
| | | | | | | | Now that the relevant functions now report changed/not-changed status via a boolean out-parameter (see !527), there's no reason to have a separate NoChanged error case. Closes #484.
* Merge branch 'bug482' into 'main'eta2022-05-242-29/+133
|\ | | | | | | | | | | | | DirMgr: Stop load-from-cache process when there is no change. Closes #482 See merge request tpo/core/arti!527
| * DirMgr: Stop load-from-cache process when there is no change.Nick Mathewson2022-05-242-29/+133
| | | | | | | | | | | | | | | | | | | | | | | | Previously in !511 I had introduced a bug where, if there was an error more serious than "no change", that error would keep us from noticing that we had no change, and we'd loop until the safety counter ran out. Then we'd panic. This commit fixes the bug by reintroducing the `changed` boolean -- this time as an outparam for the add_from_* methods. Fixes #482.
* | fs-mistrust: make Mistrust have a corresponding Builder type.Nick Mathewson2022-05-242-8/+8
|/ | | | | This is an approximately minimal revision to get Builder in place; subsequent commits will clean up the API.
* Simplify advance and reset functions with mem::replace.Nick Mathewson2022-05-191-8/+4
|
* Explain why we call update_status unconditionally.Nick Mathewson2022-05-191-0/+3
|
* Remove BootstrapAction::ImpossibleNick Mathewson2022-05-193-7/+4
| | | | It does nothing that Fatal does not. Suggested by @eta in review.
* Fix compilation with Rust 1.56.Nick Mathewson2022-05-171-3/+2
|
* DirMgr: Remove blocking_error return path.Nick Mathewson2022-05-172-53/+29
|
* DirMgr: Unify error return pathsNick Mathewson2022-05-173-170/+262
| | | | | | | | | | | | | | | | | We no longer have separate return paths for recoverable and fatal errors; instead, they are merged, and distinguished based on recovery actions. Since it is now possible for download() to give an error that should _not_ destroy the previous state, it takes `&mut Box<dyn DirState>`. This change unfortunately means that we can no longer call `state = state.advance()`, but instead have to do some mem::swap junk with poisoned values. Any better solution would be a good thing. Additionally, the reset() and advance() methods can no longer fail. There is still a separate return path for reset-triggering errors; I'm about to fix that.
* DirMgr: Remove special handling of "changed" booleanNick Mathewson2022-05-172-84/+69
|
* DirMgr: Start refactoring error handling.Nick Mathewson2022-05-172-3/+96
| | | | | | This commit adds a couple of new error types that we will soon want to distinguish, and a new way of classifying errors. These are not yet all used.
* Give an error if the cache violates If-Modified-Since.Nick Mathewson2022-05-161-7/+24
| | | | | This should be sufficient to detect several kinds of nefariousness that we'd previously overlooked.
* Add missing extend_tolerance to add_consensus_text.Nick Mathewson2022-05-161-0/+1
| | | | This should have gone in when we fixed #412
* DirMgr: Blame the correct cache for consensus validation failureNick Mathewson2022-05-161-2/+15
|
* Move consensus signature verification to add-document code.Nick Mathewson2022-05-161-22/+95
| | | | | | | | | | | Previously, we did this in `advance()`, but that wasn't so great: it meant that we could fail in the advance() code, whereas the calls to `advance()` treated errors as fatal. This treats failed verification as a blocking error that requires a reset. Fixes one aspect of #439.
* On a blocking error, blame the appropriate directory cacheNick Mathewson2022-05-162-0/+22
| | | | | Fortunately, the only error type that we need to handle blocking errors with actually has a DirSource in it already.
* DirMgr: Add a way for a state to report a blocking error.Nick Mathewson2022-05-162-7/+26
| | | | | (A blocking error is one that means that the current bootstrap attempt has failed, and must be restarted.)
* Implement nonfatal errors in add_from_*Nick Mathewson2022-05-161-52/+91
|
* DirMgr: Let add_from_* distinguish non-fatal errorsNick Mathewson2022-05-162-54/+79
| | | | | | | Previously all errors were treated as non-fatal. The add_from_* implementations don't yet behave properly; I'll fix them in subsequent commits.
* DirMgr: Improve display for DocSourceNick Mathewson2022-05-161-3/+11
| | | | (Also, implement Display for tor_dirclient::SourceInfo).
* DirMgr: make DocSource useful by having it include dirserver info.Nick Mathewson2022-05-163-22/+47
| | | | | | | | | Previously DocSource would tell you whether the document was from a local store or a cache server, but it wouldn't tell you _which_ server it came from. This change required adding DocSource as an argument to DirState::add_from_download.
* Merge branch 'main' into 'ticket_466'Nick Mathewson2022-05-163-10/+7
|\ | | | | | | # Conflicts: # doc/semver_status.md
| * Merge branch 'network-config-error' into 'main'Nick Mathewson2022-05-121-5/+0
| |\ | | | | | | | | | | | | Delete tor_dirmgr::Error::BadNetworkConfig See merge request tpo/core/arti!506
| | * Delete tor_dirmgr::Error::BadNetworkConfigIan Jackson2022-05-121-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This was anomalous, in that it contains &'static str, rather than a proper nested error (eg a config::ConfigError, maybe). But in fact it tursn out it is now not constructed. The last construction site was removed a long time ago in Use derive_builder for Authority and FallbackDir.
| * | Resolve DOCDOC comments in tor-dirmgr.Nick Mathewson2022-05-122-5/+7
| | |
* | | dirmgr: use set_skew_limit.Nick Mathewson2022-05-111-0/+9
|/ / | | | | | | | | | | | | | | | | | | With this API we can now stop consensus download attempts early if any consensus that the directory cache gave us would be necessarily too far in the future or in the past. This saves wasted bandwidth for clients with skewed clocks. Closes #466.
* | Adjust if-modified-since field on the basis of tolerated skewNick Mathewson2022-05-112-29/+84
| | | | | | | | | | | | | | | | | | | | If we're happy with a directory from 3 days ago, we should say "if-modified-since 3 days ago". This patch is larger than I'd like, since I had to add &DirMgrConfig as an argument to the functions that make a consensus request. Closes #467.
* | tor-dirmgr: update status reporting to consider skew toleranceNick Mathewson2022-05-113-24/+84
| | | | | | | | | | | | In our status reporting code, we consider an expired-but-still-usable directory still bootstrapped, but not 100% bootstrapped.
* | Make reset_time() for incomplete directories more generous.Nick Mathewson2022-05-111-10/+35
| | | | | | | | | | | | | | | | | | | | | | Since we want to be willing to use older consensuses, we don't necessarily want to reset a download just because the consensus is expired. This new behavior isn't ideal either; I've added a TODO that relates to #433. Related of #412
* | Add DirSkewTolerance section to DirMgr configuration.Nick Mathewson2022-05-113-2/+63
|/ | | | | | | | | | | | | | | | | | | | This new section describes how much variance we accept when it comes to expired and not-yet-valid directory documents. (Currently, the only ones where this matters for are consensus documents and authority certificates.) A document that is invalid by no more than these tolerances is not _live_, but it can still be used. These tolerances serve two purposes: * First, they allow clients to run with a little more clock skew than they would tolerate otherwise. * Second, they allow clients to survive the situation where the authorities are unable to reach a consensus for a day or two. Compare with Tor's REASONABLY_LIVE_TIME and NETWORKSTATUS_ALLOW_SKEW constants; also compare with proposal 212. Closes #412.
* tor-dirmgr: move apply_netdir_changes() to be a DirMgr methodeta2022-05-102-79/+80
|
* tor-dirmgr: small fixups for the bootstrapping refactoreta2022-05-103-16/+10
| | | | | | | - Some FIXMEs got removed or amended. - AddMicrodescs now yields a mutable reference, so we can use .drain() and reuse the allocation. - Some panics were downgraded to debug_asserts.
* tor-dirmgr/bootstrap.rs: error on older netdirs, add log lineeta2022-05-102-0/+26
| | | | | | | | - We don't want to inadvertently replace our netdir with one that's actually older, so detect and error on this condition. - Also, print a debug line when we get a new netdir without enough guards. - (An unrelated TODO was also added.)
* tor-dirmgr/state.rs: take an object to get a netdir, not a netdireta2022-05-102-12/+29
| | | | | | | | | - Taking a previous netdir directly and keeping it around before we need it is a bit of a waste of memory, and also doesn't mesh well with how SharedMutArc works. - To remedy this, introduce a new trait `PreviousNetDir` and have the state machines take that instead. (I was a bit tempted to just pass in the SharedMutArc directly. Maybe I should've done that.)
* tor-dirmgr/state.rs: remove GetConsensusState::bodge_neweta2022-05-102-43/+36
| | | | - (Also fixes up some dirfilter stuff, whoops.)
* tor-dirmgr/state.rs: remove WriteNetDir, use filters directlyeta2022-05-101-97/+79
| | | | | - The only purpose of WriteNetDir was to provide a filter, which isn't necessary any more. Refactor to provide the filter directly.
* tor-dirmgr/state.rs: use the NetDirChange API instead of WriteNetDireta2022-05-103-260/+179
| | | | | | | | | | | - GetMicrodescsState now uses the NetDirChange API to propagate netdir changes, instead of modifying the netdir directly. - PendingNetDir was refactored in order to support this use case. - As a result, the netdir-related methods in WriteNetDir can be removed, leaving only the DirFilter for now. - add_from_cache() no longer takes a store, because nothing uses it. - (bodge: apply_netdir_changes() was put in a few places missed previously)
* tor-dirmgr/state.rs: add new NetDirChange API, consume iteta2022-05-102-3/+97
| | | | | | | | | | | | | - The new DirState::get_netdir_change() API lets the state machine export a NetDirChange: a request to either replace the current netdir, or add microdescs to it. - bootstrap.rs now consumes this new API, even though nothing implements it yet. - This will let us implement GetMicrodescsState without having to directly mutate the netdir. The calling code also handles checking the netdir against the circmgr for sufficiency, and updating the consensus metadata in the store, meaning the revised GetMicrodescsState will not have to perform these tasks.
* tor-dirmgr/state.rs: feed through additional parameters, use themeta2022-05-102-242/+222
| | | | | | | | | | | | | | - The additional parameters passed to GetConsensusState are now passed through all the states, and used as well. - WriteNetDir doesn't have a now() or config() method any more, since the states now get this from the runtime or the config parameters. - This required modifying the tests to make a mocked runtime and custom config directly, instead of using DirRcv for this purpose. - Additionally, because we don't have to upgrade a weak reference for DirState::dl_config(), that function no longer wraps its return value in Result. - (A bunch of the FIXMEs from the previous commit that introduced the additional parameters have now been rectified as a result.)
* tor-dirmgr/state.rs: refactor GetConsensusState::neweta2022-05-103-220/+285
| | | | | | | | | | | | | - GetConsensusState::new now takes a set of parameters matching what it actually needs, instead of just taking a writedir. (It still *does* take a writedir, and indeed still uses it for basically everything, but that will eventually go away.) - Its call sites were updated. - Some tests now need to take a runtime, and got indented a lot as a result. - Resetting was made non-functional, because we need to thread through the parameters passed to GetConsensusState to all of the other states, too. This will happen in a later commit.
* tor-dirmgr: move DirState to state.rseta2022-05-103-78/+80
| | | | | | - Given that this is effectively an implementation detail, it doesn't really make sense to have it be in the crate root... - (also, we're going to change it a bunch now)
* tor-dirmgr/bootstrap.rs: refactor fetch_singleeta2022-05-101-31/+34
| | | | | | | - fetch_single now takes what it needs, instead of an Arc<DirMgr<R>>. - This required refactoring the CANNED_RESPONSE mechanism, given the test would otherwise fail due to not having a CircMgr to pass to fetch_single.
* tor-dirmgr: make note_request_* functions standaloneeta2022-05-102-72/+80
| | | | | - DirMgr::note_request_outcome and friends are now just standalone functions, taking a CircMgr.
* tor-dirmgr/bootstrap.rs: refactor query_into_requests, make it usedeta2022-05-102-60/+56
| | | | | | | - query_into_requests is now called make_requests_for_documents, and does the &[DocId] -> DocQuery conversion internally instead. - DirMgr::make_consensus_request and DirMgr::query_into_requests are now gone. The tests use the new functions, as does fetch_multiple.
* tor-dirmgr: move query_into_requests into bootstrap.rseta2022-05-102-44/+71
| | | | | | | - There's no good reason these functions needed to be part of the dirmgr, apart from needing a runtime and a store. - However, we can just add those as arguments and copy them over. This commit does that.
* tor-dirmgr/bootstrap.rs: refactor load_all -> load_documents_from_storeeta2022-05-103-15/+29
| | | | | | | | - Function renamed & docs tidied up a bit - Function signature now takes what it needs (immutable &dyn Store instead of mutex, slice instead of Vec) and nothing more - DocQuery::load_documents_into was also renamed DocQuery::load_from_store_into and given similar treatment
* tor-dirmgr/storage.rs: impl Store for Box<dyn Store>eta2022-05-101-0/+87
| | | | | | | | | | | Annoyingly, Rust doesn't automatically generate this sort of `impl` for you, and I'd like to reduce the usage of Mutex<DynStore> everywhere else in favour of either &dyn Store or &mut dyn Store. (This is for two reasons: firstly, we might have a Store implementation that doesn't use a mutex as above, or similar refactors; secondly, passing the raw trait object reference lets us encode mutability into the function signature, which I believe is quite valuable.)
* tor-dirmgr/lib.rs: move DirMgr::load_documents_into to DocQueryeta2022-05-103-56/+59
| | | | | Move the function out of DirMgr, giving it a new &Mutex<DynStore> argument instead.
* Update tor-dirmgr to use fs-mistrust.Nick Mathewson2022-05-095-86/+114
|
generated by cgit v1.2.3 (git 2.46.0) at 2026-08-26 23:28:45 +0000