Merge remote-tracking branch 'origin/main' into jkt/shared-web-tests

Author: jonathanKingston

.github/workflows/ios-end-to-end.yml

@@ -115,4 +115,4 @@ jobs:
   #         --header "Accept: application/json" \
   #         --header "Authorization: Bearer ${{ secrets.ASANA_ACCESS_TOKEN }}" \
   #         --header "Content-Type: application/json" \
-  #         --data ' { "data": { "name": "GH Workflow Failure - End to end tests", "workspace": "${{ vars.GH_ASANA_WORKSPACE_ID }}", "projects": [ "${{ vars.GH_ASANA_IOS_APP_PROJECT_ID }}" ], "notes" : "The end to end workflow has failed. See https://github.com/duckduckgo/iOS/actions/runs/${{ github.run_id }}. For instructions on how to handle the failure(s), check https://app.asana.com/0/0/1206423571874502/f" } }'
+  #         --data ' { "data": { "name": "GH Workflow Failure - End to end tests", "workspace": "${{ vars.ASANA_WORKSPACE_ID }}", "projects": [ "${{ vars.GH_ASANA_IOS_APP_PROJECT_ID }}" ], "notes" : "The end to end workflow has failed. See https://github.com/duckduckgo/iOS/actions/runs/${{ github.run_id }}. For instructions on how to handle the failure(s), check https://app.asana.com/0/0/1206423571874502/f" } }'

.github/workflows/ios-sync-end-to-end.yml

@@ -132,4 +132,4 @@ jobs:
   #           --header "Accept: application/json" \
   #           --header "Authorization: Bearer ${{ secrets.ASANA_ACCESS_TOKEN }}" \
   #           --header "Content-Type: application/json" \
-  #           --data ' { "data": { "name": "GH Workflow Failure - Sync End to end tests", "workspace": "${{ vars.GH_ASANA_WORKSPACE_ID }}", "projects": [ "${{ vars.GH_ASANA_IOS_APP_PROJECT_ID }}" ], "notes" : "The end to end workflow has failed. See https://github.com/duckduckgo/iOS/actions/runs/${{ github.run_id }}" } }'
+  #           --data ' { "data": { "name": "GH Workflow Failure - Sync End to end tests", "workspace": "${{ vars.ASANA_WORKSPACE_ID }}", "projects": [ "${{ vars.GH_ASANA_IOS_APP_PROJECT_ID }}" ], "notes" : "The end to end workflow has failed. See https://github.com/duckduckgo/iOS/actions/runs/${{ github.run_id }}" } }'

.maestro/browser_features/state_restoration.yaml

@@ -0,0 +1,53 @@
+# state_restoration.yaml
+appId: com.duckduckgo.mobile.ios
+tags:
+    - release
+
+---
+
+# Set up 
+- runFlow: 
+    file: ../shared/setup.yaml
+
+# Load Site
+- assertVisible:
+    id: "searchEntry"
+- tapOn:
+    id: "searchEntry"
+- inputText: "https://www.wikipedia.org/"
+- pressKey: Enter
+
+# Create navigation stack
+- assertVisible: "English"
+- tapOn: "English"
+- assertVisible: "Welcome to Wikipedia.*"
+- tapOn: "Wikipedia" 
+- assertVisible: "Article"
+- scrollUntilVisible:
+    element: "United States"
+# Make sure bottom bar is visible
+- tapOn:
+    point: 80%, 99%
+- tapOn: "Browse Back"
+- assertVisible: "Welcome to Wikipedia.*"
+
+# Load a new tab
+- longPressOn: "Tab Switcher"
+- assertVisible:
+    id: "searchEntry"
+- tapOn: 
+    id: "searchEntry"
+- inputText: "https://example.com"
+- pressKey: Enter
+
+- stopApp
+- launchApp
+
+- tapOn: "Tab Switcher"
+- tapOn:
+    point: 20%, 25%
+
+# Check if state from previous session was restored
+- assertVisible: "Welcome to Wikipedia.*"
+- tapOn: "Browse Forward"
+- assertVisible: "United States"

Core/AppURLs.swift

