Skip to content

Avoid log binary response #524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonesbusy merged 1 commit into from
Feb 7, 2026
Merged

Avoid log binary response #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/main/java/land/oras/Registry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/land/oras/auth/HttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}",
Expand Down
17 changes: 17 additions & 0 deletions src/test/java/land/oras/PublicAzureCRITCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {

Expand Down Expand Up @@ -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"));
}
}
28 changes: 27 additions & 1 deletion src/test/java/land/oras/QuayIoITCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
}
}