summaryrefslogtreecommitdiff
path: root/crates
Commit message (Collapse)AuthorAgeFilesLines
...
| * errors: Introduce TorErrorIan Jackson2022-02-043-7/+50
| | | | | | | | Still much to do here.
| * errors: Initial impl HasKind in arti-client, ErrorKind::TODOIan Jackson2022-02-042-0/+13
| | | | | | | | | | | | | | | | | | This involves making a temporary ErrorKind::TODO. That will continue to exist until all errors (at least, the ones that make it out to here) can be properly categorised. Introducing this will let us work from the top and bottom towards the middle.
| * errors: impl HasKind for GuardMgrErrorIan Jackson2022-02-041-0/+12
| |
| * spawn errors: tor-guardmgr: Use formulaic patternIan Jackson2022-02-041-2/+2
| | | | | | | | This makes this like all the others, and is marginally shorter
| * spawn errors: Fix tor-dirmgrIan Jackson2022-02-041-3/+10
| |
| * spawn errors: Fix arti-client, tor-chanmgr, tor-circmgrIan Jackson2022-02-043-9/+29
| | | | | | | | | | | | | | Provide an enum variant to contain the SpawnError and a From impl. We use `#[from]` here because it doesn't really make sense to attach any context, as it's not likely to be very relevant.
| * spawn errors: impl HasKind for futures::SpawnErrorIan Jackson2022-02-043-0/+22
| | | | | | | | | | | | | | | | | | This needs two kinds. We have decided to treat a non-shutdown SpawnError as "unexplained" rather than as an InternalError. There are many crates whose From<futures::task::SpawnError> for Error erroneously treat it as an internal error. We will fix them in a moment.
| * tor_persist::Error: impl HasKind and adjust commentsIan Jackson2022-02-043-2/+51
| | | | | | | | | | And change the comments to slightly reinterpret these errors, to relate to the circumstances rather than error generation site.
| * tor-error: Add as a ddpendency to many cratesIan Jackson2022-02-045-0/+5
| | | | | | | | Doing this here makes it easier when I rebase/reorder things
| * tor-error: provide into_internal!Ian Jackson2022-02-041-0/+33
| |
| * tor-error: Allow making an `InternalError` from some other errorIan Jackson2022-02-041-3/+27
| | | | | | | | | | | | | | This can be used in call sites where an error is thought not to be possible. The `source` will be used only for formatting messages.
| * tor-error: Introduce InternalError as a type and a kindIan Jackson2022-02-044-1/+148
| | | | | | | | This can contain a backtrace, which will be printed.
| * tor-error: Skeleton for new crateIan Jackson2022-02-043-0/+95
| | | | | | | | | | | | As per doc/Errors.md. Currently there are no error kinds. Some will be added as we go along.
| * tor-persist: Distinguish load vs. store json errorsIan Jackson2022-02-043-10/+20
| | | | | | | | | | | | | | | | Serialisation errors ought not to occur, since they would represent an attempt to store malformed data, or something. (We always convert to a string, so the JSON error never contains IO errors or the like.) Deserialisation errors mean the persistent state is corrupt.
| * tor-circmgr: impl Display for TargetPortIan Jackson2022-02-041-0/+7
| | | | | | | | This will be used for error handling, and perhaps other things.
| * tor-linkspec: impl Display for OwnedChanTarget and OwnedCircTargetIan Jackson2022-02-041-0/+23
| |
| * tor-circmgr: Turn a type annotation comment into codeIan Jackson2022-02-041-2/+1
| | | | | | | | | | | | | | | | The type annotation may not be necessary for inference, but as a comment it risks becoming false. So it should be uncommented, or deleted. Error types round here are not entirely trivial so uncomment it.
* | Properly linkify two doc comment xrefs to issuesIan Jackson2022-02-041-2/+2
|/ | | | | | | | | | | | | | | | | | | | | Fixes these messages: warning: this URL is not a hyperlink --> crates/arti/src/watch_cfg.rs:115:5 | 115 | /// https://github.com/notify-rs/notify/issues/165 and | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use an automatic link instead: `<https://github.com/notify-rs/notify/issues/165>` | = note: `#[warn(rustdoc::bare_urls)]` on by default = note: bare URLs are not automatically turned into clickable links warning: this URL is not a hyperlink --> crates/arti/src/watch_cfg.rs:116:5 | 116 | /// https://github.com/notify-rs/notify/pull/166 . | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use an automatic link instead: `<https://github.com/notify-rs/notify/pull/166>` | = note: bare URLs are not automatically turned into clickable links
* Merge branch 'ticket270' into 'main'Nick Mathewson2022-02-036-17/+303
|\ | | | | | | | | | | | | Watch configuration files and reload them when they change Closes #270 See merge request tpo/core/arti!280
| * Document that `notify` behavior is strange with symlinksNick Mathewson2022-02-033-0/+15
| | | | | | | | | | | | | | | | | | | | (More specifically, `notify` behaves differently on different platforms. On some, it can watch specific directory objects on the filesystem, and so it only notices when _those_ directories change. If you change a symlink so that the canonical configuration file location is now in some other directory, `notify` won't notice. But on other platforms, notify just does "stat()" in a loop. On those, it _will_ notice if the configuration file changes.)
| * Avoid a potential infinite loop in configuration-watchingNick Mathewson2022-02-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | Since the user can put their logfiles and configuration files in the same directory, writing to the log can trigger an event from `notify`. If we log every non-interesting event from `notify`, then we'll trigger the logs every time we log, and fill up the disk. This commit removes the offending log and adds a comment about why. If we someday decide we do need to log here, maybe we can rate-limit the messages or something.
| * Treat rescan events as meaning "reload configuration".Nick Mathewson2022-02-031-2/+2
| |
| * Add a couple of TODOs about configuration-watching.Nick Mathewson2022-02-021-0/+7
| |
| * Before reloading configuration, drain all pending file changesNick Mathewson2022-02-021-0/+8
| | | | | | | | | | This way, if there are a bunch of changes at once, we only reload one time.
| * Refactor file-watching code to watch parent directories.Nick Mathewson2022-02-021-8/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | Due to limitations in notify and the OS APIs it uses, it isn't actually so useful to watch a single file. Instead, we have to watch the directories that contain the files, and filter out any events that aren't about the specific files we care about. I've put the logic here into a new type, but I've left the type un-exported: its API is pretty ugly, inasmuch as the caller needs to jump through hoops to only get the events that they want. That's not too bad so long as the API is private, but we'd want better if we were exposing this.
| * arti: Limit mut-ness of cfg_sources to one block.Nick Mathewson2022-02-021-12/+16
| |
| * arti-config: add blank lines between functions.Nick Mathewson2022-02-021-0/+6
| |
| * arti-config: Small type and comment refactoring from review.Nick Mathewson2022-02-021-2/+0
| |
| * Detect changes in non-client configuration sections tooNick Mathewson2022-02-012-17/+30
| | | | | | | | We don't yet do much with these, but we can avoid discarding them.
| * Make configuration-watching configurable and off-by-default.Nick Mathewson2022-02-014-4/+68
| | | | | | | | | | | | | | | | I'm slightly concerned about whether this is behavior people would expect to have on-by-default, so let's make this off-by-default for now. Maybe the `application` and `system` sections should merge?
| * Reload configuration when our configuration files change.Nick Mathewson2022-02-014-2/+73
| | | | | | | | Closes #270
* | Merge branch 'eta/reactor-2.5' into 'main'eta2022-02-031-33/+60
|\ \ | | | | | | | | | | | | Fix severe reactor ordering problems See merge request tpo/core/arti!282
| * | Fix severe reactor ordering problemseta2022-02-031-33/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A number of severe problems with the circuit reactor were fixed which could cause reordering of cells (which causes relays to terminate the circuit with a protocol violation, as they become unable to decrypt them). These mostly revolve around improper usage of queues: - The code assumed that a failure to place cells onto the channel would persist for the duration of a reactor cycle run. However, under high contention, this wouldn't always be the case. - This leads to some cells getting enqueued while others go straight through, before the enqueued cells. - To fix this, we block sending cells out of the channel while there are still some enqueued. - The hop-specific queues queued after encryption, not before. This was very brittle, and led to frequent mis-ordering. - This was fixed by making them not do that. This is arti!264 / 5bce9db5628126be2b736f228211174fe4132918 without the refactor part.
* | | Merge branch 'add-final-newline-force' into 'main'Nick Mathewson2022-02-031-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Add editorconfig to force some rules (Final Newline) See merge request tpo/core/arti!289
| * | | Add editorconfig to force some rules (Final Newline)Daniel Schischkin2022-02-031-1/+1
| | | |
* | | | Merge branch 'dirclient-testing' into 'main'Nick Mathewson2022-02-0313-45/+174
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | dir-client: bug fix and more tests See merge request tpo/core/arti!271
| * | | | Explain a testing oddity in tor-dirclient.Nick Mathewson2022-02-031-1/+11
| | | | |
| * | | | Fix a stale comment in tor-dirclient.Nick Mathewson2022-02-031-2/+1
| | | | |
| * | | | Upgrade required version of futures crate to 0.3.14Nick Mathewson2022-02-0112-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Earlier versions have a bug in UnboundedReceiver that make our new dirclient tests fail.
| * | | | dirclient: refactor and test "should-i-retire-the-circuit" code.Nick Mathewson2022-02-011-6/+13
| | | | |
| * | | | dirclient: Add tests for a number of failing cases.Nick Mathewson2022-02-011-25/+136
| | | | | | | | | | | | | | | | | | | | | | | | | These bring the case a tiny improvement in test coverage, and also manage to turn up a few bugs.
| * | | | dirclient: don't return too-long responses on decompression failureNick Mathewson2022-02-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a couple of places where we forgot to truncate our return-buffer to its actual size, and instead returned a big bunch of zeros. Found while writing the tests in the next commit. Someday, we'll have ReadBuf and won't have to worry about these things.
* | | | | Merge branch 'typos' into 'main'eta2022-02-037-7/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix typos See merge request tpo/core/arti!285
| * | | | | Fix typosDimitris Apostolou2022-02-027-7/+7
| | |/ / / | |/| | |
* | | | | Temporarily disable some clippy lints on nightlyIan Jackson2022-02-0210-1/+11
| | | | |
* | | | | Untangle two needless Ok(r?) into just rIan Jackson2022-02-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prompted by clippy::needless_question_mark. Sometimes Ok(r?) is needed to do automatic error conversion. I assume the lint checks for that. Anyway, in these cases it's not needed.
* | | | | Remove many needless borrows and slicesIan Jackson2022-02-025-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Found via clippy::needless_borrow. In some cases I removed needless `[..]` too. See also: needless_borrow suggestion doesn't go far enough https://github.com/rust-lang/rust-clippy/issues/8389
* | | | | clippy: Pass simply &output to fs::writeIan Jackson2022-02-021-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | clippy::needless_borrow quibbles here, IMO correctly. Its suggestion didn't go far enough: output is a String and a &String can be passed to write as-is for identical effect.
* | | | Merge branch 'reload-config-prep' into 'main'Ian Jackson2022-02-025-61/+108
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| Preparatory work for auto config reload See merge request tpo/core/arti!284
| * | Un-Arc<> TorClient in the arti crateNick Mathewson2022-02-012-8/+5
| | | | | | | | | | | | | | | TorClient doesn't need to be wrapped in an Arc any longer, thanks to other refactoring.