From 68d39132c5c614579017b540ed719b6bce96fa58 Mon Sep 17 00:00:00 2001 From: "kyrylo.bilchenko" Date: Tue, 27 Aug 2019 12:17:02 +0200 Subject: [PATCH 1/2] Fix header injection for rest module and promote version --- README.md | 2 +- browsermob-core/pom.xml | 2 +- .../java/net/lightbody/bmp/util/BrowserMobHttpUtil.java | 3 ++- browsermob-dist/pom.xml | 2 +- browsermob-legacy/pom.xml | 2 +- .../net/lightbody/bmp/proxy/http/BrowserMobHttpClient.java | 3 ++- browsermob-rest/pom.xml | 2 +- .../java/net/lightbody/bmp/proxy/bricks/ProxyResource.java | 6 ++++-- mitm/pom.xml | 2 +- pom.xml | 2 +- 10 files changed, 15 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 4f5498196..eab0d2a57 100644 --- a/README.md +++ b/README.md @@ -396,7 +396,7 @@ When you build the latest code from source, you'll have access to the latest sna net.lightbody.bmp browsermob-core - 2.1.34-SNAPSHOT + 2.1.34 test ``` diff --git a/browsermob-core/pom.xml b/browsermob-core/pom.xml index cc592b185..40e842a9a 100644 --- a/browsermob-core/pom.xml +++ b/browsermob-core/pom.xml @@ -6,7 +6,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.34-SNAPSHOT + 2.1.34 4.0.0 diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/util/BrowserMobHttpUtil.java b/browsermob-core/src/main/java/net/lightbody/bmp/util/BrowserMobHttpUtil.java index 282bf61b4..e8986680a 100644 --- a/browsermob-core/src/main/java/net/lightbody/bmp/util/BrowserMobHttpUtil.java +++ b/browsermob-core/src/main/java/net/lightbody/bmp/util/BrowserMobHttpUtil.java @@ -171,7 +171,8 @@ public static boolean hasTextualContent(String contentType) { contentType.startsWith("application/javascript") || contentType.startsWith("application/json") || contentType.startsWith("application/xml") || - contentType.startsWith("application/xhtml+xml") + contentType.startsWith("application/xhtml+xml") || + (contentType.startsWith("application/") && contentType.endsWith("+json")) ); } diff --git a/browsermob-dist/pom.xml b/browsermob-dist/pom.xml index 8af98bc62..7181593eb 100644 --- a/browsermob-dist/pom.xml +++ b/browsermob-dist/pom.xml @@ -4,7 +4,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.34-SNAPSHOT + 2.1.34 4.0.0 diff --git a/browsermob-legacy/pom.xml b/browsermob-legacy/pom.xml index 8bdce882e..a8c61e327 100644 --- a/browsermob-legacy/pom.xml +++ b/browsermob-legacy/pom.xml @@ -6,7 +6,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.34-SNAPSHOT + 2.1.34 4.0.0 diff --git a/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpClient.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpClient.java index 1191e164e..62c56d8d7 100644 --- a/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpClient.java +++ b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpClient.java @@ -1100,7 +1100,8 @@ private boolean hasTextualContent(String contentType) { contentType.startsWith("application/javascript") || contentType.startsWith("application/json") || contentType.startsWith("application/xml") || - contentType.startsWith("application/xhtml+xml"); + contentType.startsWith("application/xhtml+xml") || + (contentType.startsWith("application/") && contentType.endsWith("+json")); } private void setBinaryContentOfEntry(HarEntry entry, ByteArrayOutputStream copy) { diff --git a/browsermob-rest/pom.xml b/browsermob-rest/pom.xml index 42c0adb20..d815a596d 100644 --- a/browsermob-rest/pom.xml +++ b/browsermob-rest/pom.xml @@ -5,7 +5,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.34-SNAPSHOT + 2.1.34 4.0.0 diff --git a/browsermob-rest/src/main/java/net/lightbody/bmp/proxy/bricks/ProxyResource.java b/browsermob-rest/src/main/java/net/lightbody/bmp/proxy/bricks/ProxyResource.java index d92c988dd..0737ef602 100644 --- a/browsermob-rest/src/main/java/net/lightbody/bmp/proxy/bricks/ProxyResource.java +++ b/browsermob-rest/src/main/java/net/lightbody/bmp/proxy/bricks/ProxyResource.java @@ -273,11 +273,13 @@ public Reply updateHeaders(@Named("port") int port, Request request) Map mappedJsonRequest = request.read(Map.class).as(Json.class); mappedJsonRequest.entrySet().stream() - .filter(stringStringEntry -> stringStringEntry.getKey().equalsIgnoreCase("headersFilterRegexp")) + .filter(stringStringEntry -> !stringStringEntry.getKey().equalsIgnoreCase("headersFilterRegexp")) .forEach(stringStringEntry -> proxy.addHeader(stringStringEntry.getKey(), stringStringEntry.getValue())); mappedJsonRequest.entrySet().stream().filter(stringStringEntry -> - stringStringEntry.getKey().equalsIgnoreCase("headersFilterRegexp") && StringUtils.isNotEmpty(stringStringEntry.getValue())).findFirst().ifPresent(stringStringEntry -> proxy.headerFilterRegexp(stringStringEntry.getValue())); + stringStringEntry.getKey().equalsIgnoreCase("headersFilterRegexp") + && StringUtils.isNotEmpty(stringStringEntry.getValue())).findFirst() + .ifPresent(stringStringEntry -> proxy.headerFilterRegexp(stringStringEntry.getValue())); return Reply.saying().ok(); } diff --git a/mitm/pom.xml b/mitm/pom.xml index 6694724c0..0770fb119 100644 --- a/mitm/pom.xml +++ b/mitm/pom.xml @@ -4,7 +4,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.34-SNAPSHOT + 2.1.34 4.0.0 diff --git a/pom.xml b/pom.xml index bf15854e3..aa66036f0 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 net.lightbody.bmp browsermob-proxy - 2.1.34-SNAPSHOT + 2.1.34 browsermob-core browsermob-legacy From c4d4ba30ad383286e3fe13a72f55d1f3822430d9 Mon Sep 17 00:00:00 2001 From: "kyrylo.bilchenko" Date: Tue, 27 Aug 2019 12:32:32 +0200 Subject: [PATCH 2/2] Snapshot version bump --- README.md | 2 +- browsermob-core/pom.xml | 2 +- browsermob-dist/pom.xml | 2 +- browsermob-legacy/pom.xml | 2 +- browsermob-rest/pom.xml | 2 +- mitm/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index eab0d2a57..72774a7c3 100644 --- a/README.md +++ b/README.md @@ -396,7 +396,7 @@ When you build the latest code from source, you'll have access to the latest sna net.lightbody.bmp browsermob-core - 2.1.34 + 2.1.35-SNAPSHOT test ``` diff --git a/browsermob-core/pom.xml b/browsermob-core/pom.xml index 40e842a9a..9b2a51d45 100644 --- a/browsermob-core/pom.xml +++ b/browsermob-core/pom.xml @@ -6,7 +6,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.34 + 2.1.35-SNAPSHOT 4.0.0 diff --git a/browsermob-dist/pom.xml b/browsermob-dist/pom.xml index 7181593eb..fd0dd4f52 100644 --- a/browsermob-dist/pom.xml +++ b/browsermob-dist/pom.xml @@ -4,7 +4,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.34 + 2.1.35-SNAPSHOT 4.0.0 diff --git a/browsermob-legacy/pom.xml b/browsermob-legacy/pom.xml index a8c61e327..4581348de 100644 --- a/browsermob-legacy/pom.xml +++ b/browsermob-legacy/pom.xml @@ -6,7 +6,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.34 + 2.1.35-SNAPSHOT 4.0.0 diff --git a/browsermob-rest/pom.xml b/browsermob-rest/pom.xml index d815a596d..7e1647a07 100644 --- a/browsermob-rest/pom.xml +++ b/browsermob-rest/pom.xml @@ -5,7 +5,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.34 + 2.1.35-SNAPSHOT 4.0.0 diff --git a/mitm/pom.xml b/mitm/pom.xml index 0770fb119..01af63138 100644 --- a/mitm/pom.xml +++ b/mitm/pom.xml @@ -4,7 +4,7 @@ browsermob-proxy net.lightbody.bmp - 2.1.34 + 2.1.35-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index aa66036f0..792751b5a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 net.lightbody.bmp browsermob-proxy - 2.1.34 + 2.1.35-SNAPSHOT browsermob-core browsermob-legacy