From bc21d8d8ad2979a1713738bb631728b169ee2183 Mon Sep 17 00:00:00 2001 From: Kristijan Mitrovic Date: Tue, 22 Sep 2020 12:03:49 +0200 Subject: [PATCH] Add back request heades modifiers as prime app --- .../service/stream/StandardAppPrimerService.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/bubble-server/src/main/java/bubble/service/stream/StandardAppPrimerService.java b/bubble-server/src/main/java/bubble/service/stream/StandardAppPrimerService.java index 6f3d6066..f7d0e8a4 100644 --- a/bubble-server/src/main/java/bubble/service/stream/StandardAppPrimerService.java +++ b/bubble-server/src/main/java/bubble/service/stream/StandardAppPrimerService.java @@ -177,6 +177,7 @@ public class StandardAppPrimerService implements AppPrimerService { final Set whiteListDomains = new HashSet<>(); final Set filterDomains = new HashSet<>(); final Set flexExcludeDomains = new HashSet<>(); + final Set requestHeaderModifiers = new HashSet<>(); boolean areAllSetsEmpty = true; for (AppMatcher matcher : matchers) { @@ -218,6 +219,16 @@ public class StandardAppPrimerService implements AppPrimerService { areAllSetsEmpty = areAllSetsEmpty && empty(filters); } + final Set modifiers = appRuleDriver.getPrimedResponseHeaderModifiers(); + if (empty(modifiers)) { + log.debug("_primeApp: no responseHeaderModifiers for device/app/rule/matcher: " + + device.getName() + "/" + app.getName() + "/" + rule.getName() + "/" + + matcher.getName()); + } else { + requestHeaderModifiers.addAll(modifiers); + areAllSetsEmpty = areAllSetsEmpty && empty(modifiers); + } + if (account.isFirstAdmin() && flexDomains == null) { final Set flexes = appRuleDriver.getPrimedFlexDomains(); if (empty(flexes)) { @@ -261,6 +272,11 @@ public class StandardAppPrimerService implements AppPrimerService { AppRuleDriver.defineRedisFilterSet(redis, ip, app.getName() + ":" + app.getUuid(), filterDomains.toArray(String[]::new)); } + if (!empty(requestHeaderModifiers)) { + AppRuleDriver.defineRedisResponseHeaderModifiersSet( + redis, ip, app.getName() + ":" + app.getUuid(), + requestHeaderModifiers.toArray(String[]::new)); + } if (account.isFirstAdmin()) { if (!empty(flexDomains)) { if (!empty(flexExcludeDomains)) flexDomains.removeAll(flexExcludeDomains);