|
|
@@ -35,8 +35,8 @@ import java.util.concurrent.atomic.AtomicReference; |
|
|
|
|
|
|
|
import static bubble.service.stream.HttpStreamDebug.getLogFqdn; |
|
|
|
import static java.util.concurrent.TimeUnit.DAYS; |
|
|
|
import static org.cobbzilla.util.daemon.ZillaRuntime.*; |
|
|
|
import static org.cobbzilla.util.http.HttpContentTypes.isHtml; |
|
|
|
import static org.cobbzilla.util.daemon.ZillaRuntime.empty; |
|
|
|
import static org.cobbzilla.util.daemon.ZillaRuntime.shortError; |
|
|
|
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; |
|
|
@@ -65,7 +65,7 @@ public class BubbleBlockRuleDriver extends TrafficAnalyticsRuleDriver implements |
|
|
|
|
|
|
|
@Override public boolean couldModify(FilterHttpRequest request) { |
|
|
|
final BubbleBlockConfig config = getRuleConfig(); |
|
|
|
return (config.inPageBlocks() || showStats()) && isHtml(request.getContentType()); |
|
|
|
return request.isHtml() && request.isBrowser() && (config.inPageBlocks() || showStats()); |
|
|
|
} |
|
|
|
|
|
|
|
@Override public void init(JsonNode config, |
|
|
@@ -332,7 +332,7 @@ public class BubbleBlockRuleDriver extends TrafficAnalyticsRuleDriver implements |
|
|
|
return EMPTY_STREAM; |
|
|
|
} |
|
|
|
|
|
|
|
if (!isHtml(contentType)) { |
|
|
|
if (!filterRequest.isHtml()) { |
|
|
|
log.warn(prefix+"cannot request non-html response ("+request.getUrl()+"), returning as-is: "+contentType); |
|
|
|
if (log.isInfoEnabled()) log.info(prefix+"SEND: unfiltered response (non-html content-type) for "+request.getUrl()); |
|
|
|
return in; |
|
|
|