From 0714347d4f10ac33b8ba633f6ce9fb20a2cdd9ea Mon Sep 17 00:00:00 2001 From: Lorenzo Mattei Date: Mon, 7 Aug 2023 14:50:53 +0200 Subject: [PATCH 1/2] Update embedded files --- .../AppPrivacyConfigurationDataProvider.swift | 4 +- .../AppTrackerDataSetProvider.swift | 4 +- DuckDuckGo/ContentBlocker/macos-config.json | 242 +++++++++++++++++- DuckDuckGo/ContentBlocker/trackerData.json | 123 ++++++++- 4 files changed, 362 insertions(+), 11 deletions(-) diff --git a/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift b/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift index 5653e75bdb..33f14e2e5d 100644 --- a/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift +++ b/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift @@ -22,8 +22,8 @@ import BrowserServicesKit final class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider { public struct Constants { - public static let embeddedDataETag = "\"b1556a4069f2bfc1617455f906eafff0\"" - public static let embeddedDataSHA = "d24ae1c8c819ff920bb0669647f6bc1b6b4f56f61a621406446d257649dcce46" + public static let embeddedDataETag = "\"abc1ea87000568b6e5e560e196a2bb4a\"" + public static let embeddedDataSHA = "5c52a31abc7a22c5a69e5a40f1686cbdb3bf8a9e4de5c259b5f74e5ce40a6677" } var embeddedDataEtag: String { diff --git a/DuckDuckGo/ContentBlocker/AppTrackerDataSetProvider.swift b/DuckDuckGo/ContentBlocker/AppTrackerDataSetProvider.swift index 17914ab57a..1c6d6ce49a 100644 --- a/DuckDuckGo/ContentBlocker/AppTrackerDataSetProvider.swift +++ b/DuckDuckGo/ContentBlocker/AppTrackerDataSetProvider.swift @@ -22,8 +22,8 @@ import BrowserServicesKit final class AppTrackerDataSetProvider: EmbeddedDataProvider { public struct Constants { - public static let embeddedDataETag = "\"f43b7810f0374c5c6ebf3563531c004f\"" - public static let embeddedDataSHA = "243bc93361f4ba1bbdde7ae67f0169dafd0c6c1000c06d7f7acb90d34b0966c4" + public static let embeddedDataETag = "\"80559a75e5e3714d61ccca9879053a93\"" + public static let embeddedDataSHA = "46fffdaa59e02e8e90a55114ff4086a4d4ea13c41b6a7f689e05d9d0cd25b0da" } var embeddedDataEtag: String { diff --git a/DuckDuckGo/ContentBlocker/macos-config.json b/DuckDuckGo/ContentBlocker/macos-config.json index 95ae5379eb..7ff0e3c07b 100644 --- a/DuckDuckGo/ContentBlocker/macos-config.json +++ b/DuckDuckGo/ContentBlocker/macos-config.json @@ -1,6 +1,6 @@ { "readme": "https://github.com/duckduckgo/privacy-configuration", - "version": 1690819077465, + "version": 1691186943127, "features": { "adClickAttribution": { "readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection", @@ -1755,6 +1755,15 @@ } ] }, + { + "domain": "cleartax.in", + "rules": [ + { + "selector": "#credential_picker_container", + "type": "override" + } + ] + }, { "domain": "coingecko.com", "rules": [ @@ -2010,6 +2019,15 @@ } ] }, + { + "domain": "indeed.com", + "rules": [ + { + "selector": ".google-Only-Modal", + "type": "hide" + } + ] + }, { "domain": "indiatimes.com", "rules": [ @@ -2498,6 +2516,15 @@ } ] }, + { + "domain": "vinted.fr", + "rules": [ + { + "selector": ".ad-container--leaderboard", + "type": "hide" + } + ] + }, { "domain": "wunderground.com", "rules": [ @@ -2673,7 +2700,7 @@ ] }, "state": "enabled", - "hash": "5568171dfb10187ccabb0ca602449e3f" + "hash": "214ef180c3de6b13185f015e63bbbb0a" }, "exceptionHandler": { "exceptions": [], @@ -3841,6 +3868,13 @@ }, "doubleclick.net": { "rules": [ + { + "rule": "doubleclick.net/ondemand/hls/content/", + "domains": [ + "history.com" + ], + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1185" + }, { "rule": "securepubads.g.doubleclick.net/gampad/ads", "domains": [ @@ -4386,6 +4420,154 @@ "wp.pl" ], "reason": "Adwall appears which reappears when dismissed. The adwall prevents interaction with the page." + }, + { + "rule": "googletagservices.com/tag/js/gpt.js", + "domains": [ + "13wham.com", + "22thepoint.com", + "abc3340.com", + "abc45.com", + "abc6onyourside.com", + "abc7amarillo.com", + "abcnews4.com", + "abcstlouis.com", + "azteca48.com", + "bakersfieldnow.com", + "cbs12.com", + "cbs2iowa.com", + "cbs4local.com", + "cbs6albany.com", + "cbsaustin.com", + "chattanoogacw.com", + "cnycentral.com", + "cw14online.com", + "cw18milwaukee.com", + "cw23tv.com", + "cw34.com", + "cw35.com", + "cw7michigan.com", + "cwalbany.com", + "cwbaltimore.com", + "cwcentralpa.com", + "cwcincinnati.com", + "cwcolumbus.com", + "cwlasvegas.com", + "cwnashville.tv", + "cwokc.com", + "cwomaha.tv", + "cwrochester.com", + "cwtreasurevalley.com", + "dayton247now.com", + "fox11online.com", + "fox17.com", + "fox23maine.com", + "fox28savannah.com", + "fox38corpuschristi.com", + "fox42kptm.com", + "fox47.com", + "fox49.tv", + "fox4beaumont.com", + "fox56.com", + "foxbaltimore.com", + "foxchattanooga.com", + "foxillinois.com", + "foxkansas.com", + "foxnebraska.com", + "foxreno.com", + "foxrichmond.com", + "foxrochester.com", + "foxsanantonio.com", + "idahonews.com", + "katu.com", + "katv.com", + "kcby.com", + "kdsm17.com", + "keprtv.com", + "kfdm.com", + "kfoxtv.com", + "khqa.com", + "kimatv.com", + "kjzz.com", + "klewtv.com", + "kmph.com", + "kmyu.tv", + "komonews.com", + "kpic.com", + "krcgtv.com", + "ktul.com", + "ktvl.com", + "ktvo.com", + "ktxs.com", + "kunptv.com", + "kunwtv.com", + "kutv.com", + "kval.com", + "local12.com", + "local21news.com", + "midmichigannow.com", + "my15wtcn.com", + "my24milwaukee.com", + "my48.tv", + "mycbs4.com", + "myfox28columbus.com", + "mylvtv.com", + "mynbc15.com", + "mynews4.com", + "myrdctv.com", + "mytv30web.com", + "mytvbaltimore.com", + "mytvbuffalo.com", + "mytvcharleston.com", + "mytvrichmond.com", + "mytvwichita.com", + "mytvz.com", + "nbc16.com", + "nbc24.com", + "nbcmontana.com", + "nebraska.tv", + "nevadasportsnet.com", + "news3lv.com", + "news4sanantonio.com", + "newschannel20.com", + "newschannel9.com", + "okcfox.com", + "raleighcw.com", + "siouxlandnews.com", + "southernoregoncw.com", + "star64.tv", + "thecw38.com", + "thecw46.com", + "thecwtc.com", + "turnto10.com", + "univisionseattle.com", + "upnorthlive.com", + "utv44.com", + "wabm68.com", + "wach.com", + "wchstv.com", + "wcti12.com", + "wcyb.com", + "weartv.com", + "wfgxtv.com", + "wfxl.com", + "wgme.com", + "wgxa.tv", + "wjactv.com", + "wjla.com", + "wlos.com", + "wpde.com", + "wpgh53.com", + "wsbt.com", + "wset.com", + "wtov9.com", + "wtto21.com", + "wtwc40.com", + "wutv29.com", + "wvah.com", + "wwmt.com" + ], + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1173" } ] }, @@ -4849,11 +5031,18 @@ "pardot.com": { "rules": [ { - "rule": "go.pardot.com/", + "rule": "go.pardot.com", "domains": [ - "klove.com" + "" ], - "reason": "https://github.com/duckduckgo/privacy-configuration/issues/625" + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1180" + }, + { + "rule": "storage.pardot.com", + "domains": [ + "" + ], + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1180" } ] }, @@ -5057,6 +5246,17 @@ } ] }, + "qualtrics.com": { + "rules": [ + { + "rule": "qualtrics.com", + "domains": [ + "" + ], + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1196" + } + ] + }, "quantcast.com": { "rules": [ { @@ -5622,11 +5822,33 @@ "reason": "CNAME ENTRY GENERATED FROM: liveperson.net" } ] + }, + "canadapost-postescanada.ca": { + "rules": [ + { + "rule": "evaluation.canadapost-postescanada.ca", + "domains": [ + "" + ], + "reason": "CNAME ENTRY GENERATED FROM: qualtrics.com" + } + ] + }, + "goto.com": { + "rules": [ + { + "rule": "feedback.goto.com", + "domains": [ + "" + ], + "reason": "CNAME ENTRY GENERATED FROM: qualtrics.com" + } + ] } } }, "exceptions": [], - "hash": "1ba5432dfee85f56743e1726db86b0a5" + "hash": "7ab265aeb47cbefdf8f5e496c56cac4d" }, "trackingCookies1p": { "settings": { @@ -6048,6 +6270,14 @@ "domain": "earth.google.com", "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1099" }, + { + "domain": "iscorp.com", + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/794" + }, + { + "domain": "marvel.com", + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1194" + }, { "domain": "ticketmaster.com", "reason": "https://github.com/duckduckgo/privacy-configuration/issues/794" diff --git a/DuckDuckGo/ContentBlocker/trackerData.json b/DuckDuckGo/ContentBlocker/trackerData.json index b5ecab8f6e..57f073fa46 100644 --- a/DuckDuckGo/ContentBlocker/trackerData.json +++ b/DuckDuckGo/ContentBlocker/trackerData.json @@ -11638,7 +11638,7 @@ "Audience Measurement", "Third-Party Analytics Marketing" ], - "default": "block", + "default": "ignore", "rules": [ { "rule": "googletagmanager\\.com/gtm\\.js", @@ -11662,7 +11662,128 @@ "redballoon.com.au", "southbankresearch.com" ] + }, + "options": { + "domains": [ + "abbottnutrition.com", + "abril.com.br", + "alza.cz", + "amateur.tv", + "au.com", + "autobodytoolmart.com", + "autodesk.com", + "autoscout24.be", + "autoscout24.com", + "autoscout24.de", + "autoscout24.es", + "autoscout24.it", + "bfv.de", + "blackwoods.com.au", + "bloomberg.co.jp", + "bradyid.com", + "c-and-a.com", + "cerdas.com", + "coldwatercreek.com", + "connectionsacademy.com", + "dailypaws.com", + "debijenkorf.nl", + "deutschlandcard.de", + "digitec.ch", + "ensure.com", + "eprice.it", + "ew.com", + "fanatec.com", + "farrow-ball.com", + "francebleu.fr", + "galaxus.ch", + "galaxus.de", + "gardenista.com", + "gereedschapcentrum.nl", + "gobankingrates.com", + "healthchoicesfirst.com", + "hellooha.com", + "henkel-adhesives.com", + "hustlermoneyblog.com", + "hut.de", + "jetbrains.com", + "joongang.co.kr", + "kik.de", + "kunzmann.de", + "lectura-specs.com", + "lectura.de", + "marketwatch.com", + "mediaexpert.pl", + "midwestliving.com", + "milanomalpensa-airport.com", + "moneycrashers.com", + "morbocornudos.com", + "nordvpn.com", + "notino.co.uk", + "notino.pl", + "notino.ro", + "ntotank.com", + "ozone.bg", + "pajilleros.com", + "parenting.com", + "peacocks.co.uk", + "plannedparenthood.org", + "pmtonline.co.uk", + "qbe.com", + "qualys.com", + "reclameaqui.com.br", + "remax.com", + "remodelista.com", + "rotowire.com", + "seaworld.com", + "skincare-univ.com", + "sotor.com", + "specsavers.com.au", + "straighttalk.com", + "theindependentpharmacy.co.uk", + "tiaabank.com", + "todorelatos.com", + "totalbyverizon.com", + "tracfone.com", + "urssaf.fr", + "wallethacks.com", + "webjet.com.au", + "webteb.com", + "xfinity.com" + ] } + }, + { + "rule": "googletagmanager\\.com/gtag/js" + }, + { + "rule": "googletagmanager\\.com/amp\\.json" + }, + { + "rule": "googletagmanager\\.com/a" + }, + { + "rule": "googletagmanager\\.com/gtag/destination" + }, + { + "rule": "googletagmanager\\.com/ns\\.html" + }, + { + "rule": "googletagmanager\\.com/td" + }, + { + "rule": "googletagmanager\\.com/dclk/ns/v1\\.js" + }, + { + "rule": "googletagmanager\\.com/gtag\\.js" + }, + { + "rule": "googletagmanager\\.com/gtag/amp" + }, + { + "rule": "googletagmanager\\.com/gtm/js" + }, + { + "rule": "googletagmanager\\.com/ns\\.twig" } ] }, From 9e370eef16ee2ff09d905374cda9a90998d97607 Mon Sep 17 00:00:00 2001 From: Lorenzo Mattei Date: Mon, 7 Aug 2023 14:50:56 +0200 Subject: [PATCH 2/2] Bump version to 1.51.0 (47) --- Configuration/AppStoreBuildNumber.xcconfig | 2 +- Configuration/Version.xcconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Configuration/AppStoreBuildNumber.xcconfig b/Configuration/AppStoreBuildNumber.xcconfig index d0730db9f6..cc77b45085 100644 --- a/Configuration/AppStoreBuildNumber.xcconfig +++ b/Configuration/AppStoreBuildNumber.xcconfig @@ -1 +1 @@ -CURRENT_PROJECT_VERSION = 46 +CURRENT_PROJECT_VERSION = 47 diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig index 73c34f328d..ebc558f9a2 100644 --- a/Configuration/Version.xcconfig +++ b/Configuration/Version.xcconfig @@ -1 +1 @@ -MARKETING_VERSION = 1.50.2 +MARKETING_VERSION = 1.51.0