All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Felix Eckhofer <felix@eckhofer.com>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 0/3] fix pull/merge --verify-signature on an unborn branch
Date: Tue, 6 Nov 2018 02:49:10 -0500	[thread overview]
Message-ID: <20181106074910.GA31978@sigill.intra.peff.net> (raw)

This bug was reported to the private security list, but I don't think
it's easily exploitable, since merging or pulling into an unborn branch
is pretty uncommon.

The root of the issue in both commands is just that we handle unborn
branches in a special code path that never learned about
--verify-signatures.

  [1/3]: merge: extract verify_merge_signature() helper
  [2/3]: merge: handle --verify-signatures for unborn branch
  [3/3]: pull: handle --verify-signatures for unborn branch

 builtin/merge.c                    | 30 +++++-------------------------
 builtin/pull.c                     | 11 +++++++++++
 commit.c                           | 26 ++++++++++++++++++++++++++
 commit.h                           |  7 +++++++
 t/t5573-pull-verify-signatures.sh  |  7 +++++++
 t/t7612-merge-verify-signatures.sh |  7 +++++++
 6 files changed, 63 insertions(+), 25 deletions(-)

-Peff

             reply	other threads:[~2018-11-06  7:49 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-06  7:49 Jeff King [this message]
2018-11-06  7:50 ` [PATCH 1/3] merge: extract verify_merge_signature() helper Jeff King
2018-11-06  7:51 ` [PATCH 2/3] merge: handle --verify-signatures for unborn branch Jeff King
2018-11-06  7:52 ` [PATCH 3/3] pull: " Jeff King

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=20181106074910.GA31978@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=felix@eckhofer.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.