From 57d6cbd5aa4458a06665fc13dde1ba43ca08d1bd Mon Sep 17 00:00:00 2001
From: Sydney Acksman <obsidianminor@gmail.com>
Date: Sat, 31 Oct 2020 21:39:52 -0500
Subject: [PATCH] Use a better default ignore override and don't use standard
 filters

---
 src/sites/mod.rs | 62 +++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 32 deletions(-)

diff --git a/src/sites/mod.rs b/src/sites/mod.rs
index 5dc720c66..4769ce54c 100644
--- a/src/sites/mod.rs
+++ b/src/sites/mod.rs
@@ -78,18 +78,6 @@ pub fn directory_keys_values(
             let spinner_style =
                 ProgressStyle::default_spinner().template("{spinner}   Preparing {msg}...");
             let spinner = ProgressBar::new_spinner().with_style(spinner_style);
-            let regexset: regex::RegexSet;
-            if cfg!(windows) {
-                regexset = regex::RegexSet::new(&[
-                    r"^.*(\\.(.)*)+(\\.*)*$",    // Hidden files
-                    r"^.*\\.well-known(\\.*)*$", // Well-known
-                ])?;
-            } else {
-                regexset = regex::RegexSet::new(&[
-                    r"^.*(/\.(.)*)+(/.*)*$",   // Hidden files
-                    r"^.*\.well-known(/.*)*$", // Well-known
-                ])?;
-            }
 
             for entry in dir_walker {
                 spinner.tick();
@@ -97,13 +85,7 @@ pub fn directory_keys_values(
                 let path = entry.path();
                 if path.is_file() {
                     spinner.set_message(&format!("{}", path.display()));
-                    let str_path = path.to_str().unwrap();
 
-                    let matches = regexset.matches(str_path);
-                    //Catch hidden files which are NOT .well-known and don't upload
-                    if matches.matched(0) && !matches.matched(1) {
-                        continue;
-                    }
                     file_list.push(path.to_str().unwrap().to_string());
                     validate_file_size(&path)?;
 
@@ -171,7 +153,7 @@ fn validate_key_size(key: &str) -> Result<(), failure::Error> {
     Ok(())
 }
 
-const REQUIRED_IGNORE_FILES: &[&str] = &["node_modules"];
+const REQUIRED_IGNORE_FILES: &[&str] = &[NODE_MODULES];
 const NODE_MODULES: &str = "node_modules";
 
 fn get_dir_iterator(target: &Target, directory: &Path) -> Result<Walk, failure::Error> {
@@ -184,32 +166,48 @@ fn get_dir_iterator(target: &Target, directory: &Path) -> Result<Walk, failure::
 
     let ignore = build_ignore(target, directory)?;
     Ok(WalkBuilder::new(directory)
-        .git_ignore(false)
-        .hidden(false)
+        .standard_filters(false)
         .overrides(ignore)
         .build())
 }
 
 fn build_ignore(target: &Target, directory: &Path) -> Result<Override, failure::Error> {
     let mut required_override = OverrideBuilder::new(directory);
-    // First include files that must be ignored.
-    for ignored in REQUIRED_IGNORE_FILES {
-        required_override.add(&format!("!{}", ignored))?;
-        log::info!("Ignoring {}", ignored);
-    }
-
+    let required_ignore = |builder: &mut OverrideBuilder| -> Result<(), failure::Error> {
+        for ignored in REQUIRED_IGNORE_FILES {
+            builder.add(&format!("!{}", ignored))?;
+            log::info!("Ignoring {}", ignored);
+        }
+        
+        Ok(())
+    };
     if let Some(site) = &target.site {
         // If `include` present, use it and don't touch the `exclude` field
         if let Some(included) = &site.include {
+            required_ignore(&mut required_override)?;
             for i in included {
                 required_override.add(&i)?;
                 log::info!("Including {}", i);
             }
-        // If `exclude` only present, ignore anything in it.
-        } else if let Some(excluded) = &site.exclude {
-            for e in excluded {
-                required_override.add(&format!("!{}", e))?;
-                log::info!("Ignoring {}", e);
+        } else {
+            // allow all files. This is required since without this the `.well-known`
+            // override would act as a allowlist
+            required_override.add("*")?;
+            // add this AFTER since the `*` override would have precedence over this,
+            // making it useless
+            required_ignore(&mut required_override)?;
+            // ignore hidden files and folders
+            required_override.add("!**/.*")?;
+            // but allow .well-known, this has precedence over hidden files since it's later
+            required_override.add(".well-known")?;
+
+            // add any other excludes specified
+            if let Some(excluded) = &site.exclude {
+                required_ignore(&mut required_override)?;
+                for e in excluded {
+                    required_override.add(&format!("!{}", e))?;
+                    log::info!("Ignoring {}", e);
+                }
             }
         }
     }