Skip to content
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

Jump to bottom

Handle invalid base64 in SRI #23410

Closed
wants to merge 1 commit into from
Closed

Handle invalid base64 in SRI #23410

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
45 changes: 25 additions & 20 deletions src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/Checksum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ private InvalidChecksumException(KeyType keyType, String hash) {
private InvalidChecksumException(String msg) {
super(msg);
}

private InvalidChecksumException(String msg, Throwable cause) {
super(msg, cause);
}
}

/** Exception thrown to indicate that a checksum is missing. */
Expand Down Expand Up @@ -64,41 +68,42 @@ private static Checksum fromString(KeyType keyType, String hash, boolean useSubr
keyType, HashCode.fromString(Ascii.toLowerCase(hash)), useSubresourceIntegrity);
}

private static byte[] base64Decode(String data) throws InvalidChecksumException {
try {
return Base64.getDecoder().decode(data);
} catch (IllegalArgumentException e) {
throw new InvalidChecksumException("Invalid base64 '" + data + "'", e);
}
}

/** Constructs a new Checksum from a hash in Subresource Integrity format. */
public static Checksum fromSubresourceIntegrity(String integrity)
throws InvalidChecksumException {
Base64.Decoder decoder = Base64.getDecoder();
KeyType keyType = null;
byte[] hash = null;
int expectedLength = 0;
KeyType keyType;
byte[] hash;
int expectedLength;

if (integrity.startsWith("sha1-")) {
keyType = KeyType.SHA1;
expectedLength = 20;
hash = decoder.decode(integrity.substring(5));
}
if (integrity.startsWith("sha256-")) {
hash = base64Decode(integrity.substring(5));
} else if (integrity.startsWith("sha256-")) {
keyType = KeyType.SHA256;
expectedLength = 32;
hash = decoder.decode(integrity.substring(7));
}
if (integrity.startsWith("sha384-")) {
hash = base64Decode(integrity.substring(7));
} else if (integrity.startsWith("sha384-")) {
keyType = KeyType.SHA384;
expectedLength = 48;
hash = decoder.decode(integrity.substring(7));
}
if (integrity.startsWith("sha512-")) {
hash = base64Decode(integrity.substring(7));
} else if (integrity.startsWith("sha512-")) {
keyType = KeyType.SHA512;
expectedLength = 64;
hash = decoder.decode(integrity.substring(7));
}
if (integrity.startsWith("blake3-")) {
hash = base64Decode(integrity.substring(7));
} else if (integrity.startsWith("blake3-")) {
keyType = KeyType.BLAKE3;
expectedLength = 32;
hash = decoder.decode(integrity.substring(7));
}

if (keyType == null) {
hash = base64Decode(integrity.substring(7));
} else {
throw new InvalidChecksumException(
"Unsupported checksum algorithm: '"
+ integrity
Expand Down
14 changes: 14 additions & 0 deletions src/test/shell/bazel/external_integration_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1326,6 +1326,20 @@ EOF
shutdown_server
}

function test_integrity_ill_formed_base64() {
cat > $(setup_module_dot_bazel) <<EOF
http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
http_archive(
name = "repo",
integrity = "sha256-Yab3Yqr2BlLL8zKHm43MLP2BviEpoGHalX0Dnq538L=",
url = "file:///dev/null",
)
EOF
bazel build @repo//... &> $TEST_log 2>&1 && fail "Expected to fail"
expect_log "Invalid base64 'Yab3Yqr2BlLL8zKHm43MLP2BviEpoGHalX0Dnq538L='"
shutdown_server
}

function test_same_name() {
mkdir ext
echo foo> ext/foo
Expand Down
Loading