From 5e14451515a096d0651f0d7c35f53c68e2e86126 Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Fri, 31 Jan 2020 13:46:18 -0500 Subject: [PATCH] use json regex quoting, use compact json representation --- .../src/main/java/bubble/rule/bblock/BubbleBlock.java | 3 ++- utils/abp-parser | 2 +- utils/cobbzilla-utils | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bubble-server/src/main/java/bubble/rule/bblock/BubbleBlock.java b/bubble-server/src/main/java/bubble/rule/bblock/BubbleBlock.java index a8f233d9..3ba4eae7 100644 --- a/bubble-server/src/main/java/bubble/rule/bblock/BubbleBlock.java +++ b/bubble-server/src/main/java/bubble/rule/bblock/BubbleBlock.java @@ -33,6 +33,7 @@ import java.util.concurrent.TimeUnit; import static org.cobbzilla.util.daemon.ZillaRuntime.*; import static org.cobbzilla.util.io.StreamUtil.stream2string; +import static org.cobbzilla.util.json.JsonUtil.COMPACT_MAPPER; import static org.cobbzilla.util.json.JsonUtil.json; import static org.cobbzilla.util.security.ShaUtil.sha256_hex; import static org.cobbzilla.util.string.StringUtil.UTF8cs; @@ -105,7 +106,7 @@ public class BubbleBlock extends TrafficAnalytics { } else { return new FilterMatchResponse() .setDecision(FilterMatchDecision.match) - .setMeta(new NameAndValue[]{new NameAndValue(META_BLOCK_FILTERS, json(specs))}); + .setMeta(new NameAndValue[]{new NameAndValue(META_BLOCK_FILTERS, json(specs, COMPACT_MAPPER))}); } } return die("getFilterMatchResponse: invalid decisionType: "+decision.getDecisionType()); diff --git a/utils/abp-parser b/utils/abp-parser index 801d5bbf..76b5b8b2 160000 --- a/utils/abp-parser +++ b/utils/abp-parser @@ -1 +1 @@ -Subproject commit 801d5bbf6f4327a407f8af8e7d7788302f348639 +Subproject commit 76b5b8b26a95cb1c66512af83b4c9b585544afeb diff --git a/utils/cobbzilla-utils b/utils/cobbzilla-utils index cf3d35b3..d1d7639d 160000 --- a/utils/cobbzilla-utils +++ b/utils/cobbzilla-utils @@ -1 +1 @@ -Subproject commit cf3d35b3f6dbb2bd3a1b31abb2c1ded41aa15378 +Subproject commit d1d7639d04a9ea8db82022b3a72382b8e3d0a5da