lovejavaee
diff --git a/‎test/validations/relaxng/https2https_whitelist.json‎
Lines changed: 0 additions & 43 deletions b/‎test/validations/relaxng/https2https_whitelist.json‎
Lines changed: 0 additions & 43 deletions
diff --git a/‎test/validations/relaxng/run.py‎
Lines changed: 8 additions & 5 deletions b/‎test/validations/relaxng/run.py‎
Lines changed: 8 additions & 5 deletions
diff --git a/‎utils/ruleset-whitelist-cleanup.sh‎
Lines changed: 5 additions & 5 deletions b/‎utils/ruleset-whitelist-cleanup.sh‎
Lines changed: 5 additions & 5 deletions
@@ -4,14 +4,13 @@
 import argparse
 import glob
 import hashlib
-import json
 import os
 
 from lxml import etree
 
 parser = argparse.ArgumentParser(description="Validate rulesets against relaxng schema.xml")
 parser.add_argument("--source_dir", default="src/chrome/content/rules")
-parser.add_argument("--https2https_whitelist", default="test/validations/relaxng/https2https_whitelist.json")
+parser.add_argument("--https2https_whitelist", default="utils/ruleset-whitelist.csv")
 
 args = parser.parse_args()
 
@@ -23,10 +22,14 @@
 relaxng_doc_https2https = etree.parse("test/validations/relaxng/schema_https2https.xml")
 relaxng_https2https = etree.RelaxNG(relaxng_doc_https2https)
 
-https2https_whitelist = None
+https2https_whitelist = {}
 
-with open(args.https2https_whitelist, "r") as file:
-    https2https_whitelist = json.load(file)
+with open(args.https2https_whitelist) as f:
+    f.readline()
+    for line in f:
+        fileHash, _, _, fileSkip, fileName = line.strip().split(",")
+        if fileSkip == "1":
+            https2https_whitelist[fileName] = fileHash
 
 exit_code = 0
 
 
@@ -17,20 +17,20 @@ cd src/chrome/content/rules
 WLIST=../../../../utils/ruleset-whitelist.csv
 DELIM=","
 
-(read; while IFS=$DELIM read listed_hash coverage_flag fetch_flag file; do
+(read; while IFS=$DELIM read listed_hash coverage_flag fetch_flag https_flag file; do
   display_hash=$(echo $listed_hash | cut -c-7)
   # Remove those that no longer exist
   if [ ! -f $file ]; then
-    sed -i "/$listed_hash$DELIM$coverage_flag$DELIM$fetch_flag$DELIM$file/d" $WLIST
+    sed -i "/$listed_hash$DELIM$coverage_flag$DELIM$fetch_flag$DELIM$https_flag$DELIM$file/d" $WLIST
     echo >&2 "Removed $file ($display_hash): file no longer exists"
-  elif [ "$coverage_flag" == "0" -a "$fetch_flag" == "0" ]; then
-    sed -i "/$listed_hash$DELIM$coverage_flag$DELIM$fetch_flag$DELIM$file/d" $WLIST
+  elif [ "$coverage_flag" == "0" -a "$fetch_flag" == "0" -a "$https_flag" == "0" ]; then
+    sed -i "/$listed_hash$DELIM$coverage_flag$DELIM$fetch_flag$DELIM$https_flag$DELIM$file/d" $WLIST
     echo >&2 "Removed $file ($display_hash): obsolete, all flags set to false"
   else
     actual_hash=$(sha256sum $file | cut -c-64)
     # Remove those whose hashes do not match
     if [ "$listed_hash" != "$actual_hash" ]; then
-      sed -i "/$listed_hash$DELIM$coverage_flag$DELIM$fetch_flag$DELIM$file/d" $WLIST
+      sed -i "/$listed_hash$DELIM$coverage_flag$DELIM$fetch_flag$DELIM$https_flag$DELIM$file/d" $WLIST
       echo >&2 "Removed $file ($display_hash): listed hash does not match actual hash"
     fi
   fi