1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
#![forbid(unsafe_code)]
use diem_global_constants::VALIDATOR_NETWORK_ADDRESS_KEYS;
use diem_infallible::RwLock;
use diem_secure_storage::{Error as StorageError, KVStorage, Storage};
use diem_types::{
account_address::AccountAddress,
network_address::{
self,
encrypted::{
EncNetworkAddress, Key, KeyVersion, TEST_SHARED_VAL_NETADDR_KEY,
TEST_SHARED_VAL_NETADDR_KEY_VERSION,
},
NetworkAddress,
},
};
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use thiserror::Error;
#[derive(Debug, Error)]
pub enum Error {
#[error("Unable to deserialize address for account {0}: {1}")]
AddressDeserialization(AccountAddress, String),
#[error("Unable to decrypt address for account {0}: {1}")]
DecryptionError(AccountAddress, String),
#[error("Failed (de)serializing validator_network_address_keys")]
BCSError(#[from] bcs::Error),
#[error("NetworkAddress parse error {0}")]
ParseError(#[from] network_address::ParseError),
#[error("Failed reading validator_network_address_keys from storage")]
StorageError(#[from] StorageError),
#[error("The specified version does not exist in validator_network_address_keys: {0}")]
VersionNotFound(KeyVersion),
}
pub struct Encryptor<S> {
storage: S,
cached_keys: RwLock<Option<ValidatorKeys>>,
}
impl<S> Encryptor<S> {
pub fn new(storage: S) -> Self {
Self {
storage,
cached_keys: RwLock::new(None),
}
}
}
impl<S> Encryptor<S>
where
S: KVStorage,
{
pub fn add_key(&mut self, version: KeyVersion, key: Key) -> Result<(), Error> {
let mut keys = self.read()?;
keys.keys.insert(version, StorageKey(key));
self.write(&keys)
}
pub fn set_current_version(&mut self, version: KeyVersion) -> Result<(), Error> {
let mut keys = self.read()?;
if keys.keys.get(&version).is_some() {
keys.current = version;
self.write(&keys)
} else {
Err(Error::VersionNotFound(version))
}
}
pub fn current_version(&self) -> Result<KeyVersion, Error> {
self.read().map(|keys| keys.current)
}
pub fn encrypt(
&self,
network_addresses: &[NetworkAddress],
account: AccountAddress,
seq_num: u64,
) -> Result<Vec<u8>, Error> {
let keys = self.read()?;
let key = keys
.keys
.get(&keys.current)
.ok_or(Error::VersionNotFound(keys.current))?;
let mut enc_addrs = Vec::new();
for (idx, addr) in network_addresses.iter().cloned().enumerate() {
enc_addrs.push(addr.encrypt(&key.0, keys.current, &account, seq_num, idx as u32)?);
}
bcs::to_bytes(&enc_addrs).map_err(|e| e.into())
}
pub fn decrypt(
&self,
encrypted_network_addresses: &[u8],
account: AccountAddress,
) -> Result<Vec<NetworkAddress>, Error> {
let keys = self.read()?;
let enc_addrs: Vec<EncNetworkAddress> = bcs::from_bytes(encrypted_network_addresses)
.map_err(|e| Error::AddressDeserialization(account, e.to_string()))?;
let mut addrs = Vec::new();
for (idx, enc_addr) in enc_addrs.iter().enumerate() {
let key = keys
.keys
.get(&enc_addr.key_version())
.ok_or_else(|| Error::VersionNotFound(enc_addr.key_version()))?;
let addr = enc_addr
.clone()
.decrypt(&key.0, &account, idx as u32)
.map_err(|e| Error::DecryptionError(account, e.to_string()))?;
addrs.push(addr);
}
Ok(addrs)
}
fn read(&self) -> Result<ValidatorKeys, Error> {
let result = self
.storage
.get::<ValidatorKeys>(VALIDATOR_NETWORK_ADDRESS_KEYS)
.map(|v| v.value)
.map_err(|e| e.into());
match &result {
Ok(keys) => {
*self.cached_keys.write() = Some(keys.clone());
}
Err(err) => diem_logger::error!(
"Unable to read {} from storage: {}",
VALIDATOR_NETWORK_ADDRESS_KEYS,
err
),
}
let keys = self.cached_keys.read();
keys.as_ref().map_or(result, |v| Ok(v.clone()))
}
fn write(&mut self, keys: &ValidatorKeys) -> Result<(), Error> {
self.storage
.set(VALIDATOR_NETWORK_ADDRESS_KEYS, keys)
.map_err(|e| e.into())
}
pub fn initialize(&mut self) -> Result<(), Error> {
self.write(&ValidatorKeys::default())
}
}
impl Encryptor<Storage> {
pub fn empty() -> Self {
let storage = Storage::InMemoryStorage(diem_secure_storage::InMemoryStorage::new());
Encryptor::new(storage)
}
pub fn for_testing() -> Self {
let mut encryptor = Self::empty();
encryptor.initialize_for_testing().unwrap();
encryptor
}
pub fn initialize_for_testing(&mut self) -> Result<(), Error> {
self.initialize()?;
self.add_key(
TEST_SHARED_VAL_NETADDR_KEY_VERSION,
TEST_SHARED_VAL_NETADDR_KEY,
)?;
self.set_current_version(TEST_SHARED_VAL_NETADDR_KEY_VERSION)
}
}
#[derive(Clone, Debug, Deserialize, Serialize)]
struct StorageKey(
#[serde(
serialize_with = "diem_secure_storage::to_base64",
deserialize_with = "from_base64"
)]
Key,
);
pub fn to_base64<S>(bytes: &[u8], serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
{
serializer.serialize_str(&base64::encode(bytes))
}
pub fn from_base64<'de, D>(deserializer: D) -> Result<Key, D::Error>
where
D: serde::Deserializer<'de>,
{
let s: String = serde::Deserialize::deserialize(deserializer)?;
base64::decode(s)
.map_err(serde::de::Error::custom)
.and_then(|v| {
std::convert::TryInto::try_into(v.as_slice()).map_err(serde::de::Error::custom)
})
}
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct ValidatorKeys {
keys: HashMap<KeyVersion, StorageKey>,
current: KeyVersion,
}
#[cfg(test)]
mod tests {
use super::*;
use diem_secure_storage::{InMemoryStorage, Namespaced};
use rand::{rngs::OsRng, Rng, RngCore, SeedableRng};
#[test]
fn e2e() {
let storage = Storage::InMemoryStorage(InMemoryStorage::new());
let mut encryptor = Encryptor::new(storage);
encryptor.initialize().unwrap();
let mut rng = rand::rngs::StdRng::from_seed(OsRng.gen());
let mut key = [0; network_address::encrypted::KEY_LEN];
rng.fill_bytes(&mut key);
encryptor.add_key(0, key).unwrap();
encryptor.set_current_version(0).unwrap();
rng.fill_bytes(&mut key);
encryptor.add_key(1, key).unwrap();
encryptor.set_current_version(1).unwrap();
rng.fill_bytes(&mut key);
encryptor.add_key(4, key).unwrap();
encryptor.set_current_version(4).unwrap();
encryptor.set_current_version(5).unwrap_err();
let addr = std::str::FromStr::from_str("/ip4/10.0.0.16/tcp/80").unwrap();
let addrs = vec![addr];
let account = AccountAddress::random();
let enc_addrs = encryptor.encrypt(&addrs, account, 5).unwrap();
let dec_addrs = encryptor.decrypt(&enc_addrs, account).unwrap();
assert_eq!(addrs, dec_addrs);
let another_account = AccountAddress::random();
encryptor.decrypt(&enc_addrs, another_account).unwrap_err();
}
#[test]
fn cache_test() {
let mut encryptor = Encryptor::for_testing();
let addr = std::str::FromStr::from_str("/ip4/10.0.0.16/tcp/80").unwrap();
let addrs = vec![addr];
let account = AccountAddress::random();
let enc_addrs = encryptor.encrypt(&addrs, account, 0).unwrap();
let dec_addrs = encryptor.decrypt(&enc_addrs, account).unwrap();
assert_eq!(addrs, dec_addrs);
encryptor.storage = Storage::from(InMemoryStorage::new());
let enc_addrs = encryptor.encrypt(&addrs, account, 1).unwrap();
let dec_addrs = encryptor.decrypt(&enc_addrs, account).unwrap();
assert_eq!(addrs, dec_addrs);
*encryptor.cached_keys.write() = None;
encryptor.encrypt(&addrs, account, 1).unwrap_err();
encryptor.decrypt(&enc_addrs, account).unwrap_err();
}
#[ignore]
#[test]
fn initializer() {
let storage = Storage::from(Namespaced::new(
"network_address_encryption_keys",
Box::new(Storage::VaultStorage(
diem_secure_storage::VaultStorage::new(
"http://127.0.0.1:8200".to_string(),
"root_token".to_string(),
None,
None,
true,
None,
None,
),
)),
));
let mut encryptor = Encryptor::new(storage);
encryptor.initialize().unwrap();
let mut rng = rand::rngs::StdRng::from_seed(OsRng.gen());
let mut key = [0; network_address::encrypted::KEY_LEN];
rng.fill_bytes(&mut key);
encryptor.add_key(0, key).unwrap();
encryptor.set_current_version(0).unwrap();
}
}