Remove match_rule and f attributes.

jsha · jsha · commit 2b506b023de0 · 2016-01-13T23:29:06.000-08:00
diff --git a/chromium/rules.js b/chromium/rules.js
@@ -40,17 +40,12 @@ function CookieRule(host, cookiename) {
 /**
  *A collection of rules
  * @param set_name The name of this set
- * @param match_rule Quick test match rule
  * @param default_state activity state
  * @param note Note will be displayed in popup
  * @constructor
  */
-function RuleSet(set_name, match_rule, default_state, note) {
+function RuleSet(set_name, default_state, note) {
   this.name = set_name;
-  if (match_rule)
-    this.ruleset_match_c = new RegExp(match_rule);
-  else
-    this.ruleset_match_c = null;
   this.rules = [];
   this.exclusions = [];
   this.targets = [];
@@ -75,11 +70,6 @@ RuleSet.prototype = {
         return null;
       }
     }
-    // If a ruleset has a match_rule and it fails, go no further
-    if (this.ruleset_match_c && !this.ruleset_match_c.test(urispec)) {
-      log(VERB, "ruleset_match_c excluded " + urispec);
-      return null;
-    }
 
     // Okay, now find the first rule that triggers
     for(var i = 0; i < this.rules.length; ++i) {
@@ -89,12 +79,6 @@ RuleSet.prototype = {
         return returl;
       }
     }
-    if (this.ruleset_match_c) {
-      // This is not an error, because we do not insist the matchrule
-      // precisely describes to target space of URLs ot redirected
-      log(DBUG,"Ruleset "+this.name
-              +" had an applicable match-rule but no matching rules");
-    }
     return null;
   }
 
@@ -162,7 +146,7 @@ RuleSets.prototype = {
    */
   addUserRule : function(params) {
     log(INFO, 'adding new user rule for ' + JSON.stringify(params));
-    var new_rule_set = new RuleSet(params.host, null, true, "user rule");
+    var new_rule_set = new RuleSet(params.host, true, "user rule");
     var new_rule = new Rule(params.urlMatcher, params.redirectTo);
     new_rule_set.rules.push(new_rule);
     if (!(params.host in this.targets)) {
@@ -202,7 +186,6 @@ RuleSets.prototype = {
     }
 
     var rule_set = new RuleSet(ruletag.getAttribute("name"),
-                               ruletag.getAttribute("match_rule"),
                                default_state,
                                note.trim());
 
diff --git a/src/chrome/content/code/HTTPSRules.js b/src/chrome/content/code/HTTPSRules.js
@@ -19,20 +19,13 @@ function CookieRule(host, cookiename) {
   //this.name_c = new RegExp(cookiename);
 }
 
-function RuleSet(id, name, xmlName, match_rule, default_off, platform) {
-  if(xmlName == "WordPress.xml" || xmlName == "Github.xml") {
-    this.log(NOTE, "RuleSet( name="+name+", xmlName="+xmlName+", match_rule="+match_rule+", default_off="+default_off+", platform="+platform+" )");
-  }
-
+function RuleSet(id, name, default_off, platform) {
   this.id=id;
   this.on_by_default = true;
   this.compiled = false;
   this.name = name;
-  this.xmlName = xmlName;
   this.notes = "";
 
-  if (match_rule)   this.ruleset_match_c = new RegExp(match_rule);
-  else              this.ruleset_match_c = null;
   if (default_off) {
     // Perhaps problematically, this currently ignores the actual content of
     // the default_off XML attribute.  Ideally we'd like this attribute to be
@@ -93,12 +86,7 @@ RuleSet.prototype = {
     var i;
     var returl = null;
     this.ensureCompiled();
-    // If a rulset has a match_rule and it fails, go no further
-    if (this.ruleset_match_c && !this.ruleset_match_c.test(urispec)) {
-      this.log(VERB, "ruleset_match_c excluded " + urispec);
-      return null;
-    }
-    // Even so, if we're covered by an exclusion, go home
+    // If we're covered by an exclusion, go home
     for (i = 0; i < this.exclusions.length; ++i) {
       if (this.exclusions[i].pattern_c.test(urispec)) {
         this.log(DBUG,"excluded uri " + urispec);
@@ -111,7 +99,7 @@ RuleSet.prototype = {
       returl = urispec.replace(this.rules[i].from_c, this.rules[i].to);
       if (returl != urispec) {
         // we rewrote the uri
-        this.log(DBUG, "Rewrote " + urispec + " -> " + returl + " using " + this.xmlName + ": " + this.rules[i].from_c + " -> " + this.rules[i].to);
+        this.log(DBUG, "Rewrote " + urispec + " -> " + returl + " using " + this.name + ": " + this.rules[i].from_c + " -> " + this.rules[i].to);
         return returl;
       }
     }
@@ -139,13 +127,10 @@ RuleSet.prototype = {
     var urispec = uri.spec;
 
     this.ensureCompiled();
- 
-    if (this.ruleset_match_c && !this.ruleset_match_c.test(urispec)) 
-      return false;
- 
+
     for (var i = 0; i < this.exclusions.length; ++i) 
       if (this.exclusions[i].pattern_c.test(urispec)) return false;
- 
+
     for (var i = 0; i < this.rules.length; ++i) 
       if (this.rules[i].from_c.test(urispec)) return true;
     return false;
@@ -309,10 +294,9 @@ const RuleWriter = {
 
     this.log(DBUG, "Parsing " + xmlruleset.getAttribute("name"));
 
-    var match_rl = xmlruleset.getAttribute("match_rule");
     var dflt_off = xmlruleset.getAttribute("default_off");
     var platform = xmlruleset.getAttribute("platform");
-    var rs = new RuleSet(ruleset_id, xmlruleset.getAttribute("name"), xmlruleset.getAttribute("f"), match_rl, dflt_off, platform);
+    var rs = new RuleSet(ruleset_id, xmlruleset.getAttribute("name"), dflt_off, platform);
 
     // see if this ruleset has the same name as an existing ruleset;
     // if so, this ruleset is ignored; DON'T add or return it.
diff --git a/utils/make-sqlite.py b/utils/make-sqlite.py
@@ -81,10 +81,6 @@
     # pointing into the ruleset table.
     etree.strip_tags(tree, 'target')
 
-    # Store the filename in the `f' attribute so "view source XML" for rules in
-    # FF version can find it.
-    xpath_ruleset(tree)[0].attrib["f"] = os.path.basename(fi).decode(encoding="UTF-8")
-
     c.execute('''INSERT INTO rulesets (contents) VALUES(?)''', (etree.tostring(tree),))
     ruleset_id = c.lastrowid
     for target in targets:
diff --git a/utils/merge-rulesets.py b/utils/merge-rulesets.py
@@ -72,13 +72,10 @@ def clean_up(rulefile):
   # Chromium
   library.write('<rulesetlibrary>')
 
-# Include the filename.xml as the "f" attribute
 print("Removing whitespaces and comments...")
 
 for rfile in sorted(xml_ruleset_files):
   ruleset = open(rfile).read()
-  fn = os.path.basename(rfile)
-  ruleset = ruleset.replace("<ruleset", '<ruleset f="%s"' % fn, 1)
   library.write(clean_up(ruleset))
 library.write("</rulesetlibrary>\n")
 library.close()
diff --git a/utils/relaxng.xml b/utils/relaxng.xml
@@ -1,10 +1,6 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" name="ruleset" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <attribute name="name" />
 
-  <optional>
-    <attribute name="match_rule" />
-  </optional>
-
   <optional>
     <attribute name="default_off" />
   </optional>
diff --git a/utils/simple.py b/utils/simple.py
@@ -18,8 +18,6 @@ def simple(f):
     return all([
     # ruleset must not be default_off
     "default_off" not in tree.xpath("/ruleset")[0].attrib,
-    # ruleset must not contain a match_rule
-    "match_rule" not in tree.xpath("/ruleset")[0].attrib,
     # XXX: maybe also check for platform="mixedcontent" here
     # ruleset must not apply any securecookie patterns
     not tree.xpath("/ruleset/securecookie"),
