From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id yDFmMevYJ2CEWQAA0tVLHw (envelope-from ) for ; Sat, 13 Feb 2021 13:49:31 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 8IMOLevYJ2BcIQAAbx9fmQ (envelope-from ) for ; Sat, 13 Feb 2021 13:49:31 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6230228157 for ; Sat, 13 Feb 2021 14:49:31 +0100 (CET) Received: from localhost ([::1]:47762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lAvIg-00041L-If for larch@yhetil.org; Sat, 13 Feb 2021 08:49:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lAvHI-0002i1-4q for guix-patches@gnu.org; Sat, 13 Feb 2021 08:48:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50512) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lAvHH-00076z-O9 for guix-patches@gnu.org; Sat, 13 Feb 2021 08:48:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lAvHH-0002x5-L0 for guix-patches@gnu.org; Sat, 13 Feb 2021 08:48:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45409] [PATCH v5 06/14] 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, 13 Feb 2021 13:48:03 +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.161322404811201 (code B ref 45409); Sat, 13 Feb 2021 13:48:03 +0000 Received: (at 45409) by debbugs.gnu.org; 13 Feb 2021 13:47:28 +0000 Received: from localhost ([127.0.0.1]:33797 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lAvGh-0002uV-LF for submit@debbugs.gnu.org; Sat, 13 Feb 2021 08:47:27 -0500 Received: from mira.cbaines.net ([212.71.252.8]:48196) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lAvGc-0002sw-78 for 45409@debbugs.gnu.org; Sat, 13 Feb 2021 08:47:22 -0500 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:8ac0:b4c7:f5c8:7caa]) by mira.cbaines.net (Postfix) with ESMTPSA id B6D9127BC48 for <45409@debbugs.gnu.org>; Sat, 13 Feb 2021 13:47:20 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 426c47ef for <45409@debbugs.gnu.org>; Sat, 13 Feb 2021 13:47:19 +0000 (UTC) From: Christopher Baines Date: Sat, 13 Feb 2021 13:47:11 +0000 Message-Id: <20210213134719.19625-6-mail@cbaines.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210213134719.19625-1-mail@cbaines.net> References: <20210213134719.19625-1-mail@cbaines.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 2.64 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 6230228157 X-Spam-Score: 2.64 X-Migadu-Scanner: scn0.migadu.com X-TUID: AJ5afSupX3rL 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 fc6bb54301..f01c11b020 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) -- 2.30.0