瀏覽代碼

fix reject list construction

tags/v0.17.0
Jonathan Cobb 4 年之前
父節點
當前提交
e5dd40fa0c
共有 4 個文件被更改,包括 4 次插入5 次删除
  1. +2
    -2
      bubble-server/src/main/java/bubble/rule/AppRuleDriver.java
  2. +0
    -1
      bubble-server/src/main/java/bubble/rule/bblock/BubbleBlockRuleDriver.java
  3. +1
    -1
      bubble-server/src/main/java/bubble/service/block/BlockStatsService.java
  4. +1
    -1
      utils/abp-parser

+ 2
- 2
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";



+ 0
- 1
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());


+ 1
- 1
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(); }


+ 1
- 1
utils/abp-parser

@@ -1 +1 @@
Subproject commit dfd4343c60457223697c6c27ec9caaa7ec6b729d
Subproject commit 0517f384af6f8d22fc82f30a613547525282747f

Loading…
取消
儲存