actions/setup-java
2
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2025-10-30 22:10:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5 from Tradeshift/fix-already-existing-cert

Browse source 
Fix already existing cert
This commit is contained in:
Pavel Gonchukov 2021-04-13 13:51:22 +02:00 • committed by GitHub
commit 0ddd7a4320
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
dist/setup/index.js generated vendored
View file

@ -11093,6 +11093,7 @@ function setupMaven(opts) {
const p12Path = path.join(certDir, 'certificate.p12');
fs.writeFileSync(p12Path, Buffer.from(opts.keystore, 'base64'));
core.exportVariable('MAVEN_OPTS', `-Djavax.net.ssl.keyStore=${p12Path} -Djavax.net.ssl.keyStoreType=pkcs12 -Djavax.net.ssl.keyStorePassword=${opts.password}`);
try {
yield exec.exec(path.join(opts.javaPath, 'bin/keytool'), [
'-importcert',
'-cacerts',
@ -11104,6 +11105,12 @@ function setupMaven(opts) {
'-file',
rooCaPath
]);
}
catch (e) {
if (!e.message.includes('already exists')) {
throw e;
}
}
core.debug(`added maven opts for MTLS access`);
});
}

6
src/maven.ts
View file

@ -65,6 +65,7 @@ export async function setupMaven(opts: MavenOpts): Promise<void> {
`-Djavax.net.ssl.keyStore=${p12Path} -Djavax.net.ssl.keyStoreType=pkcs12 -Djavax.net.ssl.keyStorePassword=${opts.password}`
);
try {
await exec.exec(path.join(opts.javaPath, 'bin/keytool'), [
'-importcert',
'-cacerts',
@ -76,6 +77,11 @@ export async function setupMaven(opts: MavenOpts): Promise<void> {
'-file',
rooCaPath
]);
} catch (e) {
if (!(e as Error).message.includes('already exists')) {
throw e;
}
}
core.debug(`added maven opts for MTLS access`);
}