diff --git a/src/archive.rs b/src/archive.rs index ccd6a55..cca93c3 100644 --- a/src/archive.rs +++ b/src/archive.rs @@ -384,32 +384,32 @@ impl WebsiteArchive { let mut cmd = vec!["monolith", "--isolate", "-o", filename.to_str().unwrap()]; - if conf.no_audio { + if conf.no_audio.unwrap_or_default() { cmd.push("--no-audio"); } - if conf.no_css { + if conf.no_css.unwrap_or_default() { cmd.push("--no-css"); } - if conf.no_frames { + if conf.no_frames.unwrap_or_default() { cmd.push("--no-frames"); } - if conf.no_fonts { + if conf.no_fonts.unwrap_or_default() { cmd.push("--no-frames"); } - if conf.no_image { + if conf.no_image.unwrap_or_default() { cmd.push("--no-images"); } - if conf.no_javascript { + if conf.no_javascript.unwrap_or_default() { cmd.push("--no-js"); cmd.push("--unwrap-noscript"); } - if conf.no_video { + if conf.no_video.unwrap_or_default() { cmd.push("--no-video"); } diff --git a/src/blacklist.rs b/src/blacklist.rs index 26d6ebf..b45ddfa 100644 --- a/src/blacklist.rs +++ b/src/blacklist.rs @@ -8,7 +8,7 @@ pub fn check_blacklist(domain: &str) -> bool { let conf = conf.websites.as_ref(); // TODO : Block IPs - // Test SSRF + // TODO : Test SSRF let blacklisted_domains = conf .map(|x| x.BLACKLIST_DOMAINS.as_ref()) diff --git a/src/conf.rs b/src/conf.rs index 6fedc50..2dc1cb7 100644 --- a/src/conf.rs +++ b/src/conf.rs @@ -68,13 +68,13 @@ pub struct WebsiteConfig { pub struct DomainConfig { pub domain: String, pub blacklist_paths: Option>, - pub no_audio: bool, - pub no_video: bool, - pub no_image: bool, - pub no_css: bool, - pub no_javascript: bool, - pub no_fonts: bool, - pub no_frames: bool, + pub no_audio: Option, + pub no_video: Option, + pub no_image: Option, + pub no_css: Option, + pub no_javascript: Option, + pub no_fonts: Option, + pub no_frames: Option, pub user_agent: Option, } @@ -83,13 +83,13 @@ impl Default for DomainConfig { Self { domain: String::new(), blacklist_paths: None, - no_audio: false, - no_video: false, - no_image: false, - no_css: false, - no_javascript: false, - no_fonts: false, - no_frames: false, + no_audio: Some(false), + no_video: Some(false), + no_image: Some(false), + no_css: Some(false), + no_javascript: Some(false), + no_fonts: Some(false), + no_frames: Some(false), user_agent: None, } }