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