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-Status: No, score=-3.8 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,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 8C90C1F4B4 for ; Tue, 29 Sep 2020 03:37:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727432AbgI2DhI (ORCPT ); Mon, 28 Sep 2020 23:37:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727408AbgI2DhC (ORCPT ); Mon, 28 Sep 2020 23:37:02 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26A50C0613D1 for ; Mon, 28 Sep 2020 20:37:02 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id e17so3146234wme.0 for ; Mon, 28 Sep 2020 20:37:02 -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=SEpnHZvLycK4QZFA8t9RNM7Hm1dYHbneTQ8+7VkoepA=; b=Xy4snppJLMOTrqkevoZcqb03HN8OlJo2IqylRfJkAYaD2Cc0UeoCJU7CR4gT3cZKAm YYXN2iJaxtusMxxNjjAa0DhRr+wEmZtjMoHqgTI6VfsjqD2Kbnf3yXvMj6+RxzlLAb1I HzEKNTtU7cJxLLiBchKut0rBeCRu1r72D3AXyRogoM7SNWT0+KJgEYpUxqHU7mbuHY/9 6v95tZBhCXex/j8Gzy33NEDarKytOZkncO9IYKXdnHesrHi25B5TBLZMsFNfEF3ikHVR P1xaPDxn+o+OrJGgYN0JgOArfcJcKWGE5l0YHcF9ct5SR2Uu5AzO9L7i03xuiKYWcZf+ iLSA== 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=SEpnHZvLycK4QZFA8t9RNM7Hm1dYHbneTQ8+7VkoepA=; b=NS28LrFdk68HXunUUEwYtuYOZsgnp1JoG97ajgo6yOMN2Zv2BRGbP4yMOtC26AzcbC DaTZRUADIVIH+PCEQIczS4WBcIo/By8ORtxIEjLXdXkqJfkRoK6cmNyGDiPOL6IH7sdh Prtfl4J0wkfu9N87h0kLDxyBB5RAohTbaH6F98YEz35fgdKrGuS7iUQjNxVQTFKqziYg Rxfoha8Dn+gg5DcZVVdXESfcLeWBZCz6NLD2kG4vrvjBwbUEqVGF9eYaQmCxsz+7aU9T myMruemdBxqdK8EER/jDAPRQOoTTVdjRHZGGg26Vn1bIFuYcoi/muGumrc4IV8+CJdja 5XDg== X-Gm-Message-State: AOAM533F2TcVgkLDtNQetD651qKp5086HXTiyBI5Y/t3+gLLEcIS7ILK teNA9onJbtkEQXcSthBlOKk6wGLxZ4M= X-Google-Smtp-Source: ABdhPJwWLAnzDtHdt2DMu8ltrIoNRbScM6cw2KnQD6V2xWMae+sqc6ptsn/o1krvDqow86S2nTcOZA== X-Received: by 2002:a7b:cd8b:: with SMTP id y11mr2160188wmj.172.1601350620730; Mon, 28 Sep 2020 20:37:00 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id k22sm4198902wrd.29.2020.09.28.20.37.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 20:37:00 -0700 (PDT) Message-Id: In-Reply-To: References: From: "Sean Barag via GitGitGadget" Date: Tue, 29 Sep 2020 03:36:53 +0000 Subject: [PATCH v2 5/7] clone: validate --origin option before use Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin , Derrick Stolee , Jeff King , Eric Sunshine , Taylor Blau , Sean Barag , Andrei Rybak , Sean Barag , Sean Barag Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Sean Barag Providing a bad origin name to `git clone` currently reports an 'invalid refspec' error instead of a more explicit message explaining that the `--origin` option was malformed. This behavior dates back to since 8434c2f1 (Build in clone, 2008-04-27). Reintroduce validation for the provided `--origin` option, but notably _don't_ include a multi-level check (e.g. "foo/bar") that was present in the original `git-clone.sh`. `git remote` allows multi-level remote names since at least 46220ca100 (remote.c: Fix overtight refspec validation, 2008-03-20), so that appears to be the desired behavior. Helped-by: Junio C Hamano Helped-by: Derrick Stolee Helped-by: Jeff King Signed-off-by: Sean Barag --- builtin/clone.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/builtin/clone.c b/builtin/clone.c index 93ccd05b5d..673f7b68c3 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -1011,6 +1011,9 @@ int cmd_clone(int argc, const char **argv, const char *prefix) if (!option_origin) option_origin = "origin"; + if (!valid_remote_name(remote_name)) + die(_("'%s' is not a valid remote name"), remote_name); + repo_name = argv[0]; path = get_repo_path(repo_name, &is_bundle); -- gitgitgadget