From 5d885e02888d16234c7653728afb9df7ed529c21 Mon Sep 17 00:00:00 2001
From: Christopher Brind <brindy@duckduckgo.com>
Date: Mon, 26 Feb 2024 11:17:29 +0000
Subject: [PATCH 1/3] update bsk adding history to privacy config feature
 (#2249)

Task/Issue URL:
https://app.asana.com/0/414235014887631/1206524433066978/f
Tech Design URL:
CC:

**Description**:

Adds history to privacy config in BSK

**Steps to test this PR**:
1. Check the app launches OK

<!--
Tagging instructions
If this PR isn't ready to be merged for whatever reason it should be
marked with the `DO NOT MERGE` label (particularly if it's a draft)
If it's pending Product Review/PFR, please add the `Pending Product
Review` label.

If at any point it isn't actively being worked on/ready for
review/otherwise moving forward (besides the above PR/PFR exception)
strongly consider closing it (or not opening it in the first place). If
you decide not to close it, make sure it's labelled to make it clear the
PRs state and comment with more information.
-->

---
###### Internal references:
[Pull Request Review
Checklist](https://app.asana.com/0/1202500774821704/1203764234894239/f)
[Software Engineering
Expectations](https://app.asana.com/0/59792373528535/199064865822552)
[Technical Design
Template](https://app.asana.com/0/59792373528535/184709971311943)
[Pull Request
Documentation](https://app.asana.com/0/1202500774821704/1204012835277482/f)
---
 DuckDuckGo.xcodeproj/project.pbxproj                        | 2 +-
 .../xcshareddata/swiftpm/Package.resolved                   | 6 +++---
 LocalPackages/DataBrokerProtection/Package.swift            | 2 +-
 LocalPackages/LoginItems/Package.swift                      | 2 +-
 LocalPackages/NetworkProtectionMac/Package.swift            | 2 +-
 LocalPackages/PixelKit/Package.swift                        | 2 +-
 LocalPackages/SubscriptionUI/Package.swift                  | 2 +-
 LocalPackages/SwiftUIExtensions/Package.swift               | 2 +-
 LocalPackages/SyncUI/Package.swift                          | 2 +-
 LocalPackages/SystemExtensionManager/Package.swift          | 2 +-
 LocalPackages/XPCHelper/Package.swift                       | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index 294a26a1b0..d4f07f61a3 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -13538,7 +13538,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 110.0.1;
+				version = 111.0.0;
 			};
 		};
 		AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 4693fd6b11..d8b40b5ceb 100644
--- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "483427db845410f10121cf2200f5a940c9bbf70b",
-        "version" : "110.0.1"
+        "revision" : "418b186e3e015d56f73435e7f6c035e10e106aa6",
+        "version" : "111.0.0"
       }
     },
     {
@@ -147,7 +147,7 @@
     {
       "identity" : "trackerradarkit",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/duckduckgo/TrackerRadarKit.git",
+      "location" : "https://github.com/duckduckgo/TrackerRadarKit",
       "state" : {
         "revision" : "a6b7ba151d9dc6684484f3785293875ec01cc1ff",
         "version" : "1.2.2"
diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift
index 501dde2f6e..168b0a8941 100644
--- a/LocalPackages/DataBrokerProtection/Package.swift
+++ b/LocalPackages/DataBrokerProtection/Package.swift
@@ -29,7 +29,7 @@ let package = Package(
             targets: ["DataBrokerProtection"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "110.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.0"),
         .package(path: "../PixelKit"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper")
diff --git a/LocalPackages/LoginItems/Package.swift b/LocalPackages/LoginItems/Package.swift
index 44454c1e75..695048da10 100644
--- a/LocalPackages/LoginItems/Package.swift
+++ b/LocalPackages/LoginItems/Package.swift
@@ -13,7 +13,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "110.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.0"),
     ],
     targets: [
         .target(
diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift
index 423b65a2ae..ebe30985fc 100644
--- a/LocalPackages/NetworkProtectionMac/Package.swift
+++ b/LocalPackages/NetworkProtectionMac/Package.swift
@@ -31,7 +31,7 @@ let package = Package(
         .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "110.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.0"),
         .package(path: "../XPCHelper"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../LoginItems")
diff --git a/LocalPackages/PixelKit/Package.swift b/LocalPackages/PixelKit/Package.swift
index 3dba6cb6eb..efa2582a53 100644
--- a/LocalPackages/PixelKit/Package.swift
+++ b/LocalPackages/PixelKit/Package.swift
@@ -20,7 +20,7 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "110.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.0"),
     ],
     targets: [
         .target(
diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift
index 27af4a0e25..a0c7e6048d 100644
--- a/LocalPackages/SubscriptionUI/Package.swift
+++ b/LocalPackages/SubscriptionUI/Package.swift
@@ -12,7 +12,7 @@ let package = Package(
             targets: ["SubscriptionUI"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "110.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.0"),
         .package(path: "../SwiftUIExtensions")
     ],
     targets: [
diff --git a/LocalPackages/SwiftUIExtensions/Package.swift b/LocalPackages/SwiftUIExtensions/Package.swift
index 403cb4d1b3..12cf892099 100644
--- a/LocalPackages/SwiftUIExtensions/Package.swift
+++ b/LocalPackages/SwiftUIExtensions/Package.swift
@@ -11,7 +11,7 @@ let package = Package(
         .library(name: "PreferencesViews", targets: ["PreferencesViews"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "110.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.0"),
     ],
     targets: [
         .target(
diff --git a/LocalPackages/SyncUI/Package.swift b/LocalPackages/SyncUI/Package.swift
index 0ba92e3df1..5e5ca29bb2 100644
--- a/LocalPackages/SyncUI/Package.swift
+++ b/LocalPackages/SyncUI/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
     ],
     dependencies: [
         .package(path: "../SwiftUIExtensions"),
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "110.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.0"),
     ],
     targets: [
         .target(
diff --git a/LocalPackages/SystemExtensionManager/Package.swift b/LocalPackages/SystemExtensionManager/Package.swift
index 3e1d7878d0..85a79f2e27 100644
--- a/LocalPackages/SystemExtensionManager/Package.swift
+++ b/LocalPackages/SystemExtensionManager/Package.swift
@@ -16,7 +16,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "110.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.0"),
     ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.
diff --git a/LocalPackages/XPCHelper/Package.swift b/LocalPackages/XPCHelper/Package.swift
index 839f541bdd..ed884dcd57 100644
--- a/LocalPackages/XPCHelper/Package.swift
+++ b/LocalPackages/XPCHelper/Package.swift
@@ -30,7 +30,7 @@ let package = Package(
         .library(name: "XPCHelper", targets: ["XPCHelper"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "110.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.0"),
     ],
     targets: [
         .target(

From 335e0332428b408d0a4daa14c98b8879420b9bf0 Mon Sep 17 00:00:00 2001
From: Alexey Martemyanov <mallexxx@gmail.com>
Date: Mon, 26 Feb 2024 17:42:17 +0600
Subject: [PATCH 2/3] fix safari file not found error handling (#2242)

Task/Issue URL: https://app.asana.com/0/1177771139624306/1206650450402962/f

Description:
Fix Safari bookmarks file not found error message (show "we could not found any bookmarks" instead of an error)
---
 .../Bookmarks/Safari/SafariBookmarksReader.swift           | 7 ++++++-
 DuckDuckGo/DataImport/View/DataImportView.swift            | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/DuckDuckGo/DataImport/Bookmarks/Safari/SafariBookmarksReader.swift b/DuckDuckGo/DataImport/Bookmarks/Safari/SafariBookmarksReader.swift
index 8bc7771392..c726bdf412 100644
--- a/DuckDuckGo/DataImport/Bookmarks/Safari/SafariBookmarksReader.swift
+++ b/DuckDuckGo/DataImport/Bookmarks/Safari/SafariBookmarksReader.swift
@@ -49,7 +49,12 @@ final class SafariBookmarksReader {
         let type: OperationType
         let underlyingError: Error?
 
-        var errorType: DataImport.ErrorType { .dataCorrupted }
+        var errorType: DataImport.ErrorType {
+            switch underlyingError {
+            case let error as CocoaError where error.code == .fileReadNoSuchFile: .noData
+            default: .dataCorrupted
+            }
+        }
     }
 
     private let safariBookmarksFileURL: URL
diff --git a/DuckDuckGo/DataImport/View/DataImportView.swift b/DuckDuckGo/DataImport/View/DataImportView.swift
index 5d9aa0fe4f..67a8dad11c 100644
--- a/DuckDuckGo/DataImport/View/DataImportView.swift
+++ b/DuckDuckGo/DataImport/View/DataImportView.swift
@@ -128,7 +128,7 @@ struct DataImportView: ModalView {
 
                 // if no data to import
                 if model.summary(for: dataType)?.isEmpty == true
-                            || model.error(for: dataType)?.errorType == .noData {
+                    || model.error(for: dataType)?.errorType == .noData {
 
                     DataImportNoDataView(source: model.importSource, dataType: dataType)
                         .padding(.bottom, 24)

From 19c2656ae1258bc658d9f161771dd26185dc8462 Mon Sep 17 00:00:00 2001
From: Thom Espach <thomespach@me.com>
Date: Mon, 26 Feb 2024 12:23:40 +0000
Subject: [PATCH 3/3] Fix sync crypto error handling to protect against DoS
 (#2223)

Task/Issue URL: https://app.asana.com/0/0/1206634174761721/f

Description:
During a security audit, it was discovered that a lack of error handling in the ddgSyncCrypto
library can cause unexpected crashes leading to remote DoS on iOS and macOS. This is a rare
occurrence and requires some work to test, but the crux is: an unexpected exception due to
invalid cipher text lengths returned by the Sync API.
---
 DuckDuckGo.xcodeproj/project.pbxproj                        | 2 +-
 .../xcshareddata/swiftpm/Package.resolved                   | 6 +++---
 LocalPackages/DataBrokerProtection/Package.swift            | 2 +-
 LocalPackages/LoginItems/Package.swift                      | 2 +-
 LocalPackages/NetworkProtectionMac/Package.swift            | 2 +-
 LocalPackages/PixelKit/Package.swift                        | 2 +-
 LocalPackages/SubscriptionUI/Package.swift                  | 2 +-
 LocalPackages/SwiftUIExtensions/Package.swift               | 2 +-
 LocalPackages/SyncUI/Package.swift                          | 2 +-
 LocalPackages/SystemExtensionManager/Package.swift          | 2 +-
 LocalPackages/XPCHelper/Package.swift                       | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index d4f07f61a3..0558a06946 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -13538,7 +13538,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 111.0.0;
+				version = 111.0.2;
 			};
 		};
 		AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index d8b40b5ceb..1a0ae4a0e6 100644
--- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "418b186e3e015d56f73435e7f6c035e10e106aa6",
-        "version" : "111.0.0"
+        "revision" : "04c35220aa94bd005171086acccadd677400e7d5",
+        "version" : "111.0.2"
       }
     },
     {
@@ -147,7 +147,7 @@
     {
       "identity" : "trackerradarkit",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/duckduckgo/TrackerRadarKit",
+      "location" : "https://github.com/duckduckgo/TrackerRadarKit.git",
       "state" : {
         "revision" : "a6b7ba151d9dc6684484f3785293875ec01cc1ff",
         "version" : "1.2.2"
diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift
index 168b0a8941..f27728497f 100644
--- a/LocalPackages/DataBrokerProtection/Package.swift
+++ b/LocalPackages/DataBrokerProtection/Package.swift
@@ -29,7 +29,7 @@ let package = Package(
             targets: ["DataBrokerProtection"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.2"),
         .package(path: "../PixelKit"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper")
diff --git a/LocalPackages/LoginItems/Package.swift b/LocalPackages/LoginItems/Package.swift
index 695048da10..614324a607 100644
--- a/LocalPackages/LoginItems/Package.swift
+++ b/LocalPackages/LoginItems/Package.swift
@@ -13,7 +13,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.2"),
     ],
     targets: [
         .target(
diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift
index ebe30985fc..08093c2623 100644
--- a/LocalPackages/NetworkProtectionMac/Package.swift
+++ b/LocalPackages/NetworkProtectionMac/Package.swift
@@ -31,7 +31,7 @@ let package = Package(
         .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.2"),
         .package(path: "../XPCHelper"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../LoginItems")
diff --git a/LocalPackages/PixelKit/Package.swift b/LocalPackages/PixelKit/Package.swift
index efa2582a53..1dabea6b8c 100644
--- a/LocalPackages/PixelKit/Package.swift
+++ b/LocalPackages/PixelKit/Package.swift
@@ -20,7 +20,7 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.2"),
     ],
     targets: [
         .target(
diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift
index a0c7e6048d..16ee741162 100644
--- a/LocalPackages/SubscriptionUI/Package.swift
+++ b/LocalPackages/SubscriptionUI/Package.swift
@@ -12,7 +12,7 @@ let package = Package(
             targets: ["SubscriptionUI"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.2"),
         .package(path: "../SwiftUIExtensions")
     ],
     targets: [
diff --git a/LocalPackages/SwiftUIExtensions/Package.swift b/LocalPackages/SwiftUIExtensions/Package.swift
index 12cf892099..8e91cb3a94 100644
--- a/LocalPackages/SwiftUIExtensions/Package.swift
+++ b/LocalPackages/SwiftUIExtensions/Package.swift
@@ -11,7 +11,7 @@ let package = Package(
         .library(name: "PreferencesViews", targets: ["PreferencesViews"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.2"),
     ],
     targets: [
         .target(
diff --git a/LocalPackages/SyncUI/Package.swift b/LocalPackages/SyncUI/Package.swift
index 5e5ca29bb2..39495c5fe5 100644
--- a/LocalPackages/SyncUI/Package.swift
+++ b/LocalPackages/SyncUI/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
     ],
     dependencies: [
         .package(path: "../SwiftUIExtensions"),
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.2"),
     ],
     targets: [
         .target(
diff --git a/LocalPackages/SystemExtensionManager/Package.swift b/LocalPackages/SystemExtensionManager/Package.swift
index 85a79f2e27..d3ec7edb2b 100644
--- a/LocalPackages/SystemExtensionManager/Package.swift
+++ b/LocalPackages/SystemExtensionManager/Package.swift
@@ -16,7 +16,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.2"),
     ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.
diff --git a/LocalPackages/XPCHelper/Package.swift b/LocalPackages/XPCHelper/Package.swift
index ed884dcd57..b2db3d7597 100644
--- a/LocalPackages/XPCHelper/Package.swift
+++ b/LocalPackages/XPCHelper/Package.swift
@@ -30,7 +30,7 @@ let package = Package(
         .library(name: "XPCHelper", targets: ["XPCHelper"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.2"),
     ],
     targets: [
         .target(