actions/setup-java
2
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2025-04-20 18:06:45 +00:00
Code Issues Projects Releases Packages 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 43 additions and 30 deletions
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 m2Dir = path.join(__dirname, auth.M2_DIR);
const settingsFile = path.join(m2Dir, auth.SETTINGS_FILE);
const gpgDir = path.join(__dirname, auth.GPG_DIR);
const gpgFile = auth.GPG_FILE;
const privateKeyDir = path.join(__dirname, auth.PRIVATE_KEY_DIR);
const privateKeyFile = auth.PRIVATE_KEY_FILE;
describe('auth tests', () => {
beforeEach(async () => {
@ -33,7 +33,7 @@ describe('auth tests', () => {
afterAll(async () => {
try {
await io.rmRF(m2Dir);
await io.rmRF(gpgDir);
await io.rmRF(privateKeyDir);
} catch {
console.log('Failed to remove test directories');
}
@ -182,11 +182,11 @@ describe('auth tests', () => {
expect(exec.exec).toHaveBeenCalledWith(
'gpg',
['--import', '--batch', gpgFile],
{cwd: gpgDir}
['--import', '--batch', privateKeyFile],
{cwd: privateKeyDir}
);
expect(fs.existsSync(gpgDir)).toBe(false);
expect(fs.existsSync(privateKeyDir)).toBe(false);
}, 100000);
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(
'gpg',
['--import', '--batch', gpgFile],
{cwd: gpgDir}
['--import', '--batch', privateKeyFile],
{cwd: privateKeyDir}
);
expect(fs.existsSync(gpgDir)).toBe(false);
expect(fs.existsSync(privateKeyDir)).toBe(false);
}, 100000);
});

25
dist/index.js generated vendored
View file

@ -2882,8 +2882,8 @@ const io = __importStar(__webpack_require__(1));
const exec = __importStar(__webpack_require__(986));
exports.M2_DIR = '.m2';
exports.SETTINGS_FILE = 'settings.xml';
exports.GPG_DIR = '.gpgtmp';
exports.GPG_FILE = 'private.asc';
exports.PRIVATE_KEY_DIR = '.keys';
exports.PRIVATE_KEY_FILE = 'private-key.asc';
exports.DEFAULT_ID = 'github';
exports.DEFAULT_USERNAME = 'GITHUB_ACTOR';
exports.DEFAULT_PASSWORD = 'GITHUB_TOKEN';
@ -2900,13 +2900,12 @@ function configAuthentication(id = exports.DEFAULT_ID, username = exports.DEFAUL
yield write(settingsDirectory, exports.SETTINGS_FILE, generate(id, username, password, gpgPassphrase));
if (gpgPrivateKey !== exports.DEFAULT_GPG_PRIVATE_KEY) {
console.log('importing gpg key');
const gpgDirectory = path.join(os.homedir(), exports.GPG_DIR);
yield io.mkdirP(gpgDirectory);
core.debug(`created directory ${gpgDirectory}`);
yield write(gpgDirectory, exports.GPG_FILE, gpgPrivateKey);
yield importGpgKey(gpgDirectory, exports.GPG_FILE);
yield io.rmRF(gpgDirectory);
core.debug(`removed directory ${gpgDirectory}`);
const privateKeyDirectory = path.join(os.homedir(), exports.PRIVATE_KEY_DIR);
yield io.mkdirP(privateKeyDirectory);
core.debug(`created directory ${privateKeyDirectory}`);
yield write(privateKeyDirectory, exports.PRIVATE_KEY_FILE, gpgPrivateKey);
yield importGpgKey(privateKeyDirectory, exports.PRIVATE_KEY_FILE);
yield remove(privateKeyDirectory);
}
});
}
@ -2959,9 +2958,15 @@ function write(directory, file, contents) {
});
});
}
function remove(path) {
return __awaiter(this, void 0, void 0, function* () {
console.log(`removing ${path}`);
return io.rmRF(path);
});
}
function importGpgKey(directory, file) {
return __awaiter(this, void 0, void 0, function* () {
exec.exec('gpg', ['--import', '--batch', file], { cwd: directory });
return exec.exec('gpg', ['--import', '--batch', file], { cwd: directory });
});
}

29
src/auth.ts
View file

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