summaryrefslogtreecommitdiff
path: root/crates/tor-keymgr
Commit message (Collapse)AuthorAgeFilesLines
...
* | keymgr: Preserve item metadata when converting to TestPublicKeyGabriela Moldovan2026-03-171-1/+3
| | | | | | | | This will enable us to test the provenance of public keys.
* | keymgr: Update cert testsGabriela Moldovan2026-03-171-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed now that `get_or_generate_key_and_cert()` uses the keypair specifier when generating the subject key. Without this the cert retrieval tests fail because `get_or_generate_key_and_cert()` now requires the subject key specifier to have an associated keypair specifier ("KeyCertificateSpecifier has no keypair specifier for the subject key?"). Note that even with this patch, the `get_cert_entry()` test still fails because of a bug in the `get_*()` family of functions. This will be fixed in a future commit.
* | keymgr: Use the keypair specifier when generating keys.Gabriela Moldovan2026-03-171-1/+9
| | | | | | | | | | | | | | When generating a new keypair, we want to use the keypair specifier of the subject key. Fixes a bug where this code was incorrectly generating a keypair using the specifier of the public key type (the resulting generated key had a `kp_` prefix instead of `ks_`).
* | keymgr, key-forge: Use our ssh-* forksGabriela Moldovan2026-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstream `ssh-key` is missing some important features we need for arti-relay: * a bug fix without which we can't convert deserialized RSA keys to their rsa counterparts: https://github.com/RustCrypto/SSH/pull/318 * @wesleyac 's patch https://github.com/RustCrypto/SSH/pull/412 for allowing insecure (1024 bits long) RSA keys (needed because the relay KS_relayid_rsa identity keys are 1024 bits long) We plan to switch back to mainline `ssh-key` when `ssh-key 0.7.0` comes out. See the discussion in #2398 for more details.
* | keymgr: Add test retrieving an expired certGabriela Moldovan2026-03-121-1/+77
| | | | | | | | | | This tests that the `KeyMgr` returns an error if you try to retrieve an invalid cert.
* | keymgr: Introduce a new TestCert typeGabriela Moldovan2026-03-121-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a bit of a hack, but we need it to make the tests pass. The issue is that our test keystore stores `TestItem`s, and all our other test used `TestItem` as their key types. Now that we have certs, we have this concept of a `ToEncodableCert::ParsedCert`, which is what the keymgr downcasts the retrieved certs to before validating them and returning the final cert result (which is usually going to be of a different type than `ParsedCert`). This wrapper ensures that the keystore returns the expected `ParsedCert` type, so that validation doesn't fail. Before this change, we were hackily returning `TestItem` in the tests, even for certificates, but that doesn't work anymore, because the `ItemType` impl of `TestItem` returns `KeyType::Ed25519Keypair`, which is obviously not a `CertType`. Using it resulted in an error because there is a mismatch between the cert `ItemType` (`Ed25519Keypair`) and the `ItemType` of the `KeystoreItem::Cert` entry (`Ed25519TorCert`). Normally this wouldn't happen, but the whole test keystore implementation is funky and inconsistent.
* | keymgr: Add tests for the new get_cert() APIGabriela Moldovan2026-03-121-1/+89
| |
* | keymgr: Generate test cert specifiers using d-dGabriela Moldovan2026-03-122-24/+26
| | | | | | | | | | | | This will enable us to test against other keymgr APIs (e.g. `list_matching()`), which require some extra trait impls that get generated for free by our new `CertSpecifier` macro.
* | keymgr: Reexport the d-d helpersGabriela Moldovan2026-03-121-0/+5
| |
* | keymgr: Make make_certificate() a top-level functionGabriela Moldovan2026-03-121-31/+32
| | | | | | | | This will soon be used by other tests too.
* | keymgr: Add test for the auto-generated cert patternsGabriela Moldovan2026-03-121-0/+34
| |
* | keymgr: Add new KeyMgr::get_cert_entry() APIGabriela Moldovan2026-03-121-1/+70
| | | | | | | | | | | | This will enable us to retrieve a cert given its `KeystoreEntry`. This is useful for retrieving certificates listed with `KeyMgr::list_matching()`.
* | keymgr: Remove old has_certificate() optionGabriela Moldovan2026-03-122-52/+1
| | | | | | | | This was replaced by the new `CertSpecifier` d-d macro.
* | keymgr: Add a new experimental CertSpecifier macroGabriela Moldovan2026-03-121-0/+303
| | | | | | | | | | This will replace the `has_certificate()` attr from the `KeySpecifier` d-d macro.
* | keymgr: Move extract() out of parse_arti_path()Gabriela Moldovan2026-03-121-41/+41
| | | | | | | | This will soon be used for parsing the denotators of cert paths too.
* | keymgr: Abolish KeyCertificateSpecifier::signing_key_specifier() (fmt)Gabriela Moldovan2026-03-121-3/+1
| |
* | keymgr: Abolish KeyCertificateSpecifier::signing_key_specifier()Gabriela Moldovan2026-03-124-49/+12
| | | | | | | | | | | | | | We need to be able to parse KeyPaths into KeyCertificateSpecifier, and we can't do that if the signing key is part of the cert specifier (because the signing key doesn't get encoded in the key path, unlike the subject key, which does)
* | keymgr: Add a new trait for cert specifier patternsGabriela Moldovan2026-03-122-0/+31
| | | | | | | | | | These are significantly different from `KeySpecifierPattern`s, so it's best to have a separate trait.
* | Merge branch 'cert-denotators2' into 'main'Ian Jackson2026-03-114-30/+143
|\ \ | | | | | | | | | | | | | | | | | | keymgr: Update cert ArtiPath building to use denotator sets Closes #2377 See merge request tpo/core/arti!3754
| * | keymgr: Do not elide leading empty denotator groupsGabriela Moldovan2026-03-051-2/+5
| | | | | | | | | | | | Addresses https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/3754#note_3361904
| * | keymgr: Replace literal value with constantGabriela Moldovan2026-03-051-1/+1
| | |
| * | keymgr: Add test for paths with empty denotator groups (fmt)Gabriela Moldovan2026-03-051-1/+4
| | |
| * | keymgr: Add test for paths with empty denotator groupsGabriela Moldovan2026-03-051-0/+12
| | |
| * | keymgr: Add more tests for cert ArtiPath construction (fmt)Gabriela Moldovan2026-03-052-9/+9
| | |
| * | keymgr: Add more tests for cert ArtiPath constructionGabriela Moldovan2026-03-051-2/+17
| | | | | | | | | | | | | | | This commit is intentionally misindented to make reviewing the diff a bit easier.
| * | keymgr: Update cert ArtiPath building to use denotator groupsGabriela Moldovan2026-03-051-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a certificate's `ArtiPath`, the `ArtiPath` of the subject key is now separated from the certificate denotators by `@`. This will enable us to derive the subject key `ArtiPath` from the `ArtiPath` of its certificate. In practice, this change is a no-op for the relay implementation, because none of our certificates have certificate denotators. For instance, the `ArtiPath` of the for the `KP_relaysign_ed` certificate (`KP_relaysign_ed` signed with `KS_relayid_ed`) is of the form `relay/relaysign_ed+<valid_until>` (the only denotators here are the denotators of the subject key). It's important to note that the certifying key is not encoded in the `ArtiPath` of the certificate. The implication is that if we'll ever need to have multiple certs for the same subject key, signed with different with different certifying keys, those certificates will be distinguished by their certificate denotator group. So if we ever need a second certificate for `KP_relaysign_ed`, certified with something other than `KP_relaysign_ed`, it will need to be of the form `relay/relaysign_ed+<valid_until>@<CERT_DENOS>`, where `<CERT_DENOS>` is a list of `+`-separated certificate denotators. Closes #2377
| * | keymgr: Support having multiple denotator groups within an ArtiPathGabriela Moldovan2026-03-052-4/+14
| | | | | | | | | | | | | | | | | | This will enable us to parse certificate paths that consist of the `ArtiPath` of the subject key, followed by the denotator group of the certificate.
| * | keymgr: Move denotator group validation to a separate functionGabriela Moldovan2026-03-051-3/+10
| | |
| * | keymgr: Update ArtiPath docs with the new denotator rulesGabriela Moldovan2026-03-051-3/+21
| | | | | | | | | | | | | | | | | | | | | This introduces the concept of a "denotator group", and new syntax for separating denotator groups within an ArtiPath. The implementation will follow in a separate commit.
| * | keymgr: Implement KeySpecifier for KeyCertificateSpecifiersGabriela Moldovan2026-03-052-5/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | `KeyCertificateSpecifiers` have an `ArtiPath`, so it's only natural to retrieve it via this new `KeySpecifier` implementation. This replaces the old, ad-hoc `ArtiPath` building from the `KeyMgr` implementation: IMO, the `KeyMgr` impl is the wrong place to build these `ArtiPath`s (ideally they should remain opaque to the `KeyMgr`).
* | | keymgr: Remove unnecessary TestItem building (fmt)Gabriela Moldovan2026-03-101-1/+4
| | |
* | | keymgr: Remove unnecessary TestItem buildingGabriela Moldovan2026-03-101-4/+1
| | |
* | | keymgr: Remove unnecessary parenthesesGabriela Moldovan2026-03-101-1/+1
| | | | | | | | | | | | Resolves a clippy warning.
* | | keymgr: Replace .find(...).is_some() with .any() (fmt)Gabriela Moldovan2026-03-101-9/+4
| | |
* | | keymgr: Replace .find(...).is_some() with .any()Gabriela Moldovan2026-03-101-3/+2
| | | | | | | | | | | | Resolves a clippy warning.
* | | keymgr: Replace Result<> with type alias (fmt)Gabriela Moldovan2026-03-101-5/+5
| | |
* | | keymgr: Replace match with if letGabriela Moldovan2026-03-101-4/+1
| | | | | | | | | | | | As suggested by clippy
* | | keymgr: Replace Result<> with type alias (fmt)Gabriela Moldovan2026-03-101-3/+5
| | |
* | | keymgr: Replace Result<> with type aliasGabriela Moldovan2026-03-101-1/+1
| | |
* | | keymgr: Remove unnecessary type annotationGabriela Moldovan2026-03-101-4/+1
| | |
* | | keymgr: Replace macro-generated Keystore impls with a single Keystore type (fmt)Gabriela Moldovan2026-03-101-162/+156
| | |
* | | keymgr: Replace macro-generated Keystore impls with a single Keystore typeGabriela Moldovan2026-03-101-33/+22
| | | | | | | | | | | | | | | | | | | | | | | | This doesn't really need to be macro-generated, because these impls only differ in the `KeystoreId`. The code is intentionally misindented to make reviewing the diff a bit easier. A future commit will reformat it all.
* | | keymgr: Move unrecognized entry building logic out of macro (fmt)Gabriela Moldovan2026-03-101-22/+14
| | |
* | | keymgr: Move unrecognized entry building logic out of macroGabriela Moldovan2026-03-101-29/+34
|/ / | | | | | | | | I am about to remove this macro altogether and simplify the keystore impls, so I am preemptively moving this into a separate function.
* | Bump all the unstable tor- and arti- crates to 0.40.0.Gabriela Moldovan2026-03-021-15/+15
| | | | | | | | | | | | | | | | | | Done using: ``` for crate in $(./maint/list_crates | rg '^(tor|arti-)'); do cargo set-version -p $crate 0.40.0 done
* | Bump the versions of the non-{arti-,tor-} cratesGabriela Moldovan2026-03-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The non-{arti-,tor-} crates are: ``` ./maint/list-crates | rg -v '^(tor|arti)' oneshot-fused-workaround slotmap-careful test-temp-dir fslock-guard hashx equix caret fs-mistrust safelog retry-error futures-copy ``` Because this release bumps the MSRV, I am bumping the minor version of all of them. MINOR=" oneshot-fused-workaround slotmap-careful test-temp-dir fslock-guard hashx equix caret fs-mistrust safelog retry-error futures-copy " for crate in $MINOR; do cargo set-version --bump minor -p $crate; done ```
* | keymgr: Port to derive_deftly(TorConfig)Nick Mathewson2026-02-241-44/+33
| | | | | | | | | | As with previous modules, I've left some thing less conformant with our "standard" APIs in order to keep backward compat (for now).
* | keymgr: Extend d-d helper to derive KeyCertificateSpecifiersGabriela Moldovan2026-02-171-0/+71
| | | | | | | | Closes #2360
* | Allow clippy::collapsible_if to triggerGabriela Moldovan2026-02-161-0/+1
| | | | | | | | | | | | | | | | | | `clippy::collapsible_if` started triggering after bumping the MSRV to 1.88. Since this triggers from a lot of places, and since there even are a couple of instances where we explicitly allow `clippy::collapsible_ifs`, I've opened #2342 for deciding what to do about it.
* | Bump MSRV from 1.86 to 1.89Gabriela Moldovan2026-02-161-1/+1
| | | | | | | | | | | | | | As agreed at our last team meeting. See https://gitlab.torproject.org/tpo/core/arti/#minimum-supported-rust-version
generated by cgit v1.2.3 (git 2.46.0) at 2026-08-28 05:30:36 +0000