Gitea_Action/setup-java
1
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2025-05-21 18:01:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed a problem where key cleanup happened before import

Browse Source
This commit is contained in:
Jared Petersen 2020-05-02 20:10:16 -07:00
parent e09c5c7b0c
commit 1a5aa64e84
4 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
__tests__/.gpgtmp/private.asc Normal file
View File

@ -0,0 +1 @@
KEY CONTENTS

18
__tests__/auth.test.ts
View File

@ -22,8 +22,8 @@ import * as auth from '../src/auth';
const env = process.env; const env = process.env;
const m2Dir = path.join(__dirname, auth.M2_DIR); const m2Dir = path.join(__dirname, auth.M2_DIR);
const settingsFile = path.join(m2Dir, auth.SETTINGS_FILE); const settingsFile = path.join(m2Dir, auth.SETTINGS_FILE);
const gpgDir = path.join(__dirname, auth.GPG_DIR); const privateKeyDir = path.join(__dirname, auth.PRIVATE_KEY_DIR);
const gpgFile = auth.GPG_FILE; const privateKeyFile = auth.PRIVATE_KEY_FILE;
describe('auth tests', () => { describe('auth tests', () => {
beforeEach(async () => { beforeEach(async () => {
@ -33,7 +33,7 @@ describe('auth tests', () => {
afterAll(async () => { afterAll(async () => {
try { try {
await io.rmRF(m2Dir); await io.rmRF(m2Dir);
await io.rmRF(gpgDir); await io.rmRF(privateKeyDir);
} catch { } catch {
console.log('Failed to remove test directories'); console.log('Failed to remove test directories');
} }
@ -182,11 +182,11 @@ describe('auth tests', () => {
expect(exec.exec).toHaveBeenCalledWith( expect(exec.exec).toHaveBeenCalledWith(
'gpg', 'gpg',
['--import', '--batch', gpgFile], ['--import', '--batch', privateKeyFile],
{cwd: gpgDir} {cwd: privateKeyDir}
); );
expect(fs.existsSync(gpgDir)).toBe(false); expect(fs.existsSync(privateKeyDir)).toBe(false);
}, 100000); }, 100000);
it('does not import gpg private key when private key is not set', async () => { it('does not import gpg private key when private key is not set', async () => {
@ -198,10 +198,10 @@ describe('auth tests', () => {
expect(exec.exec).not.toHaveBeenCalledWith( expect(exec.exec).not.toHaveBeenCalledWith(
'gpg', 'gpg',
['--import', '--batch', gpgFile], ['--import', '--batch', privateKeyFile],
{cwd: gpgDir} {cwd: privateKeyDir}
); );
expect(fs.existsSync(gpgDir)).toBe(false); expect(fs.existsSync(privateKeyDir)).toBe(false);
}, 100000); }, 100000);
}); });

BIN
dist/index.js generated vendored
View File

Binary file not shown.

29
src/auth.ts
View File

@ -7,8 +7,8 @@ import * as exec from '@actions/exec';
export const M2_DIR = '.m2'; export const M2_DIR = '.m2';
export const SETTINGS_FILE = 'settings.xml'; export const SETTINGS_FILE = 'settings.xml';
export const GPG_DIR = '.gpgtmp'; export const PRIVATE_KEY_DIR = '.keys';
export const GPG_FILE = 'private.asc'; export const PRIVATE_KEY_FILE = 'private-key.asc';
export const DEFAULT_ID = 'github'; export const DEFAULT_ID = 'github';
export const DEFAULT_USERNAME = 'GITHUB_ACTOR'; export const DEFAULT_USERNAME = 'GITHUB_ACTOR';
@ -46,13 +46,15 @@ export async function configAuthentication(
if (gpgPrivateKey !== DEFAULT_GPG_PRIVATE_KEY) { if (gpgPrivateKey !== DEFAULT_GPG_PRIVATE_KEY) {
console.log('importing gpg key'); console.log('importing gpg key');
const gpgDirectory: string = path.join(os.homedir(), GPG_DIR); const privateKeyDirectory: string = path.join(
await io.mkdirP(gpgDirectory); os.homedir(),
core.debug(`created directory ${gpgDirectory}`); PRIVATE_KEY_DIR
await write(gpgDirectory, GPG_FILE, gpgPrivateKey); );
await importGpgKey(gpgDirectory, GPG_FILE); await io.mkdirP(privateKeyDirectory);
await io.rmRF(gpgDirectory); core.debug(`created directory ${privateKeyDirectory}`);
core.debug(`removed directory ${gpgDirectory}`); await write(privateKeyDirectory, PRIVATE_KEY_FILE, gpgPrivateKey);
await importGpgKey(privateKeyDirectory, PRIVATE_KEY_FILE);
await remove(privateKeyDirectory);
} }
} }
@ -109,6 +111,11 @@ async function write(directory: string, file: string, contents: string) {
}); });
} }
async function importGpgKey(directory: string, file: string) { async function remove(path: string) {
exec.exec('gpg', ['--import', '--batch', file], {cwd: directory}); console.log(`removing ${path}`);
return io.rmRF(path);
}
async function importGpgKey(directory: string, file: string) {
return exec.exec('gpg', ['--import', '--batch', file], {cwd: directory});
} }