summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | keymgr: Downgrade 2 "TODO hs" to "TODO HSS".Gabriela Moldovan2023-06-222-2/+2
| | | |
| * | | keymgr: Remove outdated TODO.Gabriela Moldovan2023-06-221-1/+0
|/ / / | | | | | | | | | This TODO talks about a change we've decided not to implement.
* | | Merge branch 'stderr' into 'main'Alexander Færøy2023-06-2147-1/+93
|\ \ \ | | | | | | | | | | | | | | | | lints: Promote clippy::print_stderr and clippy::print_stdout See merge request tpo/core/arti!1271
| * | | lints: Run maint/add_warning to actually apply new lints (again)Ian Jackson2023-06-211-0/+2
| | | | | | | | | | | | | | | | | | | | I prepared 161b9844d against an earlier version of main without the geoip crate. Run maint/add_warning again.
| * | | lints: Run maint/add_warning to actually apply new lintsIan Jackson2023-06-2144-0/+88
| | | |
| * | | lints: Promote clippy::print_stderr and clippy::print_stdoutIan Jackson2023-06-212-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are available in our MSRV now, so we don't need to handle specially. We can just add them to the standard lint block. (Lint block in every crate will be updated automatically in the next commit.)
* | | | Merge branch 'keymgr-refactor-fs-ops-2' into 'main'Ian Jackson2023-06-213-18/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keymgr: Make ArtiNativeKeyStore::key_path() return a relative path. Closes #908 See merge request tpo/core/arti!1267
| * | | | keymgr: Fix clippy lints.Gabriela Moldovan2023-06-211-1/+1
| | | | |
| * | | | keymgr: Remove outdated TODO.Gabriela Moldovan2023-06-211-2/+0
| | | | | | | | | | | | | | | | | | | | This TODO was addressed in #899
| * | | | keymgr: Make ArtiNativeKeyStore::key_path() return a relative path.Gabriela Moldovan2023-06-211-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also updates `ArtiNativeKeyStore`'s `KeyStore::remove` implementation to build the absolute path of the file being removed, by joining `self.keystore_dir` and the relpath returned by `ArtiNativeKeyStore::key_path()`. This addresses #908
| * | | | keymgr: Derive Into for ArtiPath.Gabriela Moldovan2023-06-211-1/+1
|/ / / / | | | | | | | | | | | | | | | | Sometimes we need the underlying String (for example to create a PathBuf).
* | | | Merge branch 'keymgr-api-consistency' into 'main'Ian Jackson2023-06-215-44/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | keymgr: Remove Error::NotFound, update KeyMgr, KeyStore APIs. See merge request tpo/core/arti!1280
| * | | | keymgr: Remove Error::NotFound, update KeyMgr, KeyStore APIs.Gabriela Moldovan2023-06-215-44/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the `NotFound` `tor_keymgr::Error` variant. Since `KeyMgr` and `KeyStore` users will need to be able to distinguish between "not found" errors and other I/O errors, this also changes the return types of the `get()` and `remove()` functions of `KeyStore` and `KeyMgr`, which now return `Ok(None)` instead of `Error::NotFound`. This makes the `KeyStore` API consistent with `KeyMgr::get`, which already has a return type of `Result<Option<K>>` (rather than `Result<K>`). This also prepares us for #901, which will make key store errors opaque. Without this change: * we'd have to create a `struct NotFoundError;` error type. Its `HasKind` impl would need to return a new `ErrorKind::KeyStoreErrorNotFound` `ErrorKind` variant * callers would have to match the `error_kind()` of the error to figure out whether the key simply can't be found (`ErrorKind::KeyStoreErrorNotFound`), or if something went wrong (any other `ErrorKind`). Given the above, I think `Result<Option<()>>` makes for a more ergonomic API. Part of #901
* | | | | Merge branch 'keymgr-rm-cond' into 'main'Ian Jackson2023-06-211-10/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | keymgr: Remove unnecessary condition. See merge request tpo/core/arti!1277
| * | | | keymgr: Remove unnecessary condition.Gabriela Moldovan2023-06-211-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to special-case `NotFound` errors because `ssh_key::PrivateKey::from_openssh` doesn't read from disk (so it shouldn't be returning `NotFound` errors in the first place). Previously, this condition made sense because we were using `ssh_key::PrivateKey::read_openssh_file` instead of `ssh_key::PrivateKey::from_openssh`, which _does_ read from disk. This condition should have been removed in !1263 (the refactoring where we switched to `from_openssh`). (Also, after #901 is implemented, we probably won't have an `Error::NotFound` error anymore).
* | | | | Merge branch 'keymgr-remove-todo' into 'main'Ian Jackson2023-06-211-8/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | keymgr: Remove outdated TODO. See merge request tpo/core/arti!1278
| * | | | keymgr: Remove outdated TODO.Gabriela Moldovan2023-06-211-8/+0
| | |_|/ | |/| | | | | | | | | | | | | | This TODO describes something we're not planning to implement, so let's just remove it.
* | | | Merge branch 'defer-hsservice-todos' into 'main'Ian Jackson2023-06-215-26/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Downgrade every "TODO HS" in tor-hsservice See merge request tpo/core/arti!1265
| * | | | Downgrade every "TODO HS" in tor-hsserviceNick Mathewson2023-06-205-26/+26
| | | | | | | | | | | | | | | | | | | | These are all service-specific, and not client-specific.
* | | | | Merge branch 'hsdesc-accessors' into 'main'Ian Jackson2023-06-213-50/+58
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | netdoc: Use derive amplify::Getters for HsDesc accessors. Closes #909 See merge request tpo/core/arti!1266
| * | | | | netdoc: downgrade two accessor-related TODOsNick Mathewson2023-06-201-4/+1
| | | | | |
| * | | | | netdoc: Use derive amplify::Getters for HsDesc accessors.Nick Mathewson2023-06-203-46/+57
| |/ / / / | | | | | | | | | | | | | | | Closes #909.
* | | | | Merge branch 'doc_link_fix' into 'main'Alexander Færøy2023-06-211-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix a rustdoc link. See merge request tpo/core/arti!1274
| * | | | | Fix a rustdoc link.Nick Mathewson2023-06-211-1/+1
| | | | | |
* | | | | | Merge branch 'upgrade_21June2023' into 'main'gabi-2502023-06-219-16/+16
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Upgrade a couple of dependencies See merge request tpo/core/arti!1276
| * | | | | Upgrade to memmap2 0.7Nick Mathewson2023-06-212-3/+3
| | | | | |
| * | | | | Upgrade to strum 0.25.Nick Mathewson2023-06-219-13/+13
| | |_|/ / | |/| | |
* | | | | Merge branch 'onionsocks' into 'main'Nick Mathewson2023-06-213-7/+85
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | arti: return prop304 extended socks5 reply codes for onion services See merge request tpo/core/arti!1248
| * | | | | Add and use ErrorKinds for remaining onion service errorsNick Mathewson2023-06-212-6/+48
| | | | | |
| * | | | | arti: return prop304 extended socks5 reply codes for onion servicesNick Mathewson2023-06-212-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't yet return all of them; this commit adds some todo notes about changes we may need to our ErrorKinds. Part of #736
| * | | | | arti: Abbreviate SocksStatus and ErrorKind imports and refactor.Nick Mathewson2023-06-211-7/+8
| | |/ / / | |/| | |
* | | | | Merge branch 'chanmgr-method' into 'main'Nick Mathewson2023-06-211-2/+11
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Create chanmgr() method in TorClient See merge request tpo/core/arti!1275
| * | | | Remove extra 'this' in some methodsSaksham Mittal2023-06-211-3/+3
| | | | |
| * | | | Create chanmgr() method in TorClientSaksham Mittal2023-06-211-0/+9
|/ / / /
* | | | Merge branch 'todos' into 'main'Nick Mathewson2023-06-216-62/+31
|\ \ \ \ | |/ / / |/| | | | | | | | | | | tor-hsclient: Dispose of easy todos and remove many allows See merge request tpo/core/arti!1272
| * | | tor-hsclient: Apply deferred clippy churn needed by fmt churnIan Jackson2023-06-211-1/+1
| | | | | | | | | | | | | | | | rustfmt *introduced* this clippy warning.
| * | | tor-hsclient: Apply deferred rustfmt churnIan Jackson2023-06-212-11/+6
| | | |
| * | | tor-hsclient: Drop most allows that are marked for removalIan Jackson2023-06-213-9/+0
| | | |
| * | | tor-hsclient: Drop a large number of unneeded importsIan Jackson2023-06-214-19/+9
| | | |
| * | | tor-hsclient: Add HSID to some log messagesIan Jackson2023-06-211-6/+7
| | | | | | | | | | | | | | | | | | | | For the debug!, we can use the unredacted form. For error!, we use Sensitive.
| * | | tor-hsclient: Do Debug the descriptor as part of DataIan Jackson2023-06-211-1/+0
| | | | | | | | | | | | | | | | | | | | Empirically, this does not cause the descriptor to be spat out in normal operation. And it seems right.
| * | | tor-hsclient: Drop some temporary trace callsIan Jackson2023-06-212-8/+2
| | | | | | | | | | | | | | | | | | | | These were added as part of a debugging #885, and are no longer needed.
| * | | tor-hsclient: Drop two eprintlns in production codeIan Jackson2023-06-211-2/+0
| | | |
| * | | tor-hsclinet: Promote dead code allows to cover all testsIan Jackson2023-06-211-1/+3
| | | | | | | | | | | | | | | | | | | | We want to remove the crate-level dead code allows. The tests are incomplete and there are multiple todos for that.
| * | | tor-hsclient: Use a formulaic TODO mark for incompleteness of testsIan Jackson2023-06-211-5/+5
| | | |
| * | | tor-hsclinet: Add a narrow allow, pending answer to open questionIan Jackson2023-06-211-0/+1
| | | | | | | | | | | | | | | | | | | | I need to talk to HS expert(s) about when this circuit can be torn down.
| * | | tor-hsclient: Remove unused Context.hs_blind_id_keyIan Jackson2023-06-211-3/+0
| | | |
| * | | tor-hsclient: Add an allow for a deliberately-unused variableIan Jackson2023-06-211-0/+1
| | | |
| * | | tor-hsclient: Omit some unussed struct fields in patternsIan Jackson2023-06-211-2/+2
| | |/ | |/| | | | | | | | | | For the arms that have a fixed retry time, or a fixed ErrorKind, dont't bind the unused inner error.
* | | Merge branch 'chanmgr-doc-fix' into 'main'Nick Mathewson2023-06-211-1/+0
|\ \ \ | | | | | | | | | | | | | | | | Remove message 'For now, only direct channels are supported' in tor-chanmgr docs See merge request tpo/core/arti!1273