Support an exclude list in the config file (#315)

* Support an exclude list in the config file

* Run cargo fmt

* Update socket2 to fixed version

Co-authored-by: Jake Shadle <jake.shadle@embark-studios.com>

src/cargo-deny/check.rs

@@ -69,6 +69,8 @@ struct Config {
     sources: Option<sources::Config>,
     #[serde(default)]
     targets: Vec<crate::common::Target>,
+    #[serde(default)]
+    exclude: Vec<String>,
 }
 
 struct ValidConfig {
@@ -77,6 +79,7 @@ struct ValidConfig {
     licenses: licenses::ValidConfig,
     sources: sources::ValidConfig,
     targets: Vec<(krates::Target, Vec<String>)>,
+    exclude: Vec<String>,
 }
 
 impl ValidConfig {
@@ -127,6 +130,7 @@ impl ValidConfig {
             let sources = cfg.sources.unwrap_or_default().validate(id, &mut diags);
 
             let targets = crate::common::load_targets(cfg.targets, &mut diags, id);
+            let exclude = cfg.exclude;
 
             (
                 diags,
@@ -136,6 +140,7 @@ impl ValidConfig {
                     licenses,
                     sources,
                     targets,
+                    exclude,
                 },
             )
         };
@@ -177,7 +182,14 @@ pub(crate) fn cmd(
     krate_ctx: crate::common::KrateContext,
 ) -> Result<AllStats, Error> {
     let mut files = Files::new();
-    let mut cfg = ValidConfig::load(
+    let ValidConfig {
+        advisories,
+        bans,
+        licenses,
+        sources,
+        targets,
+        exclude,
+    } = ValidConfig::load(
         krate_ctx.get_config_path(args.config.clone()),
         &mut files,
         log_ctx,
@@ -212,11 +224,9 @@ pub(crate) fn cmd(
     let mut advisory_lockfile = None;
     let mut krate_spans = None;
 
-    let targets = std::mem::replace(&mut cfg.targets, Vec::new());
-
     rayon::scope(|s| {
         s.spawn(|_| {
-            let gathered = krate_ctx.gather_krates(targets);
+            let gathered = krate_ctx.gather_krates(targets, exclude);
 
             if let Ok(ref krates) = gathered {
                 rayon::scope(|s| {
@@ -238,8 +248,8 @@ pub(crate) fn cmd(
         if check_advisories {
             s.spawn(|_| {
                 advisory_dbs = Some(advisories::DbSet::load(
-                    cfg.advisories.db_path.clone(),
-                    cfg.advisories
+                    advisories.db_path.clone(),
+                    advisories
                         .db_urls
                         .iter()
                         .map(|us| us.as_ref().clone())
@@ -290,9 +300,9 @@ pub(crate) fn cmd(
         let store = license_store.unwrap()?;
         let gatherer = licenses::Gatherer::default()
             .with_store(std::sync::Arc::new(store))
-            .with_confidence_threshold(cfg.licenses.confidence_threshold);
+            .with_confidence_threshold(licenses.confidence_threshold);
 
-        Some(gatherer.gather(&krates, &mut files, Some(&cfg.licenses)))
+        Some(gatherer.gather(&krates, &mut files, Some(&licenses)))
     } else {
         None
     };
@@ -347,10 +357,9 @@ pub(crate) fn cmd(
 
         if let Some(summary) = license_summary {
             let lic_tx = tx.clone();
-            let lic_cfg = cfg.licenses;
 
             let ctx = CheckCtx {
-                cfg: lic_cfg,
+                cfg: licenses,
                 krates: &krates,
                 krate_spans: &krate_spans,
                 serialize_extra,
@@ -398,10 +407,9 @@ pub(crate) fn cmd(
             });
 
             let ban_tx = tx.clone();
-            let ban_cfg = cfg.bans;
 
             let ctx = CheckCtx {
-                cfg: ban_cfg,
+                cfg: bans,
                 krates: &krates,
                 krate_spans: &krate_spans,
                 serialize_extra,
@@ -419,10 +427,9 @@ pub(crate) fn cmd(
 
         if check_sources {
             let sources_tx = tx.clone();
-            let sources_cfg = cfg.sources;
 
             let ctx = CheckCtx {
-                cfg: sources_cfg,
+                cfg: sources,
                 krates: &krates,
                 krate_spans: &krate_spans,
                 serialize_extra,
@@ -439,10 +446,8 @@ pub(crate) fn cmd(
         }
 
         if let Some((db, lockfile)) = advisory_ctx {
-            let adv_cfg = cfg.advisories;
-
             let ctx = CheckCtx {
-                cfg: adv_cfg,
+                cfg: advisories,
                 krates: &krates,
                 krate_spans: &krate_spans,
                 serialize_extra,

src/cargo-deny/common.rs

@@ -90,6 +90,7 @@ impl KrateContext {
     pub fn gather_krates(
         self,
         cfg_targets: Vec<(krates::Target, Vec<String>)>,
+        cfg_excludes: Vec<String>,
     ) -> Result<cargo_deny::Krates, anyhow::Error> {
         log::info!("gathering crates for {}", self.manifest_path.display());
         let start = std::time::Instant::now();
@@ -116,10 +117,11 @@ impl KrateContext {
         gb.ignore_kind(DepKind::Dev, krates::Scope::NonWorkspace);
         gb.workspace(self.workspace);
 
-        if !self.exclude.is_empty() {
+        if !self.exclude.is_empty() || !cfg_excludes.is_empty() {
             gb.exclude(
                 self.exclude
                     .into_iter()
+                    .chain(cfg_excludes)
                     .filter_map(|spec| match spec.parse() {
                         Ok(spec) => Some(spec),
                         Err(e) => {

src/cargo-deny/fix.rs

@@ -33,11 +33,14 @@ struct Config {
     advisories: Option<advisories::cfg::Config>,
     #[serde(default)]
     targets: Vec<crate::common::Target>,
+    #[serde(default)]
+    exclude: Vec<String>,
 }
 
 struct ValidConfig {
     advisories: advisories::cfg::ValidConfig,
     targets: Vec<(krates::Target, Vec<String>)>,
+    exclude: Vec<String>,
 }
 
 impl ValidConfig {
@@ -92,6 +95,7 @@ impl ValidConfig {
         let mut diags = Vec::new();
         let advisories = cfg.advisories.unwrap_or_default().validate(id, &mut diags);
         let targets = crate::common::load_targets(cfg.targets, &mut diags, id);
+        let exclude = cfg.exclude;
 
         let has_errors = diags
             .iter()
@@ -107,6 +111,7 @@ impl ValidConfig {
             Ok(Self {
                 advisories,
                 targets,
+                exclude,
             })
         }
     }
@@ -123,6 +128,7 @@ pub fn cmd(
     let ValidConfig {
         advisories,
         targets,
+        exclude,
     } = ValidConfig::load(cfg_path, &mut files, log_ctx)?;
 
     // Parallel all the things
@@ -154,7 +160,7 @@ pub fn cmd(
         });
 
         s.spawn(|_| {
-            krates = Some(ctx.gather_krates(targets));
+            krates = Some(ctx.gather_krates(targets, exclude));
             if let Ok(krates) = krates.as_ref().unwrap() {
                 lockfile = Some(advisories::load_lockfile(krates.lock_path()));
             }

src/cargo-deny/list.rs

@@ -65,10 +65,13 @@ pub struct Args {
 struct Config {
     #[serde(default)]
     targets: Vec<crate::common::Target>,
+    #[serde(default)]
+    exclude: Vec<String>,
 }
 
 struct ValidConfig {
     targets: Vec<(krates::Target, Vec<String>)>,
+    exclude: Vec<String>,
 }
 
 impl ValidConfig {
@@ -92,13 +95,15 @@ impl ValidConfig {
 
                 return Ok(Self {
                     targets: Vec::new(),
+                    exclude: Vec::new(),
                 });
             }
             None => {
                 log::warn!("unable to find a config path, falling back to default config");
 
                 return Ok(Self {
                     targets: Vec::new(),
+                    exclude: Vec::new(),
                 });
             }
         };
@@ -116,8 +121,9 @@ impl ValidConfig {
         let validate = || -> Result<(Vec<Diagnostic>, Self), Vec<Diagnostic>> {
             let mut diagnostics = Vec::new();
             let targets = crate::common::load_targets(cfg.targets, &mut diagnostics, id);
+            let exclude = cfg.exclude;
 
-            Ok((diagnostics, Self { targets }))
+            Ok((diagnostics, Self { targets, exclude }))
         };
 
         let print = |diags: Vec<Diagnostic>| {
@@ -163,7 +169,7 @@ pub fn cmd(
     let cfg = ValidConfig::load(krate_ctx.get_config_path(args.config), &mut files, log_ctx)?;
 
     let (krates, store) = rayon::join(
-        || krate_ctx.gather_krates(cfg.targets),
+        || krate_ctx.gather_krates(cfg.targets, cfg.exclude),
         crate::common::load_license_store,
     );