kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

rust/pvsecret: Refactor writing secret

Browse Source 
Refactor the writing of secret-type dependent output files to ease
extensions.

Reviewed-by: Marc Hartmayer <marc@linux.ibm.com>
Reviewed-by: Christoph Schlameuss <schlameuss@linux.ibm.com>
Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Steffen Eiden
2024-07-18 10:55:45 +02:00
committed by Jan Höppner
parent a9b8caa411
commit 1e44ace41d
2 changed files with 48 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rust/pv/src/uvsecret/guest_secret.rs
+1 -1
View File
@@ -68,7 +68,7 @@ impl GuestSecret {
}
/// Reference to the confidential data
pub(crate) fn confidential(&self) -> &[u8] {
pub fn confidential(&self) -> &[u8] {
match &self {
Self::Null => &[],
Self::Association { secret, .. } => secret.value().as_slice(),
rust/pvsecret/src/cmd/create.rs
+47 -42
View File
@@ -62,7 +62,7 @@ pub fn create(opt: &CreateSecretOpt) -> Result<()> {
write_out(&opt.output, ser_asrbc, "add-secret request")?;
info!("Successfully wrote the request to '{}'", &opt.output);
write_secret(&opt.secret, &asrcb, &opt.output)
write_secret(&opt.secret, asrcb.guest_secret(), &opt.output)
}
/// Read+parse the first key from the buffer.
@@ -206,54 +206,59 @@ fn read_cuid(asrcb: &mut AddSecretRequest, opt: &CreateSecretOpt) -> Result<()>
Ok(())
}
// Write non confidential data (=name+id) to a yaml stdout
fn write_yaml<P: AsRef<Path>>(
name: &str,
guest_secret: &GuestSecret,
stdout: &bool,
outp_path: P,
) -> Result<()> {
debug!("Non-confidential secret information: {guest_secret:x?}");
let secret_info = serde_yaml::to_string(guest_secret)?;
if stdout.to_owned() {
println!("{secret_info}");
return Ok(());
}
let gen_name: String = name
.chars()
.map(|c| if c.is_whitespace() { '_' } else { c })
.collect();
let mut yaml_path = outp_path
.as_ref()
.parent()
.with_context(|| format!("Cannot open directory of {:?}", outp_path.as_ref()))?
.to_owned();
yaml_path.push(gen_name);
yaml_path.set_extension("yaml");
write_out(&yaml_path, secret_info, "secret information")?;
warn!(
"Successfully wrote secret info to '{}'",
yaml_path.display().to_string()
);
Ok(())
}
/// Write the generated secret (if any) to the specified output stream
fn write_secret<P: AsRef<Path>>(
secret: &AddSecretType,
asrcb: &AddSecretRequest,
guest_secret: &GuestSecret,
outp_path: P,
) -> Result<()> {
if let AddSecretType::Association {
name,
stdout,
output_secret: secret_out,
..
} = secret
{
let gen_name: String = name
.chars()
.map(|c| if c.is_whitespace() { '_' } else { c })
.collect();
let mut gen_path = outp_path
.as_ref()
.parent()
.with_context(|| format!("Cannot open directory of {:?}", outp_path.as_ref()))?
.to_owned();
gen_path.push(format!("{gen_name}.yaml"));
// write non confidential data (=name+id) to a yaml
let secret_info = serde_yaml::to_string(asrcb.guest_secret())?;
if stdout.to_owned() {
println!("{secret_info}");
} else {
write_out(&gen_path, secret_info, "association secret info")?;
debug!(
"Non-confidential secret information: {:x?}",
asrcb.guest_secret()
);
warn!(
"Successfully wrote association info to '{}'",
gen_path.display()
);
}
if let Some(path) = secret_out {
if let GuestSecret::Association { secret, .. } = asrcb.guest_secret() {
write_out(path, secret.value(), "Association secret")?
} else {
unreachable!("The secret type has to be `association` at this point (bug)!")
match secret {
AddSecretType::Association {
name,
stdout,
output_secret,
..
} => {
write_yaml(name, guest_secret, stdout, outp_path)?;
if let Some(path) = output_secret {
write_out(path, guest_secret.confidential(), "Association secret")?
}
info!("Successfully wrote generated association secret to '{path}'");
}
_ => (),
};
Ok(())
}