hatter/local-mini-kms
1
1
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

feat: make clippy happy

Browse Source
This commit is contained in:
Hatter Jiang
2025-06-28 12:18:57 +08:00
parent 9b2705966a
commit dc8616d644
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cli.rs
View File

@@ -182,7 +182,7 @@ async fn send_kms_request_with_ssh_enabled(ssh_remote: &Option<String>, get_requ
} }
if let Some(body) = body { if let Some(body) = body {
c.args(["-H", "x-body-based64-encoded:1"]); c.args(["-H", "x-body-based64-encoded:1"]);
c.args(["--data-raw", &format!("{}", STANDARD.encode(&body))]); c.args(["--data-raw", &STANDARD.encode(body).to_string()]);
} }
c.arg(uri); c.arg(uri);
debugging!("Run command: {:?}", c); debugging!("Run command: {:?}", c);
@@ -193,12 +193,10 @@ async fn send_kms_request_with_ssh_enabled(ssh_remote: &Option<String>, get_requ
debugging!("Output: {:?}", output); debugging!("Output: {:?}", output);
let data: Value = serde_json::from_slice(&output.stdout)?; let data: Value = serde_json::from_slice(&output.stdout)?;
if let Value::Object(data_map) = &data { if let Value::Object(data_map) = &data {
if let Some(error) = data_map.get("error") { if let Some(Value::String(error)) = data_map.get("error") {
if let Value::String(error) = error {
return simple_error!("Get error: {}, details: {}", error, data); return simple_error!("Get error: {}, details: {}", error, data);
} }
} }
}
Ok(data) Ok(data)
} }
} }
@@ -297,7 +295,7 @@ fn master_key_encrypt(master_key: &str, jwk: &str) -> XResult<String> {
let challenge = opt_result!( let challenge = opt_result!(
pinentry_util::read_pin(Some("Input yubikey challenge"), Some("Challenge: ")), "Read challenge failed: {}"); pinentry_util::read_pin(Some("Input yubikey challenge"), Some("Challenge: ")), "Read challenge failed: {}");
let derived_key = yubikey_hmac::yubikey_challenge_as_32_bytes(challenge.get_pin().as_bytes())?; let derived_key = yubikey_hmac::yubikey_challenge_as_32_bytes(challenge.get_pin().as_bytes())?;
let (key, _) = jose::deserialize_jwe_aes(&master_key, &derived_key)?; let (key, _) = jose::deserialize_jwe_aes(master_key, &derived_key)?;
key key
} }
#[cfg(not(feature = "yubikey"))] #[cfg(not(feature = "yubikey"))]
@@ -305,7 +303,7 @@ fn master_key_encrypt(master_key: &str, jwk: &str) -> XResult<String> {
} else { } else {
master_key.as_bytes().to_vec() master_key.as_bytes().to_vec()
}; };
let rsa_public_key = jwk_to_rsa_pubic_key(&jwk)?; let rsa_public_key = jwk_to_rsa_pubic_key(jwk)?;
let encrypted_master_key = jose::serialize_jwe_rsa(&master_key, &rsa_public_key)?; let encrypted_master_key = jose::serialize_jwe_rsa(&master_key, &rsa_public_key)?;
Ok(encrypted_master_key) Ok(encrypted_master_key)
} }