From: "Raymond E. Pasco" <ray@ameretat.dev>
To: git@vger.kernel.org
Cc: "Raymond E. Pasco" <ray@ameretat.dev>
Subject: [PATCH] ssh: add 'ssh.keyfile' option
Date: Thu, 23 Apr 2020 02:41:10 -0400 [thread overview]
Message-ID: <20200423064110.77258-1-ray@ameretat.dev> (raw)
When a specific private key needs to be used with a repository, manually
specifying it via 'core.sshCommand' is not ideal. This option allows a
keyfile to be specified in the local configuration. If a keyfile is
specified, SSH agents are disabled for the command.
Signed-off-by: Raymond E. Pasco <ray@ameretat.dev>
---
I've encountered the need to specify a specific SSH key to be used with
a repository, and overriding the whole ssh command isn't great. I have
only tested this with OpenSSH.
connect.c | 32 ++++++++++++++++++++++++++++----
1 file changed, 28 insertions(+), 4 deletions(-)
diff --git a/connect.c b/connect.c
index 23013c6344..dc7c75ead3 100644
--- a/connect.c
+++ b/connect.c
@@ -1104,8 +1104,9 @@ static struct child_process *git_connect_git(int fd[2], char *hostandport,
* `args` for running ssh in Git's SSH-tunneled transport.
*/
static void push_ssh_options(struct argv_array *args, struct argv_array *env,
- enum ssh_variant variant, const char *port,
- enum protocol_version version, int flags)
+ enum ssh_variant variant, const char *keyfile,
+ const char *port, enum protocol_version version,
+ int flags)
{
if (variant == VARIANT_SSH &&
version > 0) {
@@ -1144,6 +1145,26 @@ static void push_ssh_options(struct argv_array *args, struct argv_array *env,
if (variant == VARIANT_TORTOISEPLINK)
argv_array_push(args, "-batch");
+ if (keyfile) {
+ switch (variant) {
+ case VARIANT_AUTO:
+ BUG("VARIANT_AUTO passed to push_ssh_options");
+ case VARIANT_SIMPLE:
+ die(_("ssh variant 'simple' does not support setting keyfiles"));
+ case VARIANT_SSH:
+ argv_array_push(args, "-a");
+ argv_array_push(args, "-i");
+ argv_array_push(args, keyfile);
+ break;
+ case VARIANT_PLINK:
+ case VARIANT_PUTTY:
+ case VARIANT_TORTOISEPLINK:
+ argv_array_push(args, "-noagent");
+ argv_array_push(args, "-i");
+ argv_array_push(args, keyfile);
+ }
+ }
+
if (port) {
switch (variant) {
case VARIANT_AUTO:
@@ -1169,6 +1190,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
int flags)
{
const char *ssh;
+ const char *keyfile;
enum ssh_variant variant;
if (looks_like_command_line_option(ssh_host))
@@ -1200,14 +1222,16 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
argv_array_push(&detect.args, ssh);
argv_array_push(&detect.args, "-G");
push_ssh_options(&detect.args, &detect.env_array,
- VARIANT_SSH, port, version, flags);
+ VARIANT_SSH, keyfile, port, version, flags);
argv_array_push(&detect.args, ssh_host);
variant = run_command(&detect) ? VARIANT_SIMPLE : VARIANT_SSH;
}
+ git_config_get_string_const("ssh.keyfile", &keyfile);
+
argv_array_push(&conn->args, ssh);
- push_ssh_options(&conn->args, &conn->env_array, variant, port, version, flags);
+ push_ssh_options(&conn->args, &conn->env_array, variant, keyfile, port, version, flags);
argv_array_push(&conn->args, ssh_host);
}
--
2.26.1
next reply other threads:[~2020-04-23 6:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-23 6:41 Raymond E. Pasco [this message]
2020-04-23 11:21 ` [PATCH v2] ssh: add 'ssh.keyfile' option Raymond E. Pasco
2020-04-23 17:24 ` Johannes Sixt
2020-04-23 19:32 ` Junio C Hamano
2020-04-24 3:24 ` Raymond E. Pasco
2020-04-23 18:03 ` Matthias Aßhauer
2020-04-23 19:38 ` Junio C Hamano
2020-04-24 4:33 ` Matthias Aßhauer
2020-04-25 9:43 ` [PATCH] connect.c: clarify BUG() messages in push_ssh_options Matthias Aßhauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200423064110.77258-1-ray@ameretat.dev \
--to=ray@ameretat.dev \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).