From 1fef42a543b2d5db3e42cd843a660bf5c642b764 Mon Sep 17 00:00:00 2001 From: Lorenzo Mattei Date: Sun, 15 Oct 2023 21:44:38 +0200 Subject: [PATCH] Add note about Danger matching rules (#2087) Co-authored-by: Lorenzo Mattei --- .../AppPrivacyConfigurationDataProvider.swift | 4 +- Core/AppURLs.swift | 3 + Core/ios-config.json | 823 ++++++++---------- scripts/update_embedded.sh | 3 +- 4 files changed, 376 insertions(+), 457 deletions(-) diff --git a/Core/AppPrivacyConfigurationDataProvider.swift b/Core/AppPrivacyConfigurationDataProvider.swift index 56755c581d..1ce3b85874 100644 --- a/Core/AppPrivacyConfigurationDataProvider.swift +++ b/Core/AppPrivacyConfigurationDataProvider.swift @@ -23,8 +23,8 @@ import BrowserServicesKit final public class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider { public struct Constants { - public static let embeddedDataETag = "\"54efb258435567856e087913f93d43df\"" - public static let embeddedDataSHA = "d0f9c70c5baba23a0966b277f8b4c949ecf01612558a50d2bda720fe1919b43f" + public static let embeddedDataETag = "\"81da520221d37e6398ea3d8940595810\"" + public static let embeddedDataSHA = "19766ed7e598cdc123c9db702264b99d0cff5ddfb2ed226fba85b06d304f7e0b" } public var embeddedDataEtag: String { diff --git a/Core/AppURLs.swift b/Core/AppURLs.swift index 6feb8e7407..e7ebfa07f1 100644 --- a/Core/AppURLs.swift +++ b/Core/AppURLs.swift @@ -33,6 +33,9 @@ public extension URL { static let aboutLink = URL(string: AppDeepLinkSchemes.quickLink.appending("\(ddg.host!)/about"))! static let surrogates = URL(string: "\(staticBase)/surrogates.txt")! + + // The following URLs shall match the ones in update_embedded.sh. + // Danger checks that the URLs match on every PR. If the code changes, the regex that Danger uses may need an update. static let privacyConfig = URL(string: "\(staticBase)/trackerblocking/config/v3/ios-config.json")! static let trackerDataSet = URL(string: "\(staticBase)/trackerblocking/v5/current/ios-tds.json")! static let bloomFilter = URL(string: "\(staticBase)/https/https-mobile-v2-bloom.bin")! diff --git a/Core/ios-config.json b/Core/ios-config.json index b9847b8298..2598db1b60 100644 --- a/Core/ios-config.json +++ b/Core/ios-config.json @@ -1,6 +1,6 @@ { "readme": "https://github.com/duckduckgo/privacy-configuration", - "version": 1695828991975, + "version": 1697058000288, "features": { "adClickAttribution": { "readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection", @@ -313,66 +313,6 @@ { "domain": "roll20.net", "reason": "Performance issue for too many fields." - }, - { - "domain": "amazon.ca", - "reason": "Performance issue, infinite loop." - }, - { - "domain": "amazon.cn", - "reason": "Performance issue, infinite loop." - }, - { - "domain": "amazon.co.jp", - "reason": "Performance issue, infinite loop." - }, - { - "domain": "amazon.com", - "reason": "Performance issue, infinite loop." - }, - { - "domain": "amazon.com.au", - "reason": "Performance issue, infinite loop." - }, - { - "domain": "amazon.com.mx", - "reason": "Performance issue, infinite loop." - }, - { - "domain": "amazon.co.uk", - "reason": "Performance issue, infinite loop." - }, - { - "domain": "amazon.de", - "reason": "Performance issue, infinite loop." - }, - { - "domain": "amazon.es", - "reason": "Performance issue, infinite loop." - }, - { - "domain": "amazon.eu", - "reason": "Performance issue, infinite loop." - }, - { - "domain": "amazon.fr", - "reason": "Performance issue, infinite loop." - }, - { - "domain": "amazon.in", - "reason": "Performance issue, infinite loop." - }, - { - "domain": "amazon.it", - "reason": "Performance issue, infinite loop." - }, - { - "domain": "amazon.nl", - "reason": "Performance issue, infinite loop." - }, - { - "domain": "amazon.sa", - "reason": "Performance issue, infinite loop." } ], "state": "enabled", @@ -398,7 +338,7 @@ "minSupportedVersion": "7.75.0" } }, - "hash": "c427670d1be007f3bd4af4c0e83addfb" + "hash": "0050520033bd94b10474e9d2f649f8f9" }, "clickToLoad": { "exceptions": [ @@ -1198,6 +1138,10 @@ "domain": "iamexpat.nl", "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1247" }, + { + "domain": "pocketbook.digital", + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1368" + }, { "domain": "earth.google.com", "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1099" @@ -1230,7 +1174,7 @@ } }, "state": "disabled", - "hash": "396f535f481c52cc31108ac8a0f7e53a" + "hash": "282361b69a7a17fbd3a6c53cdfba6b97" }, "clickToPlay": { "exceptions": [ @@ -1274,6 +1218,14 @@ "domain": "welt.de", "reason": "Video pauses at about 13-15 seconds in. Playing the video again results in a single frame rendering without progressing to the next frame." }, + { + "domain": "optout.aboutads.info", + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1377" + }, + { + "domain": "optout.networkadvertising.org", + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1377" + }, { "domain": "earth.google.com", "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1099" @@ -1291,7 +1243,7 @@ "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1085" } ], - "hash": "acdaea57d6585b8b4c15750545c477ff" + "hash": "f43e0ec67d1177139fe5cfc603cbd8a3" }, "cookie": { "settings": { @@ -1325,6 +1277,14 @@ "domain": "nespresso.com", "reason": "Clicking 'Continue' after filling out details for account creation yields an error." }, + { + "domain": "optout.aboutads.info", + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1377" + }, + { + "domain": "optout.networkadvertising.org", + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1377" + }, { "domain": "earth.google.com", "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1099" @@ -1343,10 +1303,145 @@ } ], "state": "disabled", - "hash": "d391a768cdcd83fe39d2229cfca7239c" + "hash": "ee691572b20893705632f670a2f72801" }, "customUserAgent": { "settings": { + "defaultPolicy": "ddg", + "ddgFixedSites": [], + "ddgDefaultSites": [ + { + "domain": "duckduckgo.com", + "reason": "Internal exclusion to roll out experiment" + } + ], + "ddgFixedUserAgent": { + "versions": [ + "391", + "389", + "388", + "386", + "383", + "382", + "379", + "377", + "376", + "374", + "371", + "370", + "367", + "365", + "364", + "361", + "360", + "358", + "356", + "353", + "351", + "349", + "348", + "345", + "343", + "341", + "340", + "338", + "336", + "334", + "332", + "330", + "327", + "325", + "324", + "322", + "319", + "317", + "316", + "314", + "311", + "310", + "307", + "305", + "303", + "301", + "299", + "297", + "296", + "294", + "292", + "290", + "288", + "286", + "283", + "282", + "280", + "277", + "275", + "273", + "272", + "270", + "267", + "265", + "264", + "261", + "259", + "258", + "255", + "253", + "252", + "250", + "247", + "246", + "243", + "242", + "240", + "237", + "235", + "233", + "231", + "229", + "227", + "225", + "224", + "221", + "219", + "217", + "216", + "214", + "212", + "210", + "207", + "206", + "204", + "201", + "200", + "198", + "195", + "193", + "192", + "189", + "188", + "186", + "183", + "181", + "179", + "177", + "175", + "174", + "172", + "170", + "168", + "166", + "164", + "162", + "159", + "158", + "156", + "153", + "151", + "149", + "147" + ] + }, "omitApplicationSites": [ { "domain": "thingiverse.com", @@ -1466,7 +1561,7 @@ }, "exceptions": [], "state": "enabled", - "hash": "8b39b35be3b5b92c999539eb1ebc252f" + "hash": "512418708ceed91fa734fcdbae795543" }, "duckPlayer": { "exceptions": [], @@ -1630,7 +1725,7 @@ } ], "settings": { - "useStrictHideStyleTag": true, + "useStrictHideStyleTag": false, "rules": [ { "selector": "[id*='gpt-']", @@ -1780,6 +1875,10 @@ "selector": "#topBanner", "type": "hide-empty" }, + { + "selector": ".top-ad", + "type": "hide-empty" + }, { "selector": ".ad-banner-container", "type": "hide-empty" @@ -2001,6 +2100,10 @@ { "domain": "github.com", "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1058" + }, + { + "domain": "pocketbook.digital", + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1365" } ], "hideTimeouts": [ @@ -2026,6 +2129,7 @@ "advertisements", "advertisment", "advertisementclose", + "advertisementadvertisement", "advertisementcontinue reading the main story", "advertisement\ncontinue reading the main story", "advertisement\n\ncontinue reading the main story", @@ -2044,6 +2148,7 @@ "sponsored", "sponsorisé", "story continues below advertisement", + "story continues below advertisementadvertisement", "publicité", "publicidade", "reklama", @@ -2963,6 +3068,15 @@ } ] }, + { + "domain": "refinery29.com", + "rules": [ + { + "selector": ".section-ad", + "type": "hide-empty" + } + ] + }, { "domain": "reuters.com", "rules": [ @@ -3049,6 +3163,15 @@ } ] }, + { + "domain": "slate.com", + "rules": [ + { + "selector": ".slate-ad", + "type": "hide-empty" + } + ] + }, { "domain": "snopes.com", "rules": [ @@ -3272,6 +3395,10 @@ { "selector": "#cx-what-to-read-next", "type": "closest-empty" + }, + { + "selector": "[class*='WSJTheme--adWrapper']", + "type": "hide-empty" } ] }, @@ -3299,6 +3426,10 @@ { "selector": ".darla", "type": "closest-empty" + }, + { + "selector": "[data-content='Advertisement']", + "type": "hide-empty" } ] }, @@ -3437,7 +3568,7 @@ ] }, "state": "enabled", - "hash": "d0034c140c0ee9ce9015b74b428523b3" + "hash": "0d1bbb9811caae04c96e677d78d9b9ce" }, "exceptionHandler": { "exceptions": [ @@ -3680,190 +3811,6 @@ "domain": "hyatt.com", "reason": "Site loads blank and does not proceed." }, - { - "domain": "bank.marksandspencer.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/794" - }, - { - "domain": "www7.marksandspencer.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/794" - }, - { - "domain": "fidelity.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/794" - }, - { - "domain": "citi.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/794" - }, - { - "domain": "americanexpress.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "capitalone.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "marcus.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "bankofamerica.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "wellsfargo.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "usbank.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "citizensbankonline.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "sofi.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "regions.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "usaa.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "boh.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "santander.com.br", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "pnc.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "edwardjones.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "ally.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "metrobank.com.ph", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "key.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "synchronybank.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "oldglorybank.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "santander.com.mx", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "secureinternetbank.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "bankfirst.com.au", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "fnbo.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "salliemae.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "bnc.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "kanza.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "prosperity.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "firstwestern.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "penncrest.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "northwest.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "bell.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "dollar.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "dellsbank.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "rcbbank.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "ebt.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "mybct.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "wells.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "365.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "atom.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "ibanking-services.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "bmo.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "tsb.co.uk", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, { "domain": "earth.google.com", "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1099" @@ -3882,7 +3829,7 @@ } ], "state": "enabled", - "hash": "f28bbd2f54f441ea5f830398df41f45e" + "hash": "c2469977eaaaf117362492d2c993fd1c" }, "fingerprintingScreenSize": { "settings": { @@ -3924,190 +3871,6 @@ "domain": "secureserver.net", "reason": "After entering login details and clicking to log in, the site shows an adwall and prevents login." }, - { - "domain": "bank.marksandspencer.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/794" - }, - { - "domain": "www7.marksandspencer.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/794" - }, - { - "domain": "fidelity.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/794" - }, - { - "domain": "citi.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/794" - }, - { - "domain": "americanexpress.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "capitalone.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "marcus.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "bankofamerica.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "wellsfargo.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "usbank.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "citizensbankonline.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "sofi.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "regions.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "usaa.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "boh.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "santander.com.br", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "pnc.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "edwardjones.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "ally.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "metrobank.com.ph", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "key.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "synchronybank.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "oldglorybank.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "santander.com.mx", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "secureinternetbank.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "bankfirst.com.au", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "fnbo.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "salliemae.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "bnc.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "kanza.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "prosperity.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "firstwestern.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "penncrest.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "northwest.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "bell.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "dollar.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "dellsbank.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "rcbbank.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "ebt.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "mybct.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "wells.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "365.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "atom.bank", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "ibanking-services.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "bmo.com", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, - { - "domain": "tsb.co.uk", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1265" - }, { "domain": "earth.google.com", "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1099" @@ -4126,7 +3889,7 @@ } ], "state": "enabled", - "hash": "702a26f39577785255f35af7fc7f2578" + "hash": "27afff6e74517f41184f4d3df479c53b" }, "fingerprintingTemporaryStorage": { "exceptions": [ @@ -4363,6 +4126,10 @@ "domain": "act.alz.org", "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1158" }, + { + "domain": "amica.com", + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1336" + }, { "domain": "earth.google.com", "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1099" @@ -4380,7 +4147,7 @@ "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1085" } ], - "hash": "8de33b0e54940edad6504523c8db58ff" + "hash": "22b055005a4ea3a5f5d387000c4b838b" }, "incontextSignup": { "exceptions": [], @@ -4395,11 +4162,18 @@ "state": "disabled", "features": { "rollout": { - "state": "disabled" + "state": "enabled", + "rollout": { + "steps": [ + { + "percent": 0.5 + } + ] + } } }, "exceptions": [], - "hash": "c1293c7b2687c8a2f7c5433a4d7a330d" + "hash": "429cea8d27316dc62af04159ec7c42b5" }, "navigatorInterface": { "exceptions": [ @@ -4435,10 +4209,13 @@ "features": { "waitlist": { "state": "disabled" + }, + "waitlistBetaActive": { + "state": "disabled" } }, "exceptions": [], - "hash": "bf4c9cd751a7626bd89136f6cc98ccf1" + "hash": "ba52a36920a4a76343fc3c44d98936f9" }, "newTabContinueSetUp": { "exceptions": [], @@ -5106,6 +4883,48 @@ }, "connatix.com": { "rules": [ + { + "rule": "cd.connatix.com", + "domains": [ + "" + ], + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/768" + }, + { + "rule": "cds.connatix.com", + "domains": [ + "" + ], + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/768" + }, + { + "rule": "cdn.connatix.com", + "domains": [ + "" + ], + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/768" + }, + { + "rule": "capi.connatix.com", + "domains": [ + "" + ], + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/768" + }, + { + "rule": "vid.connatix.com", + "domains": [ + "" + ], + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/768" + }, + { + "rule": "img.connatix.com", + "domains": [ + "" + ], + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/768" + }, { "rule": "connatix.com", "domains": [ @@ -5365,6 +5184,17 @@ } ] }, + "eccmp.com": { + "rules": [ + { + "rule": "eccmp.com/sts/scripts/conversen-SDK.js", + "domains": [ + "pch.com" + ], + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1344" + } + ] + }, "edgekey.net": { "rules": [ { @@ -5667,9 +5497,10 @@ "rule": "google-analytics.com/analytics.js", "domains": [ "doterra.com", - "easyjet.com" + "easyjet.com", + "worlddutyfree.com" ], - "reason": "doterra.com - For doterra.com/login/loading, the page shows a loading indicator and never redirects.,easyjet.com - Clicking 'Show Worldwide flights' after entering parameters for a worldwide flight in the flight viewing form does nothing." + "reason": "doterra.com - For doterra.com/login/loading, the page shows a loading indicator and never redirects.,easyjet.com - Clicking 'Show Worldwide flights' after entering parameters for a worldwide flight in the flight viewing form does nothing.,worlddutyfree.com - https://github.com/duckduckgo/privacy-configuration/issues/1380" }, { "rule": "www.google-analytics.com/plugins/ua/ecommerce.js", @@ -6193,7 +6024,8 @@ { "rule": "static.klaviyo.com/onsite/js/klaviyo.js", "domains": [ - "kidsguide.com" + "kidsguide.com", + "urbanebikes.com" ], "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1277" }, @@ -6216,6 +6048,13 @@ "andieswim.com" ], "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1285" + }, + { + "rule": "lightboxcdn.com/vendor/.*/user.js", + "domains": [ + "nascar.com" + ], + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1373" } ] }, @@ -6786,6 +6625,17 @@ } ] }, + "rokt.com": { + "rules": [ + { + "rule": "rokt.com/wsdk/integrations/snippet.js", + "domains": [ + "pch.com" + ], + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1344" + } + ] + }, "rumble.com": { "rules": [ { @@ -7020,6 +6870,34 @@ "royalcaribbean.com" ], "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1255" + }, + { + "rule": "tags.tiqcdn.com/utag/lbg/", + "domains": [ + "" + ], + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1334" + }, + { + "rule": "tags.tiqcdn.com/utag/pch/", + "domains": [ + "pch.com" + ], + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1344" + }, + { + "rule": "tags.tiqcdn.com/utag/tiqapp/utag.v.js", + "domains": [ + "oracle.com" + ], + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1353" + }, + { + "rule": "tags.tiqcdn.com/utag/politico/main/prod/utag.js", + "domains": [ + "politico.com" + ], + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1382" } ] }, @@ -7196,6 +7074,13 @@ "" ], "reason": "https://github.com/duckduckgo/privacy-configuration/issues/366" + }, + { + "rule": "yandex.ru/map-widget/", + "domains": [ + "" + ], + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1384" } ] }, @@ -7268,6 +7153,17 @@ } ] }, + "zopim.com": { + "rules": [ + { + "rule": "widget-mediator.zopim.com", + "domains": [ + "" + ], + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1360" + } + ] + }, "citi.com": { "rules": [ { @@ -7329,6 +7225,17 @@ "reason": "CNAME ENTRY GENERATED FROM: qualtrics.com" } ] + }, + "yandex.tm": { + "rules": [ + { + "rule": "mc.yandex.tm/map-widget/", + "domains": [ + "" + ], + "reason": "CNAME ENTRY GENERATED FROM: yandex.ru" + } + ] } } }, @@ -7350,7 +7257,7 @@ "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1085" } ], - "hash": "f9b5279848f985f769d973e76d09b28b" + "hash": "631ad08511317fe79ad266992d5a05a5" }, "trackingCookies1p": { "settings": { @@ -7560,17 +7467,25 @@ "state": "enabled", "features": { "rollout": { - "state": "disabled" + "state": "enabled", + "rollout": { + "steps": [ + { + "percent": 1 + }, + { + "percent": 5 + }, + { + "percent": 15 + } + ] + } } }, "exceptions": [], - "hash": "54776d4aa010391dc14a53ad69cd1777" + "hash": "39a36ca9002bd5aea4dd7b6bdb5b79d4" } }, - "unprotectedTemporary": [ - { - "domain": "vinted.fr", - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/794" - } - ] + "unprotectedTemporary": [] } \ No newline at end of file diff --git a/scripts/update_embedded.sh b/scripts/update_embedded.sh index 892183b2c3..0001b6d31c 100755 --- a/scripts/update_embedded.sh +++ b/scripts/update_embedded.sh @@ -60,5 +60,6 @@ performUpdate() { rm -f "$TEMP_ETAG_FILENAME" } +# The following URLs shall match the ones in AppURLs.swift. Danger checks that the URLs match on every PR. If the code changes, the regex that Danger uses may need an update. performUpdate 'https://staticcdn.duckduckgo.com/trackerblocking/v5/current/ios-tds.json' "${base_dir}/Core/AppTrackerDataSetProvider.swift" "${base_dir}/Core/trackerData.json" -performUpdate 'https://staticcdn.duckduckgo.com/trackerblocking/config/v2/ios-config.json' "${base_dir}/Core/AppPrivacyConfigurationDataProvider.swift" "${base_dir}/Core/ios-config.json" +performUpdate 'https://staticcdn.duckduckgo.com/trackerblocking/config/v3/ios-config.json' "${base_dir}/Core/AppPrivacyConfigurationDataProvider.swift" "${base_dir}/Core/ios-config.json"