safely truncate

jgilfelt · Feb 22, 2017 · 75da679 · 75da679
1 parent 2977e36
commit 75da679
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/library/src/main/java/com/readystatesoftware/chuck/ChuckInterceptor.java b/library/src/main/java/com/readystatesoftware/chuck/ChuckInterceptor.java
@@ -18,6 +18,7 @@
 import android.content.ContentValues;
 import android.content.Context;
 import android.net.Uri;
+import android.util.Log;
 
 import com.readystatesoftware.chuck.internal.data.ChuckContentProvider;
 import com.readystatesoftware.chuck.internal.data.HttpTransaction;
@@ -69,6 +70,7 @@ public enum Period {
         FOREVER
     }
 
+    private static final String LOG_TAG = "ChuckInterceptor";
     private static final Period DEFAULT_RETENTION = Period.ONE_WEEK;
     private static final Charset UTF8 = Charset.forName("UTF-8");
 
@@ -145,11 +147,10 @@ public ChuckInterceptor retainDataFor(Period period) {
             }
         }
 
-        transaction.setRequestBodyIsPlainText(!bodyEncoded(request.headers()));
+        transaction.setRequestBodyIsPlainText(!bodyHasUnsupportedEncoding(request.headers()));
         if (hasRequestBody && transaction.requestBodyIsPlainText()) {
             BufferedSource source = getNativeSource(new Buffer(), bodyGzipped(request.headers()));
             Buffer buffer = source.buffer();
-            //Buffer buffer = new Buffer();
             requestBody.writeTo(buffer);
             Charset charset = UTF8;
             MediaType contentType = requestBody.contentType();
@@ -191,10 +192,9 @@ public ChuckInterceptor retainDataFor(Period period) {
         }
         transaction.setResponseHeaders(response.headers());
 
-        transaction.setResponseBodyIsPlainText(!bodyEncoded(response.headers()));
+        transaction.setResponseBodyIsPlainText(!bodyHasUnsupportedEncoding(response.headers()));
         if (HttpHeaders.hasBody(response) && transaction.responseBodyIsPlainText()) {
-            BufferedSource source = getNativeSource(response, bodyGzipped(response.headers()));
-            //BufferedSource source = responseBody.source();
+            BufferedSource source = getNativeSource(response);
             source.request(Long.MAX_VALUE);
             Buffer buffer = source.buffer();
             Charset charset = UTF8;
@@ -264,7 +264,7 @@ private boolean isPlaintext(Buffer buffer) {
         }
     }
 
-    private boolean bodyEncoded(Headers headers) {
+    private boolean bodyHasUnsupportedEncoding(Headers headers) {
         String contentEncoding = headers.get("Content-Encoding");
         return contentEncoding != null &&
                 !contentEncoding.equalsIgnoreCase("identity") &&
@@ -300,11 +300,15 @@ private BufferedSource getNativeSource(BufferedSource input, boolean isGzipped)
         }
     }
 
-    private BufferedSource getNativeSource(Response response, boolean isGzipped) throws IOException {
-        if (isGzipped) {
-            return getNativeSource(response.peekBody(maxContentLength).source(), true);
-        } else {
-            return response.body().source();
+    private BufferedSource getNativeSource(Response response) throws IOException {
+        if (bodyGzipped(response.headers())) {
+            BufferedSource source = response.peekBody(maxContentLength).source();
+            if (source.buffer().size() < maxContentLength) {
+                return getNativeSource(source, true);
+            } else {
+                Log.w(LOG_TAG, "gzip encoded response was too long");
+            }
         }
+        return response.body().source();
     }
 }
diff --git a/sample/src/main/java/com/readystatesoftware/chuck/sample/MainActivity.java b/sample/src/main/java/com/readystatesoftware/chuck/sample/MainActivity.java
@@ -52,7 +52,7 @@ public void onClick(View view) {
     private OkHttpClient getClient(Context context) {
         return new OkHttpClient.Builder()
                 // Add a ChuckInterceptor instance to your OkHttp client
-                .addNetworkInterceptor(new ChuckInterceptor(context))
+                .addInterceptor(new ChuckInterceptor(context))
                 .addInterceptor(new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY))
                 .build();
     }