@@ -38,6 +38,7 @@ public extension URL {
     static let apps = URL(string: AppDeepLinkSchemes.quickLink.appending("\(ddg.host!)/apps?origin=funnel_app_ios"))!
     static let searchSettings = URL(string: AppDeepLinkSchemes.quickLink.appending("\(ddg.host!)/settings"))!
     static let autofillHelpPageLink = URL(string: AppDeepLinkSchemes.quickLink.appending("\(ddg.host!)/duckduckgo-help-pages/sync-and-backup/password-manager-security/"))!
+    static let maliciousSiteProtectionLearnMore = URL(string: AppDeepLinkSchemes.quickLink.appending("\(ddg.host!)/duckduckgo-help-pages/privacy/phishing-and-malware-protection/"))!
 
     static let surrogates = URL(string: "\(staticBase)/surrogates.txt")!
 

Core/FeatureFlag.swift

@@ -70,7 +70,14 @@ public enum FeatureFlag: String {
     /// https://app.asana.com/0/72649045549333/1208944782348823/f
     case syncSeamlessAccountSwitching
 
+    /// https://app.asana.com/0/1204167627774280/1209205869217377
+    case aiChatNewTabPage
+
     case testExperiment
+
+    /// Feature flag to enable / disable phishing and malware protection
+    /// https://app.asana.com/0/1206329551987282/1207149365636877/f
+    case maliciousSiteProtection
 }
 
 extension FeatureFlag: FeatureFlagDescribing {
@@ -172,8 +179,12 @@ extension FeatureFlag: FeatureFlagDescribing {
             return .remoteReleasable(.feature(.webViewStateRestoration))
         case .syncSeamlessAccountSwitching:
             return .remoteReleasable(.subfeature(SyncSubfeature.seamlessAccountSwitching))
+        case .aiChatNewTabPage:
+            return .internalOnly()
         case .testExperiment:
             return .remoteReleasable(.subfeature(ExperimentTestSubfeatures.experimentTestAA))
+        case .maliciousSiteProtection:
+            return .remoteReleasable(.subfeature(MaliciousSiteProtectionSubfeature.onByDefault))
         }
     }
 }

Core/HistoryManager.swift

@@ -114,6 +114,10 @@ class NullHistoryCoordinator: HistoryCoordinating {
         return nil
     }
 
+    func addVisit(of url: URL, at date: Date) -> History.Visit? {
+        return nil
+    }
+
     func addBlockedTracker(entityName: String, on url: URL) {
     }
 

Core/Pixel.swift

@@ -168,6 +168,9 @@ public struct PixelParameters {
     public static let appEvent = "event"
 
     public static let didCallWillEnterForeground = "didCallWillEnterForeground"
+
+    // Background Tasks
+    public static let backgroundTaskCategory = "category"
 }
 
 public struct PixelValues {

Core/PixelEvent.swift

@@ -22,6 +22,8 @@ import BrowserServicesKit
 import Bookmarks
 import Configuration
 import DDGSync
+import MaliciousSiteProtection
+import PixelKit
 
 extension Pixel {
 
@@ -979,6 +981,9 @@ extension Pixel {
 
         case tabInteractionStateFailedToRestore
         case tabInteractionStateRestorationTime(_ time: BucketAggregation)
+
+        // MARK: Malicious Site Protection
+        case maliciousSiteProtection(event: MaliciousSiteProtectionEvent)
     }
 
 }
@@ -1540,7 +1545,7 @@ extension Pixel.Event {
         case .webKitWarmupUnexpectedDidFinish: return "m_d_webkit-warmup-unexpected-did-finish"
         case .webKitWarmupUnexpectedDidTerminate: return "m_d_webkit-warmup-unexpected-did-terminate"
 
-        case .backgroundTaskSubmissionFailed: return "m_bt_rf"
+        case .backgroundTaskSubmissionFailed: return "m_background-task_submission-failed"
 
         case .blankOverlayNotDismissed: return "m_d_ovs"
 
@@ -1961,6 +1966,9 @@ extension Pixel.Event {
         case .appDidTransitionToUnexpectedState: return "m_debug_app-did-transition-to-unexpected-state-3"
 
         case .debugBreakageExperiment: return "m_debug_breakage_experiment_u"
+
+        // MARK: Malicious Site Protection
+        case .maliciousSiteProtection(let event): return "m_\(event.name)"
         }
     }
 }
