From patchwork Sat Jan 16 13:57:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 26404 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B82F727BC14; Sat, 16 Jan 2021 13:59:35 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 68CC327BC13 for ; Sat, 16 Jan 2021 13:59:35 +0000 (GMT) Received: from localhost ([::1]:60490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0m74-0007Ev-I3 for patchwork@mira.cbaines.net; Sat, 16 Jan 2021 08:59:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0m6e-0007Cy-7d for guix-patches@gnu.org; Sat, 16 Jan 2021 08:59:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59301) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0m6a-0004vw-3N for guix-patches@gnu.org; Sat, 16 Jan 2021 08:59:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l0m6a-0005ws-2w for guix-patches@gnu.org; Sat, 16 Jan 2021 08:59:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45409] [PATCH v4 06/13] substitute: open-connection-for-uri/maybe add #:verify-certificate?. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jan 2021 13:59:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45409 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45409@debbugs.gnu.org Received: via spool by 45409-submit@debbugs.gnu.org id=B45409.161080550222730 (code B ref 45409); Sat, 16 Jan 2021 13:59:04 +0000 Received: (at 45409) by debbugs.gnu.org; 16 Jan 2021 13:58:22 +0000 Received: from localhost ([127.0.0.1]:42595 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0m5u-0005uW-Cl for submit@debbugs.gnu.org; Sat, 16 Jan 2021 08:58:22 -0500 Received: from mira.cbaines.net ([212.71.252.8]:49426) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0m5h-0005sZ-Hp for 45409@debbugs.gnu.org; Sat, 16 Jan 2021 08:58:10 -0500 Received: from localhost (188.29.101.63.threembb.co.uk [188.29.101.63]) by mira.cbaines.net (Postfix) with ESMTPSA id 5D6C527BC18 for <45409@debbugs.gnu.org>; Sat, 16 Jan 2021 13:58:07 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 19dd725f for <45409@debbugs.gnu.org>; Sat, 16 Jan 2021 13:58:03 +0000 (UTC) From: Christopher Baines Date: Sat, 16 Jan 2021 13:57:56 +0000 Message-Id: <20210116135803.21955-6-mail@cbaines.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210116135803.21955-1-mail@cbaines.net> References: <20210116135803.21955-1-mail@cbaines.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches As this is used by http-fetch and http-multiple-get when they call the specified open connection procedure. * guix/scripts/substitute.scm (open-connection-for-uri/maybe): Support #:verify-certificate?. --- guix/scripts/substitute.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 64b8ae2a15..259b109cc6 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -322,7 +322,8 @@ if file doesn't exist, and the narinfo otherwise." (define* (open-connection-for-uri/maybe uri #:key fresh? - (time %fetch-timeout)) + (time %fetch-timeout) + verify-certificate?) "Open a connection to URI via 'open-connection-for-uri/cached' and return a port to it, or, if connection failed, print a warning and return #f. Pass #:fresh? to 'open-connection-for-uri/cached'." @@ -332,7 +333,8 @@ port to it, or, if connection failed, print a warning and return #f. Pass (catch #t (lambda () (open-connection-for-uri/cached uri #:timeout time - #:fresh? fresh?)) + #:fresh? fresh? + #:verify-certificate? verify-certificate?)) (match-lambda* (('getaddrinfo-error error) (unless (hash-ref %unreachable-hosts host)