X-Git-Url: https://code.octet-stream.net/hashgood/blobdiff_plain/b237f9d12de2062843975400c85dcad05bf4065c..585a245dd6e90efc545dbd68f928da9e03086cb9:/src/verify.rs?ds=sidebyside diff --git a/src/verify.rs b/src/verify.rs index 25e565f..c3d0147 100644 --- a/src/verify.rs +++ b/src/verify.rs @@ -2,8 +2,6 @@ use super::{ Algorithm, CandidateHash, CandidateHashes, Hash, MatchLevel, MessageLevel, Opt, Verification, VerificationSource, }; -#[cfg(feature = "paste")] -use copypasta::{ClipboardContext, ClipboardProvider}; use std::fs::File; use std::io; use std::io::prelude::*; @@ -16,8 +14,6 @@ use std::path::Path; pub fn get_candidate_hashes(opt: &Opt) -> Result, String> { if let Some(hash_string) = &opt.hash { return Ok(Some(get_by_parameter(hash_string)?)); - } else if opt.get_paste() { - return Ok(Some(get_from_clipboard()?)); } else if let Some(hash_file) = &opt.hash_file { return Ok(Some(get_from_file(hash_file)?)); } @@ -27,7 +23,7 @@ pub fn get_candidate_hashes(opt: &Opt) -> Result, String /// Generate a candidate hash from the provided command line parameter, or throw an error. fn get_by_parameter(param: &str) -> Result { let bytes = - hex::decode(¶m).map_err(|_| "Provided hash is invalid or truncated hex".to_owned())?; + hex::decode(param).map_err(|_| "Provided hash is invalid or truncated hex".to_owned())?; let alg = Algorithm::from_len(bytes.len())?; let candidate = CandidateHash { filename: None, @@ -40,39 +36,6 @@ fn get_by_parameter(param: &str) -> Result { }) } -/// Generate a candidate hash from the system clipboard, or throw an error. -fn get_from_clipboard() -> Result { - #[cfg(feature = "paste")] - { - let mut ctx: ClipboardContext = match ClipboardContext::new() { - Ok(ctx) => ctx, - Err(e) => return Err(format!("Error getting system clipboard: {}", e)), - }; - - let possible_hash = match ctx.get_contents() { - Ok(value) => value, - Err(e) => format!("Error reading from clipboard: {}", e), - }; - - let bytes = hex::decode(&possible_hash) - .map_err(|_| "Clipboard contains invalid or truncated hex".to_owned())?; - let alg = Algorithm::from_len(bytes.len())?; - let candidate = CandidateHash { - filename: None, - bytes, - }; - return Ok(CandidateHashes { - alg, - hashes: vec![candidate], - source: VerificationSource::Clipboard, - }); - } - #[cfg(not(feature = "paste"))] - { - return Err("Paste not implemented".to_owned()); - } -} - /// Generate a candidate hash from the digests file specified (could be "-" for STDIN), or throw an error. fn get_from_file(path: &Path) -> Result { // Get a reader for either standard input or the chosen path @@ -96,7 +59,7 @@ fn get_from_file(path: &Path) -> Result { let line = line.trim().to_owned(); // Does our first line look like a raw hash on its own? If so, use that - if let Some(candidate) = read_raw_candidate_from_file(&line, &path) { + if let Some(candidate) = read_raw_candidate_from_file(&line, path) { return Ok(candidate); } @@ -105,7 +68,7 @@ fn get_from_file(path: &Path) -> Result { let full_lines = vec![Ok(line)].into_iter().chain(reader.lines()); // Does the entire file look like a coreutils-style digests file? (SHA1SUMS, etc.) - if let Some(candidate) = read_coreutils_digests_from_file(full_lines, &path) { + if let Some(candidate) = read_coreutils_digests_from_file(full_lines, path) { return Ok(candidate); } @@ -148,51 +111,49 @@ where { let mut hashes = vec![]; let mut alg: Option = None; - for l in lines { - if let Ok(l) = l { - let l = l.as_ref().trim(); - // Allow (ignore) blank lines - if l.is_empty() { - continue; - } - // Expected format - // - let (line_alg, bytes, filename) = match l - .find(' ') - .and_then(|space_pos| { - // Char before filename should be space for text or * for binary - match l.chars().nth(space_pos + 1) { - Some(' ') | Some('*') => (l.get(..space_pos)).zip(l.get(space_pos + 2..)), - _ => None, - } - }) - .and_then(|(maybe_hash, filename)| { - // Filename should be in this position without extra whitespace - if filename.trim() == filename { - try_parse_hash(maybe_hash).map(|(alg, bytes)| (alg, bytes, filename)) - } else { - None - } - }) { - Some(t) => t, - None => { - // if we have a line with content we cannot parse, this is an error - return None; + for l in lines.flatten() { + let l = l.as_ref().trim(); + // Allow (ignore) blank lines + if l.is_empty() { + continue; + } + // Expected format + // + let (line_alg, bytes, filename) = match l + .find(' ') + .and_then(|space_pos| { + // Char before filename should be space for text or * for binary + match l.chars().nth(space_pos + 1) { + Some(' ') | Some('*') => (l.get(..space_pos)).zip(l.get(space_pos + 2..)), + _ => None, } - }; - if alg.is_some() && alg != Some(line_alg) { - // Different algorithms in the same digest file are not supported + }) + .and_then(|(maybe_hash, filename)| { + // Filename should be in this position without extra whitespace + if filename.trim() == filename { + try_parse_hash(maybe_hash).map(|(alg, bytes)| (alg, bytes, filename)) + } else { + None + } + }) { + Some(t) => t, + None => { + // if we have a line with content we cannot parse, this is an error return None; - } else { - // If we are the first line, we define the overall algorithm - alg = Some(line_alg); } - // So far so good - create an entry for this line - hashes.push(CandidateHash { - bytes, - filename: Some(filename.to_owned()), - }); + }; + if alg.is_some() && alg != Some(line_alg) { + // Different algorithms in the same digest file are not supported + return None; + } else { + // If we are the first line, we define the overall algorithm + alg = Some(line_alg); } + // So far so good - create an entry for this line + hashes.push(CandidateHash { + bytes, + filename: Some(filename.to_owned()), + }); } // It is a failure if we got zero hashes or we somehow don't know the algorithm @@ -293,6 +254,7 @@ mod tests { let valid_sha1 = "b314c7ebb7d599944981908b7f3ed33a30e78f3a"; let valid_sha1_2 = valid_sha1.to_uppercase(); let valid_sha256 = "1eb85fc97224598dad1852b5d6483bbcf0aa8608790dcc657a5a2a761ae9c8c6"; + let valid_sha512 = "f4f7de1665cdcd00b2e526da6876f3e06a37da3549e9f880602f64407f602983a571c142eb0de0eacfc9c1d0f534e9339cdce04eb9daddc6ddfa8cf34853beed"; let invalid1 = "x"; let invalid2 = "a"; @@ -301,36 +263,43 @@ mod tests { let invalid5 = "1eb85fc97224598dad1852b5d 483bbcf0aa8608790dcc657a5a2a761ae9c8c6"; assert!(matches!( - read_raw_candidate_from_file(valid_md5, &example_path), + read_raw_candidate_from_file(valid_md5, example_path), Some(CandidateHashes { alg: Algorithm::Md5, .. }) )); assert!(matches!( - read_raw_candidate_from_file(valid_sha1, &example_path), + read_raw_candidate_from_file(valid_sha1, example_path), Some(CandidateHashes { alg: Algorithm::Sha1, .. }) )); assert!(matches!( - read_raw_candidate_from_file(&valid_sha1_2, &example_path), + read_raw_candidate_from_file(&valid_sha1_2, example_path), Some(CandidateHashes { alg: Algorithm::Sha1, .. }) )); assert!(matches!( - read_raw_candidate_from_file(valid_sha256, &example_path), + read_raw_candidate_from_file(valid_sha256, example_path), Some(CandidateHashes { alg: Algorithm::Sha256, .. }) )); + assert!(matches!( + read_raw_candidate_from_file(valid_sha512, example_path), + Some(CandidateHashes { + alg: Algorithm::Sha512, + .. + }) + )); for i in &[invalid1, invalid2, invalid3, invalid4, invalid5] { - assert!(read_raw_candidate_from_file(*i, &example_path).is_none()); + assert!(read_raw_candidate_from_file(i, example_path).is_none()); } } @@ -340,9 +309,9 @@ mod tests { 75eb7420a9f5a260b04a3e8ad51e50f2838a17fc lel.txt fe6c26d485a3573a1cb0ad0682f5105325a1905f shasums"; - let lines = shasums.lines().map(|l| std::io::Result::Ok(l)); + let lines = shasums.lines().map(std::io::Result::Ok); let path = Path::new("SHASUMS"); - let candidates = read_coreutils_digests_from_file(lines, &path); + let candidates = read_coreutils_digests_from_file(lines, path); assert_eq!( candidates, @@ -374,7 +343,7 @@ mod tests { let extra_space = "4b91f7a387a6edd4a7c0afb2897f1ca968c9695b cp"; for digest in [no_format, invalid_format, extra_space] { - let lines = digest.lines().map(|l| std::io::Result::Ok(l)); + let lines = digest.lines().map(std::io::Result::Ok); assert!( read_coreutils_digests_from_file(lines, Path::new("SHASUMS")).is_none(), "Should be invalid digest: {:?}",