mirror/IronFox
1
0
Fork 0
mirror of https://github.com/ironfox-oss/IronFox.git synced 2026-06-11 17:54:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat: Update configure-safe-browsing.patch to also disable the legacy Google Safe Browsing API for defense in depth

Browse Source 
Signed-off-by: celenity <celenity@celenity.dev>
This commit is contained in:
celenity
2025-01-23 03:26:20 +00:00
parent a678c87d52
commit 09523462ae
2 changed files with 13 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
patches/configure-safe-browsing-temp.patch
View File

@@ -1,43 +0,0 @@
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlocking.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlocking.java
index b761e1126e..df47710155 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlocking.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlocking.java
@@ -38,14 +38,14 @@ public class ContentBlocking {
"goog-malware-shavar",
"goog-unwanted-shavar")
.updateUrl(
- "https://safebrowsing.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2&key=%GOOGLE_SAFEBROWSING_API_KEY%")
+ "")
.getHashUrl(
- "https://safebrowsing.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2")
- .reportUrl("https://safebrowsing.google.com/safebrowsing/diagnostic?site=")
- .reportPhishingMistakeUrl("https://%LOCALE%.phish-error.mozilla.com/?url=")
- .reportMalwareMistakeUrl("https://%LOCALE%.malware-error.mozilla.com/?url=")
+ "")
+ .reportUrl("https://transparencyreport.google.com/safe-browsing/search?url=")
+ .reportPhishingMistakeUrl("https://safebrowsing.google.com/safebrowsing/report_error/?tpl=mozilla&url=")
+ .reportMalwareMistakeUrl("https://safebrowsing.google.com/safebrowsing/report_error/?tpl=mozilla&url=")
.advisoryUrl("https://developers.google.com/safe-browsing/v4/advisory")
- .advisoryName("Google Safe Browsing")
+ .advisoryName("Google Safe Browsing (Legacy)")
.build();
/** {@link SafeBrowsingProvider} configuration for Google's SafeBrowsing server. */
@@ -64,13 +64,13 @@ public class ContentBlocking {
"https://safebrowsing.googleapis.com/v4/threatListUpdates:fetch?$ct=application/x-protobuf&key=%GOOGLE_SAFEBROWSING_API_KEY%&$httpMethod=POST")
.getHashUrl(
"https://safebrowsing.googleapis.com/v4/fullHashes:find?$ct=application/x-protobuf&key=%GOOGLE_SAFEBROWSING_API_KEY%&$httpMethod=POST")
- .reportUrl("https://safebrowsing.google.com/safebrowsing/diagnostic?site=")
- .reportPhishingMistakeUrl("https://%LOCALE%.phish-error.mozilla.com/?url=")
- .reportMalwareMistakeUrl("https://%LOCALE%.malware-error.mozilla.com/?url=")
+ .reportUrl("https://transparencyreport.google.com/safe-browsing/search?url=")
+ .reportPhishingMistakeUrl("https://safebrowsing.google.com/safebrowsing/report_error/?tpl=mozilla&url=")
+ .reportMalwareMistakeUrl("https://safebrowsing.google.com/safebrowsing/report_error/?tpl=mozilla&url=")
.advisoryUrl("https://developers.google.com/safe-browsing/v4/advisory")
.advisoryName("Google Safe Browsing")
.dataSharingUrl(
- "https://safebrowsing.googleapis.com/v4/threatHits?$ct=application/x-protobuf&key=%GOOGLE_SAFEBROWSING_API_KEY%&$httpMethod=POST")
+ "")
.dataSharingEnabled(false)
.build();

18
patches/configure-safe-browsing.patch
View File

@@ -1,20 +1,28 @@
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlocking.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlocking.java
index b761e1126e..1cb27627f2 100644
index b761e1126e..df47710155 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlocking.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlocking.java
@@ -41,9 +41,9 @@ public class ContentBlocking {
"https://safebrowsing.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2&key=%GOOGLE_SAFEBROWSING_API_KEY%")
@@ -38,14 +38,14 @@ public class ContentBlocking {
"goog-malware-shavar",
"goog-unwanted-shavar")
.updateUrl(
- "https://safebrowsing.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2&key=%GOOGLE_SAFEBROWSING_API_KEY%")
+ "")
.getHashUrl(
"https://safebrowsing.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2")
- "https://safebrowsing.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2")
- .reportUrl("https://safebrowsing.google.com/safebrowsing/diagnostic?site=")
- .reportPhishingMistakeUrl("https://%LOCALE%.phish-error.mozilla.com/?url=")
- .reportMalwareMistakeUrl("https://%LOCALE%.malware-error.mozilla.com/?url=")
+ "")
+ .reportUrl("https://transparencyreport.google.com/safe-browsing/search?url=")
+ .reportPhishingMistakeUrl("https://safebrowsing.google.com/safebrowsing/report_error/?tpl=mozilla&url=")
+ .reportMalwareMistakeUrl("https://safebrowsing.google.com/safebrowsing/report_error/?tpl=mozilla&url=")
.advisoryUrl("https://developers.google.com/safe-browsing/v4/advisory")
.advisoryName("Google Safe Browsing")
- .advisoryName("Google Safe Browsing")
+ .advisoryName("Google Safe Browsing (Legacy)")
.build();
/** {@link SafeBrowsingProvider} configuration for Google's SafeBrowsing server. */
@@ -64,13 +64,13 @@ public class ContentBlocking {
"https://safebrowsing.googleapis.com/v4/threatListUpdates:fetch?$ct=application/x-protobuf&key=%GOOGLE_SAFEBROWSING_API_KEY%&$httpMethod=POST")
.getHashUrl(