summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'fix-unfortunate-merge-outcome' into 'main'Ian Jackson2023-06-301-1/+1
|\| | | | | | | | | arti-client: Rename KeyStore to Keystore. See merge request tpo/core/arti!1359
| * arti-client: Rename KeyStore to Keystore.Gabriela Moldovan2023-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | `KeyStore` was renamed to `Keystore` globally in !1355. This fixes a compile error caused an unfortunate series of non-conflicting (from git's POV) but incompatible merges: * !1356 added a line threferencing an error variant that capitalizes the "s" in "KeyStore" (`ErrorDetail::KeyStore`) * !1356 landed just before !1355 (the global renaming). Since there was no conflict between the 2, we're now in a state where the code added in !1356 is referencing an `ErrorDetail` variant that no longer exists.
* | Merge branch 'docsrs-fix' into 'main'Ian Jackson2023-06-301-0/+1
|\ \ | | | | | | | | | | | | Add a missing "experimental-api" rustdoc notation See merge request tpo/core/arti!1353
| * | Add a missing "experimental-api" rustdoc notationNick Mathewson2023-06-291-0/+1
| | |
* | | Merge branch 'fixup-features' into 'main'Ian Jackson2023-06-308-7/+15
|\ \ \ | |_|/ |/| | | | | | | | Run fixup-features on current `main` See merge request tpo/core/arti!1352
| * | Resolve XXXs from fixup-features.Nick Mathewson2023-06-295-11/+5
| | | | | | | | | | | | | | | Some of these seem spurious: it looks like fixup-features resolved an issue and then complained about it too. I'll investigate further.
| * | Run "cargo sort".Nick Mathewson2023-06-292-2/+0
| | |
| * | Run "fixup-features".Nick Mathewson2023-06-298-7/+23
| |/
* | Merge branch 'keymgr-naming' into 'main'Alexander Færøy2023-06-3010-42/+42
|\ \ | | | | | | | | | | | | keymgr: Rename KeyStore to Keystore globally. See merge request tpo/core/arti!1355
| * | keymgr: Rename KeyStore to Keystore globally.Gabriela Moldovan2023-06-2910-42/+42
| |/ | | | | | | | | We've been capitalizing the "s" in "KeyStore" inconsistently. This `s/KeyStore/Keystore/g` across the codebase.
* | Merge branch 'keymgr-from-bug' into 'main'Nick Mathewson2023-06-291-1/+1
|\ \ | | | | | | | | | | | | keymgr: Fix another infinite loop around Keymgr error handling. See merge request tpo/core/arti!1356
| * | keymgr: Fix another infinite loop around Keymgr error handling.Gabriela Moldovan2023-06-291-1/+1
| |/ | | | | | | This `From` impl was just calling itself recursively...
* | Merge branch 'changelog3' into 'main'Nick Mathewson2023-06-291-4/+7
|\ \ | |/ |/| | | | | update changelog one more time. See merge request tpo/core/arti!1354
| * update changelog one more time.Nick Mathewson2023-06-291-4/+7
|/
* Merge branch 'rustdoc_fix' into 'main'Nick Mathewson2023-06-291-1/+1
|\ | | | | | | | | Fix a rustdoc link. See merge request tpo/core/arti!1351
| * Fix a rustdoc link.Nick Mathewson2023-06-291-1/+1
| |
* | Merge branch 'exp' into 'main'Ian Jackson2023-06-292-1/+4
|\ \ | | | | | | | | | | | | tor-error: Make KeystoreFsPermissions experimental for now See merge request tpo/core/arti!1350
| * | tor-error: Make KeystoreFsPermissions experimental for nowIan Jackson2023-06-291-0/+3
| | | | | | | | | | | | Let's defer this decision.
| * | tor-keymgr: When keymgr enabled, enable tor-error's experimental tooIan Jackson2023-06-291-1/+1
| | |
* | | Merge branch 'validate-client-spec' into 'main'Ian Jackson2023-06-296-41/+176
|\ \ \ | | | | | | | | | | | | | | | | keymgr: Validate ArtiPaths, replace HsClientSpecifier with generic ArtiPathComponent See merge request tpo/core/arti!1262
| * | | Run rustfmtIan Jackson2023-06-291-3/+2
| | | |
| * | | keymgr: Remove unstable ErrorKind, use internal! for ArtiPath errors.Gabriela Moldovan2023-06-293-29/+8
| | | |
| * | | keymgr: Validate the individual ArtiPahtComponents of ArtiPath.Gabriela Moldovan2023-06-291-37/+25
| | | | | | | | | | | | | | | | | | | | This also implicitly forbids leading and trailing slashes in an `ArtiPath`.
| * | | keymgr: Rephrase ArtiPath docs.Gabriela Moldovan2023-06-291-14/+5
| | | | | | | | | | | | | | | | This updates the docs with Diziet's suggested doc improvements.
| * | | keymgr: Remove ArtiPath normalization, introduce additional restrictions.Gabriela Moldovan2023-06-293-58/+69
| | | |
| * | | keymgr: Document how ArtiPath validation is actually supposed to work.Gabriela Moldovan2023-06-291-7/+11
| | | |
| * | | keymgr: Move validation requirements to the ArtiPath docs.Gabriela Moldovan2023-06-291-12/+15
| | | |
| * | | keymgr: Make ArtiPath platform-independent by always using '/' as a separator.Gabriela Moldovan2023-06-291-10/+10
| | | |
| * | | hsclient: Make HsClientSpecifier a newtype instead of a type alias.Gabriela Moldovan2023-06-291-1/+11
| | | |
| * | | keymgr: Add tests for ArtiPath validation.Gabriela Moldovan2023-06-291-0/+90
| | | |
| * | | keymgr: Validate ArtiPath and ArtiPathComponent.Gabriela Moldovan2023-06-291-12/+45
| | | |
| * | | keymgr: Derive Into for ArtiPath and ArtiPathComponent.Gabriela Moldovan2023-06-291-1/+3
| | | |
| * | | keymgr: Define an error type for bad `ArtiPathComponents`.Gabriela Moldovan2023-06-294-14/+29
| | | |
| * | | arti-client, hsclient: Typealias HsClientSpecifier to ArtiPathComponent.Gabriela Moldovan2023-06-292-26/+14
| | | | | | | | | | | | | | | | `ArtiPathComponent` is a more generic version of `HsClientSpecifier`.
| * | | keymgr: Derive Display for ArtiPath and ArtiPathComponent.Gabriela Moldovan2023-06-291-3/+4
| | | |
| * | | keymgr: Define `ArtiPathComponent`.Gabriela Moldovan2023-06-292-1/+22
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | An `ArtiPathComponent` is a substring of an `ArtiPath`. An `ArtiPathComponent` will be validated according to the same rules as `ArtiPath`. In the future we can replace `HsClientSpecifier` with `ArtiPathComponent` (they both serve the same purpose except `ArtiPathComponent` is more generic).
* | | Merge branch 'keymgr-config' into 'main'gabi-2502023-06-296-9/+196
|\ \ \ | | | | | | | | | | | | | | | | arti-client: Add keystore_dir to StorageConfig. See merge request tpo/core/arti!1312
| * | | arti-client: Fix clippy lint.Gabriela Moldovan2023-06-291-0/+1
| | | |
| * | | arti-client: Make keystore_dir an experimental option.Gabriela Moldovan2023-06-292-25/+17
| | | |
| * | | arti-client: Add TODO regarding keystore_dir deserialization.Gabriela Moldovan2023-06-291-0/+3
| | | |
| * | | arti cfg tests: Add declare_exceptions for storage.keystore_dir.Gabriela Moldovan2023-06-291-1/+22
| | | | | | | | | | | | | | | | | | | | This moves `storage.keystore_dir` to a separate `declare_exceptions` block and explains why we have this exception.
| * | | tor-config: Remove semver.mdGabriela Moldovan2023-06-291-1/+0
| | | | | | | | | | | | | | | | | | | | The APIs mentioned in semver.md are all `experimental` now so we don't really need the file anymore.
| * | | tor-config: Make ItemOrBool an experimental feature.Gabriela Moldovan2023-06-294-3/+35
| | | |
| * | | example-config: Temporarily remove keystore_dir example.Gabriela Moldovan2023-06-292-17/+1
| | | | | | | | | | | | | | | | | | | | | | | | Let's remove this until we figure out how the config should behave when the `keymgr` feature is disabled (should it accept or reject `keystore_dir = true`?)
| * | | arti-client: Fix clippy lints.Gabriela Moldovan2023-06-291-1/+1
| | | | | | | | | | | | | | | | Part of #891
| * | | arti-client: Load keystore dir and permissions from config.Gabriela Moldovan2023-06-291-6/+2
| | | | | | | | | | | | | | | | Part of #891
| * | | arti-client: Add expand_keystore_dir function.Gabriela Moldovan2023-06-291-0/+13
| | | | | | | | | | | | | | | | Part of #891
| * | | arti-client: Add keystore_dir to StorageConfig.Gabriela Moldovan2023-06-295-5/+91
| | | |
| * | | config: Add ItemOrBool helper for deserializing a bool or a value.Gabriela Moldovan2023-06-292-0/+60
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will enable us to support the new `keystore_dir` field, which can be either a boolean indicating whether the keystore is disabled or enabled and initialized with the default keystore dir, or a string which points to a custom keystore directory (and implies the keystore is enabled): ``` # use this path, fail if compiled out # keystore = "/path/to/arti/keystore" # # use default path, fail if compiled out # keystore = true # # disable # keystore = false ``` Part of #891
* | | Merge branch 'keymgr' into 'main'Ian Jackson2023-06-292-5/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | tor-keymgr: Adjust stability guarantees for release Closes #934 See merge request tpo/core/arti!1346