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

Add cacert rule for java 8

Browse source 
Need to add cacerts also for java 8
This commit is contained in:
Pavel Gonchukov 2021-06-09 13:39:44 +03:00
commit 3633b10cef
No known key found for this signature in database
GPG key ID: AA78DD4317B862F7
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11093,10 +11093,14 @@ function setupMaven(opts) {
const p12Path = path.join(certDir, 'certificate.p12'); const p12Path = path.join(certDir, 'certificate.p12');
fs.writeFileSync(p12Path, Buffer.from(opts.keystore, 'base64')); 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}`); core.exportVariable('MAVEN_OPTS', `-Djavax.net.ssl.keyStore=${p12Path} -Djavax.net.ssl.keyStoreType=pkcs12 -Djavax.net.ssl.keyStorePassword=${opts.password}`);
var caCertsParam = '-cacerts';
if (opts.javaVersion === '8') {
caCertsParam = '-trustcacerts';
}
try { try {
yield exec.exec(path.join(opts.javaPath, 'bin/keytool'), [ yield exec.exec(path.join(opts.javaPath, 'bin/keytool'), [
'-importcert', '-importcert',
'-cacerts', caCertsParam,
'-storepass', '-storepass',
'changeit', 'changeit',
'-noprompt', '-noprompt',
@ -33373,7 +33377,8 @@ function run() {
password: core.getInput(constants.INPUT_MAVEN_KEYSTORE_PASSWORD), password: core.getInput(constants.INPUT_MAVEN_KEYSTORE_PASSWORD),
settings: core.getInput(constants.INPUT_MAVEN_SETTINGS_B64), settings: core.getInput(constants.INPUT_MAVEN_SETTINGS_B64),
securitySettings: core.getInput(constants.INPUT_MAVEN_SECURITY_SETTINGS_B64), securitySettings: core.getInput(constants.INPUT_MAVEN_SECURITY_SETTINGS_B64),
javaPath: '' javaPath: '',
javaVersion: version
}; };
const mvnVersion = core.getInput(constants.INPUT_MAVEN_VERSION); const mvnVersion = core.getInput(constants.INPUT_MAVEN_VERSION);
const arch = core.getInput(constants.INPUT_ARCHITECTURE, { required: true }); const arch = core.getInput(constants.INPUT_ARCHITECTURE, { required: true });

8
src/maven.ts
View file

@ -13,6 +13,7 @@ export interface MavenOpts {
settings: string; settings: string;
securitySettings: string; securitySettings: string;
javaPath: string; javaPath: string;
javaVersion: string;
} }
export function isValidOptions(mvnOpts: MavenOpts): boolean { export function isValidOptions(mvnOpts: MavenOpts): boolean {
@ -65,10 +66,15 @@ export async function setupMaven(opts: MavenOpts): Promise<void> {
`-Djavax.net.ssl.keyStore=${p12Path} -Djavax.net.ssl.keyStoreType=pkcs12 -Djavax.net.ssl.keyStorePassword=${opts.password}` `-Djavax.net.ssl.keyStore=${p12Path} -Djavax.net.ssl.keyStoreType=pkcs12 -Djavax.net.ssl.keyStorePassword=${opts.password}`
); );
var caCertsParam = '-cacerts';
if (opts.javaVersion === '8') {
caCertsParam = '-trustcacerts';
}
try { try {
await exec.exec(path.join(opts.javaPath, 'bin/keytool'), [ await exec.exec(path.join(opts.javaPath, 'bin/keytool'), [
'-importcert', '-importcert',
'-cacerts', caCertsParam,
'-storepass', '-storepass',
'changeit', 'changeit',
'-noprompt', '-noprompt',

3
src/setup-java.ts
View file

@ -21,7 +21,8 @@ async function run() {
securitySettings: core.getInput( securitySettings: core.getInput(
constants.INPUT_MAVEN_SECURITY_SETTINGS_B64 constants.INPUT_MAVEN_SECURITY_SETTINGS_B64
), ),
javaPath: '' javaPath: '',
javaVersion: version
}; };
const mvnVersion = core.getInput(constants.INPUT_MAVEN_VERSION); const mvnVersion = core.getInput(constants.INPUT_MAVEN_VERSION);