summaryrefslogtreecommitdiff
path: root/crates
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | arti SOCKS proxy: Tear down connections when client sends optimistic dataIan Jackson2024-09-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We *do* want to support optimistic data, see https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/2436#note_3081886 However, right now, Arti risks mis-framing bugs if clients do send optimistic data, which would be quite serious. Mitigates #1627 / TROVE-2024-010 by replacing the misframing bug with connection failure. It doesn't seem so easy to write a test case for this.
* | | | | | | rpc: Expose a delegation table in arti:x_list_all_rpc_methodsNick Mathewson2024-09-244-1/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #1624.
* | | | | | | rpc: add mandatory delegate-type attribute to Object templateNick Mathewson2024-09-243-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When specifying a delegation, the template user must also say what type they're delegating to. We're going to use this to document and expose delegations.
* | | | | | | Merge branch 'hscircpool-builder-generic' into 'main'gabi-2502024-09-249-464/+875
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make `HsCircPool` generic over circuit builder type See merge request tpo/core/arti!2420
| * | | | | | | CircMgr: Make CircMgr and HsCircPool generic over builder type.Wesley Aptekar-Cassels2024-09-249-464/+875
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow for testing, as the CircuitBuilder can be replaced with a mocked version. This did require moving some of what was in the CircuitBuilder impl into the AbstractCircuitBuilder type, since Drop implementations can't be specialized, but that's fine, as we'll probably be doing more of that in the future anyways.
* | | | | | | Merge branch 'abstract-socket-v2' into 'main'Nick Mathewson2024-09-2431-406/+972
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rtcompat: Second attempt at AF_UNIX support Closes #1152 See merge request tpo/core/arti!2437
| * | | | | | rtcompat: Finalize names for general::SocketAddr.Nick Mathewson2024-09-242-44/+52
| | | | | | |
| * | | | | | rtcompat: Expose FakeStream and friends; fix compilation in tor-rtmockNick Mathewson2024-09-244-17/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that these types are generally useful, and that they are in fact needed for tor-rtmock to compile without a PreferredRuntime.
| * | | | | | rtcompat: Fix some rustdoc links.Nick Mathewson2024-09-244-6/+6
| | | | | | |
| * | | | | | rtcompat: remove async_trait from NetStreamListener.Nick Mathewson2024-09-248-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (The trait no longer has any async methods.)
| * | | | | | Make Runtime require NetStreamProvider<unix::SocketAddr>Nick Mathewson2024-09-247-10/+46
| | | | | | |
| * | | | | | rtcompat: initial implementation for "Abstract" addresses.Nick Mathewson2024-09-242-0/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is feature-complete, but will need tests. I'm holding off at this point so we can discuss naming on these types.
| * | | | | | rtcompat: Require Sync and 'static for NetStreamListener::IncomingNick Mathewson2024-09-243-2/+7
| | | | | | |
| * | | | | | rtcompat: Add NetStreamProvider<Unix> to CompoundRuntimeNick Mathewson2024-09-243-39/+106
| | | | | | |
| * | | | | | rtcompat: NetStreamProvider<unix::SocketAddr> for non-unix platformsNick Mathewson2024-09-244-0/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since there is no way to construct a unix::SocketAddr on these platforms, it's harmless to provide an implementation for NetStreamProvider. What's more, doing so greatly simplifies our AbstractAddr implementation.
| * | | | | | Implement NetStramProvider<Unix> for async_std.Nick Mathewson2024-09-241-0/+23
| | | | | | |
| * | | | | | async_std: Perpare macro for use with Unix streams.Nick Mathewson2024-09-242-33/+35
| | | | | | |
| * | | | | | async_std: start a macro to implement wrappers for stream typeNick Mathewson2024-09-241-71/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As before, this commit does nothing interesting: it's a separate commit because it reindents a lot of code.
| * | | | | | rtcompat: Implement NetStreamProvider<Unix> for tokio.Nick Mathewson2024-09-241-4/+60
| | | | | | |
| * | | | | | tokio: Perpare macro for use with Unix streams.Nick Mathewson2024-09-241-24/+31
| | | | | | |
| * | | | | | tokio: start a macro to implement wrappers for stream typeNick Mathewson2024-09-241-67/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit does nothing interesting yet: it's a separate commit because it reindents a lot of code.
| * | | | | | rtcompat: Add ADDR parameter to NetStream{Provider,Listener}Nick Mathewson2024-09-241-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will let us make a NetStreamProvider that works for AF_UNIX addresses, and for "abstract" addresses. I've decided to let this parameter have a default value of `std::net::SocketAddr` for now. We can remove the default later if we decide it's confusing.
| * | | | | | Documentation updates for "NetStreamProvider" renameNick Mathewson2024-09-2410-32/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop referring to TCP streams in its documentation; update other documentation to refer to NetStreamProvider rather than TcpProvider.
| * | | | | | rtcompat: Rename TcpProvider to NetStreamProvider.Nick Mathewson2024-09-2417-98/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (And similarly rename TcpListener to NetStreamListener, along with their TcpStream/TcpListener associated types.) These types are about to become generic over addresses, and therefore shouldn't be named after TCP. Renaming was done mostly with Rust Analyzer, except for some macros that needed to be hand-edited. (I'll revise the comments in the next commit; this one is all about renaming.)
| * | | | | | rtcompat: Remove accept() from TcpListenerNick Mathewson2024-09-2412-82/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's redundant with the incoming() method (which turns the TcpListener into a Stream of connections), and nothing actually used it outside of tests. Removing this method allows us to simplify our TcpListener code a good deal, as can be seen by some of the implementations we removed from our example and testing code.
| * | | | | | rtcompat: Add definitions for unix::SocketAddr.Nick Mathewson2024-09-243-0/+97
| | | | | | |
| * | | | | | rtcompat: reformat Cargo.tomlNick Mathewson2024-09-241-1/+5
| | | | | | |
| * | | | | | rtcompat: Add an extension trait for building modified RuntimesNick Mathewson2024-09-246-23/+80
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this extension trait, we no longer need to construct `CompoundRuntime` directly outside of tor-rtcompat. This in turn will make it a little less painful when we have to add more generics to CompoundRuntime.
* | | | | | tor-keymgr: Rename keystore.type to keystore.kind.Gabriela Moldovan2024-09-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In !2394 we settled on `kind`. This updates the error messages to reference the new field name.
* | | | | | arti: Update example config with new keystore configuration.Gabriela Moldovan2024-09-231-10/+8
| | | | | |
* | | | | | tor-keymgr: Move keystore config under keystore.primary.Gabriela Moldovan2024-09-233-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The keystore settings only configure the *primary* keystore, so they should be under `keystore.primary`.
* | | | | | arti: Reinstate the keystore.enabled option.Gabriela Moldovan2024-09-232-54/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow-up from !2394 I want to keep the `keystore.enabled` option, because I'm planning on extending `ArtiKeystoreConfig` to support configuring secondary keystores too (currently, the only supported setting is `keystore.kind`, which configures the primary keystore). `keystore.enabled` will disable keystore use altogether (i.e. both primary and secondary). Currently, we only support configuring the "primary" (previously known as "default") keystore, which can be either "native" (the on-disk Arti keystore), or "ephemeral" (an in-memory keystore). To implement #858, we will need to support configuring additional keystores too, so we will need to move to a config of the form ```toml [storage.keystore] # Whether the keystore is enabled. #enabled = "auto" # Configure the primary keystore. [storage.keystore.primary] # The type of primary keystore to use kind = "auto" | "native" | "ephemeral" # Optionally configure C Tor keystores for arti to use. # # Note: The keystores listed here are read-only (keys are only # ever written to the primary keystore, configured in # `storage.keystore.primary`). [[storage.keystore.ctor]] # If the `kind` is `service`, this should be set to the `HiddenServiceDirectory` # of your hidden service. Arti will read `HiddenServiceDirectory/hostname` # and `HiddenServiceDirectory/private_key`. (Note: if your service is running # in restricted discovery mode, you must set the # `[[onion_services."<the nickname of your svc>".restricted_discovery.key_dirs]]` # to `HiddenServiceDirectory/client_keys` # # If the `kind` is `client`, this should be set to `ClientOnionAuthDir` of # your client. If Arti is configured to run as a client (i.e. if it runs in SOCKS # proxy mode), it will read the client restricted discovery keys from this path. path = "/foo/bar" # The type of keystore `path` should be interpreted as kind = "client" | "service" ``` This moves the current keystore settings to `storage.keystore.primary` in preparation for that change.
* | | | | | tor-keymgr: Add back ArtiKeystoreConfig::is_enabled().Gabriela Moldovan2024-09-232-1/+7
|/ / / / / | | | | | | | | | | | | | | | | | | | | I am adding `is_enabled()` back because I plan to un-deprecate the `enabled` setting.
* | | | | tor-hsservice: Update docs to reflect KeystoreSelector renaming.Gabriela Moldovan2024-09-231-1/+1
| | | | |
* | | | | arti-client: Update docs to reflect KeystoreSelector renaming.Gabriela Moldovan2024-09-231-3/+3
| | | | |
* | | | | tor-keymgr: Rename the primary keystore for clarity.Gabriela Moldovan2024-09-2310-44/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, arti's primary keystore was referred to as its "default" keystore. However, "default" is inaccurate here: there is no way to meaningfully override this "default" (the "default" store acts as the main keystore). Throughout the codebase, we query all keystores for keys (including the secondary ones), but only ever write to the default/primary keystore. This is OK for now, because it enables us to have one mutable keystore, and multiple secondary, read-only stores.
* | | | | arti-client: added support for constructing ArtiEphemeralKeystore to ↵Morgan2024-09-201-22/+37
| | | | | | | | | | | | | | | | | | | | InertTorClient::create_keymgr()
* | | | | tor-keymgr: added dummy implementation of ArtiEphemeralKeyStoreMorgan2024-09-201-0/+14
| | | | |
* | | | | tor-keymgr: added support for specifying keystore kind to ArtiKeystoreConfigMorgan2024-09-204-18/+102
| | | | |
* | | | | tor-keymgr: renamed ArtiNativeKeystoreConfig to ArtiKeystoreConfigMorgan2024-09-206-11/+14
| | | | |
* | | | | arti-client: expose key-mgr/ephemeral-keystore feature in arti-clientMorgan2024-09-201-0/+3
|/ / / /
* | | | Merge branch 'rotate-keys' into 'main'gabi-2502024-09-2010-20/+225
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arti: Add hsc subcommands for key rotation and deletion Closes #1475 See merge request tpo/core/arti!2435
| * | | | arti: Tolerate lowercase "no" in confirmation prompt.Gabriela Moldovan2024-09-191-3/+7
| | | | | | | | | | | | | | | | | | | | Prompted by https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/2435#note_3080452
| * | | | arti: Fix typo in display_service_discovery_key function name.Gabriela Moldovan2024-09-191-3/+3
| | | | |
| * | | | arti: Gate the arti hsc subcommand behind a new "hsc" feature (fmt).Gabriela Moldovan2024-09-191-4/+1
| | | | |
| * | | | arti: Gate the arti hsc subcommand behind a new "hsc" feature.Gabriela Moldovan2024-09-195-17/+9
| | | | | | | | | | | | | | | | | | | | This new feature is experimental.
| * | | | arti: Add a test for the "hsc key" subcommand help output.Gabriela Moldovan2024-09-193-0/+19
| | | | |
| * | | | arti: Add a subcommand for removing a client discovery key.Gabriela Moldovan2024-09-191-0/+35
| | | | | | | | | | | | | | | | | | | | Closes #1475
| * | | | arti: Add an hsc subcommand for rotating client keys.Gabriela Moldovan2024-09-192-0/+69
| | | | | | | | | | | | | | | | | | | | Part of #1475
| * | | | arti: Move public key output logic to a separate function.Gabriela Moldovan2024-09-191-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | This will be reused for `arti hsc key rotate`, which also outputs the public key.