vincenzopalazzo
/
arti
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'key-mgmt-api-sketch' into 'main' 

dev docs: Add key manager API sketch.

Closes #834

See merge request tpo/core/arti!1147
This commit is contained in:
gabi-250 2023-04-25 18:22:50 +00:00
parent 829122ba2d 17ff3a6f6a
commit f9358183e0
1 changed files with 568 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

568
doc/dev/notes/key-management.md Normal file
View File

@ -0,0 +1,568 @@
# Key management backend
## Motivation
Arti will need to be able to manage various types of keys, including:
* HS client authorization keys (`KS_hsd_desc_enc`, `KS_hsc_intro_auth`)
* HS service keys (`KS_hs_id`, `KS_hs_desc_sign`)
* relay keys
* dirauth keys
* ...
This document describes a possible design for a key manager that can read, add,
or remove keys from persistent storage. It is based on some ideas proposed by
@Diziet.
See also: [#728]
## Usage example
```rust
let client_id = HsClientIdentity::from_str("alice")?;
let intro_auth_key_id: HsClientSecretKeyIdentity =
(client_id, hs_id, HsClientKeyRole::IntroAuth).into();
// Get KP_hsc_intro_auth
let sk: Option<ed25519::SecretKey> = keymgr.get::<ed25519::SecretKey>(&intro_auth_key_id)?;
// Alternatively, instead of returning a type-erased value, KeyStore::get could return a `Key`
// (TODO hs: come up with a better name), `Key` being an enum over all supported key types.
// `Key` could then have a `Key::as` convenience function that returns the underlying key (or
// an error if none of the variants have the requested type):
// let sk: Option<ed25519::SecretKey> = keymgr.get(&key_id)?.as::<ed25519::SecretKey>().unwrap();
```
## Key stores
The key manager is an interface to one or more key stores.
Supported key stores:
* C Tor key store: an on-disk store that is backwards-compatible with C Tor (new
keys are stored in the format used by C Tor, and any existing keys are
expected to be in this format too).
* Arti key store: an on-disk store that stores keys in OpenSSH key
format.
In the future we plan to also support HSM-based key stores.
## Key passphrases
OpenSSH keys can have passphrases. While the first version of the key manager
won't be able to handle such keys, we will add passphrase support at some point
in the future.
## Proposed configuration changes
We introduce a new `[keys]` section for configuring the key stores. The
`[keys.permissions]` section specifies the permissions all top-level key store
directories are expected to have. It serves a similar purpose to
`[storage.permissions]`.
Initially, it will only be possible to configure two disk-backed key stores: the
Arti key store via the `[keys.arti_store]` section, and the C Tor key store via
the `[keys.ctor_store]` section. Future versions will be able to support the
configuration of arbitrary key store implementations.
The order of the key store sections is important, because keys are looked up in
each of the configured key stores, in the order they are specified in the
config. For example, if the Arti key store comes before the C Tor key store in
the config, when prompted to retrieve a key, the key manager will search
for the key in the Arti key store before checking the C Tor one:
```toml
[keys.arti_store]
...
[keys.ctor_store]
...
```
Note that both key stores are optional. It is possible to run Arti without
configuring a key store (for example, when running Arti as a client).
TODO hs: pick reasonable default values for the various top-level key store
directories (`root_dir`, `client_dir`, `key_dir`).
```toml
# Key store options
[keys]
# Describe the filesystem permissions to enforce.
[keys.permissions]
# If set to true, we ignore all filesystem permissions.
#dangerously_trust_everyone = false
# What user (if any) is trusted to own files and directories? ":current" means
# to trust the current user.
#trust_user = ":current"
# What group (if any) is trusted to have read/write access to files and
# directories? ":selfnamed" means to trust the group with the same name as the
# current user, if that user is a member.
#trust_group = ":username"
# If set, gives a path prefix that will always be trusted. For example, if this
# option is set to "/home/", and we are checking "/home/username/.cache", then
# we always accept the permissions on "/" and "/home", but we check the
# permissions on "/home/username" and "/home/username/.cache".
#
# (This is not the default.)
#
# ignore_prefix = "/home/"
#ignore_prefix = ""
# The Arti key store.
[keys.arti_store]
# The root of the key store. All keys are stored somewhere in the `root_dir`
# heirarchy
root_dir = ""
# The C Tor key store.
[keys.ctor_store]
# The client authorization key directory (if running Arti as a client).
#
# This corresponds to C Tor's ClientOnionAuthDir option.
client_dir = ""
# The key directory.
#
# This corresponds to C Tor's KeyDirectory option.
key_dir = ""
```
## Key identities
We introduce the concept of a "key identity" (specified for each supported key
type via the `KeyIdentity` trait). A "key identity" uniquely identifies an
instance of a type of key. From an implementation standpoint, `KeyIdentity`
implementers must specify:
* `arti_path`: the location of the key in the Arti key store. This also serves
as a unique identifier for a particular instance of a key.
* `ctor_path`: the location of the key in the C Tor key store (optional).
For example, an Arti key store might have the following structure (note that
each path within the `keys.arti_store.root_dir` directory, minus the extension,
is the `arti_path` of a particular key):
```
<keys.arti_store.root_dir>
├── client
│ ├── alice # HS client identity "alice"
│ │   ├── foo.onion
│ │ │   ├── hsc_desc_enc.arti_priv # arti_path = "client/alice/foo.onion/hsc_desc_enc"
│ │ │ │ # (HS client Alice's x25519 hsc_desc_enc keypair for decrypting the HS
│ │ │ │ # descriptors of foo.onion")
│ │ │   └── hsc_intro_auth.arti_priv # arti_path = "client/alice/foo.onion/hsc_intro_auth"
│ │ │ # (HS client Alice's ed25519 hsc_intro_auth keypair for computing
│ │ │ # signatures to prove to foo.onion she is authorized")
│ │ │ # Note: this is not implemented in C Tor
│ │   └── bar.onion
│ │    ├── hsc_desc_enc.arti_priv # arti_path = "client/alice/foo.onion/hsc_desc_enc"
│ │ │ # (HS client Alice's x25519 hsc_desc_enc keypair for decrypting the HS
│ │ │ # descriptors of bar.onion")
│ │    └── hsc_intro_auth.arti_priv # arti_path = "client/alice/bar.onion/hsc_intro_auth"
│ │ # (HS client Alice's ed25519 hsc_intro_auth keypair for computing
│ │ # signatures to prove to bar.onion she is authorized")
│ └── bob # HS client identity "bob"
│    └── foo.onion
│    ├── hsc_desc_enc.arti_priv # arti_path = "client/bob/foo.onion/hsc_desc_enc"
│ │ # (HS client Bob's x25519 hsc_desc_enc keypair for decrypting the HS
│ │ # descriptors of foo.onion")
│    └── hsc_intro_auth.arti_priv # arti_path = "client/bob/foo.onion/hsc_intro_auth"
│ # (HS client Bob's ed25519 hsc_intro_auth keypair for computing
│ # signatures to prove to foo.onion he is authorized")
│ # Note: this is not implemented in C Tor
├── hs
│ └── baz.onion # Hidden service baz.onion
│    ├── authorized_clients # The clients authorized to access baz.onion
│ │   └── dan
│ │ └── hsc_desc_enc.arti_pub # arti_path = "hs/baz.onion/authorized_clients/dan/hsc_desc_enc"
│ │ # (The public part of HS client Dan's x25519 hsc_desc_enc keypair for
│ │ # decrypting baz.onions descriptors)
│ │
│ │
│ │  
│    ├── hs_id.arti_priv # arti_path = "hs/baz.onion/hs_id" (baz.onion's identity key)
│    └── hs_blind_id.arti_priv # arti_path = "hs/baz.onion/hs_blind_id" (baz.onion's blinded identity key)
│
├── relay
│ └── Carol # Relay Carol
│    └── ...
...
```
### The `KeyIdentity` trait
```rust
/// The path of a key in the Arti key store.
///
/// NOTE: There is a 1:1 mapping between a value that implements
/// `KeyIdentity` and its corresponding `ArtiPath`.
/// A `KeyIdentity` can be converted to an `ArtiPath`,
/// but the reverse conversion is not supported.
//
// TODO hs: restrict the character set and syntax for values of this type
// (it should not be possible to construct an ArtiPath out of a String that
// uses disallowed chars, or one that is in the wrong format (TBD exactly what
// this format is supposed to look like)
pub struct ArtiPath(PathBuf);
/// The path of a key in the C Tor key store.
pub struct CTorPath(PathBuf);
/// The "identity" of a key.
///
/// `KeyIdentity::arti_path()` uniquely identifies an instance of a key.
pub trait KeyIdentity {
/// The location of the key in the Arti key store.
///
/// This also acts as a unique identifier for a specific key instance.
fn arti_path(&self) -> ArtiPath;
/// The location of the key in the C Tor key store (if supported).
fn ctor_path(&self) -> Option<CTorPath>;
}
/// An identifier for an HS client.
#[derive(AsRef, Into, ...)]
struct HsClientIdentity(String);
impl FromStr for HsClientIdentity { /* check syntax rules */ }
/// The role of a HS client key.
enum HsClientKeyRole {
/// A key for deriving keys for decrypting HS descriptors (KP_hsc_desc_enc).
DescEnc,
/// A key for computing INTRODUCE1 signatures (KP_hsc_intro_auth).
IntroAuth,
}
struct HsClientSecretKeyIdentity {
/// The client associated with this key.
client_id: HsClientIdentity,
/// The hidden service this authorization key is for.
hs_id: HsId,
/// The role of the key.
role: HsClientKeyRole,
}
impl KeyIdentity for HsClientSecretKeyIdentity {
fn arti_path(&self) -> ArtiPath {
ArtiPath(
Path::new("client")
.join(self.client_id.to_string())
.join(self.hs_id.to_string())
.join(self.role.to_string()),
)
}
fn ctor_path(&self) -> Option<CTorPath> {
...
}
}
```
## Proposed key manager API
```rust
/// A key that can be stored in, or retrieved from, a `KeyStore.`
pub trait EncodableKey {
/// The underlying key type.
fn key_type() -> KeyType
where
Self: Sized;
}
// Implement `EncodableKey` for all the key types we wish to support.
impl EncodableKey for ed25519::SecretKey {
fn key_type() -> KeyType {
KeyType::Ed25519Private
}
}
...
/// The key manager.
#[derive(Default)]
struct KeyMgr {
/// The underlying persistent stores.
key_store: Vec<Box<dyn KeyStore>>,
}
impl KeyMgr {
/// Read a key from the key store, attempting to deserialize it as `K`.
pub fn get<K: Any + EncodableKey>(&self, key_id: &dyn KeyIdentity) -> Result<Option<K>> {
// Check if the requested key identity exists in any of the key stores:
for store in &self.key_store {
let key = store.get(key_id, K::key_type())?;
if key.is_some() {
// Found it! Now try to downcast it to the right type (the
// downcast should _not_ fail, because K::key_type() tells the
// store to return a key of type `K` constructed from the key
// material read from disk)
return key
.map(|k| k.downcast::<K>().map(|k| *k).map_err(|e| /* bug */ ...))
.transpose();
}
}
// Not found
Ok(None)
}
/// Insert the specified key into the appropriate key store.
///
/// If the key bundle (key family?) of this `key` exists in one of the key stores, the key is
/// inserted there. Otherwise, the key is inserted into the first key store.
///
/// If the key already exists, it is overwritten.
///
/// TODO hs: update the API to return a Result<Option<K>> here (i.e. the old key)
pub fn insert<K: EncodableKey>(
&self,
key_id: &dyn KeyIdentity,
key: K,
) -> Result<()> {
for store in &self.key_store {
if store.has_key_bundle(key_id) {
return store.insert(&key, key_id, K::key_type());
}
}
// None of the stores has the key bundle of key_id, so we insert the key into the first key
// store.
if let Some(store) = self.key_store.first() {
return store.insert(&key, key_id, K::key_type());
}
// Bug: no key stores were configured
Err(...)
}
/// Remove the specified key.
///
/// If the key exists in multiple key stores, this will only remove it from the first one. An
/// error is returned if none of the key stores contain the specified key.
pub fn remove<K: EncodableKey>(
&self,
key_id: &dyn KeyIdentity,
) -> Result<()> {
for store in &self.key_store {
match store.remove(key_id, K::key_type()) {
Ok(()) => return Ok(()),
Err(e) if e is NotFound => continue,
Err(e) => return Err(e),
}
}
Err(not found)
}
}
```
## Proposed key store API
The key manager reads from (and writes to) the configured key stores. The key
stores all implement the `KeyStore` trait:
```rust
/// A generic key store.
pub trait KeyStore {
/// Retrieve the key identified by `key_id`.
fn get(&self, key_id: &dyn KeyIdentity, key_type: KeyType) -> Result<Option<ErasedKey>>;
/// Write `key` to the key store.
fn insert(&self, key: &dyn EncodableKey, key_id: &dyn KeyIdentity, key_type: KeyType) -> Result<()>;
/// Remove the specified key.
fn remove(&self, key_id: &dyn KeyIdentity, key_type: KeyType) -> Result<()>;
}
```
We will initially support 2 key store implementations (one for the C Tor key
store, and another for the Arti store):
```rust
impl KeyStore for ArtiNativeKeyStore {
fn get(&self, key_id: &dyn KeyIdentity, key_type: KeyType) -> Result<Option<ErasedKey>> {
let key_path = self.key_path(key_id, key_type);
let input = match fs::read(key_path) {
Ok(input) => input,
Err(e) if matches!(e.kind(), ErrorKind::NotFound) => return Ok(None),
Err(e) => return Err(...),
};
key_type.read_ssh_format_erased(&input).map(Some)
}
fn insert(&self, key: &dyn EncodableKey, key_id: &dyn KeyIdentity, key_type: KeyType) -> Result<()> {
let key_path = self.key_path(key_id, key_type);
let ssh_format = key_type.write_ssh_format(key)?;
fs::write(key_path, ssh_format).map_err(|_| ())?;
Ok(())
}
fn remove(&self, key_id: &dyn KeyIdentity, key_type: KeyType) -> Result<()> {
let key_path = self.key_path(key_id, key_type);
fs::remove_file(key_path).map_err(|e| ...)?;
Ok(())
}
}
impl ArtiNativeKeyStore {
/// The path on disk of the key with the specified identity and type.
fn key_path(&self, key_id: &dyn KeyIdentity, key_type: KeyType) -> PathBuf {
self.keystore_dir
.join(key_id.arti_path().0)
.join(key_type.extension())
}
}
impl KeyStore for CTorKeyStore {
...
}
#[derive(Copy, Clone, ...)]
pub enum KeyType {
Ed25519Private,
Ed25519Public,
X25519StaticSecret,
X25519Public,
// ...plus all the other key types we're interested in.
}
impl KeyType {
/// The file extension for a key of this type.
///
/// We use nonstandard extensions to prevent keys from being used in unexpected ways (e.g. if
/// the user renames a key from KP_hsc_intro_auth.arti_priv to KP_hsc_intro_auth.arti_priv.old,
/// the arti key store should disregard the backup file).
///
/// The key stores will ignore any files that don't have a recognized extension.
pub fn extension(&self) -> &'static str {
// TODO hs: come up with a better convention for extensions.
if self.is_private() {
".arti_priv"
} else {
".arti_pub"
}
}
/// Whether the key is public or private.
fn is_private(&self) -> bool {
match self {
// Secret key types
KeyType::Ed25519Private | KeyType::X25519StaticSecret => true,
// Public key types
KeyType::Ed25519Public | KeyType::X25519Public => false,
}
}
}
pub enum Algorithm {
Ed25519,
X25519,
...
}
impl Algorithm {
fn as_str(&self) -> &'static str {
...
}
}
```
The `ArtiNativeKeyStore` uses the `SshKeyType` implementation of `KeyType`
to read and write OpenSSH key files:
```rust
pub trait SshKeyType: Send + Sync + 'static {
fn ssh_algorithm(&self) -> Algorithm;
/// Read an OpenSSH key, parse the key material into a known key type, returning the
/// type-erased value.
///
/// The caller is expected to downcast the value returned to a concrete type.
fn read_ssh_format_erased(&self, input: &[u8]) -> Result<ErasedKey>;
/// Encode an OpenSSH-formatted key.
fn write_ssh_format(&self, key: &dyn EncodableKey) -> Result<Vec<u8>>;
}
impl SshKeyType for KeyType {
fn ssh_algorithm(&self) -> Algorithm {
...
}
fn read_ssh_format_erased(&self, input: &[u8]) -> Result<ErasedKey> {
match self {
KeyType::Ed25519Private => {
let sk = ssh_key::PrivateKey::from_bytes(input).map_err(|_| ())?;
// Build the expected key type (i.e. convert ssh_key key types to the key types
// we use internally).
let sk = match sk.key_data() {
KeypairData::Ed25519(kp) => {
ed25519::SecretKey ::from_bytes(&kp.private.to_bytes())?
}
_ => {
// bug
return Err(...);
}
};
Ok(Box::new(sk))
}
KeyType::Ed25519Public => {
let pk = ssh_key::PublicKey::from_bytes(input).map_err(|_| ())?;
// Build the expected key type (i.e. convert ssh_key key types to the key types
// we use internally).
let pk = match pk.key_data() {
KeyData::Ed25519(pk) => ed25519::PublicKey::from_bytes(&pk.0)?,
_ => {
// bug
return Err(...);
}
};
Ok(Box::new(pk))
}
KeyType::X25519StaticSecret | KeyType::X25519Public => {
// The ssh-key crate doesn't support arbitrary key types. We'll probably
// need a more general-purpose crate for parsing OpenSSH (one that allows
// arbitrary values for the algorithm), or to roll our own (we
// could also fork ssh-key and modify it as required).
todo!()
}
}
}
fn write_ssh_format(&self, key: &dyn EncodableKey) -> Result<Vec<u8>> {
/* Encode `key` in SSH key format. */
}
}
```
## Concurrent access for disk-based key stores
The key stores will allow concurrent modification by different processes. In
order to implement this safely without locking, the key store operations (get,
insert, remove) will need to be atomic. Reading and removing keys atomically is
trivial. To create/import a key atomically, we write the new key to a temporary
file before using `rename(2)` to atomically replace the existing one (this
ensures preexisting keys are replaced atomically).
Note: on Windows, we can't use `rename` to atomically replace an existing file
with a new one (`rename` returns an error if the destination path already
exists). As such, on Windows we will need some sort of synchronization mechanism
(unless it exposes some other APIs we can use for atomic renaming).
[#728]: https://gitlab.torproject.org/tpo/core/arti/-/issues/728