Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a script to update embedded data #599

Merged
merged 6 commits into from
Jun 6, 2022
Merged

Add a script to update embedded data #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6283712
Unify constants naming in embedded data providers
ayoy May 27, 2022
0b3f86a
Fix ETag in AppPrivacyConfigurationDataProvider
ayoy May 27, 2022
8e9cfd7
Add initial version of update_embedded.sh
ayoy May 27, 2022
13f9341
Update Privacy Config
ayoy May 27, 2022
1169026
Update etag and sha for TDS
ayoy May 30, 2022
72941ca
Reformat update_embedded.sh and add it to scripts README
ayoy May 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DuckDuckGo/Configuration/ConfigurationDownloading.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ final class DefaultConfigurationDownloader: ConfigurationDownloading {

func embeddedEtag(for config: ConfigurationLocation) -> String? {
switch config {
case .trackerRadar: return AppTrackerDataSetProvider.Constants.embeddedDataSetETag
case .privacyConfiguration: return AppPrivacyConfigurationDataProvider.Constants.embeddedConfigETag
case .trackerRadar: return AppTrackerDataSetProvider.Constants.embeddedDataETag
case .privacyConfiguration: return AppPrivacyConfigurationDataProvider.Constants.embeddedDataSHA
default: return nil
}
}
Expand Down
6 changes: 3 additions & 3 deletions DuckDuckGo/Content Blocker/AppPrivacyConfigurationDataProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import BrowserServicesKit
final class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {

public struct Constants {
public static let embeddedConfigETag = "74e7a5aec4321b3ad331f5ec43231162"
public static let embeddedConfigurationSHA = "7892388e73124bee008024ba508095d7122d1d28b3404956840230efdab2f135"
public static let embeddedDataETag = "\"bc13e454cd4a8a96b9ed56ea954c8665\""
public static let embeddedDataSHA = "49837e943dac5ab96ae37f18d04ea233344ae7b9bb6401dea0d277962952b6c1"
}

var embeddedDataEtag: String {
return Constants.embeddedConfigETag
return Constants.embeddedDataETag
}

var embeddedData: Data {
Expand Down
6 changes: 3 additions & 3 deletions DuckDuckGo/Content Blocker/AppTrackerDataSetProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import BrowserServicesKit
final class AppTrackerDataSetProvider: EmbeddedDataProvider {

public struct Constants {
public static let embeddedDataSetETag = "\"b5a369bfb768bc327fb22575c792a348\""
public static let embeddedDataSetSHA = "b85c321da42d5f2286982e1242d2d1985307d443a7e3c2d195fda92d012f77ef"
public static let embeddedDataETag = "\"c46161eb7f1e9f74958f1c861b1d8433\""
public static let embeddedDataSHA = "5ee435350af5fb3c713a8d03f9a2df730fabc5a6446567b4b0c1793a191b160d"
}

var embeddedDataEtag: String {
return Constants.embeddedDataSetETag
return Constants.embeddedDataETag
}

var embeddedData: Data {
Expand Down
100 changes: 93 additions & 7 deletions DuckDuckGo/Content Blocker/macos-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
{
"readme": "https://github.com/duckduckgo/privacy-configuration",
"version": 1650460275005,
"version": 1653680846662,
"features": {
"ampLinks": {
"exceptions": [],
"exceptions": [
{
"domain": "freecodecamp.org",
"reason": "sign-up issues"
}
],
"settings": {
"deepExtractionEnabled": true,
"deepExtractionTimeout": 1500,
Expand Down Expand Up @@ -70,6 +75,10 @@
{
"domain": "n-tv.de",
"reason": "broken scrolling"
},
{
"domain": "concursolutions.com",
"reason": "blank page during opt-out"
}
],
"settings": {
Expand Down Expand Up @@ -143,6 +152,35 @@
}
]
},
"cookie": {
"exceptions": [],
"state": "disabled"
},
"customUserAgent": {
"settings": {
"omitApplicationSites": [
{
"domain": "cvs.com",
"reason": "Site reports browser not supported"
},
{
"domain": "sovietgames.su",
"reason": "Wordpress plugin reports our browser as a bot"
},
{
"domain": "accounts.google.com",
"reason": "Site reports browser not supported"
},
{
"domain": "facebook.com",
"reason": "Site reports browser not supported"
}
],
"omitVersionSites": []
},
"exceptions": [],
"state": "disabled"
},
"fingerprintingAudio": {
"state": "disabled",
"exceptions": [
Expand Down Expand Up @@ -206,6 +244,10 @@
"domain": "accounts.nintendo.com",
"reason": "broken login"
},
{
"domain": "clearpay.co.uk",
"reason": "broken login"
},
{
"domain": "gamestop.com",
"reason": "broken add to cart"
Expand Down Expand Up @@ -276,10 +318,6 @@
{
"domain": "newyorker.com",
"reason": "Cookie consent box hiding audio"
},
{
"domain": "nytimes.com",
"reason": "interaction with browser UI"
}
],
"settings": {
Expand All @@ -300,6 +338,13 @@
"exceptions": [],
"state": "enabled"
},
"nonTracking3pCookies": {
"settings": {
"excludedCookieDomains": []
},
"exceptions": [],
"state": "disabled"
},
"referrer": {
"exceptions": [
{
Expand Down Expand Up @@ -364,6 +409,17 @@
}
]
},
"alicdn.com": {
"rules": [
{
"rule": "alicdn.com",
"domains": [
"aliexpress.com"
],
"reason": "content not loading"
}
]
},
"amazon-adsystem.com": {
"rules": [
{
Expand Down Expand Up @@ -395,6 +451,13 @@
"winnipegfreepress.com"
],
"reason": "content not loading"
},
{
"rule": "cdnjs.cloudflare.com/ajax/libs/vue/2.5.16/vue.min.js",
"domains": [
"fortnitetracker.com"
],
"reason": "content not loading"
}
]
},
Expand Down Expand Up @@ -492,6 +555,17 @@
}
]
},
"google-analytics.com": {
"rules": [
{
"rule": "google-analytics.com/analytics.js",
"domains": [
"easyjet.com"
],
"reason": "broken form"
}
]
},
"googlesyndication.com": {
"rules": [
{
Expand Down Expand Up @@ -573,6 +647,18 @@
}
]
},
"ltwebstatic.com": {
"rules": [
{
"rule": "sheinsz.ltwebstatic.com/she_dist/libs/geetest/fullpage.1.1.9.js",
"domains": [
"shein.co.uk",
"shein.com"
],
"reason": "login issues"
}
]
},
"mailgun.com": {
"rules": [
{
Expand Down Expand Up @@ -901,4 +987,4 @@
}
},
"unprotectedTemporary": []
}
}
Loading