-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adds a lockfile::Lockfile type for modeling Cargo.lock files This could potentially be replaced with built-in types from Cargo, but suffices to meet RustSec's needs for now.
- Loading branch information
Showing
5 changed files
with
155 additions
and
55 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| //! Types for representing Cargo.lock files | ||
| use AdvisoryDatabase; | ||
| use advisory::Advisory; | ||
| use error::{Error, Result}; | ||
| use std::fs::File; | ||
| use std::io::Read; | ||
| use std::path::Path; | ||
| use toml; | ||
| use util; | ||
|
|
||
| /// Entry from Cargo.lock's `[[package]]` array | ||
| /// TODO: serde macros or switch to cargo's builtin types | ||
| #[derive(Debug, PartialEq)] | ||
| pub struct Package { | ||
| /// Name of a dependent crate | ||
| pub name: String, | ||
|
|
||
| /// Version of dependent crate | ||
| pub version: String, | ||
| } | ||
|
|
||
| /// Parsed Cargo.lock file containing dependencies | ||
| #[derive(Debug, PartialEq)] | ||
| pub struct Lockfile { | ||
| /// Dependencies enumerated in the lockfile | ||
| pub packages: Vec<Package>, | ||
| } | ||
|
|
||
| impl Lockfile { | ||
| /// Load lockfile from disk | ||
| pub fn load(filename: &str) -> Result<Self> { | ||
| let path = Path::new(filename); | ||
| let mut file = File::open(&path).or(Err(Error::IO))?; | ||
| let mut toml = String::new(); | ||
|
|
||
| file.read_to_string(&mut toml).or(Err(Error::IO))?; | ||
| Self::from_toml(&toml) | ||
| } | ||
|
|
||
| /// Load lockfile from a TOML string | ||
| pub fn from_toml(string: &str) -> Result<Self> { | ||
| let toml = string.parse::<toml::Value>().or(Err(Error::Parse))?; | ||
|
|
||
| let packages_toml = match toml.get("package") { | ||
| Some(&toml::Value::Array(ref arr)) => arr, | ||
| _ => return Ok(Lockfile { packages: Vec::new() }), | ||
| }; | ||
|
|
||
| let mut packages = Vec::new(); | ||
|
|
||
| for package in packages_toml { | ||
| match *package { | ||
| toml::Value::Table(ref table) => { | ||
| packages.push(Package { | ||
| name: util::parse_mandatory_string(table, "name")?, | ||
| version: util::parse_mandatory_string(table, "version")?, | ||
| }) | ||
| } | ||
| _ => return Err(Error::InvalidAttribute), | ||
| } | ||
| } | ||
|
|
||
| Ok(Lockfile { packages: packages }) | ||
| } | ||
|
|
||
| /// Find all relevant vulnerabilities for this lockfile using the given database | ||
| pub fn vulnerabilities<'a>(&self, db: &'a AdvisoryDatabase) -> Result<Vec<&'a Advisory>> { | ||
| let mut result = Vec::new(); | ||
|
|
||
| for package in &self.packages { | ||
| result.extend(&db.find_vulns_for_crate(&package.name, &package.version)?) | ||
| } | ||
|
|
||
| Ok(result) | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use lockfile::Lockfile; | ||
|
|
||
| #[test] | ||
| fn load_cargo_lockfile() { | ||
| Lockfile::load("Cargo.lock").unwrap(); | ||
| } | ||
| } |
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,35 @@ | ||
| use error::{Error, Result}; | ||
| use semver::VersionReq; | ||
| use toml::value::Table; | ||
| use toml::Value; | ||
|
|
||
| pub fn parse_optional_string(table: &Table, attribute: &str) -> Result<Option<String>> { | ||
| match table.get(attribute) { | ||
| Some(v) => Ok(Some(String::from(v.as_str().ok_or(Error::InvalidAttribute)?))), | ||
| None => Ok(None), | ||
| } | ||
| } | ||
|
|
||
| pub fn parse_mandatory_string(table: &Table, attribute: &str) -> Result<String> { | ||
| let str = parse_optional_string(table, attribute)?; | ||
| str.ok_or(Error::MissingAttribute) | ||
| } | ||
|
|
||
| pub fn parse_versions(table: &Table, attribute: &str) -> Result<Vec<VersionReq>> { | ||
| match table.get(attribute) { | ||
| Some(&Value::Array(ref arr)) => { | ||
| let mut result = Vec::new(); | ||
|
|
||
| for version in arr { | ||
| let version_str = version.as_str().ok_or(Error::MissingAttribute)?; | ||
| let version_req = VersionReq::parse(version_str).or(Err(Error::MalformedVersion))?; | ||
|
|
||
| result.push(version_req) | ||
| } | ||
|
|
||
| Ok(result) | ||
| } | ||
| Some(_) => Err(Error::InvalidAttribute), | ||
| None => Err(Error::MissingAttribute), | ||
| } | ||
| } |