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

Update malware protection pixels #3672

Merged
merged 5 commits into from
Dec 20, 2024
Merged

Update malware protection pixels #3672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd07d0f
Update pixels
mallexxx Dec 18, 2024
31a8094
bump bsk
mallexxx Dec 18, 2024
f69e608
bump bsk
mallexxx Dec 18, 2024
ce9fa03
BSK -> 223.0.0
mallexxx Dec 20, 2024
57e13df
Merge remote-tracking branch 'origin/main' into alex/malware-protecti…
mallexxx Dec 20, 2024
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
2 changes: 1 addition & 1 deletion DuckDuckGo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15306,7 +15306,7 @@
repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
requirement = {
kind = exactVersion;
version = 222.1.0;
version = 223.0.0;
};
};
9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = {
Expand Down
12 changes: 6 additions & 6 deletions DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/duckduckgo/BrowserServicesKit",
"state" : {
"revision" : "5704d77e3b4c77c7387518d796d31a35f7a1ffcf",
"version" : "222.1.0"
"revision" : "e8f94cf597f4a447f86f39f461b736ac9ea280ce",
"version" : "223.0.0"
}
},
{
"identity" : "content-scope-scripts",
"kind" : "remoteSourceControl",
"location" : "https://github.com/duckduckgo/content-scope-scripts",
"state" : {
"revision" : "93ea6c3e771bc0b743b38cefbff548c10add9898",
"version" : "6.42.0"
"revision" : "bc808eb735d9eb72d5c54cf2452b104b6a370e25",
"version" : "6.43.0"
}
},
{
Expand Down Expand Up @@ -104,8 +104,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/duckduckgo/privacy-dashboard",
"state" : {
"revision" : "022c845b06ace6a4aa712a4fa3e79da32193d5c6",
"version" : "7.4.0"
"revision" : "2e2baf7d31c7d8e158a58bc1cb79498c1c727fd2",
"version" : "7.5.0"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions DuckDuckGo/Tab/TabExtensions/SpecialErrorPageTabExtension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ extension SpecialErrorPageTabExtension: NavigationResponder {

@MainActor
private func redirectMaliciousIframeNavigationAction(_ navigationAction: NavigationAction, with threatKind: MaliciousSiteProtection.ThreatKind) -> NavigationActionPolicy? {
PixelKit.fire(MaliciousSiteProtection.Event.iframeLoaded)
PixelKit.fire(MaliciousSiteProtection.Event.iframeLoaded(category: threatKind))

// Extract the URL of the source frame (the iframe) that initiated the navigation action
let iframeTopUrl = navigationAction.sourceFrame.url
Expand Down Expand Up @@ -232,7 +232,7 @@ extension SpecialErrorPageTabExtension: SpecialErrorPageUserScriptDelegate {
guard let errorData, let webView, let url = webView.url else { return }
switch errorData {
case .maliciousSite(kind: let threatKind, url: _):
PixelKit.fire(MaliciousSiteProtection.Event.visitSite)
PixelKit.fire(MaliciousSiteProtection.Event.visitSite(category: threatKind))

exemptions[url] = threatKind
state.bypassedMaliciousSiteThreatKind = threatKind
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/DataBrokerProtection/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ let package = Package(
targets: ["DataBrokerProtection"])
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "222.1.0"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "223.0.0"),
.package(path: "../SwiftUIExtensions"),
.package(path: "../AppKitExtensions"),
.package(path: "../XPCHelper"),
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/FeatureFlags/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ let package = Package(
targets: ["FeatureFlags"]),
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "222.1.0"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "223.0.0"),
],
targets: [
// Targets are the basic building blocks of a package, defining a module or a test suite.
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/NetworkProtectionMac/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ let package = Package(
.library(name: "VPNAppLauncher", targets: ["VPNAppLauncher"]),
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "222.1.0"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "223.0.0"),
.package(url: "https://github.com/airbnb/lottie-spm", exact: "4.4.3"),
.package(path: "../AppLauncher"),
.package(path: "../UDSHelper"),
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/NewTabPage/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ let package = Package(
targets: ["NewTabPage"]),
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "222.1.0"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "223.0.0"),
.package(path: "../WebKitExtensions"),
.package(path: "../Utilities"),
],
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/SubscriptionUI/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ let package = Package(
targets: ["SubscriptionUI"]),
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "222.1.0"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "223.0.0"),
.package(path: "../SwiftUIExtensions"),
.package(path: "../FeatureFlags")
],
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/WebKitExtensions/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "222.1.0"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "223.0.0"),
.package(path: "../AppKitExtensions")
],
targets: [
Expand Down
Loading