Merge branch 'release/7.68.0'

Author: bwaresiak

Configuration/Version.xcconfig

@@ -1,2 +1,2 @@
-MARKETING_VERSION = 7.67.9
+MARKETING_VERSION = 7.68.0
 

Core/AppPrivacyConfigurationDataProvider.swift

@@ -22,8 +22,8 @@ import BrowserServicesKit
 final class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"39ae29fb5fba0204bc01da5e1bcb8e4b\""
-        public static let embeddedDataSHA = "7faf7905914c59b57bb29b62d0d9a928f43e4e12041633a55abdb7ce39a3b3ba"
+        public static let embeddedDataETag = "\"40db837f2bfc286cb9a8fcbd49b64697\""
+        public static let embeddedDataSHA = "21cc26cbd2591b997b671c71402e1796650c1d531f7e8c378df7949cc5a0ebae"
     }
 
     var embeddedDataEtag: String {

Core/BookmarksImporter.swift

@@ -22,7 +22,9 @@ import SwiftSoup
 import os.log
 
 public enum BookmarksImportError: Error {
-    case invalidHtml
+    case invalidHtmlNoDLTag
+    case invalidHtmlNoBodyTag
+    case safariTransformFailure
     case saveFailure
     case unknown
 }
@@ -58,40 +60,47 @@ final public class BookmarksImporter {
             try await saveBookmarks(importedBookmarks)
             NotificationCenter.default.post(name: Notifications.importDidEnd, object: nil)
             return .success(importedBookmarks)
-        } catch BookmarksImportError.invalidHtml {
+        } catch BookmarksImportError.invalidHtmlNoDLTag {
             NotificationCenter.default.post(name: Notifications.importDidEnd, object: nil)
-            return .failure(.invalidHtml)
+            Pixel.fire(pixel: .bookmarkImportFailureParsingDL)
+            return .failure(.invalidHtmlNoDLTag)
+        } catch BookmarksImportError.invalidHtmlNoBodyTag {
+            NotificationCenter.default.post(name: Notifications.importDidEnd, object: nil)
+            Pixel.fire(pixel: .bookmarkImportFailureParsingBody)
+            return .failure(.invalidHtmlNoBodyTag)
+        } catch BookmarksImportError.safariTransformFailure {
+            NotificationCenter.default.post(name: Notifications.importDidEnd, object: nil)
+            Pixel.fire(pixel: .bookmarkImportFailureTransformingSafari)
+            return .failure(.safariTransformFailure)
         } catch BookmarksImportError.saveFailure {
             NotificationCenter.default.post(name: Notifications.importDidEnd, object: nil)
+            Pixel.fire(pixel: .bookmarkImportFailureSaving)
             return .failure(.saveFailure)
         } catch {
             NotificationCenter.default.post(name: Notifications.importDidEnd, object: nil)
+            Pixel.fire(pixel: .bookmarkImportFailureUnknown)
             return .failure(.unknown)
         }
     }
 
     func parseHtml(_ htmlContent: String) async throws {
         let document: Document = try SwiftSoup.parse(htmlContent)
 
-        do {
-            if isDocumentInSafariFormat(document) {
-                guard let newDocument = try transformSafariDocument(document: document) else {
-                    os_log("Safari format could not be handled", type: .debug)
-                    throw BookmarksImportError.invalidHtml
-                }
-                try parse(documentElement: newDocument, importedBookmark: nil)
-            } else {
-                try parse(documentElement: document, importedBookmark: nil)
+        if isDocumentInSafariFormat(document) {
+            guard let newDocument = try transformSafariDocument(document: document) else {
+                os_log("Safari format could not be handled", type: .debug)
+                throw BookmarksImportError.safariTransformFailure
             }
-        } catch {
-            throw BookmarksImportError.invalidHtml
+            try parse(documentElement: newDocument, importedBookmark: nil)
+        } else {
+            try parse(documentElement: document, importedBookmark: nil)
         }
     }
 
     /// transform Safari document into a standard bookmark html format
     func transformSafariDocument(document: Document) throws -> Document? {
         guard let body = try document.select("body").first() else {
-            throw BookmarksImportError.invalidHtml
+            throw BookmarksImportError.invalidHtmlNoBodyTag
         }
 
         let newDocument: Document = Document("")
@@ -123,7 +132,7 @@ final public class BookmarksImporter {
 
     func parse(documentElement: Element, importedBookmark: BookmarkOrFolder?, inFavorite: Bool = false) throws {
         guard let firstDL = try documentElement.select("DL").first() else {
-            throw BookmarksImportError.invalidHtml
+            throw BookmarksImportError.invalidHtmlNoDLTag
         }
         try firstDL.children()
                 .filter({ try $0.select("DT").hasText() })

Core/ContentBlocking.swift

@@ -161,7 +161,8 @@ public class DomainsProtectionUserDefaultsStore: DomainsProtectionStore {
     public private(set) var unprotectedDomains: Set<String> {
         get {
             guard let data = userDefaults?.data(forKey: Keys.unprotectedDomains) else { return Set<String>() }
-            guard let unprotectedDomains = try? NSKeyedUnarchiver.unarchivedObject(ofClass: NSSet.self, from: data) as? Set<String> else {
+            guard let unprotectedDomains = try? NSKeyedUnarchiver.unarchivedObject(ofClasses: [NSSet.self, NSString.self],
+                                                                                   from: data) as? Set<String> else {
                 return Set<String>()
             }
             return unprotectedDomains

Core/FeatureFlagger.swift

@@ -21,6 +21,7 @@ import Foundation
 
 public enum Feature: String {
     case debugMenu
+    case autofill
 }
 
 public protocol FeatureFlagger {
@@ -31,7 +32,8 @@ public protocol FeatureFlaggerInternalUserDecider {
 
     var isInternalUser: Bool { get }
 
-    func markUserAsInternalIfNeeded(forUrl url: URL?, response: HTTPURLResponse?)
+    @discardableResult
+    func markUserAsInternalIfNeeded(forUrl url: URL?, response: HTTPURLResponse?) -> Bool
 }
 
 public class DefaultFeatureFlagger: FeatureFlagger {
@@ -42,6 +44,12 @@ public class DefaultFeatureFlagger: FeatureFlagger {
         switch feature {
         case .debugMenu:
             return isInternalUser
+        case .autofill:
+            if #available(iOS 14, *), isInternalUser {
+                return true
+            } else {
+                return false
+            }
         }
     }
 
@@ -60,12 +68,18 @@ extension DefaultFeatureFlagger: FeatureFlaggerInternalUserDecider {
 
     private static let internalUserVerificationURLHost = "login.duckduckgo.com"
 
-    public func markUserAsInternalIfNeeded(forUrl url: URL?, response: HTTPURLResponse?) {
+    @discardableResult
+    public func markUserAsInternalIfNeeded(forUrl url: URL?, response: HTTPURLResponse?) -> Bool {
         if isInternalUser { // If we're already an internal user, we don't need to do anything
-            return
+            return false
         }
 
-        didVerifyInternalUser = shouldMarkUserAsInternal(forUrl: url, statusCode: response?.statusCode)
+        if shouldMarkUserAsInternal(forUrl: url, statusCode: response?.statusCode) {
+            didVerifyInternalUser = true
+            Pixel.fire(pixel: .featureFlaggingInternalUserAuthenticated)
+            return true
+        }
+        return false
     }
 
     func shouldMarkUserAsInternal(forUrl url: URL?, statusCode: Int?) -> Bool {

Core/Pixel.swift

@@ -22,6 +22,7 @@ import os.log
 
 // swiftlint:disable file_length
 // swiftlint:disable identifier_name
+// swiftlint:disable type_body_length
 public enum PixelName: String {
 
     case appLaunch = "ml"
@@ -168,6 +169,11 @@ public enum PixelName: String {
 
     case bookmarkImportSuccess = "m_bi_s"
     case bookmarkImportFailure = "m_bi_e"
+    case bookmarkImportFailureParsingDL = "m_bi_e_parsing_dl"
+    case bookmarkImportFailureParsingBody = "m_bi_e_parsing_body"
+    case bookmarkImportFailureTransformingSafari = "m_bi_e_transforming_safari"
+    case bookmarkImportFailureSaving = "m_bi_e_saving"
+    case bookmarkImportFailureUnknown = "m_bi_e_unknown"
     case bookmarkExportSuccess = "m_be_a"
     case bookmarkExportFailure = "m_be_e"
 
@@ -191,6 +197,35 @@ public enum PixelName: String {
 
     case jsAlertShown = "m_js_alert_shown"
     case jsAlertBlocked = "m_js_alert_blocked"
+    
+    case featureFlaggingInternalUserAuthenticated = "m_internal-user_authenticated"
+
+    case autofillLoginsSaveLoginModalOnboardingDisplayed = "m_autofill_logins_save_login_onboarding_inline_displayed"
+    
+    case autofillLoginsSaveLoginModalDisplayed = "m_autofill_logins_save_login_inline_displayed"
+    case autofillLoginsSaveLoginModalConfirmed = "m_autofill_logins_save_login_inline_confirmed"
+    
+    case autofillLoginsSavePasswordModalDisplayed = "m_autofill_logins_save_password_inline_displayed"
+    case autofillLoginsSavePasswordModalConfirmed = "m_autofill_logins_save_password_inline_confirmed"
+    
+    case autofillLoginsUpdatePasswordModalDisplayed = "m_autofill_logins_update_password_inline_displayed"
+    case autofillLoginsUpdatePasswordModalConfirmed = "m_autofill_logins_update_password_inline_confirmed"
+    
+    case autofillLoginsUpdateUsernameModelDisplayed = "m_autofill_logins_update_username_inline_displayed"
+    case autofillLoginsUpdateUsernameModelConfirmed = "m_autofill_logins_update_username_inline_confirmed"
+
+    case autofillLoginsFillLoginInlineDisplayed = "m_autofill_logins_fill_login_inline_displayed"
+    case autofillLoginsFillLoginInlineConfirmed = "m_autofill_logins_fill_login_inline_confirmed"
+    case autofillLoginsFillLoginInlineAuthenticationDeviceAuthAuthenticated =
+            "m_autofill_logins_fill_login_inline_authentication_device-auth_authenticated"
+    case autofillLoginsFillLoginInlineAuthenticationDeviceAuthFailed = "m_autofill_logins_fill_login_inline_authentication_device-auth_failed"
+    case autofillLoginsFillLoginInlineAuthenticationDeviceAuthUnavailable =
+            "m_autofill_logins_fill_login_inline_authentication_device-auth_unavailable"
+
+    case autofillSettingsOpened = "m_autofill_settings_opened"
+
+    case secureVaultInitError = "m_secure_vault_init_error"
+    case secureVaultError = "m_secure_vault_error"
 
     // MARK: SERP pixels
 
@@ -254,6 +289,7 @@ public enum PixelName: String {
     case cachedTabPreviewsExceedsTabCount = "m_d_tpetc"
     case cachedTabPreviewRemovalError = "m_d_tpre"
 }
+// swiftlint:enable type_body_length
 // swiftlint:enable identifier_name
 
 public struct PixelParameters {

Core/UserDefaultsPropertyWrapper.swift

@@ -72,6 +72,10 @@ public struct UserDefaultsWrapper<T> {
 
         case emailWaitlistShouldReceiveNotifications = "com.duckduckgo.ios.showWaitlistNotification"
         case unseenDownloadsAvailable = "com.duckduckgo.app.unseenDownloadsAvailable"
+
+        case autofill = "com.duckduckgo.ios.autofill"
+        case autofillSaveModalRejectionCount = "com.duckduckgo.ios.autofillSaveModalRejectionCount"
+        case autofillFirstTimeUser = "com.duckduckgo.ios.autofillFirstTimeUser"
 
         case featureFlaggingDidVerifyInternalUser = "com.duckduckgo.app.featureFlaggingDidVerifyInternalUser"
 

Core/ios-config.json

@@ -1,6 +1,6 @@
 {
     "readme": "https://github.com/duckduckgo/privacy-configuration",
-    "version": 1654870517289,
+    "version": 1655387185511,
     "features": {
         "ampLinks": {
             "exceptions": [
@@ -207,6 +207,10 @@
                     "domain": "adidas.com",
                     "reason": "Broken add to cart"
                 },
+                {
+                    "domain": "hm.com",
+                    "reason": "Broken add to cart"
+                },
                 {
                     "domain": "notebooksbilliger.de",
                     "reason": "Broken add to cart"
@@ -409,6 +413,17 @@
                             }
                         ]
                     },
+                    "aldi-digital.co.uk": {
+                        "rules": [
+                            {
+                                "rule": "assets.aldi-digital.co.uk/assets/050b4966c22c430e5c9308903ebb87e1/dist/scripts/main.js",
+                                "domains": [
+                                    "aldi.co.uk"
+                                ],
+                                "reason": "product images missing"
+                            }
+                        ]
+                    },
                     "alicdn.com": {
                         "rules": [
                             {
@@ -555,6 +570,39 @@
                             }
                         ]
                     },
+                    "facebook.net": {
+                        "rules": [
+                            {
+                                "rule": "connect.facebook.net/en_US/sdk.js",
+                                "domains": [
+                                    "grubhub.com"
+                                ],
+                                "reason": "broken login"
+                            }
+                        ]
+                    },
+                    "fwmrm.net": {
+                        "rules": [
+                            {
+                                "rule": "2a7e9.v.fwmrm.net/ad/g/1",
+                                "domains": [
+                                    "channel4.com"
+                                ],
+                                "reason": "adwall"
+                            }
+                        ]
+                    },
+                    "gigya.com": {
+                        "rules": [
+                            {
+                                "rule": "gigya.com/js/gigya.services.plugins.base.min.js",
+                                "domains": [
+                                    "<all>"
+                                ],
+                                "reason": "login content not loading"
+                            }
+                        ]
+                    },
                     "google-analytics.com": {
                         "rules": [
                             {
@@ -731,6 +779,17 @@
                             }
                         ]
                     },
+                    "tiqcdn.com": {
+                        "rules": [
+                            {
+                                "rule": "tags.tiqcdn.com/utag/agl/community/prod/utag.sync.js",
+                                "domains": [
+                                    "agl.com.au"
+                                ],
+                                "reason": "site loading delayed"
+                            }
+                        ]
+                    },
                     "twitter.com": {
                         "rules": [
                             {