Revert "Use etld+1 to compare exceptions for the user agent" (#3887)

Reverts #3886
duckduckgo · Nov 17, 2023 · 5dd3f5d · 5dd3f5d
1 parent fee3168
commit 5dd3f5d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 22 deletions.
diff --git a/common/common-utils/src/main/java/com/duckduckgo/common/utils/UriString.kt b/common/common-utils/src/main/java/com/duckduckgo/common/utils/UriString.kt
@@ -17,11 +17,9 @@
 package com.duckduckgo.common.utils
 
 import android.net.Uri
-import androidx.core.net.toUri
 import androidx.core.util.PatternsCompat
 import java.lang.IllegalArgumentException
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import timber.log.Timber
 
 class UriString {
@@ -37,16 +35,6 @@ class UriString {
             return Uri.parse(uriString).baseHost
         }
 
-        fun sameEffectiveTldPlusOne(child: String, parent: String): Boolean {
-            val childDomain = child.toUri().withScheme().toString().toHttpUrlOrNull() ?: return false
-            val parentDomain = parent.toUri().withScheme().toString().toHttpUrlOrNull() ?: return false
-
-            val childETldPlusOne = childDomain.topPrivateDomain()
-            val parentETldPlusOne = parentDomain.topPrivateDomain()
-
-            return childETldPlusOne == parentETldPlusOne
-        }
-
         fun sameOrSubdomain(
             child: String,
             parent: String,

diff --git a/...impl/src/main/java/com/duckduckgo/privacy/config/impl/features/useragent/RealUserAgent.kt b/...impl/src/main/java/com/duckduckgo/privacy/config/impl/features/useragent/RealUserAgent.kt
@@ -35,20 +35,15 @@ class RealUserAgent @Inject constructor(
 ) : UserAgent {
 
     override fun isAnApplicationException(url: String): Boolean {
-        return userAgentRepository.omitApplicationExceptions.any { UriString.sameEffectiveTldPlusOne(url, it.domain) }
+        return userAgentRepository.omitApplicationExceptions.any { UriString.sameOrSubdomain(url, it.domain) }
     }
 
     override fun isAVersionException(url: String): Boolean {
-        return userAgentRepository.omitVersionExceptions.any { UriString.sameEffectiveTldPlusOne(url, it.domain) }
+        return userAgentRepository.omitVersionExceptions.any { UriString.sameOrSubdomain(url, it.domain) }
     }
 
     override fun isADefaultException(url: String): Boolean {
-        return unprotectedTemporary.isAnException(url) || userAgentRepository.defaultExceptions.any {
-            UriString.sameEffectiveTldPlusOne(
-                url,
-                it.domain,
-            )
-        }
+        return unprotectedTemporary.isAnException(url) || userAgentRepository.defaultExceptions.any { UriString.sameOrSubdomain(url, it.domain) }
     }
 
     override fun defaultPolicy(): DefaultPolicy {
@@ -61,11 +56,11 @@ class RealUserAgent @Inject constructor(
     }
 
     override fun isADdgDefaultSite(url: String): Boolean {
-        return userAgentRepository.ddgDefaultSites.any { UriString.sameEffectiveTldPlusOne(url, it.domain) }
+        return userAgentRepository.ddgDefaultSites.any { UriString.sameOrSubdomain(url, it.domain) }
     }
 
     override fun isADdgFixedSite(url: String): Boolean {
-        return userAgentRepository.ddgFixedSites.any { UriString.sameEffectiveTldPlusOne(url, it.domain) }
+        return userAgentRepository.ddgFixedSites.any { UriString.sameOrSubdomain(url, it.domain) }
     }
 
     override fun closestUserAgentEnabled(): Boolean {