improve ruleset unmarshalling behavior if there isnt a top level rule key

handlers/api_modifiers_structdef.gen.go

@@ -513,6 +513,15 @@ var AllMods Modifiers = Modifiers{
     {Name: "val", Type: "string"},
   },
 },
+{
+  Name:        "ModifyIncomingScriptsWithRegex",
+  Description: "ModifyIncomingScriptsWithRegex modifies all incoming javascript (application/javascript and inline <script> in text/html) using a regex match and replacement.",
+  CodeEditLink: "https://github.com/everywall/ladder/edit/origin/proxy_v2/proxychain/responsemodifiers/modify_incoming_scripts_with_regex.go",
+  Params: []Param{
+    {Name: "matchRegex", Type: "string"},
+    {Name: "replacement", Type: "string"},
+  },
+},
 {
   Name:        "SetResponseHeader",
   Description: "SetResponseHeader modifies response headers from the upstream server",

handlers/proxy.go

@@ -45,7 +45,7 @@ func NewProxySiteHandler(opts *ProxyOptions) fiber.Handler {
 			).
 			AddResponseModifications(
 				tx.ForwardResponseHeaders(),
-				//tx.BlockThirdPartyScripts(),
+				tx.BlockThirdPartyScripts(),
 				tx.DeleteIncomingCookies(),
 				tx.DeleteLocalStorageData(),
 				tx.DeleteSessionStorageData(),
@@ -54,7 +54,7 @@ func NewProxySiteHandler(opts *ProxyOptions) fiber.Handler {
 				tx.RewriteHTMLResourceURLs(),
 				tx.PatchDynamicResourceURLs(),
 				tx.PatchTrackerScripts(),
-				tx.BlockElementRemoval(".article-content"), // techcrunch
+				//tx.BlockElementRemoval(".article-content"), // techcrunch
 				//tx.BlockElementRemoval(".available-content"), // substack
 			// tx.SetContentSecurityPolicy("default-src * 'unsafe-inline' 'unsafe-eval' data: blob:;"),
 			)

proxychain/responsemodifiers/patch_dynamic_resource_urls.go

@@ -52,6 +52,19 @@ func PatchDynamicResourceURLs() proxychain.ResponseModification {
 		htmlRewriter := rewriters.NewHTMLRewriter(chain.Response.Body, rr)
 		chain.Response.Body = htmlRewriter
 
+		// window.location
+		/*
+				spoofedLocationAPI := fmt.Sprintf(`{href:"%s", origin:"%s", pathname:"%s", protocol:"%s:", port:"%s"}`,
+					reqURL.String(), reqURL.Host,
+					reqURL.Path, reqURL.Scheme, reqURL.Port())
+			spoofedLocationAPI := fmt.Sprintf(`{origin: "%s"}`, reqURL.Host)
+			fmt.Println(spoofedLocationAPI)
+
+			chain.AddOnceResponseModifications(
+				ModifyIncomingScriptsWithRegex(`window\.location`, spoofedLocationAPI),
+			)
+		*/
+
 		return nil
 	}
 }

proxychain/ruleset/rule_resmod_types.gen.go

@@ -84,6 +84,10 @@ func init() {
     return tx.SetIncomingCookie(params[0], params[1])
   }
 
+  rsmModMap["ModifyIncomingScriptsWithRegex"] = func(params ...string) proxychain.ResponseModification {
+    return tx.ModifyIncomingScriptsWithRegex(params[0], params[1])
+  }
+
   rsmModMap["SetResponseHeader"] = func(params ...string) proxychain.ResponseModification {
     return tx.SetResponseHeader(params[0], params[1])
   }

proxychain/ruleset/ruleset.go

@@ -33,14 +33,24 @@ func (rs *Ruleset) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	type AuxRuleset struct {
 		Rules []Rule `yaml:"rules"`
 	}
-	yr := &AuxRuleset{}
+	yamlRuleset := &AuxRuleset{}
 
-	if err := unmarshal(&yr); err != nil {
-		return err
+	if err := unmarshal(&yamlRuleset); err != nil {
+		// if there is no top-level rule key, we'll try to unmarshal as if it is just a bare rule
+		recovered := false
+		yamlRule := &Rule{}
+		if err := unmarshal(&yamlRule); err != nil {
+			yamlRuleset.Rules = append(yamlRuleset.Rules, *yamlRule)
+			recovered = true
+		}
+
+		if !recovered {
+			return err
+		}
 	}
 
 	rs._rulemap = make(map[string]*Rule)
-	rs.Rules = yr.Rules
+	rs.Rules = yamlRuleset.Rules
 
 	// create a map of pointers to rules loaded above based on domain string keys
 	// this way we don't have two copies of the rule in ruleset

ruleset_v2.yaml

@@ -15,3 +15,19 @@ rules:
     requestmodifications:
     - name: ForwardRequestHeaders
       params: []
+
+  - domains:
+    - quantamagzine.org
+    responsemodifications:
+    - name: BlockElementRemoval
+      params:
+      - "#postContent"
+
+  - domains:
+    - techcrunch.com
+    responsemodifications:
+    - name: ModifyIncomingScriptsWithRegex
+      params:
+      - "window\\.location"
+      - |
+        {origin: "techcrunch.com"}