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

test if cacertsPath exists #622

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

test if cacertsPath exists #622

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52daaaf
test if cacertsPath exists
carlotafuro Jan 21, 2025
8762974
Merge pull request #1 from carlotafuro/carlotafuro-patch-truststore_java
carlotafuro Jan 21, 2025
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
11 changes: 9 additions & 2 deletions truststore_java.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ import (
)

var (
hasJava bool
hasKeytool bool
hasJava bool
hasKeytool bool
hasCAcertsPath bool

javaHome string
cacertsPath string
Expand All @@ -45,10 +46,12 @@ func init() {
}

if pathExists(filepath.Join(v, "lib", "security", "cacerts")) {
hasCAcertsPath = true
cacertsPath = filepath.Join(v, "lib", "security", "cacerts")
}

if pathExists(filepath.Join(v, "jre", "lib", "security", "cacerts")) {
hasCAcertsPath = true
cacertsPath = filepath.Join(v, "jre", "lib", "security", "cacerts")
}
}
Expand All @@ -59,6 +62,10 @@ func (m *mkcert) checkJava() bool {
return false
}

if !hasCAcertsPath {
return false
}

// exists returns true if the given x509.Certificate's fingerprint
// is in the keytool -list output
exists := func(c *x509.Certificate, h hash.Hash, keytoolOutput []byte) bool {
Expand Down