From e5dd40fa0c0fa6486bc6804a983f953892acd0cd Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Fri, 21 Aug 2020 17:36:55 -0400 Subject: [PATCH] fix reject list construction --- bubble-server/src/main/java/bubble/rule/AppRuleDriver.java | 4 ++-- .../main/java/bubble/rule/bblock/BubbleBlockRuleDriver.java | 1 - .../src/main/java/bubble/service/block/BlockStatsService.java | 2 +- utils/abp-parser | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bubble-server/src/main/java/bubble/rule/AppRuleDriver.java b/bubble-server/src/main/java/bubble/rule/AppRuleDriver.java index 83da6eb9..dc9c5a61 100644 --- a/bubble-server/src/main/java/bubble/rule/AppRuleDriver.java +++ b/bubble-server/src/main/java/bubble/rule/AppRuleDriver.java @@ -40,8 +40,8 @@ public interface AppRuleDriver { InputStream EMPTY_STREAM = new ByteArrayInputStream(new byte[0]); // also used in dnscrypt-proxy/plugin_reverse_resolve_cache.go - String REDIS_BLOCK_LISTS = "rejectLists"; - String REDIS_REJECT_LISTS = "blockLists"; + String REDIS_REJECT_LISTS = "rejectLists"; + String REDIS_BLOCK_LISTS = "blockLists"; String REDIS_FILTER_LISTS = "filterLists"; String REDIS_LIST_SUFFIX = "~UNION"; diff --git a/bubble-server/src/main/java/bubble/rule/bblock/BubbleBlockRuleDriver.java b/bubble-server/src/main/java/bubble/rule/bblock/BubbleBlockRuleDriver.java index e8f9d968..82b848b5 100644 --- a/bubble-server/src/main/java/bubble/rule/bblock/BubbleBlockRuleDriver.java +++ b/bubble-server/src/main/java/bubble/rule/bblock/BubbleBlockRuleDriver.java @@ -155,7 +155,6 @@ public class BubbleBlockRuleDriver extends TrafficAnalyticsRuleDriver implements partiallyBlockedDomains.set(newBlockList.getPartiallyBlockedDomains()); } - log.warn("refreshBlockLists: rejectDomains="+StringUtil.toString(rejectDomains.get())); log.debug("refreshBlockLists: rejectDomains="+rejectDomains.get().size()); log.debug("refreshBlockLists: fullyBlockedDomains="+fullyBlockedDomains.get().size()); log.debug("refreshBlockLists: partiallyBlockedDomains="+partiallyBlockedDomains.get().size()); diff --git a/bubble-server/src/main/java/bubble/service/block/BlockStatsService.java b/bubble-server/src/main/java/bubble/service/block/BlockStatsService.java index c584f481..acd0d101 100644 --- a/bubble-server/src/main/java/bubble/service/block/BlockStatsService.java +++ b/bubble-server/src/main/java/bubble/service/block/BlockStatsService.java @@ -33,7 +33,7 @@ public class BlockStatsService { private final String[] EXCLUDE_FQDNS = { "detectportal.firefox.com", "push.services.mozilla.com", "spocs.getpocket.com", "img-getpocket.cdn.mozilla.net", - "incoming.telemetry.mozilla.org" + "incoming.telemetry.mozilla.org", "safebrowsing.googleapis.com" }; public void flush () { records.clear(); } diff --git a/utils/abp-parser b/utils/abp-parser index dfd4343c..0517f384 160000 --- a/utils/abp-parser +++ b/utils/abp-parser @@ -1 +1 @@ -Subproject commit dfd4343c60457223697c6c27ec9caaa7ec6b729d +Subproject commit 0517f384af6f8d22fc82f30a613547525282747f