Support duplicated hash filters

duckduckgo · Dec 20, 2024 · 75f7e5d · 75f7e5d
1 parent 67e60b4
commit 75f7e5d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/...c/main/kotlin/com/duckduckgo/malicioussiteprotection/impl/data/MaliciousSiteRepository.kt b/...c/main/kotlin/com/duckduckgo/malicioussiteprotection/impl/data/MaliciousSiteRepository.kt
@@ -33,7 +33,7 @@ import timber.log.Timber
 
 interface MaliciousSiteRepository {
     suspend fun containsHashPrefix(hashPrefix: String): Boolean
-    suspend fun getFilter(hash: String): Filter?
+    suspend fun getFilters(hash: String): List<Filter>?
     suspend fun matches(hashPrefix: String): List<Match>
 }
 
@@ -86,9 +86,11 @@ class RealMaliciousSiteRepository @Inject constructor(
         return maliciousSiteDao.getHashPrefix(hashPrefix) != null
     }
 
-    override suspend fun getFilter(hash: String): Filter? {
+    override suspend fun getFilters(hash: String): List<Filter>? {
         return maliciousSiteDao.getFilter(hash)?.let {
-            Filter(it.hash, it.regex)
+            it.map {
+                Filter(it.hash, it.regex)
+            }
         }
     }
 

diff --git a/...l/src/main/kotlin/com/duckduckgo/malicioussiteprotection/impl/data/db/MaliciousSiteDao.kt b/...l/src/main/kotlin/com/duckduckgo/malicioussiteprotection/impl/data/db/MaliciousSiteDao.kt
@@ -51,7 +51,7 @@ interface MaliciousSiteDao {
     suspend fun getHashPrefix(hashPrefix: String): HashPrefixEntity?
 
     @Query("SELECT * FROM filters WHERE hash = :hash")
-    suspend fun getFilter(hash: String): FilterEntity?
+    suspend fun getFilter(hash: String): List<FilterEntity>?
 
     @Transaction
     suspend fun insertData(

diff --git a/.../kotlin/com/duckduckgo/malicioussiteprotection/impl/domain/RealMaliciousSiteProtection.kt b/.../kotlin/com/duckduckgo/malicioussiteprotection/impl/domain/RealMaliciousSiteProtection.kt
@@ -59,10 +59,12 @@ class RealMaliciousSiteProtection @Inject constructor(
             Timber.d("\uD83D\uDFE2 Cris: should not block (no hash) $hashPrefix,  $url")
             return IsMaliciousResult.SAFE
         }
-        maliciousSiteRepository.getFilter(hash)?.let {
-            if (Pattern.compile(it.regex).matcher(url.toString()).find()) {
-                Timber.d("\uD83D\uDFE2 Cris: shouldBlock $url")
-                return IsMaliciousResult.MALICIOUS
+        maliciousSiteRepository.getFilters(hash)?.let {
+            for (filter in it) {
+                if (Pattern.compile(filter.regex).matcher(url.toString()).find()) {
+                    Timber.d("\uD83D\uDFE2 Cris: shouldBlock $url")
+                    return IsMaliciousResult.MALICIOUS
+                }
             }
         }
         appCoroutineScope.launch(dispatchers.io()) {

diff --git a/...lin/com/duckduckgo/malicioussiteprotection/impl/domain/RealMaliciousSiteProtectionTest.kt b/...lin/com/duckduckgo/malicioussiteprotection/impl/domain/RealMaliciousSiteProtectionTest.kt
@@ -81,7 +81,7 @@ class RealMaliciousSiteProtectionTest {
         val filter = Filter(hash, ".*malicious.*")
 
         whenever(maliciousSiteRepository.containsHashPrefix(hashPrefix)).thenReturn(true)
-        whenever(maliciousSiteRepository.getFilter(hash)).thenReturn(filter)
+        whenever(maliciousSiteRepository.getFilters(hash)).thenReturn(listOf(filter))
 
         val result = realMaliciousSiteProtection.isMalicious(url) {}
 
@@ -97,7 +97,7 @@ class RealMaliciousSiteProtectionTest {
         val filter = Filter(hash, ".*malicious.*")
 
         whenever(maliciousSiteRepository.containsHashPrefix(hashPrefix)).thenReturn(true)
-        whenever(maliciousSiteRepository.getFilter(hash)).thenReturn(filter)
+        whenever(maliciousSiteRepository.getFilters(hash)).thenReturn(listOf(filter))
         whenever(mockMaliciousSiteProtectionRCFeature.isFeatureEnabled()).thenReturn(false)
 
         val result = realMaliciousSiteProtection.isMalicious(url) {}
@@ -114,7 +114,7 @@ class RealMaliciousSiteProtectionTest {
         val filter = Filter(hash, ".*unsafe.*")
 
         whenever(maliciousSiteRepository.containsHashPrefix(hashPrefix)).thenReturn(true)
-        whenever(maliciousSiteRepository.getFilter(hash)).thenReturn(filter)
+        whenever(maliciousSiteRepository.getFilters(hash)).thenReturn(listOf(filter))
 
         val result = realMaliciousSiteProtection.isMalicious(url) {}
 
@@ -131,7 +131,7 @@ class RealMaliciousSiteProtectionTest {
         var onSiteBlockedAsyncCalled = false
 
         whenever(maliciousSiteRepository.containsHashPrefix(hashPrefix)).thenReturn(true)
-        whenever(maliciousSiteRepository.getFilter(hash)).thenReturn(filter)
+        whenever(maliciousSiteRepository.getFilters(hash)).thenReturn(listOf(filter))
         whenever(maliciousSiteRepository.matches(hashPrefix.substring(0, 4)))
             .thenReturn(listOf(Match(hostname, url.toString(), ".*malicious.*", hash)))