tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

handle invalid mtime when formating entries 

otherwise operations like catalog shell panic when viewing pxar archives
containing such entries, e.g. with mtime very far ahead into the future.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2020-09-11 14:34:37 +02:00 committed by Dietmar Maurer
parent 833eca6d2f
commit 7158b304f5
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/pxar/tools.rs
View File

@ -8,7 +8,7 @@ use std::path::Path;
use anyhow::{bail, format_err, Error}; use anyhow::{bail, format_err, Error};
use nix::sys::stat::Mode; use nix::sys::stat::Mode;
use pxar::{mode, Entry, EntryKind, Metadata}; use pxar::{mode, Entry, EntryKind, Metadata, format::StatxTimestamp};
/// Get the file permissions as `nix::Mode` /// Get the file permissions as `nix::Mode`
pub fn perms_from_metadata(meta: &Metadata) -> Result<Mode, Error> { pub fn perms_from_metadata(meta: &Metadata) -> Result<Mode, Error> {
@ -114,13 +114,19 @@ fn mode_string(entry: &Entry) -> String {
) )
} }
pub fn format_single_line_entry(entry: &Entry) -> String { fn format_mtime(mtime: &StatxTimestamp) -> String {
use chrono::offset::TimeZone; use chrono::offset::TimeZone;
match chrono::Local.timestamp_opt(mtime.secs, mtime.nanos) {
chrono::LocalResult::Single(mtime) => mtime.format("%Y-%m-%d %H:%M:%S").to_string(),
_ => format!("{}.{}", mtime.secs, mtime.nanos),
}
}
pub fn format_single_line_entry(entry: &Entry) -> String {
let mode_string = mode_string(entry); let mode_string = mode_string(entry);
let meta = entry.metadata(); let meta = entry.metadata();
let mtime = chrono::Local.timestamp(meta.stat.mtime.secs, meta.stat.mtime.nanos);
let (size, link) = match entry.kind() { let (size, link) = match entry.kind() {
EntryKind::File { size, .. } => (format!("{}", *size), String::new()), EntryKind::File { size, .. } => (format!("{}", *size), String::new()),
@ -134,7 +140,7 @@ pub fn format_single_line_entry(entry: &Entry) -> String {
"{} {:<13} {} {:>8} {:?}{}", "{} {:<13} {} {:>8} {:?}{}",
mode_string, mode_string,
format!("{}/{}", meta.stat.uid, meta.stat.gid), format!("{}/{}", meta.stat.uid, meta.stat.gid),
mtime.format("%Y-%m-%d %H:%M:%S"), format_mtime(&meta.stat.mtime),
size, size,
entry.path(), entry.path(),
link, link,
@ -142,12 +148,9 @@ pub fn format_single_line_entry(entry: &Entry) -> String {
} }
pub fn format_multi_line_entry(entry: &Entry) -> String { pub fn format_multi_line_entry(entry: &Entry) -> String {
use chrono::offset::TimeZone;
let mode_string = mode_string(entry); let mode_string = mode_string(entry);
let meta = entry.metadata(); let meta = entry.metadata();
let mtime = chrono::Local.timestamp(meta.stat.mtime.secs, meta.stat.mtime.nanos);
let (size, link, type_name) = match entry.kind() { let (size, link, type_name) = match entry.kind() {
EntryKind::File { size, .. } => (format!("{}", *size), String::new(), "file"), EntryKind::File { size, .. } => (format!("{}", *size), String::new(), "file"),
@ -196,6 +199,6 @@ pub fn format_multi_line_entry(entry: &Entry) -> String {
mode_string, mode_string,
meta.stat.uid, meta.stat.uid,
meta.stat.gid, meta.stat.gid,
mtime.format("%Y-%m-%d %H:%M:%S"), format_mtime(&meta.stat.mtime),
) )
} }