Support max_depth config without breaking stuff

slackhq · Sep 26, 2024 · 9030463 · 9030463
1 parent bd96959
commit 9030463
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/analyzer/config/json_config.rs b/src/analyzer/config/json_config.rs
@@ -4,7 +4,6 @@ use rustc_hash::FxHashMap;
 use serde::Deserialize;
 
 #[derive(Deserialize, Debug)]
-#[serde(deny_unknown_fields)]
 pub struct JsonConfig {
  #[serde(default)]
  pub ignore_files: Vec<String>,
@@ -24,7 +23,7 @@ pub struct JsonConfig {
 pub struct JsonSecurityConfig {
  pub ignore_files: Vec<String>,
  pub ignore_sink_files: FxHashMap<String, Vec<String>>,
- pub max_depth: u8,
+ pub max_depth: Option<u8>,
 }
 
 pub(crate) fn read_from_file(path: &Path) -> Result<JsonConfig, Box<dyn Error>> {

diff --git a/src/analyzer/config/mod.rs b/src/analyzer/config/mod.rs
@@ -167,7 +167,7 @@ impl Config {
  )
  })
  .collect();
- self.security_config.max_depth = json_config.security_analysis.max_depth;
+ self.security_config.max_depth = json_config.security_analysis.max_depth.unwrap_or(40);
 
  Ok(())
  }