Commit Graph

3842 Commits

Author SHA1 Message Date
Nick Mathewson d12e2422b3 linkspec: Add a missing ; in tests. 2023-04-06 10:27:35 -04:00
Nick Mathewson fdd28d9319 dirclient: fix an "unused import" warning. 2023-04-06 10:26:58 -04:00
Nick Mathewson 9dbfaf5f9b guardmgr: update feature behavior wrt testing and pts. 2023-04-06 10:26:20 -04:00
Nick Mathewson 2f231b2ea0 circmgr: make "testing" depend on guardmgr/testing 2023-04-06 10:24:32 -04:00
Nick Mathewson 43e1128cdf circmgr: Mark a number of internal APIs as hs-only.
This resolves a few dead-code warnings.

Closes #801.
2023-04-06 09:05:12 -04:00
Nick Mathewson c22cf483ff circmgr: Expand an incomplete comment in exitpath.rs 2023-04-06 08:59:41 -04:00
Nick Mathewson 465ad963c4 Merge branch 'rw' into 'main'
tor-async-utils: Introduce JoinReadWrite

See merge request tpo/core/arti!1115
2023-04-06 12:28:54 +00:00
Ian Jackson 11d0c4c6fb Merge branch 'error' into 'main'
tor-error: Introduce ErrorKind::TorDirectoryBroken

See merge request tpo/core/arti!1117
2023-04-06 10:43:52 +00:00
Ian Jackson bf9a7826de tor-error: Rename ErrorKind::TorDirectoryUsable (from ...Broken)
As per
  https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/1117#note_2893986

(Not going to squash this as it has a semantic conflict with !1118, so
needs a little special handling there.)
2023-04-06 11:06:18 +01:00
Ian Jackson 4bf42c951c JoinReadWrite: Minor docs improvements. 2023-04-06 11:02:27 +01:00
Ian Jackson fbf1a6d8d4 JoinReadWrite: Move the example to the struct
This makes it more prominent on the rustdoc page.
2023-04-06 11:02:03 +01:00
Ian Jackson 2c87219a01 JoinReadWrite: Discuss using .reunite() or .unsplit()
As per
  https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/1115#note_2894238

