actions/gpg
1
0
Fork 0
mirror of https://github.com/crazy-max/ghaction-import-gpg.git synced 2024-11-22 21:10:58 -05:00
Code Issues Projects Releases Packages Wiki Activity

fix: ensure gitCommitterEmail uses correct action input (#67)

Browse source
This commit is contained in:
Xunnamius 2020-11-24 06:03:54 -06:00 committed by GitHub
parent 1802bb73ed
commit cef50da2f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
dist/index.js generated vendored
View file

@ -48,7 +48,7 @@ function getInputs() {
gitTagGpgsign: /true/i.test(core.getInput('git-tag-gpgsign')), gitTagGpgsign: /true/i.test(core.getInput('git-tag-gpgsign')),
gitPushGpgsign: /true/i.test(core.getInput('git-push-gpgsign')), gitPushGpgsign: /true/i.test(core.getInput('git-push-gpgsign')),
gitCommitterName: core.getInput('git-committer-name'), gitCommitterName: core.getInput('git-committer-name'),
gitCommitterEmail: core.getInput('git-committer-name'), gitCommitterEmail: core.getInput('git-committer-email'),
workdir: core.getInput('workdir') || '.' workdir: core.getInput('workdir') || '.'
}; };
}); });
@ -94,7 +94,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
Object.defineProperty(exports, "__esModule", ({ value: true })); Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.exec = void 0; exports.exec = void 0;
const actionsExec = __importStar(__webpack_require__(514)); const actionsExec = __importStar(__webpack_require__(514));
exports.exec = (command, args = [], silent) => __awaiter(void 0, void 0, void 0, function* () { const exec = (command, args = [], silent) => __awaiter(void 0, void 0, void 0, function* () {
let stdout = ''; let stdout = '';
let stderr = ''; let stderr = '';
const options = { const options = {
@ -116,6 +116,7 @@ exports.exec = (command, args = [], silent) => __awaiter(void 0, void 0, void 0,
stderr: stderr.trim() stderr: stderr.trim()
}; };
}); });
exports.exec = exec;
//# sourceMappingURL=exec.js.map //# sourceMappingURL=exec.js.map
/***/ }), /***/ }),
@ -240,7 +241,7 @@ const gpgConnectAgent = (command) => __awaiter(void 0, void 0, void 0, function*
return res.stdout.trim(); return res.stdout.trim();
}); });
}); });
exports.getVersion = () => __awaiter(void 0, void 0, void 0, function* () { const getVersion = () => __awaiter(void 0, void 0, void 0, function* () {
return yield exec.exec('gpg', ['--version'], true).then(res => { return yield exec.exec('gpg', ['--version'], true).then(res => {
if (res.stderr != '') { if (res.stderr != '') {
throw new Error(res.stderr); throw new Error(res.stderr);
@ -264,7 +265,8 @@ exports.getVersion = () => __awaiter(void 0, void 0, void 0, function* () {
}; };
}); });
}); });
exports.getDirs = () => __awaiter(void 0, void 0, void 0, function* () { exports.getVersion = getVersion;
const getDirs = () => __awaiter(void 0, void 0, void 0, function* () {
return yield exec.exec('gpgconf', ['--list-dirs'], true).then(res => { return yield exec.exec('gpgconf', ['--list-dirs'], true).then(res => {
if (res.stderr != '' && !res.success) { if (res.stderr != '' && !res.success) {
throw new Error(res.stderr); throw new Error(res.stderr);
@ -295,7 +297,8 @@ exports.getDirs = () => __awaiter(void 0, void 0, void 0, function* () {
}; };
}); });
}); });
exports.importKey = (key) => __awaiter(void 0, void 0, void 0, function* () { exports.getDirs = getDirs;
const importKey = (key) => __awaiter(void 0, void 0, void 0, function* () {
const keyFolder = fs.mkdtempSync(path.join(os.tmpdir(), 'ghaction-import-gpg-')); const keyFolder = fs.mkdtempSync(path.join(os.tmpdir(), 'ghaction-import-gpg-'));
const keyPath = `${keyFolder}/key.pgp`; const keyPath = `${keyFolder}/key.pgp`;
fs.writeFileSync(keyPath, (yield openpgp.isArmored(key)) ? key : Buffer.from(key, 'base64').toString(), { mode: 0o600 }); fs.writeFileSync(keyPath, (yield openpgp.isArmored(key)) ? key : Buffer.from(key, 'base64').toString(), { mode: 0o600 });
@ -314,7 +317,8 @@ exports.importKey = (key) => __awaiter(void 0, void 0, void 0, function* () {
fs.unlinkSync(keyPath); fs.unlinkSync(keyPath);
}); });
}); });
exports.getKeygrips = (fingerprint) => __awaiter(void 0, void 0, void 0, function* () { exports.importKey = importKey;
const getKeygrips = (fingerprint) => __awaiter(void 0, void 0, void 0, function* () {
return yield exec.exec('gpg', ['--batch', '--with-colons', '--with-keygrip', '--list-secret-keys', fingerprint], true).then(res => { return yield exec.exec('gpg', ['--batch', '--with-colons', '--with-keygrip', '--list-secret-keys', fingerprint], true).then(res => {
if (res.stderr != '' && !res.success) { if (res.stderr != '' && !res.success) {
throw new Error(res.stderr); throw new Error(res.stderr);
@ -328,7 +332,8 @@ exports.getKeygrips = (fingerprint) => __awaiter(void 0, void 0, void 0, functio
return keygrips; return keygrips;
}); });
}); });
exports.configureAgent = (config) => __awaiter(void 0, void 0, void 0, function* () { exports.getKeygrips = getKeygrips;
const configureAgent = (config) => __awaiter(void 0, void 0, void 0, function* () {
const gpgAgentConf = path.join(yield getGnupgHome(), 'gpg-agent.conf'); const gpgAgentConf = path.join(yield getGnupgHome(), 'gpg-agent.conf');
yield fs.writeFile(gpgAgentConf, config, function (err) { yield fs.writeFile(gpgAgentConf, config, function (err) {
if (err) if (err)
@ -336,12 +341,14 @@ exports.configureAgent = (config) => __awaiter(void 0, void 0, void 0, function*
}); });
yield gpgConnectAgent('RELOADAGENT'); yield gpgConnectAgent('RELOADAGENT');
}); });
exports.presetPassphrase = (keygrip, passphrase) => __awaiter(void 0, void 0, void 0, function* () { exports.configureAgent = configureAgent;
const presetPassphrase = (keygrip, passphrase) => __awaiter(void 0, void 0, void 0, function* () {
const hexPassphrase = Buffer.from(passphrase, 'utf8').toString('hex').toUpperCase(); const hexPassphrase = Buffer.from(passphrase, 'utf8').toString('hex').toUpperCase();
yield gpgConnectAgent(`PRESET_PASSPHRASE ${keygrip} -1 ${hexPassphrase}`); yield gpgConnectAgent(`PRESET_PASSPHRASE ${keygrip} -1 ${hexPassphrase}`);
return yield gpgConnectAgent(`KEYINFO ${keygrip}`); return yield gpgConnectAgent(`KEYINFO ${keygrip}`);
}); });
exports.deleteKey = (fingerprint) => __awaiter(void 0, void 0, void 0, function* () { exports.presetPassphrase = presetPassphrase;
const deleteKey = (fingerprint) => __awaiter(void 0, void 0, void 0, function* () {
yield exec.exec('gpg', ['--batch', '--yes', '--delete-secret-keys', fingerprint], true).then(res => { yield exec.exec('gpg', ['--batch', '--yes', '--delete-secret-keys', fingerprint], true).then(res => {
if (res.stderr != '' && !res.success) { if (res.stderr != '' && !res.success) {
throw new Error(res.stderr); throw new Error(res.stderr);
@ -353,9 +360,11 @@ exports.deleteKey = (fingerprint) => __awaiter(void 0, void 0, void 0, function*
} }
}); });
}); });
exports.killAgent = () => __awaiter(void 0, void 0, void 0, function* () { exports.deleteKey = deleteKey;
const killAgent = () => __awaiter(void 0, void 0, void 0, function* () {
yield gpgConnectAgent('KILLAGENT'); yield gpgConnectAgent('KILLAGENT');
}); });
exports.killAgent = killAgent;
//# sourceMappingURL=gpg.js.map //# sourceMappingURL=gpg.js.map
/***/ }), /***/ }),
@ -450,7 +459,7 @@ function run() {
const userEmail = inputs.gitCommitterEmail || privateKey.email; const userEmail = inputs.gitCommitterEmail || privateKey.email;
const userName = inputs.gitCommitterName || privateKey.name; const userName = inputs.gitCommitterName || privateKey.name;
if (userEmail != privateKey.email) { if (userEmail != privateKey.email) {
core.setFailed('Committer email does not match GPG key user address'); core.setFailed(`Committer email "${inputs.gitCommitterEmail}" (name: "${inputs.gitCommitterName}") does not match GPG private key email "${privateKey.email}" (name: "${privateKey.name}")`);
return; return;
} }
core.info(`🔨 Configuring Git committer (${userName} <${userEmail}>)`); core.info(`🔨 Configuring Git committer (${userName} <${userEmail}>)`);
@ -543,7 +552,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.isArmored = exports.generateKeyPair = exports.readPrivateKey = void 0; exports.isArmored = exports.generateKeyPair = exports.readPrivateKey = void 0;
const openpgp = __importStar(__webpack_require__(144)); const openpgp = __importStar(__webpack_require__(144));
const addressparser_1 = __importDefault(__webpack_require__(764)); const addressparser_1 = __importDefault(__webpack_require__(764));
exports.readPrivateKey = (key) => __awaiter(void 0, void 0, void 0, function* () { const readPrivateKey = (key) => __awaiter(void 0, void 0, void 0, function* () {
const { keys: [privateKey], err: err } = yield openpgp.key.readArmored((yield exports.isArmored(key)) ? key : Buffer.from(key, 'base64').toString()); const { keys: [privateKey], err: err } = yield openpgp.key.readArmored((yield exports.isArmored(key)) ? key : Buffer.from(key, 'base64').toString());
if (err === null || err === void 0 ? void 0 : err.length) { if (err === null || err === void 0 ? void 0 : err.length) {
throw err[0]; throw err[0];
@ -562,7 +571,8 @@ exports.readPrivateKey = (key) => __awaiter(void 0, void 0, void 0, function* ()
creationTime: privateKey.getCreationTime() creationTime: privateKey.getCreationTime()
}; };
}); });
exports.generateKeyPair = (name, email, passphrase, numBits = 4096) => __awaiter(void 0, void 0, void 0, function* () { exports.readPrivateKey = readPrivateKey;
const generateKeyPair = (name, email, passphrase, numBits = 4096) => __awaiter(void 0, void 0, void 0, function* () {
const keyPair = yield openpgp.generateKey({ const keyPair = yield openpgp.generateKey({
userIds: [{ name: name, email: email }], userIds: [{ name: name, email: email }],
numBits, numBits,
@ -573,9 +583,11 @@ exports.generateKeyPair = (name, email, passphrase, numBits = 4096) => __awaiter
privateKey: keyPair.privateKeyArmored.replace(/\r\n/g, '\n').trim() privateKey: keyPair.privateKeyArmored.replace(/\r\n/g, '\n').trim()
}; };
}); });
exports.isArmored = (text) => __awaiter(void 0, void 0, void 0, function* () { exports.generateKeyPair = generateKeyPair;
const isArmored = (text) => __awaiter(void 0, void 0, void 0, function* () {
return text.trimLeft().startsWith('---'); return text.trimLeft().startsWith('---');
}); });
exports.isArmored = isArmored;
//# sourceMappingURL=openpgp.js.map //# sourceMappingURL=openpgp.js.map
/***/ }), /***/ }),

2
src/context.ts
View file

@ -21,7 +21,7 @@ export async function getInputs(): Promise<Inputs> {
gitTagGpgsign: /true/i.test(core.getInput('git-tag-gpgsign')), gitTagGpgsign: /true/i.test(core.getInput('git-tag-gpgsign')),
gitPushGpgsign: /true/i.test(core.getInput('git-push-gpgsign')), gitPushGpgsign: /true/i.test(core.getInput('git-push-gpgsign')),
gitCommitterName: core.getInput('git-committer-name'), gitCommitterName: core.getInput('git-committer-name'),
gitCommitterEmail: core.getInput('git-committer-name'), gitCommitterEmail: core.getInput('git-committer-email'),
workdir: core.getInput('workdir') || '.' workdir: core.getInput('workdir') || '.'
}; };
} }

2
src/main.ts
View file

@ -64,7 +64,7 @@ async function run(): Promise<void> {
const userName = inputs.gitCommitterName || privateKey.name; const userName = inputs.gitCommitterName || privateKey.name;
if (userEmail != privateKey.email) { if (userEmail != privateKey.email) {
core.setFailed('Committer email does not match GPG key user address'); core.setFailed(`Committer email "${inputs.gitCommitterEmail}" (name: "${inputs.gitCommitterName}") does not match GPG private key email "${privateKey.email}" (name: "${privateKey.name}")`);
return; return;
} }