Update littleproxy-1.1.7.jar (#35)

* Update littleproxy-1.1.7.jar

* typo

* Update dependencies and capture filter

* Update code formatting

* Use ubuntu 18.04

Author: kirillbilchenko

.travis.yml

@@ -1,11 +1,8 @@
 sudo: false
 
 language: java
-dist: trusty
+dist: bionic
 jdk:
-    # Not running tests against openjdk7, since the SunEC is not included in travis-ci's version of openjdk7.
-    # Not running tests against oraclejdk7, since travis-ci no longer provides it.
-    # - openjdk7
   - openjdk11
 
 cache:

README.md

@@ -396,7 +396,7 @@ When you build the latest code from source, you'll have access to the latest sna
     <dependency>
         <groupId>net.lightbody.bmp</groupId>
         <artifactId>browsermob-core</artifactId>
-        <version>2.1.37</version>
+        <version2.1.38</version>
         <scope>test</scope>
     </dependency>
 ```

browsermob-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.37</version>
+        <version>2.1.38</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -69,12 +69,6 @@
             <artifactId>jackson-core</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.fluentd</groupId>
-            <artifactId>fluent-logger</artifactId>
-        </dependency>
-
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -269,5 +263,9 @@
             <artifactId>httpclient</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+        </dependency>
     </dependencies>
 </project>

browsermob-core/src/main/java/net/lightbody/bmp/filters/HarCaptureFilter.java

@@ -6,28 +6,48 @@
 import com.timgroup.statsd.StatsDClient;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.http.*;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaderValues;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpObject;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.handler.codec.http.QueryStringDecoder;
 import io.netty.handler.codec.http.cookie.ClientCookieDecoder;
 import io.netty.handler.codec.http.cookie.Cookie;
 import io.netty.handler.codec.http.cookie.ServerCookieDecoder;
-import net.lightbody.bmp.core.har.*;
+import net.lightbody.bmp.core.har.Har;
+import net.lightbody.bmp.core.har.HarCookie;
+import net.lightbody.bmp.core.har.HarEntry;
+import net.lightbody.bmp.core.har.HarNameValuePair;
+import net.lightbody.bmp.core.har.HarPostData;
+import net.lightbody.bmp.core.har.HarPostDataParam;
+import net.lightbody.bmp.core.har.HarRequest;
+import net.lightbody.bmp.core.har.HarResponse;
 import net.lightbody.bmp.exception.UnsupportedCharsetException;
 import net.lightbody.bmp.filters.support.HttpConnectTiming;
 import net.lightbody.bmp.filters.util.HarCaptureUtil;
 import net.lightbody.bmp.proxy.CaptureType;
 import net.lightbody.bmp.util.BeansJsonMapper;
 import net.lightbody.bmp.util.BrowserMobHttpUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.fluentd.logger.FluentLogger;
 import org.littleshoot.proxy.impl.ProxyUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -38,15 +58,8 @@
 
 public class HarCaptureFilter extends HttpsAwareFiltersAdapter {
     private static final Logger log = LoggerFactory.getLogger(HarCaptureFilter.class);
-    private static FluentLogger LOG;
     private static final InheritableThreadLocal<HarRequest> isAlreadyLoggedIn = new InheritableThreadLocal<>();
 
-    static {
-        if (StringUtils.isNotEmpty(System.getProperty("fluentdHost")) || StringUtils.isNotEmpty(System.getProperty("fluentdPort"))) {
-            LOG = FluentLogger.getLogger("mobproxy", System.getProperty("fluentdHost"), Integer.parseInt(System.getProperty("fluentdPort")));
-        }
-    }
-
     /**
      * The currently active HAR at the time the current request is received.
      */
@@ -780,17 +793,16 @@ public void serverToProxyResponseReceived() {
     }
 
     protected static void logFailedRequestIfRequired(HarRequest request, HarResponse response) {
-        if (Objects.nonNull(LOG) &&
-                (Objects.isNull(isAlreadyLoggedIn.get()) || isAlreadyLoggedIn.get().hashCode() != request.hashCode())
+        if ((Objects.isNull(isAlreadyLoggedIn.get()) ||
+                isAlreadyLoggedIn.get().hashCode() != request.hashCode())
                 && (response.getStatus() >= 500 || response.getStatus() == 0)) {
-            Map<String, Object> data = new HashMap<String, Object>();
-            data.put("caller", "mobproxy");
-            data.put("http_response_code", String.valueOf(response.getStatus()));
-            data.put("http_host", request.getUrl());
-            data.put("request_details", BeansJsonMapper.getJsonString(request));
-            data.put("method", request.getMethod());
-            data.put("response", BeansJsonMapper.getJsonString(response));
-            LOG.log("failure", data);
+            MDC.put("caller", "mobproxy");
+            MDC.put("http_response_code", String.valueOf(response.getStatus()));
+            MDC.put("http_host", request.getUrl());
+            MDC.put("request_details", BeansJsonMapper.getJsonString(request));
+            MDC.put("method", request.getMethod());
+            MDC.put("response", BeansJsonMapper.getJsonString(response));
+            log.error("received bad status code");
             isAlreadyLoggedIn.set(request);
         }
     }

browsermob-dist/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.37</version>
+        <version>2.1.38</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -45,11 +45,6 @@
             <artifactId>logstash-gelf</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.fluentd</groupId>
-            <artifactId>fluent-logger</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>

browsermob-legacy/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.37</version>
+        <version>2.1.38</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

browsermob-rest/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.37</version>
+        <version>2.1.38</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mitm/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.37</version>
+        <version>2.1.38</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.lightbody.bmp</groupId>
     <artifactId>browsermob-proxy</artifactId>
-    <version>2.1.37</version>
+    <version>2.1.38</version>
     <modules>
         <module>browsermob-core</module>
         <module>browsermob-legacy</module>
@@ -177,11 +177,11 @@
                             <inherited>false</inherited>
                             <phase>install</phase>
                             <configuration>
-                                <file>${basedir}/resources/jar/littleproxy-1.1.6.jar</file>
+                                <file>${basedir}/resources/jar/littleproxy-1.1.7.jar</file>
                                 <repositoryLayout>default</repositoryLayout>
                                 <groupId>org.littleshoot</groupId>
                                 <artifactId>littleproxy</artifactId>
-                                <version>1.1.6</version>
+                                <version>1.1.7</version>
                                 <packaging>jar</packaging>
                             </configuration>
                             <goals>
@@ -239,11 +239,6 @@
                 <version>${logstash-gelf.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.fluentd</groupId>
-                <artifactId>fluent-logger</artifactId>
-                <version>0.3.4</version>
-            </dependency>
 
             <dependency>
                 <groupId>com.google.guava</groupId>
@@ -315,7 +310,7 @@
             <dependency>
                 <groupId>org.littleshoot</groupId>
                 <artifactId>littleproxy</artifactId>
-                <version>1.1.6</version>
+                <version>1.1.7</version>
             </dependency>