From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id D370F1F5AE for ; Mon, 19 Jul 2021 13:35:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238585AbhGSMwu (ORCPT ); Mon, 19 Jul 2021 08:52:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238588AbhGSMwn (ORCPT ); Mon, 19 Jul 2021 08:52:43 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EDACAC061574 for ; Mon, 19 Jul 2021 05:55:04 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id n4so10377791wms.1 for ; Mon, 19 Jul 2021 06:33:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=TymVszFjsJBdjwLDTQ6Si3e5nI9WQC7VP4b+jb56DIU=; b=p7Cv4DMuWuVK5EWUtT8YeYVjBl+RPJY+LH63a+DDIOg5kmuQ3XtMvnsIfxk0P0jXfu HTGsjWO61fIZXXRz72afEDXqLN7eypCVN8XLAmXbMYjrXbUJt81d8+adj4t55yT4+o0e J5CJUpnUhmzDlnfnUFWe4upX57HiJqa1nYsne3gULRcwodG2xYZtTvP7c3Miic/s76gm rOe60ILBZAoS8GK08RPNB05DSM/dfQaTAAK/+O9UJByQthDfUxs/eAL7bUu+Wi6I6qUm 3vFkHglDGzwSHqO2Yl/CxGia5OXckO6X+YjlbQMZIXC0Q+oNM41upMTk1YZoJ4HzbUy4 11uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=TymVszFjsJBdjwLDTQ6Si3e5nI9WQC7VP4b+jb56DIU=; b=fWxPrRbqTyV9JLJhZQmGRebcOWAOFBJlK5X0N692tRnx+Wk/c+RsMMaBOopR2bqGK/ FPOLERV0L9ttCMUyNyu2gEyV6sWhJTJ5hYU+ykfLbS7cOMSvo9OOO7s4DAcEcoRxCiAE JxvRRe4C4TzZL+9ZulJoNNLl6xxo7aWIE6ossJeXwdxfiKkM64wMTCjiA/mAn0IK/j8Z 5TbZTvgODCoNu7nmYSJJXzVd1vn9j2tRYB6LMR8ARLa69a/OnogihtikmID0Q8nF68Io 5+P0MI87CAxQOH7nWRq5uR+BIfCPD3V/LETx1J+QGp/0cT165dx0PIbtN7AqElaPGJme iK2w== X-Gm-Message-State: AOAM5337tFA5QTqEpGyA7TKwOlz+vGWQc2nKVtsReBTAWTp1Dakah5cn 7ix7gz1oR0koHavHQt77qw/n0RM2krs= X-Google-Smtp-Source: ABdhPJwm/VBvzA8v4lZfZ2dVe8/GMXQJhnurMyzQ7PmdvLbowy4dzvayVvfgxQ5VKMBY4p2JZGuYzw== X-Received: by 2002:a1c:20c7:: with SMTP id g190mr15774509wmg.16.1626701601162; Mon, 19 Jul 2021 06:33:21 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id u16sm24447433wrw.36.2021.07.19.06.33.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jul 2021 06:33:20 -0700 (PDT) Message-Id: <1ec5c06cbe9c0b3ceded291822431baa1564485e.1626701596.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Fabian Stelzer via GitGitGadget" Date: Mon, 19 Jul 2021 13:33:10 +0000 Subject: [PATCH v4 3/9] ssh signing: retrieve a default key from ssh-agent Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Han-Wen Nienhuys , Fabian Stelzer , "brian m. carlson" , "Randall S. Becker" , Bagas Sanjaya , Hans Jerry Illikainen , =?UTF-8?Q?=C3=86var_Arnfj=C3=B6r=C3=B0?= Bjarmason , Felipe Contreras , Eric Sunshine , Gwyneth Morgan , Fabian Stelzer , Fabian Stelzer Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Fabian Stelzer if user.signingkey is not set and a ssh signature is requested we call ssh-add -L and use the first key we get Signed-off-by: Fabian Stelzer --- gpg-interface.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gpg-interface.c b/gpg-interface.c index a086123754d..35e584b94ef 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -470,11 +470,35 @@ int git_gpg_config(const char *var, const char *value, void *cb) return 0; } +/* Returns the first public key from an ssh-agent to use for signing */ +static char *get_default_ssh_signing_key(void) +{ + struct child_process ssh_add = CHILD_PROCESS_INIT; + int ret = -1; + struct strbuf key_stdout = STRBUF_INIT; + struct strbuf **keys; + + strvec_pushl(&ssh_add.args, "ssh-add", "-L", NULL); + ret = pipe_command(&ssh_add, NULL, 0, &key_stdout, 0, NULL, 0); + if (!ret) { + keys = strbuf_split_max(&key_stdout, '\n', 2); + if (keys[0]) + return strbuf_detach(keys[0], NULL); + } + + strbuf_release(&key_stdout); + return ""; +} + const char *get_signing_key(void) { if (configured_signing_key) return configured_signing_key; - return git_committer_info(IDENT_STRICT|IDENT_NO_DATE); + if (!strcmp(use_format->name, "ssh")) { + return get_default_ssh_signing_key(); + } else { + return git_committer_info(IDENT_STRICT | IDENT_NO_DATE); + } } int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *signing_key) -- gitgitgadget