2011-09-08 06:19:47 +02:00
|
|
|
#include "cache.h"
|
2017-06-14 20:07:36 +02:00
|
|
|
#include "config.h"
|
2011-09-08 06:19:47 +02:00
|
|
|
#include "run-command.h"
|
|
|
|
#include "strbuf.h"
|
|
|
|
#include "gpg-interface.h"
|
|
|
|
#include "sigchain.h"
|
2016-06-18 01:38:43 +02:00
|
|
|
#include "tempfile.h"
|
2011-09-08 06:19:47 +02:00
|
|
|
|
|
|
|
static char *configured_signing_key;
|
2018-07-17 14:50:09 +02:00
|
|
|
struct gpg_format {
|
|
|
|
const char *name;
|
|
|
|
const char *program;
|
|
|
|
const char **verify_args;
|
|
|
|
const char **sigs;
|
|
|
|
};
|
|
|
|
|
|
|
|
static const char *openpgp_verify_args[] = {
|
|
|
|
"--keyid-format=long",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
static const char *openpgp_sigs[] = {
|
|
|
|
"-----BEGIN PGP SIGNATURE-----",
|
|
|
|
"-----BEGIN PGP MESSAGE-----",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2018-07-17 14:50:12 +02:00
|
|
|
static const char *x509_verify_args[] = {
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
static const char *x509_sigs[] = {
|
|
|
|
"-----BEGIN SIGNED MESSAGE-----",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2018-07-17 14:50:09 +02:00
|
|
|
static struct gpg_format gpg_format[] = {
|
|
|
|
{ .name = "openpgp", .program = "gpg",
|
|
|
|
.verify_args = openpgp_verify_args,
|
|
|
|
.sigs = openpgp_sigs
|
|
|
|
},
|
2018-07-17 14:50:12 +02:00
|
|
|
{ .name = "x509", .program = "gpgsm",
|
|
|
|
.verify_args = x509_verify_args,
|
|
|
|
.sigs = x509_sigs
|
|
|
|
},
|
2018-07-17 14:50:09 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct gpg_format *use_format = &gpg_format[0];
|
2011-09-08 06:19:47 +02:00
|
|
|
|
2018-07-17 14:50:09 +02:00
|
|
|
static struct gpg_format *get_format_by_name(const char *str)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(gpg_format); i++)
|
|
|
|
if (!strcmp(gpg_format[i].name, str))
|
|
|
|
return gpg_format + i;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct gpg_format *get_format_by_sig(const char *sig)
|
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(gpg_format); i++)
|
|
|
|
for (j = 0; gpg_format[i].sigs[j]; j++)
|
|
|
|
if (starts_with(sig, gpg_format[i].sigs[j]))
|
|
|
|
return gpg_format + i;
|
|
|
|
return NULL;
|
|
|
|
}
|
2014-08-19 22:18:07 +02:00
|
|
|
|
2014-06-23 09:05:47 +02:00
|
|
|
void signature_check_clear(struct signature_check *sigc)
|
|
|
|
{
|
2017-06-16 01:15:49 +02:00
|
|
|
FREE_AND_NULL(sigc->payload);
|
|
|
|
FREE_AND_NULL(sigc->gpg_output);
|
|
|
|
FREE_AND_NULL(sigc->gpg_status);
|
|
|
|
FREE_AND_NULL(sigc->signer);
|
|
|
|
FREE_AND_NULL(sigc->key);
|
2018-10-22 18:38:20 +02:00
|
|
|
FREE_AND_NULL(sigc->fingerprint);
|
2018-10-22 18:38:21 +02:00
|
|
|
FREE_AND_NULL(sigc->primary_key_fingerprint);
|
2014-06-23 09:05:47 +02:00
|
|
|
}
|
|
|
|
|
2018-10-20 21:30:20 +02:00
|
|
|
/* An exclusive status -- only one of them can appear in output */
|
|
|
|
#define GPG_STATUS_EXCLUSIVE (1<<0)
|
2018-10-22 18:38:19 +02:00
|
|
|
/* The status includes key identifier */
|
|
|
|
#define GPG_STATUS_KEYID (1<<1)
|
|
|
|
/* The status includes user identifier */
|
|
|
|
#define GPG_STATUS_UID (1<<2)
|
2018-10-22 18:38:20 +02:00
|
|
|
/* The status includes key fingerprints */
|
|
|
|
#define GPG_STATUS_FINGERPRINT (1<<3)
|
2018-10-22 18:38:19 +02:00
|
|
|
|
|
|
|
/* Short-hand for standard exclusive *SIG status with keyid & UID */
|
|
|
|
#define GPG_STATUS_STDSIG (GPG_STATUS_EXCLUSIVE|GPG_STATUS_KEYID|GPG_STATUS_UID)
|
2018-10-20 21:30:20 +02:00
|
|
|
|
2014-08-15 00:31:13 +02:00
|
|
|
static struct {
|
|
|
|
char result;
|
|
|
|
const char *check;
|
2018-10-20 21:30:20 +02:00
|
|
|
unsigned int flags;
|
2014-08-15 00:31:13 +02:00
|
|
|
} sigcheck_gpg_status[] = {
|
2018-10-22 18:38:19 +02:00
|
|
|
{ 'G', "GOODSIG ", GPG_STATUS_STDSIG },
|
|
|
|
{ 'B', "BADSIG ", GPG_STATUS_STDSIG },
|
2018-10-20 21:30:20 +02:00
|
|
|
{ 'U', "TRUST_NEVER", 0 },
|
|
|
|
{ 'U', "TRUST_UNDEFINED", 0 },
|
2018-10-22 18:38:19 +02:00
|
|
|
{ 'E', "ERRSIG ", GPG_STATUS_EXCLUSIVE|GPG_STATUS_KEYID },
|
|
|
|
{ 'X', "EXPSIG ", GPG_STATUS_STDSIG },
|
|
|
|
{ 'Y', "EXPKEYSIG ", GPG_STATUS_STDSIG },
|
|
|
|
{ 'R', "REVKEYSIG ", GPG_STATUS_STDSIG },
|
2018-10-22 18:38:20 +02:00
|
|
|
{ 0, "VALIDSIG ", GPG_STATUS_FINGERPRINT },
|
2014-08-15 00:31:13 +02:00
|
|
|
};
|
|
|
|
|
2019-11-22 00:43:35 +01:00
|
|
|
static void replace_cstring(char **field, const char *line, const char *next)
|
|
|
|
{
|
|
|
|
free(*field);
|
|
|
|
|
|
|
|
if (line && next)
|
|
|
|
*field = xmemdupz(line, next - line);
|
|
|
|
else
|
|
|
|
*field = NULL;
|
|
|
|
}
|
|
|
|
|
2018-07-11 10:38:25 +02:00
|
|
|
static void parse_gpg_output(struct signature_check *sigc)
|
2014-08-15 00:31:13 +02:00
|
|
|
{
|
|
|
|
const char *buf = sigc->gpg_status;
|
2018-10-20 21:30:20 +02:00
|
|
|
const char *line, *next;
|
2018-10-22 18:38:21 +02:00
|
|
|
int i, j;
|
2018-10-20 21:30:20 +02:00
|
|
|
int seen_exclusive_status = 0;
|
|
|
|
|
|
|
|
/* Iterate over all lines */
|
|
|
|
for (line = buf; *line; line = strchrnul(line+1, '\n')) {
|
|
|
|
while (*line == '\n')
|
|
|
|
line++;
|
2019-07-16 20:47:37 +02:00
|
|
|
if (!*line)
|
|
|
|
break;
|
|
|
|
|
2018-10-20 21:30:20 +02:00
|
|
|
/* Skip lines that don't start with GNUPG status */
|
|
|
|
if (!skip_prefix(line, "[GNUPG:] ", &line))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Iterate over all search strings */
|
|
|
|
for (i = 0; i < ARRAY_SIZE(sigcheck_gpg_status); i++) {
|
|
|
|
if (skip_prefix(line, sigcheck_gpg_status[i].check, &line)) {
|
|
|
|
if (sigcheck_gpg_status[i].flags & GPG_STATUS_EXCLUSIVE) {
|
2018-11-02 16:53:57 +01:00
|
|
|
if (seen_exclusive_status++)
|
2018-10-20 21:30:20 +02:00
|
|
|
goto found_duplicate_status;
|
|
|
|
}
|
|
|
|
|
2018-10-22 18:38:20 +02:00
|
|
|
if (sigcheck_gpg_status[i].result)
|
|
|
|
sigc->result = sigcheck_gpg_status[i].result;
|
2018-10-22 18:38:19 +02:00
|
|
|
/* Do we have key information? */
|
|
|
|
if (sigcheck_gpg_status[i].flags & GPG_STATUS_KEYID) {
|
2018-10-20 21:30:20 +02:00
|
|
|
next = strchrnul(line, ' ');
|
2019-11-22 00:43:35 +01:00
|
|
|
replace_cstring(&sigc->key, line, next);
|
2018-10-22 18:38:19 +02:00
|
|
|
/* Do we have signer information? */
|
|
|
|
if (*next && (sigcheck_gpg_status[i].flags & GPG_STATUS_UID)) {
|
2018-10-20 21:30:20 +02:00
|
|
|
line = next + 1;
|
|
|
|
next = strchrnul(line, '\n');
|
2019-11-22 00:43:35 +01:00
|
|
|
replace_cstring(&sigc->signer, line, next);
|
2018-10-20 21:30:20 +02:00
|
|
|
}
|
|
|
|
}
|
2018-10-22 18:38:20 +02:00
|
|
|
/* Do we have fingerprint? */
|
|
|
|
if (sigcheck_gpg_status[i].flags & GPG_STATUS_FINGERPRINT) {
|
2019-11-22 21:23:12 +01:00
|
|
|
const char *limit;
|
|
|
|
char **field;
|
|
|
|
|
2018-10-22 18:38:20 +02:00
|
|
|
next = strchrnul(line, ' ');
|
2019-11-22 00:43:35 +01:00
|
|
|
replace_cstring(&sigc->fingerprint, line, next);
|
2018-10-22 18:38:21 +02:00
|
|
|
|
2019-11-22 21:23:12 +01:00
|
|
|
/*
|
|
|
|
* Skip interim fields. The search is
|
|
|
|
* limited to the same line since only
|
|
|
|
* OpenPGP signatures has a field with
|
|
|
|
* the primary fingerprint.
|
|
|
|
*/
|
|
|
|
limit = strchrnul(line, '\n');
|
2018-10-22 18:38:21 +02:00
|
|
|
for (j = 9; j > 0; j--) {
|
2019-11-22 21:23:12 +01:00
|
|
|
if (!*next || limit <= next)
|
2018-10-22 18:38:21 +02:00
|
|
|
break;
|
|
|
|
line = next + 1;
|
|
|
|
next = strchrnul(line, ' ');
|
|
|
|
}
|
|
|
|
|
2019-11-22 21:23:12 +01:00
|
|
|
field = &sigc->primary_key_fingerprint;
|
|
|
|
if (!j) {
|
|
|
|
next = strchrnul(line, '\n');
|
|
|
|
replace_cstring(field, line, next);
|
|
|
|
} else {
|
|
|
|
replace_cstring(field, NULL, NULL);
|
|
|
|
}
|
2018-10-22 18:38:20 +02:00
|
|
|
}
|
2018-10-20 21:30:20 +02:00
|
|
|
|
|
|
|
break;
|
gpg-interface: use more status letters
According to gpg2's doc/DETAILS:
For each signature only one of the codes GOODSIG, BADSIG,
EXPSIG, EXPKEYSIG, REVKEYSIG or ERRSIG will be emitted.
gpg1 ("classic") behaves the same (although doc/DETAILS differs).
Currently, we parse gpg's status output for GOODSIG, BADSIG and
trust information and translate that into status codes G, B, U, N
for the %G? format specifier.
git-verify-* returns success in the GOODSIG case only. This is
somewhat in disagreement with gpg, which considers the first 5 of
the 6 above as VALIDSIG, but we err on the very safe side.
Introduce additional status codes E, X, Y, R for ERRSIG, EXPSIG,
EXPKEYSIG, and REVKEYSIG so that a user of %G? gets more information
about the absence of a 'G' on first glance.
Requested-by: Alex <agrambot@gmail.com>
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-10-12 15:04:15 +02:00
|
|
|
}
|
2014-08-15 00:31:13 +02:00
|
|
|
}
|
|
|
|
}
|
2018-10-20 21:30:20 +02:00
|
|
|
return;
|
|
|
|
|
|
|
|
found_duplicate_status:
|
|
|
|
/*
|
|
|
|
* GOODSIG, BADSIG etc. can occur only once for each signature.
|
|
|
|
* Therefore, if we had more than one then we're dealing with multiple
|
|
|
|
* signatures. We don't support them currently, and they're rather
|
|
|
|
* hard to create, so something is likely fishy and we should reject
|
|
|
|
* them altogether.
|
|
|
|
*/
|
|
|
|
sigc->result = 'E';
|
|
|
|
/* Clear partial data to avoid confusion */
|
2018-10-22 18:38:21 +02:00
|
|
|
FREE_AND_NULL(sigc->primary_key_fingerprint);
|
2018-10-22 18:38:20 +02:00
|
|
|
FREE_AND_NULL(sigc->fingerprint);
|
2018-10-20 21:30:20 +02:00
|
|
|
FREE_AND_NULL(sigc->signer);
|
|
|
|
FREE_AND_NULL(sigc->key);
|
2014-08-15 00:31:13 +02:00
|
|
|
}
|
|
|
|
|
2019-11-27 18:48:21 +01:00
|
|
|
static int verify_signed_buffer(const char *payload, size_t payload_size,
|
|
|
|
const char *signature, size_t signature_size,
|
|
|
|
struct strbuf *gpg_output,
|
|
|
|
struct strbuf *gpg_status)
|
|
|
|
{
|
|
|
|
struct child_process gpg = CHILD_PROCESS_INIT;
|
|
|
|
struct gpg_format *fmt;
|
|
|
|
struct tempfile *temp;
|
|
|
|
int ret;
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
|
|
|
|
temp = mks_tempfile_t(".git_vtag_tmpXXXXXX");
|
|
|
|
if (!temp)
|
|
|
|
return error_errno(_("could not create temporary file"));
|
|
|
|
if (write_in_full(temp->fd, signature, signature_size) < 0 ||
|
|
|
|
close_tempfile_gently(temp) < 0) {
|
|
|
|
error_errno(_("failed writing detached signature to '%s'"),
|
|
|
|
temp->filename.buf);
|
|
|
|
delete_tempfile(&temp);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
fmt = get_format_by_sig(signature);
|
|
|
|
if (!fmt)
|
|
|
|
BUG("bad signature '%s'", signature);
|
|
|
|
|
|
|
|
argv_array_push(&gpg.args, fmt->program);
|
|
|
|
argv_array_pushv(&gpg.args, fmt->verify_args);
|
|
|
|
argv_array_pushl(&gpg.args,
|
|
|
|
"--status-fd=1",
|
|
|
|
"--verify", temp->filename.buf, "-",
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
if (!gpg_status)
|
|
|
|
gpg_status = &buf;
|
|
|
|
|
|
|
|
sigchain_push(SIGPIPE, SIG_IGN);
|
|
|
|
ret = pipe_command(&gpg, payload, payload_size,
|
|
|
|
gpg_status, 0, gpg_output, 0);
|
|
|
|
sigchain_pop(SIGPIPE);
|
|
|
|
|
|
|
|
delete_tempfile(&temp);
|
|
|
|
|
|
|
|
ret |= !strstr(gpg_status->buf, "\n[GNUPG:] GOODSIG ");
|
|
|
|
strbuf_release(&buf); /* no matter it was used or not */
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2015-06-22 01:14:40 +02:00
|
|
|
int check_signature(const char *payload, size_t plen, const char *signature,
|
2015-06-22 01:14:38 +02:00
|
|
|
size_t slen, struct signature_check *sigc)
|
|
|
|
{
|
|
|
|
struct strbuf gpg_output = STRBUF_INIT;
|
|
|
|
struct strbuf gpg_status = STRBUF_INIT;
|
|
|
|
int status;
|
|
|
|
|
|
|
|
sigc->result = 'N';
|
|
|
|
|
|
|
|
status = verify_signed_buffer(payload, plen, signature, slen,
|
|
|
|
&gpg_output, &gpg_status);
|
|
|
|
if (status && !gpg_output.len)
|
|
|
|
goto out;
|
|
|
|
sigc->payload = xmemdupz(payload, plen);
|
|
|
|
sigc->gpg_output = strbuf_detach(&gpg_output, NULL);
|
|
|
|
sigc->gpg_status = strbuf_detach(&gpg_status, NULL);
|
|
|
|
parse_gpg_output(sigc);
|
2018-08-09 20:40:27 +02:00
|
|
|
status |= sigc->result != 'G' && sigc->result != 'U';
|
2015-06-22 01:14:38 +02:00
|
|
|
|
|
|
|
out:
|
|
|
|
strbuf_release(&gpg_status);
|
|
|
|
strbuf_release(&gpg_output);
|
2015-06-22 01:14:40 +02:00
|
|
|
|
2018-08-09 20:40:27 +02:00
|
|
|
return !!status;
|
2015-06-22 01:14:38 +02:00
|
|
|
}
|
|
|
|
|
2015-06-22 01:14:41 +02:00
|
|
|
void print_signature_buffer(const struct signature_check *sigc, unsigned flags)
|
|
|
|
{
|
2015-06-22 01:14:42 +02:00
|
|
|
const char *output = flags & GPG_VERIFY_RAW ?
|
|
|
|
sigc->gpg_status : sigc->gpg_output;
|
|
|
|
|
2015-06-22 01:14:41 +02:00
|
|
|
if (flags & GPG_VERIFY_VERBOSE && sigc->payload)
|
|
|
|
fputs(sigc->payload, stdout);
|
|
|
|
|
2015-06-22 01:14:42 +02:00
|
|
|
if (output)
|
|
|
|
fputs(output, stderr);
|
2015-06-22 01:14:41 +02:00
|
|
|
}
|
|
|
|
|
2018-04-13 23:18:32 +02:00
|
|
|
size_t parse_signature(const char *buf, size_t size)
|
2014-08-19 22:18:07 +02:00
|
|
|
{
|
|
|
|
size_t len = 0;
|
2018-04-13 23:18:35 +02:00
|
|
|
size_t match = size;
|
|
|
|
while (len < size) {
|
|
|
|
const char *eol;
|
|
|
|
|
2018-07-17 14:50:09 +02:00
|
|
|
if (get_format_by_sig(buf + len))
|
2018-04-13 23:18:35 +02:00
|
|
|
match = len;
|
|
|
|
|
|
|
|
eol = memchr(buf + len, '\n', size - len);
|
2014-08-19 22:18:07 +02:00
|
|
|
len += eol ? eol - (buf + len) + 1 : size - len;
|
|
|
|
}
|
2018-04-13 23:18:35 +02:00
|
|
|
return match;
|
2014-08-19 22:18:07 +02:00
|
|
|
}
|
|
|
|
|
2011-09-08 06:19:47 +02:00
|
|
|
void set_signing_key(const char *key)
|
|
|
|
{
|
|
|
|
free(configured_signing_key);
|
|
|
|
configured_signing_key = xstrdup(key);
|
|
|
|
}
|
|
|
|
|
|
|
|
int git_gpg_config(const char *var, const char *value, void *cb)
|
|
|
|
{
|
2018-07-17 14:50:09 +02:00
|
|
|
struct gpg_format *fmt = NULL;
|
|
|
|
char *fmtname = NULL;
|
|
|
|
|
2011-09-08 06:19:47 +02:00
|
|
|
if (!strcmp(var, "user.signingkey")) {
|
2018-04-13 23:18:30 +02:00
|
|
|
if (!value)
|
|
|
|
return config_error_nonbool(var);
|
2011-11-29 21:29:48 +01:00
|
|
|
set_signing_key(value);
|
2018-04-13 23:18:30 +02:00
|
|
|
return 0;
|
2011-11-29 21:29:48 +01:00
|
|
|
}
|
2018-04-13 23:18:30 +02:00
|
|
|
|
2018-07-17 14:50:07 +02:00
|
|
|
if (!strcmp(var, "gpg.format")) {
|
|
|
|
if (!value)
|
|
|
|
return config_error_nonbool(var);
|
2018-07-17 14:50:09 +02:00
|
|
|
fmt = get_format_by_name(value);
|
|
|
|
if (!fmt)
|
2018-07-17 14:50:07 +02:00
|
|
|
return error("unsupported value for %s: %s",
|
|
|
|
var, value);
|
2018-07-17 14:50:09 +02:00
|
|
|
use_format = fmt;
|
|
|
|
return 0;
|
2018-07-17 14:50:07 +02:00
|
|
|
}
|
|
|
|
|
2018-07-17 14:50:11 +02:00
|
|
|
if (!strcmp(var, "gpg.program") || !strcmp(var, "gpg.openpgp.program"))
|
2018-07-17 14:50:09 +02:00
|
|
|
fmtname = "openpgp";
|
|
|
|
|
2018-07-17 14:50:12 +02:00
|
|
|
if (!strcmp(var, "gpg.x509.program"))
|
|
|
|
fmtname = "x509";
|
|
|
|
|
2018-07-17 14:50:09 +02:00
|
|
|
if (fmtname) {
|
|
|
|
fmt = get_format_by_name(fmtname);
|
|
|
|
return git_config_string(&fmt->program, var, value);
|
2011-09-08 06:19:47 +02:00
|
|
|
}
|
2018-04-13 23:18:30 +02:00
|
|
|
|
2011-09-08 06:19:47 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
const char *get_signing_key(void)
|
|
|
|
{
|
|
|
|
if (configured_signing_key)
|
|
|
|
return configured_signing_key;
|
2012-05-25 01:28:40 +02:00
|
|
|
return git_committer_info(IDENT_STRICT|IDENT_NO_DATE);
|
2011-09-08 06:19:47 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *signing_key)
|
|
|
|
{
|
2014-08-19 21:09:35 +02:00
|
|
|
struct child_process gpg = CHILD_PROCESS_INIT;
|
sign_buffer: use pipe_command
Similar to the prior commit for verify_signed_buffer, the
motivation here is both to make the code simpler, and to
avoid any possible deadlocks with gpg.
In this case we have the same "write to stdin, then read
from stdout" that the verify case had. This is unlikely to
be a problem in practice, since stdout has the detached
signature, which it cannot compute until it has read all of
stdin (if it were a non-detached signature, that would be a
problem, though).
We don't read from stderr at all currently. However, we will
want to in a future patch, so this also prepares us there
(and in that case gpg _does_ write before reading all of the
input, though again, it is unlikely that a key uid will fill
up a pipe buffer).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-06-18 01:38:55 +02:00
|
|
|
int ret;
|
2011-09-08 06:19:47 +02:00
|
|
|
size_t i, j, bottom;
|
2016-06-18 01:38:59 +02:00
|
|
|
struct strbuf gpg_status = STRBUF_INIT;
|
2011-09-08 06:19:47 +02:00
|
|
|
|
2016-06-18 01:38:35 +02:00
|
|
|
argv_array_pushl(&gpg.args,
|
2018-07-17 14:50:09 +02:00
|
|
|
use_format->program,
|
2016-06-18 01:38:59 +02:00
|
|
|
"--status-fd=2",
|
2016-06-18 01:38:35 +02:00
|
|
|
"-bsau", signing_key,
|
|
|
|
NULL);
|
2011-09-08 06:19:47 +02:00
|
|
|
|
sign_buffer: use pipe_command
Similar to the prior commit for verify_signed_buffer, the
motivation here is both to make the code simpler, and to
avoid any possible deadlocks with gpg.
In this case we have the same "write to stdin, then read
from stdout" that the verify case had. This is unlikely to
be a problem in practice, since stdout has the detached
signature, which it cannot compute until it has read all of
stdin (if it were a non-detached signature, that would be a
problem, though).
We don't read from stderr at all currently. However, we will
want to in a future patch, so this also prepares us there
(and in that case gpg _does_ write before reading all of the
input, though again, it is unlikely that a key uid will fill
up a pipe buffer).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-06-18 01:38:55 +02:00
|
|
|
bottom = signature->len;
|
2011-09-08 06:19:47 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* When the username signingkey is bad, program could be terminated
|
|
|
|
* because gpg exits without reading and then write gets SIGPIPE.
|
|
|
|
*/
|
|
|
|
sigchain_push(SIGPIPE, SIG_IGN);
|
sign_buffer: use pipe_command
Similar to the prior commit for verify_signed_buffer, the
motivation here is both to make the code simpler, and to
avoid any possible deadlocks with gpg.
In this case we have the same "write to stdin, then read
from stdout" that the verify case had. This is unlikely to
be a problem in practice, since stdout has the detached
signature, which it cannot compute until it has read all of
stdin (if it were a non-detached signature, that would be a
problem, though).
We don't read from stderr at all currently. However, we will
want to in a future patch, so this also prepares us there
(and in that case gpg _does_ write before reading all of the
input, though again, it is unlikely that a key uid will fill
up a pipe buffer).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-06-18 01:38:55 +02:00
|
|
|
ret = pipe_command(&gpg, buffer->buf, buffer->len,
|
2016-06-18 01:38:59 +02:00
|
|
|
signature, 1024, &gpg_status, 0);
|
2011-09-08 06:19:47 +02:00
|
|
|
sigchain_pop(SIGPIPE);
|
|
|
|
|
2016-06-18 01:38:59 +02:00
|
|
|
ret |= !strstr(gpg_status.buf, "\n[GNUPG:] SIG_CREATED ");
|
|
|
|
strbuf_release(&gpg_status);
|
|
|
|
if (ret)
|
2011-09-08 06:19:47 +02:00
|
|
|
return error(_("gpg failed to sign the data"));
|
|
|
|
|
|
|
|
/* Strip CR from the line endings, in case we are on Windows. */
|
|
|
|
for (i = j = bottom; i < signature->len; i++)
|
|
|
|
if (signature->buf[i] != '\r') {
|
|
|
|
if (i != j)
|
|
|
|
signature->buf[j] = signature->buf[i];
|
|
|
|
j++;
|
|
|
|
}
|
|
|
|
strbuf_setlen(signature, j);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|