Merge branch 'main' into sam/remove-wireguard-dependency

* main:
  Unified feedback form for Privacy Pro (#922)
  bump privacy-dashboard to 5.1.1 (#955)
  Bump Tests/BrowserServicesKitTests/Resources/privacy-reference-tests from `afb4f61` to `6133e7d` (#962)
  Freemium PIR - Add Desktop RMF Attribute (#960)
  Fix address bar queries when doing math expressions (#952)

Package.resolved

@@ -50,8 +50,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/privacy-dashboard",
       "state" : {
-        "revision" : "36dc07cba4bc1e7e0c1d1fb679c3cd077694a072",
-        "version" : "5.0.0"
+        "revision" : "665b23dc656c9f787494620494f8e56098a900b2",
+        "version" : "5.1.1"
       }
     },
     {

Package.swift

@@ -49,7 +49,7 @@ let package = Package(
         .package(url: "https://github.com/duckduckgo/sync_crypto", exact: "0.2.0"),
         .package(url: "https://github.com/gumob/PunycodeSwift.git", exact: "2.1.0"),
         .package(url: "https://github.com/duckduckgo/content-scope-scripts", exact: "6.7.0"),
-        .package(url: "https://github.com/duckduckgo/privacy-dashboard", exact: "5.0.0"),
+        .package(url: "https://github.com/duckduckgo/privacy-dashboard", exact: "5.1.1"),
         .package(url: "https://github.com/httpswift/swifter.git", exact: "1.5.0"),
         .package(url: "https://github.com/duckduckgo/bloom_cpp.git", exact: "3.0.0"),
         .package(url: "https://github.com/1024jp/GzipSwift.git", exact: "6.0.1")

Sources/BrowserServicesKit/PrivacyConfig/Features/PrivacyFeature.swift

@@ -117,6 +117,7 @@ public enum PrivacyProSubfeature: String, Equatable, PrivacySubfeature {
     case allowPurchaseStripe
     case isLaunchedOverride
     case isLaunchedOverrideStripe
+    case useUnifiedFeedback
 }
 
 public enum sslCertificatesSubfeature: String, PrivacySubfeature {

Sources/BrowserServicesKit/Subscription/SubscriptionFeatureAvailability.swift

@@ -22,6 +22,7 @@ import Subscription
 public protocol SubscriptionFeatureAvailability {
     var isFeatureAvailable: Bool { get }
     var isSubscriptionPurchaseAllowed: Bool { get }
+    var usesUnifiedFeedbackForm: Bool { get }
 }
 
 public final class DefaultSubscriptionFeatureAvailability: SubscriptionFeatureAvailability {
@@ -52,6 +53,10 @@ public final class DefaultSubscriptionFeatureAvailability: SubscriptionFeatureAv
         return isPurchaseAllowed || isInternalUser
     }
 
+    public var usesUnifiedFeedbackForm: Bool {
+        privacyConfigurationManager.privacyConfig.isSubfeatureEnabled(PrivacyProSubfeature.useUnifiedFeedback)
+    }
+
 // MARK: - Conditions
 
     private var isInternalUser: Bool {

Sources/Common/Extensions/StringExtension.swift

@@ -31,6 +31,8 @@ extension RegEx {
     static let hostName = regex("^(((?!-)[A-Za-z0-9-]{1,63}(?<!-)\\.)*[A-Za-z0-9-]{2,63})$", .caseInsensitive)
 
     static let email = regex(#"[^\s]+@[^\s]+\.[^\s]+"#)
+
+    static let mathExpression = regex(#"^[\s$]*([\d]+(\.[\d]+)?|\\.[\d]+)([\s]*[+\-*/][\s]*([\d]+(\.[\d]+)?|\\.[\d]+))*[\s$]*$"#)
 }
 
 // Use this instead of NSLocalizedString for strings that are not supposed to be translated
@@ -362,7 +364,11 @@ public extension String {
     // MARK: Host name validation
 
     var isValidHost: Bool {
-        return isValidHostname || isValidIpHost
+        return (isValidHostname || isValidIpHost) && !isMathFormula
+    }
+
+    private var isMathFormula: Bool {
+        return matches(.mathExpression)
     }
 
     var isValidHostname: Bool {

Sources/PixelKit/PixelKit+Parameters.swift

@@ -70,6 +70,14 @@ public extension PixelKit {
         public static let reason = "reason"
 
         public static let vpnCohort = "cohort"
+
+        // Unified Feedback Form
+        public static let pproIssueDescription = "description"
+        public static let pproIssueSource = "source"
+        public static let pproIssueReportType = "reportType"
+        public static let pproIssueCategory = "category"
+        public static let pproIssueSubcategory = "subcategory"
+        public static let pproIssueMetadata = "customMetadata"
     }
 
     enum Values {

Sources/RemoteMessaging/Matchers/UserAttributeMatcher.swift

@@ -98,6 +98,7 @@ public struct MobileUserAttributeMatcher: AttributeMatching {
 public struct DesktopUserAttributeMatcher: AttributeMatching {
     private let pinnedTabsCount: Int
     private let hasCustomHomePage: Bool
+    private let isCurrentFreemiumPIRUser: Bool
     private let dismissedDeprecatedMacRemoteMessageIds: [String]
 
     private let commonUserAttributeMatcher: CommonUserAttributeMatcher
@@ -123,10 +124,12 @@ public struct DesktopUserAttributeMatcher: AttributeMatching {
                 hasCustomHomePage: Bool,
                 isDuckPlayerOnboarded: Bool,
                 isDuckPlayerEnabled: Bool,
+                isCurrentFreemiumPIRUser: Bool,
                 dismissedDeprecatedMacRemoteMessageIds: [String]
     ) {
         self.pinnedTabsCount = pinnedTabsCount
         self.hasCustomHomePage = hasCustomHomePage
+        self.isCurrentFreemiumPIRUser = isCurrentFreemiumPIRUser
         self.dismissedDeprecatedMacRemoteMessageIds = dismissedDeprecatedMacRemoteMessageIds
 
         commonUserAttributeMatcher = .init(
@@ -158,6 +161,8 @@ public struct DesktopUserAttributeMatcher: AttributeMatching {
             return matchingAttribute.evaluate(for: pinnedTabsCount)
         case let matchingAttribute as CustomHomePageMatchingAttribute:
             return matchingAttribute.evaluate(for: hasCustomHomePage)
+        case let matchingAttribute as FreemiumPIRCurrentUserMatchingAttribute:
+            return matchingAttribute.evaluate(for: isCurrentFreemiumPIRUser)
         case let matchingAttribute as InteractedWithDeprecatedMacRemoteMessageMatchingAttribute:
             if dismissedDeprecatedMacRemoteMessageIds.contains(where: { messageId in
                 StringArrayMatchingAttribute(matchingAttribute.value).matches(value: messageId) == .match

Sources/RemoteMessaging/Model/MatchingAttributes.swift

@@ -191,6 +191,11 @@ struct DuckPlayerEnabledMatchingAttribute: SingleValueMatching {
     var fallback: Bool?
 }
 
+struct FreemiumPIRCurrentUserMatchingAttribute: SingleValueMatching {
+    var value: Bool?
+    var fallback: Bool?
+}
+
 struct MessageShownMatchingAttribute: SingleValueMatching {
     var value: [String]? = []
     var fallback: Bool?

Tests/CommonTests/Extensions/StringExtensionTests.swift

@@ -336,4 +336,38 @@ final class StringExtensionTests: XCTestCase {
 
     }
 
+    func testWhenStringIsValidHost_thenValidHostIsTrue() {
+        let validHostnames = [
+            "example.com",
+            "subdomain.example.com",
+            "my-host123",
+            "localhost",
+            "192.168.1.1", // Valid IP address
+            "2001:0db8:85a3:0000:0000:8a2e:0370:7334" // Valid IPv6 address
+        ]
+
+        for hostname in validHostnames {
+            XCTAssertTrue(hostname.isValidHost, "\(hostname) should be a valid host")
+        }
+    }
+
+    func testWhenStringIsInvalidHost_thenValidHostIsFalse() {
+        let invalidHostnames = [
+            "invalid_hostname", // Invalid character
+            "-example.com", // Starts with a hyphen
+            "example-.com", // Ends with a hyphen
+            "example..com", // Consecutive dots
+            "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890.com", // Too long
+            "example.com.", // Ends with a dot
+            "3 + 5 * (2 - 1)", // Mathematical expression
+            "16385-12228.72", // Other mathetmatical expression
+            "[email protected]", // Invalid character
+            "2001:0db8:85a3:0000:0000:8a2e:0370:7334:1234" // Invalid IPv6 address
+        ]
+
+        for hostname in invalidHostnames {
+            XCTAssertFalse(hostname.isValidHost, "\(hostname) should NOT be a valid host")
+        }
+    }
+
 }

Tests/RemoteMessagingTests/Matchers/DesktopUserAttributeMatcherTests.swift

@@ -133,6 +133,18 @@ class DesktopUserAttributeMatcherTests: XCTestCase {
                        .fail)
     }
 
+    // MARK: - FreemiumPIRCurrentUser
+
+    func testWhenIsCurrentFreemiumPIRUserEnabledMatchesThenReturnMatch() throws {
+        XCTAssertEqual(matcher.evaluate(matchingAttribute: FreemiumPIRCurrentUserMatchingAttribute(value: false, fallback: nil)),
+                       .match)
+    }
+
+    func testWhenIsCurrentFreemiumPIRUserDoesNotMatchThenReturnFail() throws {
+        XCTAssertEqual(matcher.evaluate(matchingAttribute: FreemiumPIRCurrentUserMatchingAttribute(value: true, fallback: nil)),
+                       .fail)
+    }
+
     // MARK: - DeprecatedMacRemoteMessage
 
     func testWhenNoDismissedMessageIdsAreProvidedThenReturnFail() throws {
@@ -186,6 +198,7 @@ class DesktopUserAttributeMatcherTests: XCTestCase {
             hasCustomHomePage: true,
             isDuckPlayerOnboarded: true,
             isDuckPlayerEnabled: false,
+            isCurrentFreemiumPIRUser: false,
             dismissedDeprecatedMacRemoteMessageIds: dismissedDeprecatedMacRemoteMessageIds
         )
     }