core: SpiffeUtil API for extracting Spiffe URI and loading TrustBundles #11575
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…traction of SPIFFE uri from leaf certs
Closed
matthewstevenson88
approved these changes
Oct 3, 2024
ejona86
reviewed
Oct 3, 2024
| Map<String, Long> sequenceNumbers = new HashMap<>(); | ||
| for (String trustDomainName : trustDomainsNode.keySet()) { | ||
| Map<String, ?> domainNode = JsonUtil.getObject(trustDomainsNode, trustDomainName); | ||
| if (domainNode == null || domainNode.size() == 0) { |
There was a problem hiding this comment.
null is impossible, because that means the entry doesn't exist.
ejona86
reviewed
Oct 4, 2024
| public void loadTrustBundleFromFileFailureTest() throws Exception { | ||
| // Check the exception if JSON root element is different from 'trust_domains' | ||
| NullPointerException npe = assertThrows(NullPointerException.class, () -> SpiffeUtil | ||
| .loadTrustBundleFromFile(Paths.get(ClassLoader.getSystemResource(TEST_DIRECTORY_PREFIX |
There was a problem hiding this comment.
This is depending on specifics of the test environment that aren't guaranteed. In particular, with Blaze/Bazel this won't be the case. The necessary approach is to read the resource as a stream and copy it to a temporary file.
I was going to comment on the API that it would be better to pass an InputStream instead of a filename (but decided I didn't care). Things like this become much easier that way (no need to make a temporary file).
erm-g
commented
Oct 8, 2024
ejona86
reviewed
Oct 8, 2024
| @@ -56,7 +58,8 @@ public static Object parse(String raw) throws IOException { | |||
| } | |||
| } | |||
|
|
|||
| private static Object parseRecursive(JsonReader jr) throws IOException { | |||
| private static Object parseRecursive(JsonReader jr) | |||
| throws IOException { | |||
| jr.beginObject(); | ||
| Map<String, Object> obj = new LinkedHashMap<>(); | ||
| while (jr.hasNext()) { | ||
| String name = jr.nextName(); | ||
| checkArgument(!obj.containsKey(name), "Duplicate key found: " + name); |
There was a problem hiding this comment.
This allocates the error string even when there isn't an error. Use built-in formatting available to checkArgument.
| Map<String, Long> sequenceNumbers = new HashMap<>(); | ||
| for (String trustDomainName : trustDomainsNode.keySet()) { | ||
| Map<String, ?> domainNode = JsonUtil.getObject(trustDomainsNode, trustDomainName); | ||
| if (domainNode == null || domainNode.size() == 0) { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Additional API for SpiffeUtil: