-
Notifications
You must be signed in to change notification settings - Fork 5
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.
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
Support adding CA Certificates #1
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
4c7df91
Code to add ca certs
CRogers 0684112
Test for CA cert
CRogers 20a072e
Add generated changelog entries
svc-changelog 286c846
Merge branch 'develop' of github.com:palantir/gradle-jdks into callum…
CRogers 2ed4e8d
Fix build
CRogers 8c10819
Merge branch 'develop' of github.com:palantir/gradle-jdks into callum…
CRogers 06de32c
Fix test
CRogers f3cc670
format
CRogers d128df8
Abandon files
CRogers 25bc1f4
SortedMap -> NavigableMap
CRogers File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
type: feature | ||
feature: | ||
description: Provide a way to add CA certs to all installed JDKs. | ||
links: | ||
- https://github.com/palantir/gradle-jdks/pull/1 |
50 changes: 50 additions & 0 deletions
50
gradle-jdks/src/main/java/com/palantir/gradle/jdks/CaCerts.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
/* | ||
* (c) Copyright 2022 Palantir Technologies Inc. All rights reserved. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package com.palantir.gradle.jdks; | ||
|
||
import java.util.Comparator; | ||
import java.util.Map; | ||
import java.util.NavigableMap; | ||
import java.util.TreeMap; | ||
import org.immutables.value.Value; | ||
|
||
@Value.Immutable | ||
interface CaCerts { | ||
NavigableMap<String, String> caCerts(); | ||
|
||
default String combinedInSortedOrder() { | ||
StringBuilder stringBuilder = new StringBuilder(); | ||
|
||
caCerts().forEach((alias, caCert) -> { | ||
stringBuilder.append(alias).append(": ").append(caCert).append('\n'); | ||
}); | ||
|
||
return stringBuilder.toString(); | ||
} | ||
|
||
class Builder extends ImmutableCaCerts.Builder {} | ||
|
||
static Builder builder() { | ||
return new Builder(); | ||
} | ||
|
||
static CaCerts from(Map<String, String> caCerts) { | ||
NavigableMap<String, String> sortedMap = new TreeMap<>(Comparator.naturalOrder()); | ||
sortedMap.putAll(caCerts); | ||
return builder().caCerts(sortedMap).build(); | ||
} | ||
} |
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
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
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, given two projects which use azul-17 x86_64, what happens if both projects specify completely different certificates? Do we need to include the certificates in our cache key? I'm not sure that we should mutate the jvm in a potentially leaky way such that tests pass on project B only if you've run project A first.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I made the CA certificates configurable at the root level/all jdks level, so all the jdks will have the same CA certs.misread what you wroteThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Certificates are included in the cache key:
gradle-jdks/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdkSpec.java
Lines 35 to 40 in 8c10819
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah fantastic, I missed that in the block above :-)