clean up

handlers/proxy.go

@@ -116,7 +116,7 @@ func loadRules() RuleSet {
 		return RulesList
 	}
 	log.Println("Loading rules")
-	// TODO: Load the rules from the URL
+
 	resp, err := http.Get(rulesUrl)
 	if err != nil {
 		log.Println("ERROR:", err)
@@ -149,10 +149,11 @@ func applyRules(domain string, path string, body string) string {
 		if rule.Path != "" && rule.Path != path {
 			continue
 		}
-		for _, domRule := range rule.DomRules {
+		/*
-			re := regexp.MustCompile(domRule.Match)
+			for _, domRule := range rule.DomRules {
-			body = re.ReplaceAllString(body, domRule.Replace)
+				// run the dom rules
-		}
+			}
+		*/
 		for _, regexRule := range rule.RegexRules {
 			re := regexp.MustCompile(regexRule.Match)
 			body = re.ReplaceAllString(body, regexRule.Replace)

ruleset.yaml

@@ -1,24 +1,15 @@
-- domain: www.example.ch
+- domain: www.example.com
   path: /article
   regexRules:
-    - match: "asdf"
+    - match: <script\s+([^>]*\s+)?src="(/)([^"]*)"
-      replace: "asdf"
+      replace: <script $1 script="/https://www.example.com/$3"
-    - match: "asdf"
-      replace: "asdf"
   domRules:
-    - match: "asdf"
+    - match: "tobe.defined"
-      replace: "asdf"
+      replace: "test"
-    - match: "asdf"
+- domain: www.anotherdomain.com
-      replace: "asdf"
-- domain: www.srf.ch
-  path: /article
   regexRules:
-    - match: "asdf"
+    - match: <script\s+([^>]*\s+)?src="(/)([^"]*)"
-      replace: "asdf"
+      replace: <script $1 script="/https://www.example.com/$3"
-    - match: "asdf"
-      replace: "asdf"
   domRules:
-    - match: "asdf"
+    - match: "tobe.defined"
-      replace: "asdf"
+      replace: "test"
-    - match: "asdf"
-      replace: "asdf"