For third party requests differentiate if they are affiliated with fi…

…rst party
duckduckgo · Sep 24, 2024 · 6247837 · 6247837
1 parent cc3629f
commit 6247837
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Sources/BrowserServicesKit/ContentBlocking/UserScripts/ContentBlockerRulesUserScript.swift b/Sources/BrowserServicesKit/ContentBlocking/UserScripts/ContentBlockerRulesUserScript.swift
@@ -187,11 +187,13 @@ open class ContentBlockerRulesUserScript: NSObject, UserScript {
                   !isFirstParty(requestURL: trackerUrlString, websiteURL: pageUrlStr) else { return }
 
             let entity = currentTrackerData.findEntity(forHost: requestETLDp1) ?? Entity(displayName: requestETLDp1, domains: nil, prevalence: nil)
+            let isAffiliated = resolver.isPageAffiliatedWithTrackerEntity(pageUrlString: pageUrlStr, trackerEntity: entity)
+
             let thirdPartyRequest = DetectedRequest(url: trackerUrlString,
                                                     eTLDplus1: requestETLDp1,
                                                     knownTracker: nil,
                                                     entity: entity,
-                                                    state: .allowed(reason: .otherThirdPartyRequest),
+                                                    state: .allowed(reason: isAffiliated ? .ownedByFirstParty : .otherThirdPartyRequest),
                                                     pageUrl: pageUrlStr)
             delegate.contentBlockerRulesUserScript(self, detectedThirdPartyRequest: thirdPartyRequest)
         }

diff --git a/Sources/BrowserServicesKit/ContentBlocking/UserScripts/TrackerResolver.swift b/Sources/BrowserServicesKit/ContentBlocking/UserScripts/TrackerResolver.swift
@@ -85,7 +85,7 @@ public class TrackerResolver {
                                pageUrl: pageUrlString)
     }
 
-    private func isPageAffiliatedWithTrackerEntity(pageUrlString: String, trackerEntity: Entity) -> Bool {
+    public func isPageAffiliatedWithTrackerEntity(pageUrlString: String, trackerEntity: Entity) -> Bool {
         guard let pageHost = URL(string: pageUrlString)?.host,
               let pageEntity = tds.findEntity(forHost: pageHost)
         else { return false }