mirror
/
s3proxy
kopia lustrzana https://github.com/gaul/s3proxy
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Enforce correct MD5 hash in transient-nio2 putBlob 

Found via s3-tests.  References #697.
pull/733/head
Andrew Gaul 2024-11-23 17:40:27 -08:00
rodzic fc0f31fc01
commit 6b63abb6b6
1 zmienionych plików z 8 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
src/main/java/org/gaul/s3proxy/nio2blob/Nio2BlobStore.java
Wyświetl plik

@ -527,12 +527,17 @@ public final class Nio2BlobStore extends BaseBlobStore {
try (var is = new HashingInputStream(Hashing.md5(), blob.getPayload().openStream());
var os = Files.newOutputStream(tmpPath)) {
var count = is.transferTo(os);
var hashCode = is.hash();
var actualHashCode = is.hash();
var expectedHashCode = metadata.getContentMD5AsHashCode();
if (expectedHashCode != null && !actualHashCode.equals(expectedHashCode)) {
Files.delete(tmpPath);
throw returnResponseException(400);
}
var view = Files.getFileAttributeView(tmpPath, UserDefinedFileAttributeView.class);
if (view != null) {
try {
var eTag = hashCode.asBytes();
var eTag = actualHashCode.asBytes();
view.write(XATTR_CONTENT_MD5, ByteBuffer.wrap(eTag));
writeStringAttributeIfPresent(view, XATTR_CACHE_CONTROL, metadata.getCacheControl());
writeStringAttributeIfPresent(view, XATTR_CONTENT_DISPOSITION, metadata.getContentDisposition());
@ -557,7 +562,7 @@ public final class Nio2BlobStore extends BaseBlobStore {
Files.move(tmpPath, path, StandardCopyOption.ATOMIC_MOVE, StandardCopyOption.REPLACE_EXISTING);
return "\"" + hashCode + "\"";
return "\"" + actualHashCode + "\"";
} catch (IOException ioe) {
throw new RuntimeException(ioe);
}