-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3637 from jbaublitz/metadata-rework
Metadata rework
- Loading branch information
Showing
85 changed files
with
14,969 additions
and
5,606 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| // This Source Code Form is subject to the terms of the Mozilla Public | ||
| // License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| // file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
|
|
||
| use std::{env, path::PathBuf}; | ||
|
|
||
| use clap::{Arg, ArgAction, ArgGroup, Command}; | ||
| use serde_json::{json, Map, Value}; | ||
|
|
||
| use stratisd::{ | ||
| engine::{ | ||
| register_clevis_token, EncryptionInfo, KeyDescription, ProcessedPathInfos, StratPool, | ||
| CLEVIS_TANG_TRUST_URL, | ||
| }, | ||
| stratis::StratisResult, | ||
| }; | ||
|
|
||
| fn stratis_legacy_pool_args() -> Command { | ||
| Command::new("stratis-legacy-pool") | ||
| .arg(Arg::new("pool_name").num_args(1).required(true)) | ||
| .arg( | ||
| Arg::new("blockdevs") | ||
| .action(ArgAction::Append) | ||
| .required(true), | ||
| ) | ||
| .arg( | ||
| Arg::new("key_desc") | ||
| .long("key-desc") | ||
| .num_args(1) | ||
| .required(false), | ||
| ) | ||
| .arg( | ||
| Arg::new("clevis") | ||
| .long("clevis") | ||
| .num_args(1) | ||
| .required(false) | ||
| .value_parser(["nbde", "tang", "tpm2"]) | ||
| .requires_if("nbde", "tang_args") | ||
| .requires_if("tang", "tang_args"), | ||
| ) | ||
| .arg( | ||
| Arg::new("tang_url") | ||
| .long("tang-url") | ||
| .num_args(1) | ||
| .required_if_eq("clevis", "nbde") | ||
| .required_if_eq("clevis", "tang"), | ||
| ) | ||
| .arg(Arg::new("thumbprint").long("thumbprint").num_args(1)) | ||
| .arg(Arg::new("trust_url").long("trust-url").num_args(0)) | ||
| .group( | ||
| ArgGroup::new("tang_args") | ||
| .arg("thumbprint") | ||
| .arg("trust_url"), | ||
| ) | ||
| } | ||
|
|
||
| type ParseReturn = StratisResult<( | ||
| String, | ||
| Vec<PathBuf>, | ||
| Option<KeyDescription>, | ||
| Option<(String, Value)>, | ||
| )>; | ||
|
|
||
| fn parse_args() -> ParseReturn { | ||
| let args = env::args().collect::<Vec<_>>(); | ||
| let parser = stratis_legacy_pool_args(); | ||
| let matches = parser.get_matches_from(args); | ||
|
|
||
| let pool_name = matches | ||
| .get_one::<String>("pool_name") | ||
| .expect("required") | ||
| .clone(); | ||
| let blockdevs = matches | ||
| .get_many::<String>("blockdevs") | ||
| .expect("required") | ||
| .map(PathBuf::from) | ||
| .collect::<Vec<_>>(); | ||
| let key_desc = match matches.get_one::<String>("key_desc") { | ||
| Some(kd) => Some(KeyDescription::try_from(kd)?), | ||
| None => None, | ||
| }; | ||
| let pin = matches.get_one::<String>("clevis"); | ||
| let clevis_info = match pin.map(|s| s.as_str()) { | ||
| Some("nbde" | "tang") => { | ||
| let mut json = Map::new(); | ||
| json.insert( | ||
| "url".to_string(), | ||
| Value::from( | ||
| matches | ||
| .get_one::<String>("tang_url") | ||
| .expect("Required") | ||
| .clone(), | ||
| ), | ||
| ); | ||
| if matches.get_flag("trust_url") { | ||
| json.insert(CLEVIS_TANG_TRUST_URL.to_string(), Value::from(true)); | ||
| } else if let Some(thp) = matches.get_one::<String>("thumbprint") { | ||
| json.insert("thp".to_string(), Value::from(thp.clone())); | ||
| } | ||
| pin.map(|p| (p.to_string(), Value::from(json))) | ||
| } | ||
| Some("tpm2") => Some(("tpm2".to_string(), json!({}))), | ||
| Some(_) => unreachable!("Validated by parser"), | ||
| None => None, | ||
| }; | ||
|
|
||
| Ok((pool_name, blockdevs, key_desc, clevis_info)) | ||
| } | ||
|
|
||
| fn main() -> StratisResult<()> { | ||
| env_logger::init(); | ||
|
|
||
| let (name, devices, key_desc, clevis_info) = parse_args()?; | ||
| let unowned = ProcessedPathInfos::try_from( | ||
| devices | ||
| .iter() | ||
| .map(|p| p.as_path()) | ||
| .collect::<Vec<_>>() | ||
| .as_slice(), | ||
| )? | ||
| .unpack() | ||
| .1; | ||
| let encryption_info = match (key_desc, clevis_info) { | ||
| (Some(kd), Some(ci)) => Some(EncryptionInfo::Both(kd, ci)), | ||
| (Some(kd), _) => Some(EncryptionInfo::KeyDesc(kd)), | ||
| (_, Some(ci)) => Some(EncryptionInfo::ClevisInfo(ci)), | ||
| (_, _) => None, | ||
| }; | ||
| register_clevis_token()?; | ||
| StratPool::initialize(name.as_str(), unowned, encryption_info.as_ref())?; | ||
| Ok(()) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.