Avoid log binary response (#524)

Author: jonesbusy

src/main/java/land/oras/Registry.java

@@ -734,9 +734,13 @@ private void handleError(HttpClient.ResponseWrapper<?> responseWrapper) {
     private void logResponse(HttpClient.ResponseWrapper<?> response) {
         LOG.debug("Status Code: {}", response.statusCode());
         LOG.debug("Headers: {}", response.headers());
+        String contentType = response.headers().get(Const.CONTENT_TYPE_HEADER.toLowerCase());
+        boolean isBinaryResponse = contentType != null && contentType.contains("octet-stream");
         // Only log non-binary responses
-        if (response.response() instanceof String) {
+        if (response.response() instanceof String && !isBinaryResponse) {
             LOG.debug("Response: {}", response.response());
+        } else {
+            LOG.debug("Not logging binary response of content type: {}", contentType);
         }
     }
 

src/main/java/land/oras/auth/HttpClient.java

@@ -391,9 +391,9 @@ public <T> TokenResponse refreshToken(
                 "Response: {}",
                 responseWrapper
                         .response()
-                        .replaceAll("\"token\"\\s*:\\s*\"([A-Za-z0-9\\-_\\.]+)\"", "\"token\":\"<redacted>\"")
+                        .replaceAll("\"token\"\\s*:\\s*\"([A-Za-z0-9\\-_\\.=]+)\"", "\"token\":\"<redacted>\"")
                         .replaceAll(
-                                "\"access_token\"\\s*:\\s*\"([A-Za-z0-9\\-_\\.]+)\"",
+                                "\"access_token\"\\s*:\\s*\"([A-Za-z0-9\\-_\\.=]+)\"",
                                 "\"access_token\":\"<redacted>\""));
         LOG.debug(
                 "Headers: {}",

src/test/java/land/oras/PublicAzureCRITCase.java

@@ -22,13 +22,19 @@
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import java.io.IOException;
+import java.nio.file.Path;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 
 @Execution(ExecutionMode.CONCURRENT)
 class PublicAzureCRITCase {
 
+    @TempDir
+    private Path tempDir;
+
     @Test
     void shouldPullAnonymousIndex() {
 
@@ -57,4 +63,15 @@ void shouldPullAnonymousManifest() {
         Manifest manifest1 = registry.getManifest(containerRef1);
         assertNotNull(manifest1);
     }
+
+    @Test
+    void shouldPullOneBlob() throws IOException {
+        Registry registry = Registry.builder().build();
+        ContainerRef containerRef1 = ContainerRef.parse(
+                "mcr.microsoft.com/azurelinux/busybox@sha256:ec5adfc87f57633da1feedb2361c06374020ab9c99d4a14b19319e57284b6656");
+        Manifest manifest = registry.getManifest(containerRef1);
+        Layer oneLayer = manifest.getLayers().get(0);
+        registry.fetchBlob(containerRef1.withDigest(oneLayer.getDigest()), tempDir.resolve("my-blob"));
+        assertNotNull(tempDir.resolve("my-blob"));
+    }
 }

src/test/java/land/oras/QuayIoITCase.java

@@ -22,15 +22,41 @@
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import java.io.IOException;
+import java.nio.file.Path;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 class QuayIoITCase {
 
+    @TempDir
+    private Path tempDir;
+
     @Test
-    void shouldPull() {
+    void shouldPullIndex() {
         Registry registry = Registry.builder().build();
         ContainerRef containerRef1 = ContainerRef.parse("quay.io/openshift/origin-cli:latest");
         Index index = registry.getIndex(containerRef1);
         assertNotNull(index);
     }
+
+    @Test
+    void shouldPullManifest() {
+        Registry registry = Registry.builder().build();
+        ContainerRef containerRef1 = ContainerRef.parse(
+                "quay.io/openshift/origin-cli@sha256:58b3680e6f8141829412f3010477ed84ebc73da65665dcde988e0b2a1276ae1f");
+        Manifest manifest = registry.getManifest(containerRef1);
+        assertNotNull(manifest);
+    }
+
+    @Test
+    void shouldPullOneBlob() throws IOException {
+        Registry registry = Registry.builder().build();
+        ContainerRef containerRef1 = ContainerRef.parse(
+                "quay.io/openshift/origin-cli@sha256:58b3680e6f8141829412f3010477ed84ebc73da65665dcde988e0b2a1276ae1f");
+        Manifest manifest = registry.getManifest(containerRef1);
+        Layer oneLayer = manifest.getLayers().get(0);
+        registry.fetchBlob(containerRef1.withDigest(oneLayer.getDigest()), tempDir.resolve("my-blob"));
+        assertNotNull(tempDir.resolve("my-blob"));
+    }
 }