@@ -2081,3 +2089,67 @@ extension Pixel.Event {
         }
     }
 }
+
+// This is a temporary mapper from PixelKit to Pixel events for MaliciousSiteProtection
+// Malicious Site Protection BSK library depends on PixelKit which is not ready yet to be ported to iOS.
+// The below code maps between `PixelKitEvent` to `Pixel.Event` in order to use `Pixel.fire` on the client.
+public extension Pixel.Event {
+
+    enum MaliciousSiteProtectionEvent: Equatable {
+        case errorPageShown(category: ThreatKind, clientSideHit: Bool?)
+        case visitSite(category: ThreatKind)
+        case iframeLoaded(category: ThreatKind)
+        case settingToggled(to: Bool)
+        case matchesApiTimeout
+        case failedToDownloadInitialDataSets(category: ThreatKind, type: DataManager.StoredDataType.Kind)
+
+        public init?(_ pixelKitEvent: MaliciousSiteProtection.Event) {
+            switch pixelKitEvent {
+            case .errorPageShown(category: let category, clientSideHit: let clientSideHit):
+                self = .errorPageShown(category: category, clientSideHit: clientSideHit)
+            case .visitSite(category: let category):
+                self = .visitSite(category: category)
+            case .iframeLoaded(category: let category):
+                self = .iframeLoaded(category: category)
+            case .settingToggled(let enabled):
+                self = .settingToggled(to: enabled)
+            case .matchesApiTimeout:
+                self = .matchesApiTimeout
+            case .matchesApiFailure:
+                return nil
+            case .failedToDownloadInitialDataSets(category: let category, type: let type):
+                self = .failedToDownloadInitialDataSets(category: category, type: type)
+            }
+        }
+
+        private var event: PixelKitEventV2 {
+            switch self {
+            case .errorPageShown(let category, let clientSideHit):
+                return MaliciousSiteProtection.Event.errorPageShown(category: category, clientSideHit: clientSideHit)
+            case .visitSite(let category):
+                return MaliciousSiteProtection.Event.visitSite(category: category)
+            case .iframeLoaded(let category):
+                return MaliciousSiteProtection.Event.iframeLoaded(category: category)
+            case .settingToggled(let enabled):
+                return MaliciousSiteProtection.Event.settingToggled(to: enabled)
+            case .matchesApiTimeout:
+                return MaliciousSiteProtection.Event.matchesApiTimeout
+            case .failedToDownloadInitialDataSets(let category, let type):
+                return MaliciousSiteProtection.Event.failedToDownloadInitialDataSets(category: category, type: type)
+            }
+        }
+
+        var name: String {
+            switch self {
+            case .failedToDownloadInitialDataSets:
+                return "debug_\(event.name)"
+            default:
+                return event.name
+            }
+        }
+
+        public var parameters: [String: String] {
+            event.parameters ?? [:]
+        }
+    }
+}

Core/UserAgentManager.swift

@@ -283,7 +283,7 @@ struct UserAgent {
                               isDesktop: Bool,
                               privacyConfig: PrivacyConfiguration) -> String {
         if isDesktop {
-            return "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.5 Safari/605.1.15"
+            return "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.3 Safari/605.1.15"
         }
         return "Mozilla/5.0 (" + deviceProfile + ") AppleWebKit/605.1.15 (KHTML, like Gecko) \(versionComponent) Mobile/15E148 Safari/604.1"
     }

Core/UserDefaultsPropertyWrapper.swift

@@ -182,6 +182,9 @@ public struct UserDefaultsWrapper<T> {
 
         // TipKit
         case resetTipKitOnNextLaunch = "com.duckduckgo.ios.tipKit.resetOnNextLaunch"
+
+        // Malicious Site Protection
+        case maliciousSiteProtectionEnabled = "com.duckduckgo.ios.maliciousSiteProtection.enabled"
     }
 
     private let key: Key