dandri/mycelium
1
0 Fork 0
mirror of https://github.com/threefoldtech/mycelium.git synced 2026-10-22 21:51:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Keys only loaded when needed

Browse Source
This commit is contained in:
Maxime Van Hees authored and Lee Smet committed 2024-06-20 15:23:46 +02:00
1 parent f97f9b7ace
commit 35896d779c
2 files changed
+38 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

myceliumd-private/src/main.rs
+23 -8
View File
@@ -276,14 +276,14 @@ async fn main() -> Result<(), Box<dyn Error>> {
.unwrap_or_else(|| PathBuf::from(DEFAULT_KEY_FILE));
// Load the keypair for this node, or generate a new one if the file does not exist.
let node_keys = if key_path.exists() {
let sk = load_key_file(&key_path).await?;
let pk = crypto::PublicKey::from(&sk);
debug!("Loaded key file at {key_path:?}");
Some((sk, pk))
} else {
None
};
// let node_keys = if key_path.exists() {
// let sk = load_key_file(&key_path).await?;
// let pk = crypto::PublicKey::from(&sk);
// debug!("Loaded key file at {key_path:?}");
// Some((sk, pk))
// } else {
// None
// };
match cli.command {
None => {
@@ -297,6 +297,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
_ => None,
};
let node_keys = get_node_keys(&key_path).await?;
let node_secret_key = if let Some((node_secret_key, _)) = node_keys {
node_secret_key
} else {
@@ -370,6 +371,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
}
Some(cmd) => match cmd {
Command::Inspect { json, key } => {
let node_keys = get_node_keys(&key_path).await?;
let key = if let Some(key) = key {
PublicKey::try_from(key.as_str())?
} else if let Some((_, node_pub_key)) = node_keys {
@@ -449,6 +451,19 @@ async fn main() -> Result<(), Box<dyn Error>> {
Ok(())
}
async fn get_node_keys(
key_path: &PathBuf,
) -> Result<Option<(crypto::SecretKey, crypto::PublicKey)>, io::Error> {
if key_path.exists() {
let sk = load_key_file(key_path).await?;
let pk = crypto::PublicKey::from(&sk);
debug!("Loaded key file at {key_path:?}");
Ok(Some((sk, pk)))
} else {
Ok(None)
}
}
async fn load_key_file<T>(path: &Path) -> Result<T, io::Error>
where
T: From<[u8; 32]>,
myceliumd/src/main.rs
+15 -10
View File
@@ -258,18 +258,9 @@ async fn main() -> Result<(), Box<dyn Error>> {
.key_file
.unwrap_or_else(|| PathBuf::from(DEFAULT_KEY_FILE));
// Load the keypair for this node, or generate a new one if the file does not exist.
let node_keys = if key_path.exists() {
let sk = load_key_file(&key_path).await?;
let pk = crypto::PublicKey::from(&sk);
debug!("Loaded key file at {key_path:?}");
Some((sk, pk))
} else {
None
};
match cli.command {
None => {
let node_keys = get_node_keys(&key_path).await?;
let node_secret_key = if let Some((node_secret_key, _)) = node_keys {
node_secret_key
} else {
@@ -343,6 +334,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
}
Some(cmd) => match cmd {
Command::Inspect { json, key } => {
let node_keys = get_node_keys(&key_path).await?;
let key = if let Some(key) = key {
PublicKey::try_from(key.as_str())?
} else if let Some((_, node_pub_key)) = node_keys {
@@ -422,6 +414,19 @@ async fn main() -> Result<(), Box<dyn Error>> {
Ok(())
}
async fn get_node_keys(
key_path: &PathBuf,
) -> Result<Option<(crypto::SecretKey, crypto::PublicKey)>, io::Error> {
if key_path.exists() {
let sk = load_key_file(key_path).await?;
let pk = crypto::PublicKey::from(&sk);
debug!("Loaded key file at {key_path:?}");
Ok(Some((sk, pk)))
} else {
Ok(None)
}
}
async fn load_key_file<T>(path: &Path) -> Result<T, io::Error>
where
T: From<[u8; 32]>,