Clear processed URLs after a page is marked as malicious

duckduckgo · Jan 24, 2025 · 1c4cd9e · 1c4cd9e
1 parent 7baf134
commit 1c4cd9e
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/...rc/main/java/com/duckduckgo/app/browser/webview/MaliciousSiteBlockerWebViewIntegration.kt b/...rc/main/java/com/duckduckgo/app/browser/webview/MaliciousSiteBlockerWebViewIntegration.kt
@@ -114,8 +114,9 @@ class RealMaliciousSiteBlockerWebViewIntegration @Inject constructor(
         if (request.isForMainFrame || (isForIframe(request) && documentUri?.host == request.requestHeaders["Referer"]?.toUri()?.host)) {
             if (checkMaliciousUrl(decodedUrl, confirmationCallback)) {
                 return WebResourceResponse(null, null, null)
+            } else {
+                processedUrls.add(decodedUrl)
             }
-            processedUrls.add(decodedUrl)
         }
         return null
     }
@@ -141,8 +142,9 @@ class RealMaliciousSiteBlockerWebViewIntegration @Inject constructor(
             if (isForMainFrame) {
                 if (checkMaliciousUrl(decodedUrl, confirmationCallback)) {
                     return@runBlocking true
+                } else {
+                    processedUrls.add(decodedUrl)
                 }
-                processedUrls.add(decodedUrl)
             }
             false
         }
@@ -153,12 +155,14 @@ class RealMaliciousSiteBlockerWebViewIntegration @Inject constructor(
         confirmationCallback: (isMalicious: Boolean) -> Unit,
     ): Boolean {
         val checkId = currentCheckId.incrementAndGet()
-        return maliciousSiteProtection.isMalicious(url.toUri()) { isMalicious ->
-            if (checkId == currentCheckId.get()) {
-                confirmationCallback(isMalicious)
+        return maliciousSiteProtection.isMalicious(url.toUri()) {
+            val isMalicious = if (checkId == currentCheckId.get()) {
+                it
             } else {
-                confirmationCallback(false)
+                false
             }
+            processedUrls.clear()
+            confirmationCallback(isMalicious)
         } == MALICIOUS
     }