And move the "This is the converse" comment to somewhere it actually
appears in public docs.  The module-level docs only appear with
--document-private-items because the modules themselves are private.
2023-04-06 10:58:39 +01:00
Ian Jackson 0e8384bcb4 tor-error: Introduce ErrorKind::TorDirectoryBroken
We will use this for a lack of HS directories.  (These aren't chosen
according to any local restrictions, so the problems with EK::NoPath
and EK::NoExit don't arise.)
2023-04-05 15:11:17 +01:00
Ian Jackson dfceb50f69 tor-netdir: testnet: Make all non-guard non-exits be hsdirs 2023-04-05 15:10:07 +01:00
Ian Jackson c29cb6ac2b tor-circmgr: HsCircKind: derive Eq 2023-04-05 15:10:07 +01:00
Ian Jackson 10f19eaf56 tor-async-utils: Introduce JoinReadWrite
I wanted one of these for a test stream.  Unaccountably neither
the futures crate, nor tokio, seem to have one!
2023-04-05 13:34:25 +01:00
Ian Jackson 11dc265325 Merge branch 'netdoc' into 'main'
tor-netdoc: Expose some test data (and fix feature builds)

See merge request tpo/core/arti!1106
2023-04-05 10:36:08 +00:00
Ian Jackson 38805f53b2 tor-netdoc: Expose test data under new "testing" feature flag 2023-04-05 11:02:36 +01:00
Ian Jackson 646e291f96 tor-netdoc: Fix feature builds
Fixes
  cargo +stable test --locked --offline F -p tor-netdoc
  cargo +stable clippy -p tor-netdoc F --all-targets
for values of F including
  --all-features
  --features=hs-client
  --features=hs-common
  --features=hs-service
  (nothing)
2023-04-05 11:02:33 +01:00
Ian Jackson 173b577069 Merge branch 'req' into 'main'
tor-dirclient: Provide HsDescDownloadRequest

See merge request tpo/core/arti!1097
2023-04-04 16:15:37 +00:00
Nick Mathewson 559aed002f Merge branch 'x25519' into 'main'
tor-llcrypto: Pin x25519-dalek version, bump our crate version

Closes #807

See merge request tpo/core/arti!1108
2023-04-04 12:51:39 +00:00
Ian Jackson ed594b5a6f tor-llcrypto: Pin x25519-dalek version, bump our crate version
Fixes #807
2023-04-04 11:59:54 +01:00
gabi-250 d1553e884b Merge branch 'timerange' into 'main'
Ergonomic improvements to TimerangeBound

See merge request tpo/core/arti!1105
2023-04-03 17:35:42 +00:00
gabi-250 fd13a26a00 tor-dirclient: Add a comment about 50 x 1024 2023-04-03 17:32:48 +01:00
Ian Jackson 91b3b79fed tor-dirclient: Add test case for HsDescDownloadRequest
I couldn't find a test vector in C Tor.  This test case was generated
from the code here.

I'm fairly sure it's right since I managed to get my descriptor
downloader to work.  (That's not an MR yet, but uses this code.)
2023-04-03 17:32:48 +01:00
Ian Jackson 4a754ae76a tor-dirclient: Provide HsDescDownloadRequest
In my tests this seems to do the right thing, but I'm getting 404s.
I'm not sure if actually this URL is wrong.
2023-04-03 17:32:48 +01:00
Ian Jackson e85f974934 TimerangeBound: Provide .as_ref() and .as_deref() 2023-04-03 15:54:13 +01:00
Ian Jackson 456eb2f3df TimerangeBound: derive Debug and Clone, and Eq/PartialEq in tests 2023-04-03 15:50:32 +01:00
Nick Mathewson 289007ef96 Merge branch 'debug-hex' into 'main'
Debug two types as compact hex strings

See merge request tpo/core/arti!1104
2023-04-03 12:31:27 +00:00
Ian Jackson 14cc805929 Merge branch 'hserror' into 'main'
tor-error: Errors for hidden services

See merge request tpo/core/arti!1099
2023-03-31 18:16:45 +00:00
Ian Jackson aafdf755c0 Debug as hex strings for HsBlindId and HsDirIndex 2023-03-31 19:10:17 +01:00
Ian Jackson 9de3c1e307 tor-basic-utils: Provide impl_debug_hex 2023-03-31 19:10:06 +01:00
Ian Jackson c5f6b2e3a5 tor-error: Add missing footnote
I C&P this from tor-dirmgr, and missed this part.
2023-03-31 18:45:40 +01:00
gabi-250 11a70925fd Fix duplicated licence in Cargo.toml 2023-03-31 17:44:30 +00:00
Ian Jackson 8a045af479 Merge branch 'netdir' into 'main'
tor-netdir: API changes to support hsconn hsdir fetch

See merge request tpo/core/arti!1094
2023-03-31 17:12:42 +00:00
Ian Jackson 3e22e881f3 tor-error: Add OnionServiceNotRunning error
We'll want this later.  Define it now, though, since we've discussed
it here
  https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/1099#note_2892020
2023-03-31 18:01:36 +01:00
Ian Jackson 68e5711684 tor-error: Put OnionService errors behind a new experimental-api feature 2023-03-31 17:57:24 +01:00
Ian Jackson 307af3714f tor-error: Document cargo feature 2023-03-31 17:56:32 +01:00
Ian Jackson c6a10387e3 tor-error: Errors for hidden services
So far these are just the errors that occur during descriptor
fetch. There will be more later as we have more code in tor-hsconn.

This is very user-facing; use the "onion service" terminology.
2023-03-31 17:53:40 +01:00
Gabriela Moldovan 3d0bf0d6ab
Generate a new KP_hss_desc_enc keypair for each new descriptor.
Previously, to build descriptors for hidden services with client auth
enabled, in addition to the list of authorized clients, users of
`HsDescBuilder` were required to also provide a descriptor encryption
keypair and a descriptor cookie. This was potentially dangerous and/or
error-prone, because the ephemeral encryption key and the descriptor
cookie are expected to be randomly generated and unique for each
descriptor.

This change makes `ClientAuth` private to the `hsdesc::build` module and
updates `HsDescBuilder` to build `ClientAuth`s internally. Users now
only need to provide the list of authorized client public keys.

Signed-off-by: Gabriela Moldovan <gabi@torproject.org>
2023-03-31 15:04:30 +01:00
Gabriela Moldovan 94a4d2ea43
Remove unnecessary test constant.
It's not really needed, it can just be generated at (test) runtime.

Signed-off-by: Gabriela Moldovan <gabi@torproject.org>
2023-03-31 15:04:26 +01:00
Gabriela Moldovan cd66781577
Add an encode-decode test for descriptors with client auth.
This adds a test for an `encode -> decode -> encode` flow for a hidden
service descriptor with client authorization enabled.

Signed-off-by: Gabriela Moldovan <gabi@torproject.org>
2023-03-31 15:04:23 +01:00
Gabriela Moldovan 8aa930a645
Use constants instead of magic numbers.
Signed-off-by: Gabriela Moldovan <gabi@torproject.org>
2023-03-31 15:04:19 +01:00
Gabriela Moldovan 2d9d16aabc
Stop requiring the caller to supply `AuthClient`s.
`AuthClient`s were originally meant to represent parsed `auth-client`
lines. In !1070, this struct was repurposed for representing individual
authorized clients in the HS descriptor encoder. However, hidden
services will likely use a list of public keys to represent the
authorized clients rather than a list of `AuthClient`s, as the
information from an `AuthClient` (`client_id`, `iv`, `encrypted_cookie`)
likely won't be immediately available to the hidden service.

This change updates the HS descriptor encoder to represent authorized
clients as a list of `curve25519::PublicKey`s. As such, it is now the
responsibility of the encoder to create the `client_id`, `iv`, and
`encrypted_cookie` using the available keys, the unencrypted descriptor
cookie, and HS subcredential.

Signed-off-by: Gabriela Moldovan <gabi@torproject.org>
2023-03-31 15:04:15 +01:00
Nick Mathewson 2ab5348ab2 Remove semver.md files. 2023-03-31 09:24:41 -04:00
Nick Mathewson d3a727a5a1 Remove "publish = false" from tor-hsclient.
It is now a (conditional, experimental) dependency of arti-client.
2023-03-31 09:14:35 -04:00
Nick Mathewson 9ef115a7fb Patchlevel bumps for crates whose dependencies just changed.
These crates had no changes until just a moment ago. But since
we updated the versions on some of their dependents, they have now
changed themselves.  Thus they get patchlevel bumps.

```
tor-rtmock
tor-protover
tor-socksproto
tor-consdiff
tor-chanmgr
tor-dirclient
tor-hsservice
```
2023-03-31 08:30:14 -04:00
Nick Mathewson e208fb15ad Bump crate versions that have breaking changes
These crates have had breaking changes.  They are pre-1.0, so they get
a minor bump.

```
tor-basic-utils
tor-config
```
2023-03-31 08:28:06 -04:00
Nick Mathewson a81ab391ae Bump patchlevel on crates with non-breaking changes
For these crates, the changes are nontrivial, so we
_do_ bump the versions on which their dependent crates depend.

Fortunately, since they are all pre-1.0, we don't need to
distinguish semver-additions from other changes.  (Except for arti,
which _is_ post-1.0, but gets a patchlevel bump anyway.)

These are unstable crates with breaking changes:

```
tor-hscrypto
tor-hsclient
```

These have new or extended APIs:

```
safelog
tor-bytes
tor-cell
tor-linkspec
tor-llcrypto
tor-proto
tor-cert
arti-client
```

These have new unstable APIs or features:
```
tor-netdoc
tor-circmgr (also broke some unstable APIs)
arti (is post-1.0)
```

These have bugfixes only:
```
caret
tor-dirmgr
```
2023-03-31 08:24:39 -04:00
Nick Mathewson 622c79aaa6 Bump patchlevel on crates with semver-irrelevant changes.
Their dependents are _not_ updated to a more recent version.

These bumped the version of a dependency that they don't expose
```
tor-rtcompat
fs-mistrust
```

This one had internal refactoring:
```
tor-netdir
```

These had trivial changes only:
```
tor-checkable
tor-ptmgr
tor-guardmgr
arti-hyper
arti-bench
arti-testing
```
2023-03-31 08:20:58 -04:00