Junio C Hamano | 2f47eae | 2011-09-07 21:19:47 -0700 | [diff] [blame] | 1 | #include "cache.h" |
brian m. carlson | 9b27b49 | 2021-02-11 02:08:06 +0000 | [diff] [blame] | 2 | #include "commit.h" |
Brandon Williams | b2141fc | 2017-06-14 11:07:36 -0700 | [diff] [blame] | 3 | #include "config.h" |
Junio C Hamano | 2f47eae | 2011-09-07 21:19:47 -0700 | [diff] [blame] | 4 | #include "run-command.h" |
| 5 | #include "strbuf.h" |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 6 | #include "dir.h" |
Junio C Hamano | 2f47eae | 2011-09-07 21:19:47 -0700 | [diff] [blame] | 7 | #include "gpg-interface.h" |
| 8 | #include "sigchain.h" |
Jeff King | 4322353 | 2016-06-17 19:38:43 -0400 | [diff] [blame] | 9 | #include "tempfile.h" |
Fabian Stelzer | fd9e226 | 2021-09-10 20:07:37 +0000 | [diff] [blame] | 10 | #include "alias.h" |
Junio C Hamano | 2f47eae | 2011-09-07 21:19:47 -0700 | [diff] [blame] | 11 | |
| 12 | static char *configured_signing_key; |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 13 | static const char *ssh_default_key_command, *ssh_allowed_signers, *ssh_revocation_file; |
Hans Jerry Illikainen | 54887b4 | 2019-12-27 13:55:57 +0000 | [diff] [blame] | 14 | static enum signature_trust_level configured_min_trust_level = TRUST_UNDEFINED; |
| 15 | |
Henning Schild | 58af57e | 2018-07-17 14:50:09 +0200 | [diff] [blame] | 16 | struct gpg_format { |
| 17 | const char *name; |
| 18 | const char *program; |
| 19 | const char **verify_args; |
| 20 | const char **sigs; |
Fabian Stelzer | b5726a5 | 2021-09-10 20:07:34 +0000 | [diff] [blame] | 21 | int (*verify_signed_buffer)(struct signature_check *sigc, |
Fabian Stelzer | 0276943 | 2021-12-09 09:52:43 +0100 | [diff] [blame] | 22 | struct gpg_format *fmt, |
| 23 | const char *signature, |
Fabian Stelzer | b5726a5 | 2021-09-10 20:07:34 +0000 | [diff] [blame] | 24 | size_t signature_size); |
| 25 | int (*sign_buffer)(struct strbuf *buffer, struct strbuf *signature, |
| 26 | const char *signing_key); |
Fabian Stelzer | fd9e226 | 2021-09-10 20:07:37 +0000 | [diff] [blame] | 27 | const char *(*get_default_key)(void); |
Fabian Stelzer | 4838f62 | 2021-09-10 20:07:38 +0000 | [diff] [blame] | 28 | const char *(*get_key_id)(void); |
Henning Schild | 58af57e | 2018-07-17 14:50:09 +0200 | [diff] [blame] | 29 | }; |
Junio C Hamano | 2f47eae | 2011-09-07 21:19:47 -0700 | [diff] [blame] | 30 | |
Henning Schild | 58af57e | 2018-07-17 14:50:09 +0200 | [diff] [blame] | 31 | static const char *openpgp_verify_args[] = { |
| 32 | "--keyid-format=long", |
| 33 | NULL |
| 34 | }; |
| 35 | static const char *openpgp_sigs[] = { |
| 36 | "-----BEGIN PGP SIGNATURE-----", |
| 37 | "-----BEGIN PGP MESSAGE-----", |
| 38 | NULL |
| 39 | }; |
| 40 | |
Henning Schild | 1e7adb9 | 2018-07-17 14:50:12 +0200 | [diff] [blame] | 41 | static const char *x509_verify_args[] = { |
| 42 | NULL |
| 43 | }; |
| 44 | static const char *x509_sigs[] = { |
| 45 | "-----BEGIN SIGNED MESSAGE-----", |
| 46 | NULL |
| 47 | }; |
| 48 | |
Fabian Stelzer | 29b3157 | 2021-09-10 20:07:36 +0000 | [diff] [blame] | 49 | static const char *ssh_verify_args[] = { NULL }; |
| 50 | static const char *ssh_sigs[] = { |
| 51 | "-----BEGIN SSH SIGNATURE-----", |
| 52 | NULL |
| 53 | }; |
| 54 | |
Fabian Stelzer | b5726a5 | 2021-09-10 20:07:34 +0000 | [diff] [blame] | 55 | static int verify_gpg_signed_buffer(struct signature_check *sigc, |
Fabian Stelzer | 0276943 | 2021-12-09 09:52:43 +0100 | [diff] [blame] | 56 | struct gpg_format *fmt, |
| 57 | const char *signature, |
Fabian Stelzer | b5726a5 | 2021-09-10 20:07:34 +0000 | [diff] [blame] | 58 | size_t signature_size); |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 59 | static int verify_ssh_signed_buffer(struct signature_check *sigc, |
Fabian Stelzer | 0276943 | 2021-12-09 09:52:43 +0100 | [diff] [blame] | 60 | struct gpg_format *fmt, |
| 61 | const char *signature, |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 62 | size_t signature_size); |
Fabian Stelzer | b5726a5 | 2021-09-10 20:07:34 +0000 | [diff] [blame] | 63 | static int sign_buffer_gpg(struct strbuf *buffer, struct strbuf *signature, |
| 64 | const char *signing_key); |
Fabian Stelzer | 29b3157 | 2021-09-10 20:07:36 +0000 | [diff] [blame] | 65 | static int sign_buffer_ssh(struct strbuf *buffer, struct strbuf *signature, |
| 66 | const char *signing_key); |
Fabian Stelzer | b5726a5 | 2021-09-10 20:07:34 +0000 | [diff] [blame] | 67 | |
Fabian Stelzer | fd9e226 | 2021-09-10 20:07:37 +0000 | [diff] [blame] | 68 | static const char *get_default_ssh_signing_key(void); |
| 69 | |
Fabian Stelzer | 4838f62 | 2021-09-10 20:07:38 +0000 | [diff] [blame] | 70 | static const char *get_ssh_key_id(void); |
| 71 | |
Henning Schild | 58af57e | 2018-07-17 14:50:09 +0200 | [diff] [blame] | 72 | static struct gpg_format gpg_format[] = { |
Fabian Stelzer | b5726a5 | 2021-09-10 20:07:34 +0000 | [diff] [blame] | 73 | { |
| 74 | .name = "openpgp", |
| 75 | .program = "gpg", |
| 76 | .verify_args = openpgp_verify_args, |
| 77 | .sigs = openpgp_sigs, |
| 78 | .verify_signed_buffer = verify_gpg_signed_buffer, |
| 79 | .sign_buffer = sign_buffer_gpg, |
Fabian Stelzer | fd9e226 | 2021-09-10 20:07:37 +0000 | [diff] [blame] | 80 | .get_default_key = NULL, |
Fabian Stelzer | 4838f62 | 2021-09-10 20:07:38 +0000 | [diff] [blame] | 81 | .get_key_id = NULL, |
Henning Schild | 58af57e | 2018-07-17 14:50:09 +0200 | [diff] [blame] | 82 | }, |
Fabian Stelzer | b5726a5 | 2021-09-10 20:07:34 +0000 | [diff] [blame] | 83 | { |
| 84 | .name = "x509", |
| 85 | .program = "gpgsm", |
| 86 | .verify_args = x509_verify_args, |
| 87 | .sigs = x509_sigs, |
| 88 | .verify_signed_buffer = verify_gpg_signed_buffer, |
| 89 | .sign_buffer = sign_buffer_gpg, |
Fabian Stelzer | fd9e226 | 2021-09-10 20:07:37 +0000 | [diff] [blame] | 90 | .get_default_key = NULL, |
Fabian Stelzer | 4838f62 | 2021-09-10 20:07:38 +0000 | [diff] [blame] | 91 | .get_key_id = NULL, |
Henning Schild | 1e7adb9 | 2018-07-17 14:50:12 +0200 | [diff] [blame] | 92 | }, |
Fabian Stelzer | 29b3157 | 2021-09-10 20:07:36 +0000 | [diff] [blame] | 93 | { |
| 94 | .name = "ssh", |
| 95 | .program = "ssh-keygen", |
| 96 | .verify_args = ssh_verify_args, |
| 97 | .sigs = ssh_sigs, |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 98 | .verify_signed_buffer = verify_ssh_signed_buffer, |
Fabian Stelzer | fd9e226 | 2021-09-10 20:07:37 +0000 | [diff] [blame] | 99 | .sign_buffer = sign_buffer_ssh, |
| 100 | .get_default_key = get_default_ssh_signing_key, |
Fabian Stelzer | 4838f62 | 2021-09-10 20:07:38 +0000 | [diff] [blame] | 101 | .get_key_id = get_ssh_key_id, |
Fabian Stelzer | 29b3157 | 2021-09-10 20:07:36 +0000 | [diff] [blame] | 102 | }, |
Henning Schild | 58af57e | 2018-07-17 14:50:09 +0200 | [diff] [blame] | 103 | }; |
| 104 | |
| 105 | static struct gpg_format *use_format = &gpg_format[0]; |
| 106 | |
| 107 | static struct gpg_format *get_format_by_name(const char *str) |
| 108 | { |
| 109 | int i; |
| 110 | |
| 111 | for (i = 0; i < ARRAY_SIZE(gpg_format); i++) |
| 112 | if (!strcmp(gpg_format[i].name, str)) |
| 113 | return gpg_format + i; |
| 114 | return NULL; |
| 115 | } |
| 116 | |
| 117 | static struct gpg_format *get_format_by_sig(const char *sig) |
| 118 | { |
| 119 | int i, j; |
| 120 | |
| 121 | for (i = 0; i < ARRAY_SIZE(gpg_format); i++) |
| 122 | for (j = 0; gpg_format[i].sigs[j]; j++) |
| 123 | if (starts_with(sig, gpg_format[i].sigs[j])) |
| 124 | return gpg_format + i; |
| 125 | return NULL; |
| 126 | } |
Junio C Hamano | d7c6766 | 2014-08-19 13:18:07 -0700 | [diff] [blame] | 127 | |
Michael J Gruber | 01e57b5 | 2014-06-23 09:05:47 +0200 | [diff] [blame] | 128 | void signature_check_clear(struct signature_check *sigc) |
| 129 | { |
Ævar Arnfjörð Bjarmason | 88ce3ef | 2017-06-15 23:15:49 +0000 | [diff] [blame] | 130 | FREE_AND_NULL(sigc->payload); |
Fabian Stelzer | b5726a5 | 2021-09-10 20:07:34 +0000 | [diff] [blame] | 131 | FREE_AND_NULL(sigc->output); |
Ævar Arnfjörð Bjarmason | 88ce3ef | 2017-06-15 23:15:49 +0000 | [diff] [blame] | 132 | FREE_AND_NULL(sigc->gpg_status); |
| 133 | FREE_AND_NULL(sigc->signer); |
| 134 | FREE_AND_NULL(sigc->key); |
MichaÅ‚ GĂ³rny | 3daaaab | 2018-10-22 18:38:20 +0200 | [diff] [blame] | 135 | FREE_AND_NULL(sigc->fingerprint); |
MichaÅ‚ GĂ³rny | 4de9394 | 2018-10-22 18:38:21 +0200 | [diff] [blame] | 136 | FREE_AND_NULL(sigc->primary_key_fingerprint); |
Michael J Gruber | 01e57b5 | 2014-06-23 09:05:47 +0200 | [diff] [blame] | 137 | } |
| 138 | |
MichaÅ‚ GĂ³rny | da6cf1b | 2018-10-20 21:30:20 +0200 | [diff] [blame] | 139 | /* An exclusive status -- only one of them can appear in output */ |
| 140 | #define GPG_STATUS_EXCLUSIVE (1<<0) |
MichaÅ‚ GĂ³rny | 0b11a84 | 2018-10-22 18:38:19 +0200 | [diff] [blame] | 141 | /* The status includes key identifier */ |
| 142 | #define GPG_STATUS_KEYID (1<<1) |
| 143 | /* The status includes user identifier */ |
| 144 | #define GPG_STATUS_UID (1<<2) |
MichaÅ‚ GĂ³rny | 3daaaab | 2018-10-22 18:38:20 +0200 | [diff] [blame] | 145 | /* The status includes key fingerprints */ |
| 146 | #define GPG_STATUS_FINGERPRINT (1<<3) |
Hans Jerry Illikainen | 54887b4 | 2019-12-27 13:55:57 +0000 | [diff] [blame] | 147 | /* The status includes trust level */ |
| 148 | #define GPG_STATUS_TRUST_LEVEL (1<<4) |
MichaÅ‚ GĂ³rny | 0b11a84 | 2018-10-22 18:38:19 +0200 | [diff] [blame] | 149 | |
| 150 | /* Short-hand for standard exclusive *SIG status with keyid & UID */ |
| 151 | #define GPG_STATUS_STDSIG (GPG_STATUS_EXCLUSIVE|GPG_STATUS_KEYID|GPG_STATUS_UID) |
MichaÅ‚ GĂ³rny | da6cf1b | 2018-10-20 21:30:20 +0200 | [diff] [blame] | 152 | |
Junio C Hamano | a50e7ca | 2014-08-14 15:31:13 -0700 | [diff] [blame] | 153 | static struct { |
| 154 | char result; |
| 155 | const char *check; |
MichaÅ‚ GĂ³rny | da6cf1b | 2018-10-20 21:30:20 +0200 | [diff] [blame] | 156 | unsigned int flags; |
Junio C Hamano | a50e7ca | 2014-08-14 15:31:13 -0700 | [diff] [blame] | 157 | } sigcheck_gpg_status[] = { |
MichaÅ‚ GĂ³rny | 0b11a84 | 2018-10-22 18:38:19 +0200 | [diff] [blame] | 158 | { 'G', "GOODSIG ", GPG_STATUS_STDSIG }, |
| 159 | { 'B', "BADSIG ", GPG_STATUS_STDSIG }, |
MichaÅ‚ GĂ³rny | 0b11a84 | 2018-10-22 18:38:19 +0200 | [diff] [blame] | 160 | { 'E', "ERRSIG ", GPG_STATUS_EXCLUSIVE|GPG_STATUS_KEYID }, |
| 161 | { 'X', "EXPSIG ", GPG_STATUS_STDSIG }, |
| 162 | { 'Y', "EXPKEYSIG ", GPG_STATUS_STDSIG }, |
| 163 | { 'R', "REVKEYSIG ", GPG_STATUS_STDSIG }, |
MichaÅ‚ GĂ³rny | 3daaaab | 2018-10-22 18:38:20 +0200 | [diff] [blame] | 164 | { 0, "VALIDSIG ", GPG_STATUS_FINGERPRINT }, |
Hans Jerry Illikainen | 54887b4 | 2019-12-27 13:55:57 +0000 | [diff] [blame] | 165 | { 0, "TRUST_", GPG_STATUS_TRUST_LEVEL }, |
| 166 | }; |
| 167 | |
| 168 | static struct { |
| 169 | const char *key; |
| 170 | enum signature_trust_level value; |
| 171 | } sigcheck_gpg_trust_level[] = { |
| 172 | { "UNDEFINED", TRUST_UNDEFINED }, |
| 173 | { "NEVER", TRUST_NEVER }, |
| 174 | { "MARGINAL", TRUST_MARGINAL }, |
| 175 | { "FULLY", TRUST_FULLY }, |
| 176 | { "ULTIMATE", TRUST_ULTIMATE }, |
Junio C Hamano | a50e7ca | 2014-08-14 15:31:13 -0700 | [diff] [blame] | 177 | }; |
| 178 | |
Hans Jerry Illikainen | 392b862 | 2019-11-21 23:43:35 +0000 | [diff] [blame] | 179 | static void replace_cstring(char **field, const char *line, const char *next) |
| 180 | { |
| 181 | free(*field); |
| 182 | |
| 183 | if (line && next) |
| 184 | *field = xmemdupz(line, next - line); |
| 185 | else |
| 186 | *field = NULL; |
| 187 | } |
| 188 | |
Hans Jerry Illikainen | 54887b4 | 2019-12-27 13:55:57 +0000 | [diff] [blame] | 189 | static int parse_gpg_trust_level(const char *level, |
| 190 | enum signature_trust_level *res) |
| 191 | { |
| 192 | size_t i; |
| 193 | |
| 194 | for (i = 0; i < ARRAY_SIZE(sigcheck_gpg_trust_level); i++) { |
| 195 | if (!strcmp(sigcheck_gpg_trust_level[i].key, level)) { |
| 196 | *res = sigcheck_gpg_trust_level[i].value; |
| 197 | return 0; |
| 198 | } |
| 199 | } |
| 200 | return 1; |
| 201 | } |
| 202 | |
Henning Schild | fbd0f16 | 2018-07-11 10:38:25 +0200 | [diff] [blame] | 203 | static void parse_gpg_output(struct signature_check *sigc) |
Junio C Hamano | a50e7ca | 2014-08-14 15:31:13 -0700 | [diff] [blame] | 204 | { |
| 205 | const char *buf = sigc->gpg_status; |
MichaÅ‚ GĂ³rny | da6cf1b | 2018-10-20 21:30:20 +0200 | [diff] [blame] | 206 | const char *line, *next; |
MichaÅ‚ GĂ³rny | 4de9394 | 2018-10-22 18:38:21 +0200 | [diff] [blame] | 207 | int i, j; |
MichaÅ‚ GĂ³rny | da6cf1b | 2018-10-20 21:30:20 +0200 | [diff] [blame] | 208 | int seen_exclusive_status = 0; |
Junio C Hamano | a50e7ca | 2014-08-14 15:31:13 -0700 | [diff] [blame] | 209 | |
MichaÅ‚ GĂ³rny | da6cf1b | 2018-10-20 21:30:20 +0200 | [diff] [blame] | 210 | /* Iterate over all lines */ |
| 211 | for (line = buf; *line; line = strchrnul(line+1, '\n')) { |
| 212 | while (*line == '\n') |
| 213 | line++; |
Steven Roberts | 64c45dc | 2019-07-16 11:47:37 -0700 | [diff] [blame] | 214 | if (!*line) |
| 215 | break; |
| 216 | |
MichaÅ‚ GĂ³rny | da6cf1b | 2018-10-20 21:30:20 +0200 | [diff] [blame] | 217 | /* Skip lines that don't start with GNUPG status */ |
| 218 | if (!skip_prefix(line, "[GNUPG:] ", &line)) |
| 219 | continue; |
Junio C Hamano | a50e7ca | 2014-08-14 15:31:13 -0700 | [diff] [blame] | 220 | |
MichaÅ‚ GĂ³rny | da6cf1b | 2018-10-20 21:30:20 +0200 | [diff] [blame] | 221 | /* Iterate over all search strings */ |
| 222 | for (i = 0; i < ARRAY_SIZE(sigcheck_gpg_status); i++) { |
| 223 | if (skip_prefix(line, sigcheck_gpg_status[i].check, &line)) { |
Hans Jerry Illikainen | 54887b4 | 2019-12-27 13:55:57 +0000 | [diff] [blame] | 224 | /* |
| 225 | * GOODSIG, BADSIG etc. can occur only once for |
| 226 | * each signature. Therefore, if we had more |
| 227 | * than one then we're dealing with multiple |
| 228 | * signatures. We don't support them |
| 229 | * currently, and they're rather hard to |
| 230 | * create, so something is likely fishy and we |
| 231 | * should reject them altogether. |
| 232 | */ |
MichaÅ‚ GĂ³rny | da6cf1b | 2018-10-20 21:30:20 +0200 | [diff] [blame] | 233 | if (sigcheck_gpg_status[i].flags & GPG_STATUS_EXCLUSIVE) { |
Junio C Hamano | 0256189 | 2018-11-03 00:53:57 +0900 | [diff] [blame] | 234 | if (seen_exclusive_status++) |
Hans Jerry Illikainen | 54887b4 | 2019-12-27 13:55:57 +0000 | [diff] [blame] | 235 | goto error; |
MichaÅ‚ GĂ³rny | da6cf1b | 2018-10-20 21:30:20 +0200 | [diff] [blame] | 236 | } |
| 237 | |
MichaÅ‚ GĂ³rny | 3daaaab | 2018-10-22 18:38:20 +0200 | [diff] [blame] | 238 | if (sigcheck_gpg_status[i].result) |
| 239 | sigc->result = sigcheck_gpg_status[i].result; |
MichaÅ‚ GĂ³rny | 0b11a84 | 2018-10-22 18:38:19 +0200 | [diff] [blame] | 240 | /* Do we have key information? */ |
| 241 | if (sigcheck_gpg_status[i].flags & GPG_STATUS_KEYID) { |
MichaÅ‚ GĂ³rny | da6cf1b | 2018-10-20 21:30:20 +0200 | [diff] [blame] | 242 | next = strchrnul(line, ' '); |
Hans Jerry Illikainen | 392b862 | 2019-11-21 23:43:35 +0000 | [diff] [blame] | 243 | replace_cstring(&sigc->key, line, next); |
MichaÅ‚ GĂ³rny | 0b11a84 | 2018-10-22 18:38:19 +0200 | [diff] [blame] | 244 | /* Do we have signer information? */ |
| 245 | if (*next && (sigcheck_gpg_status[i].flags & GPG_STATUS_UID)) { |
MichaÅ‚ GĂ³rny | da6cf1b | 2018-10-20 21:30:20 +0200 | [diff] [blame] | 246 | line = next + 1; |
| 247 | next = strchrnul(line, '\n'); |
Hans Jerry Illikainen | 392b862 | 2019-11-21 23:43:35 +0000 | [diff] [blame] | 248 | replace_cstring(&sigc->signer, line, next); |
MichaÅ‚ GĂ³rny | da6cf1b | 2018-10-20 21:30:20 +0200 | [diff] [blame] | 249 | } |
| 250 | } |
Hans Jerry Illikainen | 54887b4 | 2019-12-27 13:55:57 +0000 | [diff] [blame] | 251 | |
| 252 | /* Do we have trust level? */ |
| 253 | if (sigcheck_gpg_status[i].flags & GPG_STATUS_TRUST_LEVEL) { |
| 254 | /* |
| 255 | * GPG v1 and v2 differs in how the |
| 256 | * TRUST_ lines are written. Some |
| 257 | * trust lines contain no additional |
| 258 | * space-separated information for v1. |
| 259 | */ |
| 260 | size_t trust_size = strcspn(line, " \n"); |
| 261 | char *trust = xmemdupz(line, trust_size); |
| 262 | |
| 263 | if (parse_gpg_trust_level(trust, &sigc->trust_level)) { |
| 264 | free(trust); |
| 265 | goto error; |
| 266 | } |
| 267 | free(trust); |
| 268 | } |
| 269 | |
MichaÅ‚ GĂ³rny | 3daaaab | 2018-10-22 18:38:20 +0200 | [diff] [blame] | 270 | /* Do we have fingerprint? */ |
| 271 | if (sigcheck_gpg_status[i].flags & GPG_STATUS_FINGERPRINT) { |
Hans Jerry Illikainen | 67a6ea6 | 2019-11-22 20:23:12 +0000 | [diff] [blame] | 272 | const char *limit; |
| 273 | char **field; |
| 274 | |
MichaÅ‚ GĂ³rny | 3daaaab | 2018-10-22 18:38:20 +0200 | [diff] [blame] | 275 | next = strchrnul(line, ' '); |
Hans Jerry Illikainen | 392b862 | 2019-11-21 23:43:35 +0000 | [diff] [blame] | 276 | replace_cstring(&sigc->fingerprint, line, next); |
MichaÅ‚ GĂ³rny | 4de9394 | 2018-10-22 18:38:21 +0200 | [diff] [blame] | 277 | |
Hans Jerry Illikainen | 67a6ea6 | 2019-11-22 20:23:12 +0000 | [diff] [blame] | 278 | /* |
| 279 | * Skip interim fields. The search is |
| 280 | * limited to the same line since only |
| 281 | * OpenPGP signatures has a field with |
| 282 | * the primary fingerprint. |
| 283 | */ |
| 284 | limit = strchrnul(line, '\n'); |
MichaÅ‚ GĂ³rny | 4de9394 | 2018-10-22 18:38:21 +0200 | [diff] [blame] | 285 | for (j = 9; j > 0; j--) { |
Hans Jerry Illikainen | 67a6ea6 | 2019-11-22 20:23:12 +0000 | [diff] [blame] | 286 | if (!*next || limit <= next) |
MichaÅ‚ GĂ³rny | 4de9394 | 2018-10-22 18:38:21 +0200 | [diff] [blame] | 287 | break; |
| 288 | line = next + 1; |
| 289 | next = strchrnul(line, ' '); |
| 290 | } |
| 291 | |
Hans Jerry Illikainen | 67a6ea6 | 2019-11-22 20:23:12 +0000 | [diff] [blame] | 292 | field = &sigc->primary_key_fingerprint; |
| 293 | if (!j) { |
| 294 | next = strchrnul(line, '\n'); |
| 295 | replace_cstring(field, line, next); |
| 296 | } else { |
| 297 | replace_cstring(field, NULL, NULL); |
| 298 | } |
MichaÅ‚ GĂ³rny | 3daaaab | 2018-10-22 18:38:20 +0200 | [diff] [blame] | 299 | } |
MichaÅ‚ GĂ³rny | da6cf1b | 2018-10-20 21:30:20 +0200 | [diff] [blame] | 300 | |
| 301 | break; |
Michael J Gruber | 661a180 | 2016-10-12 15:04:15 +0200 | [diff] [blame] | 302 | } |
Junio C Hamano | a50e7ca | 2014-08-14 15:31:13 -0700 | [diff] [blame] | 303 | } |
| 304 | } |
MichaÅ‚ GĂ³rny | da6cf1b | 2018-10-20 21:30:20 +0200 | [diff] [blame] | 305 | return; |
| 306 | |
Hans Jerry Illikainen | 54887b4 | 2019-12-27 13:55:57 +0000 | [diff] [blame] | 307 | error: |
MichaÅ‚ GĂ³rny | da6cf1b | 2018-10-20 21:30:20 +0200 | [diff] [blame] | 308 | sigc->result = 'E'; |
| 309 | /* Clear partial data to avoid confusion */ |
MichaÅ‚ GĂ³rny | 4de9394 | 2018-10-22 18:38:21 +0200 | [diff] [blame] | 310 | FREE_AND_NULL(sigc->primary_key_fingerprint); |
MichaÅ‚ GĂ³rny | 3daaaab | 2018-10-22 18:38:20 +0200 | [diff] [blame] | 311 | FREE_AND_NULL(sigc->fingerprint); |
MichaÅ‚ GĂ³rny | da6cf1b | 2018-10-20 21:30:20 +0200 | [diff] [blame] | 312 | FREE_AND_NULL(sigc->signer); |
| 313 | FREE_AND_NULL(sigc->key); |
Junio C Hamano | a50e7ca | 2014-08-14 15:31:13 -0700 | [diff] [blame] | 314 | } |
| 315 | |
Fabian Stelzer | b5726a5 | 2021-09-10 20:07:34 +0000 | [diff] [blame] | 316 | static int verify_gpg_signed_buffer(struct signature_check *sigc, |
Fabian Stelzer | 0276943 | 2021-12-09 09:52:43 +0100 | [diff] [blame] | 317 | struct gpg_format *fmt, |
| 318 | const char *signature, |
Fabian Stelzer | b5726a5 | 2021-09-10 20:07:34 +0000 | [diff] [blame] | 319 | size_t signature_size) |
Hans Jerry Illikainen | 6794898 | 2020-03-04 11:48:04 +0000 | [diff] [blame] | 320 | { |
| 321 | struct child_process gpg = CHILD_PROCESS_INIT; |
Hans Jerry Illikainen | 6794898 | 2020-03-04 11:48:04 +0000 | [diff] [blame] | 322 | struct tempfile *temp; |
| 323 | int ret; |
Fabian Stelzer | b5726a5 | 2021-09-10 20:07:34 +0000 | [diff] [blame] | 324 | struct strbuf gpg_stdout = STRBUF_INIT; |
| 325 | struct strbuf gpg_stderr = STRBUF_INIT; |
Hans Jerry Illikainen | 6794898 | 2020-03-04 11:48:04 +0000 | [diff] [blame] | 326 | |
| 327 | temp = mks_tempfile_t(".git_vtag_tmpXXXXXX"); |
| 328 | if (!temp) |
| 329 | return error_errno(_("could not create temporary file")); |
| 330 | if (write_in_full(temp->fd, signature, signature_size) < 0 || |
| 331 | close_tempfile_gently(temp) < 0) { |
| 332 | error_errno(_("failed writing detached signature to '%s'"), |
| 333 | temp->filename.buf); |
| 334 | delete_tempfile(&temp); |
| 335 | return -1; |
| 336 | } |
| 337 | |
Jeff King | ef8d7ac | 2020-07-28 16:24:53 -0400 | [diff] [blame] | 338 | strvec_push(&gpg.args, fmt->program); |
| 339 | strvec_pushv(&gpg.args, fmt->verify_args); |
| 340 | strvec_pushl(&gpg.args, |
Jeff King | f6d8942 | 2020-07-28 16:26:31 -0400 | [diff] [blame] | 341 | "--status-fd=1", |
| 342 | "--verify", temp->filename.buf, "-", |
| 343 | NULL); |
Hans Jerry Illikainen | 6794898 | 2020-03-04 11:48:04 +0000 | [diff] [blame] | 344 | |
Hans Jerry Illikainen | 6794898 | 2020-03-04 11:48:04 +0000 | [diff] [blame] | 345 | sigchain_push(SIGPIPE, SIG_IGN); |
Fabian Stelzer | 0276943 | 2021-12-09 09:52:43 +0100 | [diff] [blame] | 346 | ret = pipe_command(&gpg, sigc->payload, sigc->payload_len, &gpg_stdout, 0, |
Fabian Stelzer | b5726a5 | 2021-09-10 20:07:34 +0000 | [diff] [blame] | 347 | &gpg_stderr, 0); |
Hans Jerry Illikainen | 6794898 | 2020-03-04 11:48:04 +0000 | [diff] [blame] | 348 | sigchain_pop(SIGPIPE); |
| 349 | |
| 350 | delete_tempfile(&temp); |
| 351 | |
Fabian Stelzer | b5726a5 | 2021-09-10 20:07:34 +0000 | [diff] [blame] | 352 | ret |= !strstr(gpg_stdout.buf, "\n[GNUPG:] GOODSIG "); |
Fabian Stelzer | b5726a5 | 2021-09-10 20:07:34 +0000 | [diff] [blame] | 353 | sigc->output = strbuf_detach(&gpg_stderr, NULL); |
| 354 | sigc->gpg_status = strbuf_detach(&gpg_stdout, NULL); |
| 355 | |
| 356 | parse_gpg_output(sigc); |
| 357 | |
| 358 | strbuf_release(&gpg_stdout); |
| 359 | strbuf_release(&gpg_stderr); |
Hans Jerry Illikainen | 6794898 | 2020-03-04 11:48:04 +0000 | [diff] [blame] | 360 | |
| 361 | return ret; |
| 362 | } |
| 363 | |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 364 | static void parse_ssh_output(struct signature_check *sigc) |
| 365 | { |
| 366 | const char *line, *principal, *search; |
Jeff King | 78d468f | 2021-10-18 13:15:00 -0400 | [diff] [blame] | 367 | char *to_free; |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 368 | char *key = NULL; |
| 369 | |
| 370 | /* |
| 371 | * ssh-keygen output should be: |
| 372 | * Good "git" signature for PRINCIPAL with RSA key SHA256:FINGERPRINT |
| 373 | * |
| 374 | * or for valid but unknown keys: |
| 375 | * Good "git" signature with RSA key SHA256:FINGERPRINT |
| 376 | * |
| 377 | * Note that "PRINCIPAL" can contain whitespace, "RSA" and |
| 378 | * "SHA256" part could be a different token that names of |
| 379 | * the algorithms used, and "FINGERPRINT" is a hexadecimal |
| 380 | * string. By finding the last occurence of " with ", we can |
| 381 | * reliably parse out the PRINCIPAL. |
| 382 | */ |
| 383 | sigc->result = 'B'; |
| 384 | sigc->trust_level = TRUST_NEVER; |
| 385 | |
Jeff King | 78d468f | 2021-10-18 13:15:00 -0400 | [diff] [blame] | 386 | line = to_free = xmemdupz(sigc->output, strcspn(sigc->output, "\n")); |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 387 | |
| 388 | if (skip_prefix(line, "Good \"git\" signature for ", &line)) { |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 389 | /* Search for the last "with" to get the full principal */ |
| 390 | principal = line; |
| 391 | do { |
| 392 | search = strstr(line, " with "); |
| 393 | if (search) |
| 394 | line = search + 1; |
| 395 | } while (search != NULL); |
René Scharfe | 18b1850 | 2021-10-30 19:04:56 +0200 | [diff] [blame] | 396 | if (line == principal) |
| 397 | goto cleanup; |
| 398 | |
| 399 | /* Valid signature and known principal */ |
| 400 | sigc->result = 'G'; |
| 401 | sigc->trust_level = TRUST_FULLY; |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 402 | sigc->signer = xmemdupz(principal, line - principal - 1); |
| 403 | } else if (skip_prefix(line, "Good \"git\" signature with ", &line)) { |
| 404 | /* Valid signature, but key unknown */ |
| 405 | sigc->result = 'G'; |
| 406 | sigc->trust_level = TRUST_UNDEFINED; |
| 407 | } else { |
Jeff King | 78d468f | 2021-10-18 13:15:00 -0400 | [diff] [blame] | 408 | goto cleanup; |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 409 | } |
| 410 | |
René Scharfe | 65db97b | 2021-10-30 19:07:38 +0200 | [diff] [blame] | 411 | key = strstr(line, "key "); |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 412 | if (key) { |
René Scharfe | 65db97b | 2021-10-30 19:07:38 +0200 | [diff] [blame] | 413 | sigc->fingerprint = xstrdup(strstr(line, "key ") + 4); |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 414 | sigc->key = xstrdup(sigc->fingerprint); |
| 415 | } else { |
| 416 | /* |
| 417 | * Output did not match what we expected |
| 418 | * Treat the signature as bad |
| 419 | */ |
| 420 | sigc->result = 'B'; |
| 421 | } |
Jeff King | 78d468f | 2021-10-18 13:15:00 -0400 | [diff] [blame] | 422 | |
| 423 | cleanup: |
| 424 | free(to_free); |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 425 | } |
| 426 | |
| 427 | static int verify_ssh_signed_buffer(struct signature_check *sigc, |
Fabian Stelzer | 0276943 | 2021-12-09 09:52:43 +0100 | [diff] [blame] | 428 | struct gpg_format *fmt, |
| 429 | const char *signature, |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 430 | size_t signature_size) |
| 431 | { |
| 432 | struct child_process ssh_keygen = CHILD_PROCESS_INIT; |
| 433 | struct tempfile *buffer_file; |
| 434 | int ret = -1; |
| 435 | const char *line; |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 436 | char *principal; |
| 437 | struct strbuf ssh_principals_out = STRBUF_INIT; |
| 438 | struct strbuf ssh_principals_err = STRBUF_INIT; |
| 439 | struct strbuf ssh_keygen_out = STRBUF_INIT; |
| 440 | struct strbuf ssh_keygen_err = STRBUF_INIT; |
Fabian Stelzer | 6393c95 | 2021-12-09 09:52:45 +0100 | [diff] [blame] | 441 | struct strbuf verify_time = STRBUF_INIT; |
| 442 | const struct date_mode verify_date_mode = { |
| 443 | .type = DATE_STRFTIME, |
| 444 | .strftime_fmt = "%Y%m%d%H%M%S", |
| 445 | /* SSH signing key validity has no timezone information - Use the local timezone */ |
| 446 | .local = 1, |
| 447 | }; |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 448 | |
| 449 | if (!ssh_allowed_signers) { |
| 450 | error(_("gpg.ssh.allowedSignersFile needs to be configured and exist for ssh signature verification")); |
| 451 | return -1; |
| 452 | } |
| 453 | |
| 454 | buffer_file = mks_tempfile_t(".git_vtag_tmpXXXXXX"); |
| 455 | if (!buffer_file) |
| 456 | return error_errno(_("could not create temporary file")); |
| 457 | if (write_in_full(buffer_file->fd, signature, signature_size) < 0 || |
| 458 | close_tempfile_gently(buffer_file) < 0) { |
| 459 | error_errno(_("failed writing detached signature to '%s'"), |
| 460 | buffer_file->filename.buf); |
| 461 | delete_tempfile(&buffer_file); |
| 462 | return -1; |
| 463 | } |
| 464 | |
Fabian Stelzer | 6393c95 | 2021-12-09 09:52:45 +0100 | [diff] [blame] | 465 | if (sigc->payload_timestamp) |
| 466 | strbuf_addf(&verify_time, "-Overify-time=%s", |
| 467 | show_date(sigc->payload_timestamp, 0, &verify_date_mode)); |
| 468 | |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 469 | /* Find the principal from the signers */ |
| 470 | strvec_pushl(&ssh_keygen.args, fmt->program, |
| 471 | "-Y", "find-principals", |
| 472 | "-f", ssh_allowed_signers, |
| 473 | "-s", buffer_file->filename.buf, |
Fabian Stelzer | 6393c95 | 2021-12-09 09:52:45 +0100 | [diff] [blame] | 474 | verify_time.buf, |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 475 | NULL); |
| 476 | ret = pipe_command(&ssh_keygen, NULL, 0, &ssh_principals_out, 0, |
| 477 | &ssh_principals_err, 0); |
| 478 | if (ret && strstr(ssh_principals_err.buf, "usage:")) { |
| 479 | error(_("ssh-keygen -Y find-principals/verify is needed for ssh signature verification (available in openssh version 8.2p1+)")); |
| 480 | goto out; |
| 481 | } |
| 482 | if (ret || !ssh_principals_out.len) { |
| 483 | /* |
| 484 | * We did not find a matching principal in the allowedSigners |
| 485 | * Check without validation |
| 486 | */ |
| 487 | child_process_init(&ssh_keygen); |
| 488 | strvec_pushl(&ssh_keygen.args, fmt->program, |
| 489 | "-Y", "check-novalidate", |
| 490 | "-n", "git", |
| 491 | "-s", buffer_file->filename.buf, |
Fabian Stelzer | 6393c95 | 2021-12-09 09:52:45 +0100 | [diff] [blame] | 492 | verify_time.buf, |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 493 | NULL); |
Fabian Stelzer | 0276943 | 2021-12-09 09:52:43 +0100 | [diff] [blame] | 494 | pipe_command(&ssh_keygen, sigc->payload, sigc->payload_len, |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 495 | &ssh_keygen_out, 0, &ssh_keygen_err, 0); |
| 496 | |
| 497 | /* |
| 498 | * Fail on unknown keys |
| 499 | * we still call check-novalidate to display the signature info |
| 500 | */ |
| 501 | ret = -1; |
| 502 | } else { |
| 503 | /* Check every principal we found (one per line) */ |
Fabian Stelzer | caeef01 | 2022-01-07 10:07:35 +0100 | [diff] [blame] | 504 | const char *next; |
| 505 | for (line = ssh_principals_out.buf; |
| 506 | *line; |
| 507 | line = next) { |
| 508 | const char *end_of_text; |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 509 | |
Fabian Stelzer | caeef01 | 2022-01-07 10:07:35 +0100 | [diff] [blame] | 510 | next = end_of_text = strchrnul(line, '\n'); |
| 511 | |
| 512 | /* Did we find a LF, and did we have CR before it? */ |
| 513 | if (*end_of_text && |
| 514 | line < end_of_text && |
| 515 | end_of_text[-1] == '\r') |
| 516 | end_of_text--; |
| 517 | |
| 518 | /* Unless we hit NUL, skip over the LF we found */ |
| 519 | if (*next) |
| 520 | next++; |
| 521 | |
| 522 | /* Not all lines are data. Skip empty ones */ |
| 523 | if (line == end_of_text) |
| 524 | continue; |
| 525 | |
| 526 | /* We now know we have an non-empty line. Process it */ |
| 527 | principal = xmemdupz(line, end_of_text - line); |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 528 | |
| 529 | child_process_init(&ssh_keygen); |
| 530 | strbuf_release(&ssh_keygen_out); |
| 531 | strbuf_release(&ssh_keygen_err); |
| 532 | strvec_push(&ssh_keygen.args, fmt->program); |
| 533 | /* |
| 534 | * We found principals |
| 535 | * Try with each until we find a match |
| 536 | */ |
| 537 | strvec_pushl(&ssh_keygen.args, "-Y", "verify", |
| 538 | "-n", "git", |
| 539 | "-f", ssh_allowed_signers, |
| 540 | "-I", principal, |
| 541 | "-s", buffer_file->filename.buf, |
Fabian Stelzer | 6393c95 | 2021-12-09 09:52:45 +0100 | [diff] [blame] | 542 | verify_time.buf, |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 543 | NULL); |
| 544 | |
| 545 | if (ssh_revocation_file) { |
| 546 | if (file_exists(ssh_revocation_file)) { |
| 547 | strvec_pushl(&ssh_keygen.args, "-r", |
| 548 | ssh_revocation_file, NULL); |
| 549 | } else { |
| 550 | warning(_("ssh signing revocation file configured but not found: %s"), |
| 551 | ssh_revocation_file); |
| 552 | } |
| 553 | } |
| 554 | |
| 555 | sigchain_push(SIGPIPE, SIG_IGN); |
Fabian Stelzer | 0276943 | 2021-12-09 09:52:43 +0100 | [diff] [blame] | 556 | ret = pipe_command(&ssh_keygen, sigc->payload, sigc->payload_len, |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 557 | &ssh_keygen_out, 0, &ssh_keygen_err, 0); |
| 558 | sigchain_pop(SIGPIPE); |
| 559 | |
| 560 | FREE_AND_NULL(principal); |
| 561 | |
| 562 | if (!ret) |
| 563 | ret = !starts_with(ssh_keygen_out.buf, "Good"); |
| 564 | |
| 565 | if (!ret) |
| 566 | break; |
| 567 | } |
| 568 | } |
| 569 | |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 570 | strbuf_stripspace(&ssh_keygen_out, 0); |
| 571 | strbuf_stripspace(&ssh_keygen_err, 0); |
| 572 | /* Add stderr outputs to show the user actual ssh-keygen errors */ |
| 573 | strbuf_add(&ssh_keygen_out, ssh_principals_err.buf, ssh_principals_err.len); |
| 574 | strbuf_add(&ssh_keygen_out, ssh_keygen_err.buf, ssh_keygen_err.len); |
| 575 | sigc->output = strbuf_detach(&ssh_keygen_out, NULL); |
| 576 | sigc->gpg_status = xstrdup(sigc->output); |
| 577 | |
| 578 | parse_ssh_output(sigc); |
| 579 | |
| 580 | out: |
| 581 | if (buffer_file) |
| 582 | delete_tempfile(&buffer_file); |
| 583 | strbuf_release(&ssh_principals_out); |
| 584 | strbuf_release(&ssh_principals_err); |
| 585 | strbuf_release(&ssh_keygen_out); |
| 586 | strbuf_release(&ssh_keygen_err); |
Fabian Stelzer | 6393c95 | 2021-12-09 09:52:45 +0100 | [diff] [blame] | 587 | strbuf_release(&verify_time); |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 588 | |
| 589 | return ret; |
| 590 | } |
| 591 | |
Fabian Stelzer | 6393c95 | 2021-12-09 09:52:45 +0100 | [diff] [blame] | 592 | static int parse_payload_metadata(struct signature_check *sigc) |
| 593 | { |
| 594 | const char *ident_line = NULL; |
| 595 | size_t ident_len; |
| 596 | struct ident_split ident; |
| 597 | const char *signer_header; |
| 598 | |
| 599 | switch (sigc->payload_type) { |
| 600 | case SIGNATURE_PAYLOAD_COMMIT: |
| 601 | signer_header = "committer"; |
| 602 | break; |
| 603 | case SIGNATURE_PAYLOAD_TAG: |
| 604 | signer_header = "tagger"; |
| 605 | break; |
| 606 | case SIGNATURE_PAYLOAD_UNDEFINED: |
| 607 | case SIGNATURE_PAYLOAD_PUSH_CERT: |
| 608 | /* Ignore payloads we don't want to parse */ |
| 609 | return 0; |
| 610 | default: |
| 611 | BUG("invalid value for sigc->payload_type"); |
| 612 | } |
| 613 | |
| 614 | ident_line = find_commit_header(sigc->payload, signer_header, &ident_len); |
| 615 | if (!ident_line || !ident_len) |
| 616 | return 1; |
| 617 | |
| 618 | if (split_ident_line(&ident, ident_line, ident_len)) |
| 619 | return 1; |
| 620 | |
| 621 | if (!sigc->payload_timestamp && ident.date_begin && ident.date_end) |
| 622 | sigc->payload_timestamp = parse_timestamp(ident.date_begin, NULL, 10); |
| 623 | |
| 624 | return 0; |
| 625 | } |
| 626 | |
Fabian Stelzer | 0276943 | 2021-12-09 09:52:43 +0100 | [diff] [blame] | 627 | int check_signature(struct signature_check *sigc, |
| 628 | const char *signature, size_t slen) |
brian m. carlson | a4cc18f | 2015-06-21 23:14:38 +0000 | [diff] [blame] | 629 | { |
Fabian Stelzer | b5726a5 | 2021-09-10 20:07:34 +0000 | [diff] [blame] | 630 | struct gpg_format *fmt; |
brian m. carlson | a4cc18f | 2015-06-21 23:14:38 +0000 | [diff] [blame] | 631 | int status; |
| 632 | |
| 633 | sigc->result = 'N'; |
Hans Jerry Illikainen | 54887b4 | 2019-12-27 13:55:57 +0000 | [diff] [blame] | 634 | sigc->trust_level = -1; |
brian m. carlson | a4cc18f | 2015-06-21 23:14:38 +0000 | [diff] [blame] | 635 | |
Fabian Stelzer | b5726a5 | 2021-09-10 20:07:34 +0000 | [diff] [blame] | 636 | fmt = get_format_by_sig(signature); |
| 637 | if (!fmt) |
| 638 | die(_("bad/incompatible signature '%s'"), signature); |
| 639 | |
Fabian Stelzer | 6393c95 | 2021-12-09 09:52:45 +0100 | [diff] [blame] | 640 | if (parse_payload_metadata(sigc)) |
| 641 | return 1; |
| 642 | |
Fabian Stelzer | 0276943 | 2021-12-09 09:52:43 +0100 | [diff] [blame] | 643 | status = fmt->verify_signed_buffer(sigc, fmt, signature, slen); |
Fabian Stelzer | b5726a5 | 2021-09-10 20:07:34 +0000 | [diff] [blame] | 644 | |
| 645 | if (status && !sigc->output) |
| 646 | return !!status; |
| 647 | |
Hans Jerry Illikainen | 54887b4 | 2019-12-27 13:55:57 +0000 | [diff] [blame] | 648 | status |= sigc->result != 'G'; |
| 649 | status |= sigc->trust_level < configured_min_trust_level; |
brian m. carlson | a4cc18f | 2015-06-21 23:14:38 +0000 | [diff] [blame] | 650 | |
Junio C Hamano | 4e5dc9c | 2018-08-09 11:40:27 -0700 | [diff] [blame] | 651 | return !!status; |
brian m. carlson | a4cc18f | 2015-06-21 23:14:38 +0000 | [diff] [blame] | 652 | } |
| 653 | |
brian m. carlson | ca194d5 | 2015-06-21 23:14:41 +0000 | [diff] [blame] | 654 | void print_signature_buffer(const struct signature_check *sigc, unsigned flags) |
| 655 | { |
Fabian Stelzer | b5726a5 | 2021-09-10 20:07:34 +0000 | [diff] [blame] | 656 | const char *output = flags & GPG_VERIFY_RAW ? sigc->gpg_status : |
| 657 | sigc->output; |
brian m. carlson | aeff29d | 2015-06-21 23:14:42 +0000 | [diff] [blame] | 658 | |
brian m. carlson | ca194d5 | 2015-06-21 23:14:41 +0000 | [diff] [blame] | 659 | if (flags & GPG_VERIFY_VERBOSE && sigc->payload) |
Fabian Stelzer | 0276943 | 2021-12-09 09:52:43 +0100 | [diff] [blame] | 660 | fwrite(sigc->payload, 1, sigc->payload_len, stdout); |
brian m. carlson | ca194d5 | 2015-06-21 23:14:41 +0000 | [diff] [blame] | 661 | |
brian m. carlson | aeff29d | 2015-06-21 23:14:42 +0000 | [diff] [blame] | 662 | if (output) |
| 663 | fputs(output, stderr); |
brian m. carlson | ca194d5 | 2015-06-21 23:14:41 +0000 | [diff] [blame] | 664 | } |
| 665 | |
brian m. carlson | 482c119 | 2021-02-11 02:08:03 +0000 | [diff] [blame] | 666 | size_t parse_signed_buffer(const char *buf, size_t size) |
Junio C Hamano | d7c6766 | 2014-08-19 13:18:07 -0700 | [diff] [blame] | 667 | { |
Junio C Hamano | d7c6766 | 2014-08-19 13:18:07 -0700 | [diff] [blame] | 668 | size_t len = 0; |
Jeff King | 8b44b2b | 2018-04-13 15:18:35 -0600 | [diff] [blame] | 669 | size_t match = size; |
| 670 | while (len < size) { |
| 671 | const char *eol; |
| 672 | |
Henning Schild | 58af57e | 2018-07-17 14:50:09 +0200 | [diff] [blame] | 673 | if (get_format_by_sig(buf + len)) |
Jeff King | 8b44b2b | 2018-04-13 15:18:35 -0600 | [diff] [blame] | 674 | match = len; |
| 675 | |
| 676 | eol = memchr(buf + len, '\n', size - len); |
Junio C Hamano | d7c6766 | 2014-08-19 13:18:07 -0700 | [diff] [blame] | 677 | len += eol ? eol - (buf + len) + 1 : size - len; |
| 678 | } |
Jeff King | 8b44b2b | 2018-04-13 15:18:35 -0600 | [diff] [blame] | 679 | return match; |
Junio C Hamano | d7c6766 | 2014-08-19 13:18:07 -0700 | [diff] [blame] | 680 | } |
| 681 | |
brian m. carlson | 482c119 | 2021-02-11 02:08:03 +0000 | [diff] [blame] | 682 | int parse_signature(const char *buf, size_t size, struct strbuf *payload, struct strbuf *signature) |
| 683 | { |
| 684 | size_t match = parse_signed_buffer(buf, size); |
| 685 | if (match != size) { |
| 686 | strbuf_add(payload, buf, match); |
brian m. carlson | 9b27b49 | 2021-02-11 02:08:06 +0000 | [diff] [blame] | 687 | remove_signature(payload); |
brian m. carlson | 482c119 | 2021-02-11 02:08:03 +0000 | [diff] [blame] | 688 | strbuf_add(signature, buf + match, size - match); |
| 689 | return 1; |
| 690 | } |
| 691 | return 0; |
| 692 | } |
| 693 | |
Junio C Hamano | 2f47eae | 2011-09-07 21:19:47 -0700 | [diff] [blame] | 694 | void set_signing_key(const char *key) |
| 695 | { |
| 696 | free(configured_signing_key); |
| 697 | configured_signing_key = xstrdup(key); |
| 698 | } |
| 699 | |
| 700 | int git_gpg_config(const char *var, const char *value, void *cb) |
| 701 | { |
Henning Schild | 58af57e | 2018-07-17 14:50:09 +0200 | [diff] [blame] | 702 | struct gpg_format *fmt = NULL; |
| 703 | char *fmtname = NULL; |
Hans Jerry Illikainen | 54887b4 | 2019-12-27 13:55:57 +0000 | [diff] [blame] | 704 | char *trust; |
| 705 | int ret; |
Henning Schild | 58af57e | 2018-07-17 14:50:09 +0200 | [diff] [blame] | 706 | |
Junio C Hamano | 2f47eae | 2011-09-07 21:19:47 -0700 | [diff] [blame] | 707 | if (!strcmp(var, "user.signingkey")) { |
Jeff King | 1b0eeec | 2018-04-13 15:18:30 -0600 | [diff] [blame] | 708 | if (!value) |
| 709 | return config_error_nonbool(var); |
Junio C Hamano | 0c5e70f | 2011-11-29 12:29:48 -0800 | [diff] [blame] | 710 | set_signing_key(value); |
Jeff King | 1b0eeec | 2018-04-13 15:18:30 -0600 | [diff] [blame] | 711 | return 0; |
Junio C Hamano | 0c5e70f | 2011-11-29 12:29:48 -0800 | [diff] [blame] | 712 | } |
Jeff King | 1b0eeec | 2018-04-13 15:18:30 -0600 | [diff] [blame] | 713 | |
Henning Schild | 57a8dd7 | 2018-07-17 14:50:07 +0200 | [diff] [blame] | 714 | if (!strcmp(var, "gpg.format")) { |
| 715 | if (!value) |
| 716 | return config_error_nonbool(var); |
Henning Schild | 58af57e | 2018-07-17 14:50:09 +0200 | [diff] [blame] | 717 | fmt = get_format_by_name(value); |
| 718 | if (!fmt) |
Jean-Noël Avila | 1a8aea8 | 2022-01-31 22:07:47 +0000 | [diff] [blame] | 719 | return error(_("invalid value for '%s': '%s'"), |
Henning Schild | 57a8dd7 | 2018-07-17 14:50:07 +0200 | [diff] [blame] | 720 | var, value); |
Henning Schild | 58af57e | 2018-07-17 14:50:09 +0200 | [diff] [blame] | 721 | use_format = fmt; |
| 722 | return 0; |
Henning Schild | 57a8dd7 | 2018-07-17 14:50:07 +0200 | [diff] [blame] | 723 | } |
| 724 | |
Hans Jerry Illikainen | 54887b4 | 2019-12-27 13:55:57 +0000 | [diff] [blame] | 725 | if (!strcmp(var, "gpg.mintrustlevel")) { |
| 726 | if (!value) |
| 727 | return config_error_nonbool(var); |
| 728 | |
| 729 | trust = xstrdup_toupper(value); |
| 730 | ret = parse_gpg_trust_level(trust, &configured_min_trust_level); |
| 731 | free(trust); |
| 732 | |
| 733 | if (ret) |
Jean-Noël Avila | 1a8aea8 | 2022-01-31 22:07:47 +0000 | [diff] [blame] | 734 | return error(_("invalid value for '%s': '%s'"), |
| 735 | var, value); |
Hans Jerry Illikainen | 54887b4 | 2019-12-27 13:55:57 +0000 | [diff] [blame] | 736 | return 0; |
| 737 | } |
| 738 | |
Fabian Stelzer | fd9e226 | 2021-09-10 20:07:37 +0000 | [diff] [blame] | 739 | if (!strcmp(var, "gpg.ssh.defaultkeycommand")) { |
| 740 | if (!value) |
| 741 | return config_error_nonbool(var); |
| 742 | return git_config_string(&ssh_default_key_command, var, value); |
| 743 | } |
| 744 | |
Fabian Stelzer | facca53 | 2021-09-10 20:07:39 +0000 | [diff] [blame] | 745 | if (!strcmp(var, "gpg.ssh.allowedsignersfile")) { |
| 746 | if (!value) |
| 747 | return config_error_nonbool(var); |
| 748 | return git_config_pathname(&ssh_allowed_signers, var, value); |
| 749 | } |
| 750 | |
| 751 | if (!strcmp(var, "gpg.ssh.revocationfile")) { |
| 752 | if (!value) |
| 753 | return config_error_nonbool(var); |
| 754 | return git_config_pathname(&ssh_revocation_file, var, value); |
| 755 | } |
| 756 | |
Henning Schild | b02f51b | 2018-07-17 14:50:11 +0200 | [diff] [blame] | 757 | if (!strcmp(var, "gpg.program") || !strcmp(var, "gpg.openpgp.program")) |
Henning Schild | 58af57e | 2018-07-17 14:50:09 +0200 | [diff] [blame] | 758 | fmtname = "openpgp"; |
| 759 | |
Henning Schild | 1e7adb9 | 2018-07-17 14:50:12 +0200 | [diff] [blame] | 760 | if (!strcmp(var, "gpg.x509.program")) |
| 761 | fmtname = "x509"; |
| 762 | |
Fabian Stelzer | 29b3157 | 2021-09-10 20:07:36 +0000 | [diff] [blame] | 763 | if (!strcmp(var, "gpg.ssh.program")) |
| 764 | fmtname = "ssh"; |
| 765 | |
Henning Schild | 58af57e | 2018-07-17 14:50:09 +0200 | [diff] [blame] | 766 | if (fmtname) { |
| 767 | fmt = get_format_by_name(fmtname); |
| 768 | return git_config_string(&fmt->program, var, value); |
Junio C Hamano | 2f47eae | 2011-09-07 21:19:47 -0700 | [diff] [blame] | 769 | } |
Jeff King | 1b0eeec | 2018-04-13 15:18:30 -0600 | [diff] [blame] | 770 | |
Junio C Hamano | 2f47eae | 2011-09-07 21:19:47 -0700 | [diff] [blame] | 771 | return 0; |
| 772 | } |
| 773 | |
Fabian Stelzer | 350a251 | 2021-11-19 16:07:06 +0100 | [diff] [blame] | 774 | /* |
| 775 | * Returns 1 if `string` contains a literal ssh key, 0 otherwise |
| 776 | * `key` will be set to the start of the actual key if a prefix is present. |
| 777 | */ |
| 778 | static int is_literal_ssh_key(const char *string, const char **key) |
| 779 | { |
| 780 | if (skip_prefix(string, "key::", key)) |
| 781 | return 1; |
| 782 | if (starts_with(string, "ssh-")) { |
| 783 | *key = string; |
| 784 | return 1; |
| 785 | } |
| 786 | return 0; |
| 787 | } |
| 788 | |
Fabian Stelzer | 4838f62 | 2021-09-10 20:07:38 +0000 | [diff] [blame] | 789 | static char *get_ssh_key_fingerprint(const char *signing_key) |
| 790 | { |
| 791 | struct child_process ssh_keygen = CHILD_PROCESS_INIT; |
| 792 | int ret = -1; |
| 793 | struct strbuf fingerprint_stdout = STRBUF_INIT; |
| 794 | struct strbuf **fingerprint; |
Jeff King | f3af71c | 2021-10-18 13:15:37 -0400 | [diff] [blame] | 795 | char *fingerprint_ret; |
Fabian Stelzer | 350a251 | 2021-11-19 16:07:06 +0100 | [diff] [blame] | 796 | const char *literal_key = NULL; |
Fabian Stelzer | 4838f62 | 2021-09-10 20:07:38 +0000 | [diff] [blame] | 797 | |
| 798 | /* |
| 799 | * With SSH Signing this can contain a filename or a public key |
| 800 | * For textual representation we usually want a fingerprint |
| 801 | */ |
Fabian Stelzer | 350a251 | 2021-11-19 16:07:06 +0100 | [diff] [blame] | 802 | if (is_literal_ssh_key(signing_key, &literal_key)) { |
Fabian Stelzer | 4838f62 | 2021-09-10 20:07:38 +0000 | [diff] [blame] | 803 | strvec_pushl(&ssh_keygen.args, "ssh-keygen", "-lf", "-", NULL); |
Fabian Stelzer | 350a251 | 2021-11-19 16:07:06 +0100 | [diff] [blame] | 804 | ret = pipe_command(&ssh_keygen, literal_key, |
| 805 | strlen(literal_key), &fingerprint_stdout, 0, |
Fabian Stelzer | 4838f62 | 2021-09-10 20:07:38 +0000 | [diff] [blame] | 806 | NULL, 0); |
| 807 | } else { |
| 808 | strvec_pushl(&ssh_keygen.args, "ssh-keygen", "-lf", |
| 809 | configured_signing_key, NULL); |
| 810 | ret = pipe_command(&ssh_keygen, NULL, 0, &fingerprint_stdout, 0, |
| 811 | NULL, 0); |
| 812 | } |
| 813 | |
| 814 | if (!!ret) |
| 815 | die_errno(_("failed to get the ssh fingerprint for key '%s'"), |
| 816 | signing_key); |
| 817 | |
| 818 | fingerprint = strbuf_split_max(&fingerprint_stdout, ' ', 3); |
| 819 | if (!fingerprint[1]) |
| 820 | die_errno(_("failed to get the ssh fingerprint for key '%s'"), |
| 821 | signing_key); |
| 822 | |
Jeff King | f3af71c | 2021-10-18 13:15:37 -0400 | [diff] [blame] | 823 | fingerprint_ret = strbuf_detach(fingerprint[1], NULL); |
| 824 | strbuf_list_free(fingerprint); |
| 825 | strbuf_release(&fingerprint_stdout); |
| 826 | return fingerprint_ret; |
Fabian Stelzer | 4838f62 | 2021-09-10 20:07:38 +0000 | [diff] [blame] | 827 | } |
| 828 | |
Fabian Stelzer | fd9e226 | 2021-09-10 20:07:37 +0000 | [diff] [blame] | 829 | /* Returns the first public key from an ssh-agent to use for signing */ |
| 830 | static const char *get_default_ssh_signing_key(void) |
| 831 | { |
| 832 | struct child_process ssh_default_key = CHILD_PROCESS_INIT; |
| 833 | int ret = -1; |
| 834 | struct strbuf key_stdout = STRBUF_INIT, key_stderr = STRBUF_INIT; |
| 835 | struct strbuf **keys; |
| 836 | char *key_command = NULL; |
| 837 | const char **argv; |
| 838 | int n; |
| 839 | char *default_key = NULL; |
Fabian Stelzer | 350a251 | 2021-11-19 16:07:06 +0100 | [diff] [blame] | 840 | const char *literal_key = NULL; |
Fabian Stelzer | fd9e226 | 2021-09-10 20:07:37 +0000 | [diff] [blame] | 841 | |
| 842 | if (!ssh_default_key_command) |
| 843 | die(_("either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured")); |
| 844 | |
| 845 | key_command = xstrdup(ssh_default_key_command); |
| 846 | n = split_cmdline(key_command, &argv); |
| 847 | |
| 848 | if (n < 0) |
| 849 | die("malformed build-time gpg.ssh.defaultKeyCommand: %s", |
| 850 | split_cmdline_strerror(n)); |
| 851 | |
| 852 | strvec_pushv(&ssh_default_key.args, argv); |
| 853 | ret = pipe_command(&ssh_default_key, NULL, 0, &key_stdout, 0, |
| 854 | &key_stderr, 0); |
| 855 | |
| 856 | if (!ret) { |
| 857 | keys = strbuf_split_max(&key_stdout, '\n', 2); |
Fabian Stelzer | 350a251 | 2021-11-19 16:07:06 +0100 | [diff] [blame] | 858 | if (keys[0] && is_literal_ssh_key(keys[0]->buf, &literal_key)) { |
| 859 | /* |
| 860 | * We only use `is_literal_ssh_key` here to check validity |
| 861 | * The prefix will be stripped when the key is used. |
| 862 | */ |
Fabian Stelzer | fd9e226 | 2021-09-10 20:07:37 +0000 | [diff] [blame] | 863 | default_key = strbuf_detach(keys[0], NULL); |
| 864 | } else { |
Jiang Xin | f733719 | 2021-11-01 10:14:17 +0800 | [diff] [blame] | 865 | warning(_("gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"), |
Fabian Stelzer | fd9e226 | 2021-09-10 20:07:37 +0000 | [diff] [blame] | 866 | key_stderr.buf, key_stdout.buf); |
| 867 | } |
| 868 | |
| 869 | strbuf_list_free(keys); |
| 870 | } else { |
| 871 | warning(_("gpg.ssh.defaultKeyCommand failed: %s %s"), |
| 872 | key_stderr.buf, key_stdout.buf); |
| 873 | } |
| 874 | |
| 875 | free(key_command); |
| 876 | free(argv); |
| 877 | strbuf_release(&key_stdout); |
| 878 | |
| 879 | return default_key; |
| 880 | } |
| 881 | |
Fabian Stelzer | 4838f62 | 2021-09-10 20:07:38 +0000 | [diff] [blame] | 882 | static const char *get_ssh_key_id(void) { |
| 883 | return get_ssh_key_fingerprint(get_signing_key()); |
| 884 | } |
| 885 | |
| 886 | /* Returns a textual but unique representation of the signing key */ |
| 887 | const char *get_signing_key_id(void) |
| 888 | { |
| 889 | if (use_format->get_key_id) { |
| 890 | return use_format->get_key_id(); |
| 891 | } |
| 892 | |
| 893 | /* GPG/GPGSM only store a key id on this variable */ |
| 894 | return get_signing_key(); |
| 895 | } |
| 896 | |
Junio C Hamano | 2f47eae | 2011-09-07 21:19:47 -0700 | [diff] [blame] | 897 | const char *get_signing_key(void) |
| 898 | { |
| 899 | if (configured_signing_key) |
| 900 | return configured_signing_key; |
Fabian Stelzer | fd9e226 | 2021-09-10 20:07:37 +0000 | [diff] [blame] | 901 | if (use_format->get_default_key) { |
| 902 | return use_format->get_default_key(); |
| 903 | } |
| 904 | |
| 905 | return git_committer_info(IDENT_STRICT | IDENT_NO_DATE); |
Junio C Hamano | 2f47eae | 2011-09-07 21:19:47 -0700 | [diff] [blame] | 906 | } |
| 907 | |
Junio C Hamano | 2f47eae | 2011-09-07 21:19:47 -0700 | [diff] [blame] | 908 | int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *signing_key) |
| 909 | { |
Fabian Stelzer | b5726a5 | 2021-09-10 20:07:34 +0000 | [diff] [blame] | 910 | return use_format->sign_buffer(buffer, signature, signing_key); |
| 911 | } |
| 912 | |
Fabian Stelzer | 29b3157 | 2021-09-10 20:07:36 +0000 | [diff] [blame] | 913 | /* |
| 914 | * Strip CR from the line endings, in case we are on Windows. |
| 915 | * NEEDSWORK: make it trim only CRs before LFs and rename |
| 916 | */ |
| 917 | static void remove_cr_after(struct strbuf *buffer, size_t offset) |
| 918 | { |
| 919 | size_t i, j; |
| 920 | |
| 921 | for (i = j = offset; i < buffer->len; i++) { |
| 922 | if (buffer->buf[i] != '\r') { |
| 923 | if (i != j) |
| 924 | buffer->buf[j] = buffer->buf[i]; |
| 925 | j++; |
| 926 | } |
| 927 | } |
| 928 | strbuf_setlen(buffer, j); |
| 929 | } |
| 930 | |
Fabian Stelzer | b5726a5 | 2021-09-10 20:07:34 +0000 | [diff] [blame] | 931 | static int sign_buffer_gpg(struct strbuf *buffer, struct strbuf *signature, |
| 932 | const char *signing_key) |
| 933 | { |
René Scharfe | d318027 | 2014-08-19 21:09:35 +0200 | [diff] [blame] | 934 | struct child_process gpg = CHILD_PROCESS_INIT; |
Jeff King | 0581b54 | 2016-06-17 19:38:55 -0400 | [diff] [blame] | 935 | int ret; |
Fabian Stelzer | 29b3157 | 2021-09-10 20:07:36 +0000 | [diff] [blame] | 936 | size_t bottom; |
Fabian Stelzer | a075e79 | 2022-03-04 11:25:17 +0100 | [diff] [blame] | 937 | const char *cp; |
Michael J Gruber | efee955 | 2016-06-17 19:38:59 -0400 | [diff] [blame] | 938 | struct strbuf gpg_status = STRBUF_INIT; |
Junio C Hamano | 2f47eae | 2011-09-07 21:19:47 -0700 | [diff] [blame] | 939 | |
Jeff King | ef8d7ac | 2020-07-28 16:24:53 -0400 | [diff] [blame] | 940 | strvec_pushl(&gpg.args, |
Jeff King | f6d8942 | 2020-07-28 16:26:31 -0400 | [diff] [blame] | 941 | use_format->program, |
| 942 | "--status-fd=2", |
| 943 | "-bsau", signing_key, |
| 944 | NULL); |
Junio C Hamano | 2f47eae | 2011-09-07 21:19:47 -0700 | [diff] [blame] | 945 | |
Jeff King | 0581b54 | 2016-06-17 19:38:55 -0400 | [diff] [blame] | 946 | bottom = signature->len; |
Junio C Hamano | 2f47eae | 2011-09-07 21:19:47 -0700 | [diff] [blame] | 947 | |
| 948 | /* |
| 949 | * When the username signingkey is bad, program could be terminated |
| 950 | * because gpg exits without reading and then write gets SIGPIPE. |
| 951 | */ |
| 952 | sigchain_push(SIGPIPE, SIG_IGN); |
Jeff King | 0581b54 | 2016-06-17 19:38:55 -0400 | [diff] [blame] | 953 | ret = pipe_command(&gpg, buffer->buf, buffer->len, |
Michael J Gruber | efee955 | 2016-06-17 19:38:59 -0400 | [diff] [blame] | 954 | signature, 1024, &gpg_status, 0); |
Junio C Hamano | 2f47eae | 2011-09-07 21:19:47 -0700 | [diff] [blame] | 955 | sigchain_pop(SIGPIPE); |
| 956 | |
Fabian Stelzer | a075e79 | 2022-03-04 11:25:17 +0100 | [diff] [blame] | 957 | for (cp = gpg_status.buf; |
| 958 | cp && (cp = strstr(cp, "[GNUPG:] SIG_CREATED ")); |
| 959 | cp++) { |
| 960 | if (cp == gpg_status.buf || cp[-1] == '\n') |
| 961 | break; /* found */ |
| 962 | } |
| 963 | ret |= !cp; |
Michael J Gruber | efee955 | 2016-06-17 19:38:59 -0400 | [diff] [blame] | 964 | strbuf_release(&gpg_status); |
| 965 | if (ret) |
Junio C Hamano | 2f47eae | 2011-09-07 21:19:47 -0700 | [diff] [blame] | 966 | return error(_("gpg failed to sign the data")); |
| 967 | |
| 968 | /* Strip CR from the line endings, in case we are on Windows. */ |
Fabian Stelzer | 29b3157 | 2021-09-10 20:07:36 +0000 | [diff] [blame] | 969 | remove_cr_after(signature, bottom); |
Junio C Hamano | 2f47eae | 2011-09-07 21:19:47 -0700 | [diff] [blame] | 970 | |
| 971 | return 0; |
| 972 | } |
Fabian Stelzer | 29b3157 | 2021-09-10 20:07:36 +0000 | [diff] [blame] | 973 | |
| 974 | static int sign_buffer_ssh(struct strbuf *buffer, struct strbuf *signature, |
| 975 | const char *signing_key) |
| 976 | { |
| 977 | struct child_process signer = CHILD_PROCESS_INIT; |
| 978 | int ret = -1; |
| 979 | size_t bottom, keylen; |
| 980 | struct strbuf signer_stderr = STRBUF_INIT; |
| 981 | struct tempfile *key_file = NULL, *buffer_file = NULL; |
| 982 | char *ssh_signing_key_file = NULL; |
| 983 | struct strbuf ssh_signature_filename = STRBUF_INIT; |
Fabian Stelzer | 350a251 | 2021-11-19 16:07:06 +0100 | [diff] [blame] | 984 | const char *literal_key = NULL; |
Fabian Stelzer | 29b3157 | 2021-09-10 20:07:36 +0000 | [diff] [blame] | 985 | |
| 986 | if (!signing_key || signing_key[0] == '\0') |
| 987 | return error( |
| 988 | _("user.signingkey needs to be set for ssh signing")); |
| 989 | |
Fabian Stelzer | 350a251 | 2021-11-19 16:07:06 +0100 | [diff] [blame] | 990 | if (is_literal_ssh_key(signing_key, &literal_key)) { |
Fabian Stelzer | 29b3157 | 2021-09-10 20:07:36 +0000 | [diff] [blame] | 991 | /* A literal ssh key */ |
| 992 | key_file = mks_tempfile_t(".git_signing_key_tmpXXXXXX"); |
| 993 | if (!key_file) |
| 994 | return error_errno( |
| 995 | _("could not create temporary file")); |
Fabian Stelzer | 350a251 | 2021-11-19 16:07:06 +0100 | [diff] [blame] | 996 | keylen = strlen(literal_key); |
| 997 | if (write_in_full(key_file->fd, literal_key, keylen) < 0 || |
Fabian Stelzer | 29b3157 | 2021-09-10 20:07:36 +0000 | [diff] [blame] | 998 | close_tempfile_gently(key_file) < 0) { |
| 999 | error_errno(_("failed writing ssh signing key to '%s'"), |
| 1000 | key_file->filename.buf); |
| 1001 | goto out; |
| 1002 | } |
| 1003 | ssh_signing_key_file = strbuf_detach(&key_file->filename, NULL); |
| 1004 | } else { |
| 1005 | /* We assume a file */ |
| 1006 | ssh_signing_key_file = expand_user_path(signing_key, 1); |
| 1007 | } |
| 1008 | |
| 1009 | buffer_file = mks_tempfile_t(".git_signing_buffer_tmpXXXXXX"); |
| 1010 | if (!buffer_file) { |
| 1011 | error_errno(_("could not create temporary file")); |
| 1012 | goto out; |
| 1013 | } |
| 1014 | |
| 1015 | if (write_in_full(buffer_file->fd, buffer->buf, buffer->len) < 0 || |
| 1016 | close_tempfile_gently(buffer_file) < 0) { |
| 1017 | error_errno(_("failed writing ssh signing key buffer to '%s'"), |
| 1018 | buffer_file->filename.buf); |
| 1019 | goto out; |
| 1020 | } |
| 1021 | |
| 1022 | strvec_pushl(&signer.args, use_format->program, |
| 1023 | "-Y", "sign", |
| 1024 | "-n", "git", |
| 1025 | "-f", ssh_signing_key_file, |
| 1026 | buffer_file->filename.buf, |
| 1027 | NULL); |
| 1028 | |
| 1029 | sigchain_push(SIGPIPE, SIG_IGN); |
| 1030 | ret = pipe_command(&signer, NULL, 0, NULL, 0, &signer_stderr, 0); |
| 1031 | sigchain_pop(SIGPIPE); |
| 1032 | |
| 1033 | if (ret) { |
| 1034 | if (strstr(signer_stderr.buf, "usage:")) |
| 1035 | error(_("ssh-keygen -Y sign is needed for ssh signing (available in openssh version 8.2p1+)")); |
| 1036 | |
| 1037 | error("%s", signer_stderr.buf); |
| 1038 | goto out; |
| 1039 | } |
| 1040 | |
| 1041 | bottom = signature->len; |
| 1042 | |
| 1043 | strbuf_addbuf(&ssh_signature_filename, &buffer_file->filename); |
| 1044 | strbuf_addstr(&ssh_signature_filename, ".sig"); |
| 1045 | if (strbuf_read_file(signature, ssh_signature_filename.buf, 0) < 0) { |
| 1046 | error_errno( |
| 1047 | _("failed reading ssh signing data buffer from '%s'"), |
| 1048 | ssh_signature_filename.buf); |
| 1049 | } |
| 1050 | unlink_or_warn(ssh_signature_filename.buf); |
| 1051 | |
| 1052 | /* Strip CR from the line endings, in case we are on Windows. */ |
| 1053 | remove_cr_after(signature, bottom); |
| 1054 | |
| 1055 | out: |
| 1056 | if (key_file) |
| 1057 | delete_tempfile(&key_file); |
| 1058 | if (buffer_file) |
| 1059 | delete_tempfile(&buffer_file); |
| 1060 | strbuf_release(&signer_stderr); |
| 1061 | strbuf_release(&ssh_signature_filename); |
| 1062 | FREE_AND_NULL(ssh_signing_key_file); |
| 1063 | return ret; |
| 1064 | } |