Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to logging with tracing library #110

Merged
merged 1 commit into from
Dec 14, 2024
Merged

Switch to logging with tracing library #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions custota-tool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ serde = { version = "1.0.188", features = ["derive"] }
serde_json = "1.0.105"
serde_repr = "0.1.19"
sha2 = { version = "0.10.7", features = ["std"] }
tracing = "0.1.41"
x509-cert = "0.2.4"

[dependencies.avbroot]
Expand Down
34 changes: 23 additions & 11 deletions custota-tool/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ use std::{

use anyhow::{anyhow, bail, Context, Result};
use avbroot::{
cli::args::LogFormat,
crypto::{self, PassphraseSource, RsaSigningKey},
format::{ota, payload::PayloadHeader},
protobuf::build::tools::releasetools::ota_metadata::OtaType,
Expand All @@ -44,6 +45,7 @@ use rsa::{
use serde::{Deserialize, Serialize};
use serde_repr::{Deserialize_repr, Serialize_repr};
use sha2::{Sha256, Sha512};
use tracing::{info, warn, Level};
use x509_cert::{
der::{asn1::OctetStringRef, Any, Decode, Encode, Tag},
spki::AlgorithmIdentifierOwned,
Expand Down Expand Up @@ -243,6 +245,14 @@ enum Command {
struct Cli {
#[command(subcommand)]
command: Command,

/// Lowest log message severity to output.
#[arg(long, global = true, value_name = "LEVEL", default_value_t = Level::INFO)]
log_level: Level,

/// Output format for log messages.
#[arg(long, global = true, value_name = "FORMAT", default_value_t)]
log_format: LogFormat,
}

/// Compute the SHA256 digest of a section of a file.
Expand Down Expand Up @@ -392,7 +402,7 @@ fn get_cms_inline(ci: &ContentInfo, cert: Option<&Certificate>) -> Result<Vec<u8
if let Some(cert) = cert {
verify_cms_signature(&signed_data, econtent_type, econtent_data.as_bytes(), cert)?;
} else {
eprintln!("Skipping signature verification");
warn!("Skipping signature verification");
}

Ok(econtent_data.as_bytes().to_vec())
Expand Down Expand Up @@ -446,7 +456,7 @@ fn compute_vbmeta_digest(
header: &PayloadHeader,
cancel_signal: &AtomicBool,
) -> Result<[u8; 32]> {
println!("Computing vbmeta digest...");
info!("Computing vbmeta digest...");

let authority = ambient_authority();
let temp_dir = TempDir::new(authority).context("Failed to create temporary directory")?;
Expand Down Expand Up @@ -537,7 +547,7 @@ fn subcommand_gen_csig(args: &GenerateCsig, cancel_signal: &AtomicBool) -> Resul
.with_context(|| anyhow!("Failed to open for reading: {:?}", args.input))?;
let mut reader = BufReader::new(file);

println!("Verifying OTA signature...");
info!("Verifying OTA signature...");
let embedded_cert = ota::verify_ota(&mut reader, cancel_signal)?;

let (metadata, ota_cert, header, _) = ota::parse_zip_ota_info(&mut reader)
Expand Down Expand Up @@ -581,9 +591,9 @@ fn subcommand_gen_csig(args: &GenerateCsig, cancel_signal: &AtomicBool) -> Resul
.first()
.ok_or_else(|| anyhow!("Postconditions do not list a fingerprint"))?;

println!("Device name: {device_name}");
println!("Fingerprint: {fingerprint}");
println!("Security patch: {}", postcondition.security_patch_level);
info!("Device name: {device_name}");
info!("Fingerprint: {fingerprint}");
info!("Security patch: {}", postcondition.security_patch_level);

let pfs_raw = metadata
.property_files
Expand Down Expand Up @@ -632,7 +642,7 @@ fn subcommand_gen_csig(args: &GenerateCsig, cancel_signal: &AtomicBool) -> Resul
cancel_signal,
)?;

println!("vbmeta digest: {}", hex::encode(digest));
info!("vbmeta digest: {}", hex::encode(digest));

Some(VbmetaDigest(digest))
}
Expand Down Expand Up @@ -664,7 +674,7 @@ fn subcommand_gen_csig(args: &GenerateCsig, cancel_signal: &AtomicBool) -> Resul
fs::write(output.as_ref(), csig_signature_der)
.with_context(|| anyhow!("Failed to create file: {output:?}"))?;

println!("Wrote: {output:?}");
info!("Wrote: {output:?}");

Ok(())
}
Expand Down Expand Up @@ -713,9 +723,9 @@ fn subcommand_gen_update_info(args: &GenerateUpdateInfo) -> Result<()> {
serde_json::to_writer_pretty(writer, &update_info)?;

if created {
println!("Created: {:?}", args.file);
info!("Created: {:?}", args.file);
} else {
println!("Updated: {:?}", args.file);
info!("Updated: {:?}", args.file);
}

Ok(())
Expand Down Expand Up @@ -744,7 +754,7 @@ fn subcommand_gen_cert_module(args: &GenerateCertModule) -> Result<()> {
let subject_hash = u32::from_le_bytes(subject_md5.0[0..4].try_into().unwrap());

if !seen.insert(subject_hash) {
eprintln!("Skipping duplicate cert: {path:?}");
warn!("Skipping duplicate cert: {path:?}");
continue;
}

Expand Down Expand Up @@ -815,6 +825,8 @@ fn main() -> Result<()> {

let args = Cli::parse();

avbroot::cli::args::init_logging(args.log_level, args.log_format);

match args.command {
Command::ShowCsig(args) => subcommand_show_csig(&args),
Command::GenCsig(args) => subcommand_gen_csig(&args, &cancel_signal),
Expand Down
Loading