From a2665fb9d016032b845058d73c417f6f64734e66 Mon Sep 17 00:00:00 2001
From: Kyle Hickinson <git@kylehickinson.com>
Date: Fri, 19 Jan 2024 12:10:20 -0500
Subject: [PATCH] Fix #8664: Add content blocker to upgrade passive mixed
 content

---
 Package.swift                                        |  1 +
 .../ContentBlocker/ContentBlockerManager.swift       |  7 ++++++-
 .../ContentBlocker/Lists/mixed-content-upgrade.json  | 12 ++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 Sources/Brave/WebFilters/ContentBlocker/Lists/mixed-content-upgrade.json

diff --git a/Package.swift b/Package.swift
index a08eb1e2e24..4395f88d963 100644
--- a/Package.swift
+++ b/Package.swift
@@ -430,6 +430,7 @@ var braveTarget: PackageDescription.Target = .target(
     .copy("WebFilters/ContentBlocker/Lists/block-ads.json"),
     .copy("WebFilters/ContentBlocker/Lists/block-cookies.json"),
     .copy("WebFilters/ContentBlocker/Lists/block-trackers.json"),
+    .copy("WebFilters/ContentBlocker/Lists/mixed-content-upgrade.json"),
     .copy("WebFilters/ShieldStats/Adblock/Resources/ABPFilterParserData.dat"),
   ],
   plugins: ["LoggerPlugin"]
diff --git a/Sources/Brave/WebFilters/ContentBlocker/ContentBlockerManager.swift b/Sources/Brave/WebFilters/ContentBlocker/ContentBlockerManager.swift
index c47e2a38259..d8af074b38f 100644
--- a/Sources/Brave/WebFilters/ContentBlocker/ContentBlockerManager.swift
+++ b/Sources/Brave/WebFilters/ContentBlocker/ContentBlockerManager.swift
@@ -51,6 +51,7 @@ actor ContentBlockerManager {
     case blockAds
     case blockCookies
     case blockTrackers
+    case upgradeMixedContent
     
     func mode(isAggressiveMode: Bool) -> BlockingMode {
       switch self {
@@ -60,7 +61,7 @@ actor ContentBlockerManager {
         } else {
           return .standard
         }
-      case .blockCookies, .blockTrackers:
+      case .blockCookies, .blockTrackers, .upgradeMixedContent:
         return .general
       }
     }
@@ -70,6 +71,7 @@ actor ContentBlockerManager {
       case .blockAds: return "block-ads"
       case .blockCookies: return "block-cookies"
       case .blockTrackers: return "block-trackers"
+      case .upgradeMixedContent: return "mixed-content-upgrade"
       }
     }
   }
@@ -356,6 +358,9 @@ actor ContentBlockerManager {
       results.insert(.blockCookies)
     }
     
+    // Always upgrade mixed content
+    results.insert(.upgradeMixedContent)
+    
     return results
   }
   
diff --git a/Sources/Brave/WebFilters/ContentBlocker/Lists/mixed-content-upgrade.json b/Sources/Brave/WebFilters/ContentBlocker/Lists/mixed-content-upgrade.json
new file mode 100644
index 00000000000..c5fc1dd9ee5
--- /dev/null
+++ b/Sources/Brave/WebFilters/ContentBlocker/Lists/mixed-content-upgrade.json
@@ -0,0 +1,12 @@
+[
+  {
+    "trigger": {
+      "url-filter": "http://.*",
+      "if-top-url": ["https://.*"],
+      "resource-type": ["image", "media"]
+    },
+    "action": {
+      "type": "make-https"
+    }
+  }
+]