summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | tor-async-utils: Re-export oneshot-fused-workaround as oneshot.Gabriela Moldovan2024-09-033-0/+4
|/ / / /
* | | | Merge branch 'fixup-features' into 'main'gabi-2502024-09-0316-15/+62
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Run fixup-features in preparation for release See merge request tpo/core/arti!2381
| * | | arti-rpcserver: Use a non-wildcard version requirement for slotmap-careful.Gabriela Moldovan2024-09-031-1/+1
| | | |
| * | | Fix formatting issues introduced by fixup-features.Gabriela Moldovan2024-09-0312-13/+58
| | | |
| * | | arti: Remove the XXXXs added by fixup-features.Gabriela Moldovan2024-09-032-2/+0
| | | | | | | | | | | | | | | | The `restricted-discovery` feature is reachable from `experimental`.
| * | | Run fixup-features in preparation for release.Gabriela Moldovan2024-09-0316-17/+21
|/ / /
* | | Merge branch 'typos' into 'main'Ian Jackson2024-09-0337-53/+53
|\ \ \ | | | | | | | | | | | | | | | | Fix typos See merge request tpo/core/arti!2380
| * | | Fix typosDimitris Apostolou2024-09-0337-53/+53
|/ / /
* | | Merge branch 'ahf/project-naming' into 'main'gabi-2502024-09-021-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Sponsor 101 -> Project 101. See merge request tpo/core/arti!2379
| * | | Sponsor 101 -> Project 101.Alexander Færøy2024-09-021-2/+2
| | | | | | | | | | | | | | | | See: tpo/team#313.
* | | | Merge branch 'update-release-prep' into 'main'Alexander Hansen Færøy2024-09-021-259/+247
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Run cargo update in preparation for release. See merge request tpo/core/arti!2378
| * | | Run cargo update in preparation for release.Gabriela Moldovan2024-09-021-259/+247
|/ / /
* | | Merge branch 'ahf/macos-cross-build' into 'main'Alexander Hansen Færøy2024-09-023-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix reproducible build CI job for macOS Closes #1394 and #1507 See merge request tpo/core/arti!2377
| * | | Disallow failures for our CI job `build-repro-macos`Alexander Færøy2024-09-011-2/+0
| | | | | | | | | | | | | | | | See: tpo/core/arti#1394.
| * | | Bump CC version to 1.1.15.Alexander Færøy2024-09-011-2/+3
| | | | | | | | | | | | | | | | Fixes: tpo/core/arti#1507.
| * | | Explicitly specify the deployment target of macOS to 10.7.Alexander Færøy2024-09-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | osxcross tries in various ways to detect which version of the compiler we have, which version of the OS, which C++ standard library we use, and many other things. With this variable set, osxcross seems able to detect the environment provided by the SDK that we use. The error messages from osxcross is as follows: osxcross: error: cannot find libc++ headers osxcross: error: while detecting target This origins from its internal target detection code in target.cpp of osxcross. This file contains a signficant amount of the detection for paths of different versions of the macOS SDK's and macOS versions. All of this is truly cursed. In osxcross's main.cpp, the variable is read in: if (char *p = getenv("MACOSX_DEPLOYMENT_TARGET")) { target.OSNum = parseOSVersion(p); unsetenv("MACOSX_DEPLOYMENT_TARGET"); } and setting it thus forces the OS version to be parsed from the variable instead of its (in our case failed) attempt at detecting the version itself. Fixes: tpo/core/arti#1394
* | | | Merge branch 'move-stream-peek' into 'main'Jim Newsome2024-08-299-13/+25
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Move stream_peek into tor-async-utils See merge request tpo/core/arti!2357
| * | | Move stream_peek into tor-async-utilsJim Newsome2024-08-299-13/+25
|/ / /
* | | Merge branch 'reenable-hsc-test' into 'main'gabi-2502024-08-288-109/+207
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | arti-client: Add an InertTorClient for accessing client state. Closes #1496 See merge request tpo/core/arti!2370
| * | | arti: Set the COLUMNS env var in the CLI tests.Gabriela Moldovan2024-08-283-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sets `COLUMNS` to a large value to prevent line wrapping. Prompted by https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/2370#note_3067346 Closes #1574
| * | | arti-client: Fix a rustdoc warning.Gabriela Moldovan2024-08-281-1/+1
| | | |
| * | | arti-client: Document the unspecified behavior of create_inert().Gabriela Moldovan2024-08-281-0/+6
| | | | | | | | | | | | | | | | Prompted by https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/2370#note_3066621
| * | | arti: Elide some text in the expected hsc test output.Gabriela Moldovan2024-08-281-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | These file paths occupy more than 2 lines on some platforms. See also the motivation behind 2b8a7a196b3ea5cd8350dd77f5e5120fed8521e0
| * | | arti: Implement the hsc subcommand using an inert tor client.Gabriela Moldovan2024-08-283-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to reenable the `arti hsc` tests, which were previously disabled due to flakiness (see #1496). The `help` test bit rotted a bit, so I had to tweak its expected output. Closes #1496
| * | | arti-client: Add an InertTorClient for accessing client state (fmt).Gabriela Moldovan2024-08-281-1/+3
| | | |
| * | | arti-client: Add an InertTorClient for accessing client state.Gabriela Moldovan2024-08-283-74/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements the `TorClientThatIsntRunning` mentioned in !2314 (see also `doc/dev/notes/keymgr-porcelain.md`), except `TorClientThatIsntRunning` is called `InertTorClient`. This commit is mostly code motion: I've moved the `create_keymgr` function and the impls of `generate_service_discovery_key` and `get_service_discovery_key` from `TorClient` to `InertTorClient`. The `InertTorClient` advertises itself as a handle for accessing the keystores and other persistent state, but it currently only has 2 functions (`generate_service_discovery_key` and `get_service_discovery_key`). I expect it will grow additional functionality in the future.
| * | | arti-client: Move state_dir() to TorClientConfig.Gabriela Moldovan2024-08-282-17/+17
|/ / / | | | | | | | | | | | | I am about to use `state_dir()` outside of `TorClient`, so I am preemptively moving it to `TorClientConfig`.
* | | Merge branch 'move-stream-peak' into 'main'Jim Newsome2024-08-2848-81/+179
|\ \ \ | | | | | | | | | | | | | | | | extract tor_async_utils::oneshot into ::oneshot-fused-workaround See merge request tpo/core/arti!2371
| * | | tor-rtmock: remove dependency on tor-async-utilsJim Newsome2024-08-282-3/+1
| | | | | | | | | | | | | | | | | | | | Now that `oneshot-fused-workaround` is its own crate, `tor-rtmock` doesn't need `tor-async-utils`.
| * | | extract tor_async_utils::oneshot into ::oneshot-fused-workaroundJim Newsome2024-08-2848-78/+178
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having this in the `tor-async-utils` crate prevents us from doing both of the following without introducing a circular dependency: * using it in `tor-rtmock` (which we currently do, particularly in tests). * using `tor-rtmock` to test things in `tor-async-utils`. We don't do this yet, but it is generally sensible to do so. In particular we want to move the `stream_peak` module there, which is currently tested with `tor-rtmock`. Moving this into its own crate avoids this circular dependency.
* | | Merge branch 'expose-proxy-setting' into 'main'Nick Mathewson2024-08-288-14/+311
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | RPC: Add experimental method to list SOCKS proxy addresses. Closes #1523 See merge request tpo/core/arti!2359
| * | | rpc: Use MockRuntime for set_proxy_info test.Nick Mathewson2024-08-283-2/+4
| | | |
| * | | rpc: Add a test for setting proxy info.Nick Mathewson2024-08-282-0/+43
| | | |
| * | | rpc: Rename E::SenderDroppedNick Mathewson2024-08-281-5/+6
| | | |
| * | | rpc: Try another incantation for watching for ProxyInfo.Nick Mathewson2024-08-281-13/+7
| | | |
| * | | rpc: Add another layer of indirection on proxyinfoNick Mathewson2024-08-282-3/+12
| | | |
| * | | rpc: Try using postage::watch to initialize ProxyInfo.Nick Mathewson2024-08-286-35/+82
| | | | | | | | | | | | | | | | | | | | (This is a bit trickier than I would like, but it ensures that we never return a "not initialized yet" code.)
| * | | Re-wrap a Cargo.toml.Nick Mathewson2024-08-281-1/+5
| | | |
| * | | RPC: Add experimental method to list SOCKS proxies.Nick Mathewson2024-08-285-16/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We'll need this for our rpc-library code to meaningfully open SOCKS connections. Closes #1523.
| * | | arti: Define a new ArtiRpcSession type.Nick Mathewson2024-08-285-4/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This type exists in the `arti` crate. It wraps and delegates to `arti_rpcserver::RpcSession`. Subsequent commits will use it to expose information from the `arti` crate to the RPC system; right now it does nothing.
| * | | rpcserver: Fix a trivial doc typo.Nick Mathewson2024-08-281-1/+1
| | | |
* | | | Merge branch 'publisher-file-watch' into 'main'gabi-2502024-08-283-81/+124
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | tor-hsservice: Fix publisher config watching bug See merge request tpo/core/arti!2369
| * | | | tor-config: Improve FileWatcher documentation.Gabriela Moldovan2024-08-281-1/+12
| | | | |
| * | | | tor-config: Add tests for FileWatcher::watch_path.Gabriela Moldovan2024-08-281-0/+73
| | | | |
| * | | | tor-config: Make a test helper take a reference to TempTestDir.Gabriela Moldovan2024-08-281-2/+2
| | | | |
| * | | | tor-hsservice: Recreate the file watcher on every key_dir change event.Gabriela Moldovan2024-08-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that if a directory used as a `key_dir` is moved (e.g. renamed), and then moved back to its original location (the one specified in `key_dirs`), our watcher continues watching the `key_dirs` contents.
| * | | | tor-config: Rename watch_file to watch_path.Gabriela Moldovan2024-08-273-6/+6
| | | | | | | | | | | | | | | | | | | | `FileWatcher::watch_file` can be used with arbitrary paths.
| * | | | tor-hsservice: Make sure we always watch the parents of the key_dirs.Gabriela Moldovan2024-08-271-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | This ensures that if a `key_dir` is created after we start watching it (or if it's moved), we are still able to detect changes.
| * | | | tor-hsservice: Always recreate the file watcher if the config changes.Gabriela Moldovan2024-08-271-59/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While this means we will be recreating the watcher slightly more often than necessary, this new approach is less error-prone than what we had before.
* | | | | Merge branch 'runtime' into 'main'Nick Mathewson2024-08-281-0/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Discourage use of `tor_rtmock_test_with_*` macros See merge request tpo/core/arti!2372