Skip to content

core: Validate trust domain names in SPIFFE bundle map files #13167

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

Open
hidingmyname wants to merge 1 commit into
base: master
Choose a base branch
from
Open

core: Validate trust domain names in SPIFFE bundle map files #13167

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
1 change: 1 addition & 0 deletions core/src/main/java/io/grpc/internal/SpiffeUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ public static SpiffeBundle loadTrustBundleFromFile(String trustBundleFile) throw
Map<String, List<X509Certificate>> trustBundleMap = new HashMap<>();
Map<String, Long> sequenceNumbers = new HashMap<>();
for (String trustDomainName : trustDomainsNode.keySet()) {
validateTrustDomain(trustDomainName);
Map<String, ?> domainNode = JsonUtil.getObject(trustDomainsNode, trustDomainName);
if (domainNode.size() == 0) {
trustBundleMap.put(trustDomainName, Collections.emptyList());
Expand Down
16 changes: 16 additions & 0 deletions core/src/test/java/io/grpc/internal/SpiffeUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
import java.security.cert.X509Certificate;
import java.util.Arrays;
import java.util.Collection;
Expand Down Expand Up @@ -419,6 +420,21 @@ public void loadTrustBundleFromFileFailureTest() {
+ DOMAIN_ERROR_MESSAGE, iae.getMessage());
}

@Test
public void loadTrustBundleFromFileInvalidTrustDomainTest() throws Exception {
for (String trustDomain : new String[] {"invalid#character", "UPPER.example.com"}) {
File bundleFile = tempFolder.newFile();
try (OutputStream fileStream = new FileOutputStream(bundleFile)) {
fileStream.write(("{\"trust_domains\": {\"" + trustDomain + "\": {}}}")
.getBytes(StandardCharsets.UTF_8));
}
IllegalArgumentException iae = assertThrows(IllegalArgumentException.class,
() -> SpiffeUtil.loadTrustBundleFromFile(bundleFile.toString()));
assertEquals("Trust Domain must contain only letters, numbers, dots, dashes, and "
+ "underscores ([a-z0-9.-_])", iae.getMessage());
}
}

@Test
public void loadTrustBundleFromFileParameterValidityTest() {
NullPointerException npe = assertThrows(NullPointerException.class, () -> SpiffeUtil
Expand Down
Loading