Skip to content

Commit

Permalink
include object name & version in log for r2 hash length mismatch
Browse files Browse the repository at this point in the history
  • Loading branch information
Frederik-Baetens committed Jun 10, 2024
1 parent 5182a67 commit 36ba6b3
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions src/workerd/api/r2-bucket.c++
Original file line number Diff line number Diff line change
Expand Up @@ -116,39 +116,44 @@ static jsg::Ref<T> parseObjectMetadata(R2HeadResponse::Reader responseReader,
auto md5 = checksumsBuilder.getMd5();
if (md5.size() != 16) {
KJ_LOG(WARNING, "NOSENTRY MD5 checksum is not 16 bytes long",
md5.size(), md5.asBytes());
md5.size(), md5.asBytes(),
responseReader.getName(), responseReader.getVersion());
}
checksums->md5 = kj::heapArray(md5);
}
if (checksumsBuilder.hasSha1()) {
auto sha1 = checksumsBuilder.getSha1();
if (sha1.size() != 20) {
KJ_LOG(WARNING, "NOSENTRY SHA-1 checksum is not 20 bytes long",
sha1.size(), sha1.asBytes());
sha1.size(), sha1.asBytes(),
responseReader.getName(), responseReader.getVersion());
}
checksums->sha1 = kj::heapArray(sha1);
}
if (checksumsBuilder.hasSha256()) {
auto sha256 = checksumsBuilder.getSha256();
if (sha256.size() != 32) {
KJ_LOG(WARNING, "NOSENTRY SHA-256 checksum is not 32 bytes long",
sha256.size(), sha256.asBytes());
sha256.size(), sha256.asBytes(),
responseReader.getName(), responseReader.getVersion());
}
checksums->sha256 = kj::heapArray(sha256);
}
if (checksumsBuilder.hasSha384()) {
auto sha384 = checksumsBuilder.getSha384();
if (sha384.size() != 48) {
KJ_LOG(WARNING, "NOSENTRY SHA-384 checksum is not 48 bytes long",
sha384.size(), sha384.asBytes());
sha384.size(), sha384.asBytes(),
responseReader.getName(), responseReader.getVersion());
}
checksums->sha384 = kj::heapArray(sha384);
}
if (checksumsBuilder.hasSha512()) {
auto sha512 = checksumsBuilder.getSha512();
if (sha512.size() != 64) {
KJ_LOG(WARNING, "NOSENTRY SHA-512 checksum is not 64 bytes long",
sha512.size(), sha512.asBytes());
sha512.size(), sha512.asBytes(),
responseReader.getName(), responseReader.getVersion());
}
checksums->sha512 = kj::heapArray(sha512);
}
Expand Down

0 comments on commit 36ba6b3

Please sign in to comment.