From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id aO/lF3rd/V/NFwAA0tVLHw (envelope-from ) for ; Tue, 12 Jan 2021 17:33:46 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id +BXKE3rd/V/WBwAAB5/wlQ (envelope-from ) for ; Tue, 12 Jan 2021 17:33:46 +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 707F59403AC for ; Tue, 12 Jan 2021 17:33:45 +0000 (UTC) Received: from localhost ([::1]:35112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzNY8-0007sn-8W for larch@yhetil.org; Tue, 12 Jan 2021 12:33:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzNE6-0000jB-3r for bug-guix@gnu.org; Tue, 12 Jan 2021 12:13:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49670) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzNE5-0004Dc-QN for bug-guix@gnu.org; Tue, 12 Jan 2021 12:13:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kzNE5-0007XU-JE for bug-guix@gnu.org; Tue, 12 Jan 2021 12:13:01 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#45174: =?UTF-8?Q?=E2=80=98guix_?= =?UTF-8?Q?substitute=E2=80=99_?= =?UTF-8?Q?doesn=E2=80=99t?= handle HTTP redirects Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 12 Jan 2021 17:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45174 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 45174-submit@debbugs.gnu.org id=B45174.161047153428910 (code B ref 45174); Tue, 12 Jan 2021 17:13:01 +0000 Received: (at 45174) by debbugs.gnu.org; 12 Jan 2021 17:12:14 +0000 Received: from localhost ([127.0.0.1]:32983 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kzNDJ-0007WE-CB for submit@debbugs.gnu.org; Tue, 12 Jan 2021 12:12:13 -0500 Received: from lepiller.eu ([89.234.186.109]:60112) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kzNDG-0007W0-SJ for 45174@debbugs.gnu.org; Tue, 12 Jan 2021 12:12:12 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 5f912d75; Tue, 12 Jan 2021 17:12:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type; s=dkim; bh=uAki5ARhQPt5ahRW/Hm/4mXufjFcxVQZ/WNKXW q+cmc=; b=blP+zTLZb5UvzrVdGUR1B6ICdkOWnZ7FPMm33thBdglKBcAN0Lt5zB Se497yScO2v6vH+LZoKQtc7+9ue4ornrPL0GrDxec1LIa8emIUaRJ65g4OQkzPqX jVrGbd/z3weAlapBgoeCOOyTQ7pKG/IllLB+9DcjY7cm6mUtdI2sUSXTIQGKfdWZ dl3RGlX+qEmYbFoVWfIfSHn0ot71+30ArnJIVhLckQHJgP03hNJLDKg8jkJt0oZk oL4NAK+MA0sWQW3tzjrmSHkgjq3p2J9+0rjGoQAOpNULTB8NOAzoPfaQSkzM4IyR 8tvQdGDZ5+oufbPMLtYWw7Fg1jP056LQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 00eab565 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Tue, 12 Jan 2021 17:12:04 +0000 (UTC) Date: Tue, 12 Jan 2021 18:11:55 +0100 From: Julien Lepiller Message-ID: <20210112181155.05b7992d@tachikoma.lepiller.eu> In-Reply-To: <87a6uk8ydv.fsf@inria.fr> References: <87a6uk8ydv.fsf@inria.fr> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/HMfGdeue67HATiQgj_SBCh/" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 45174@debbugs.gnu.org Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.26 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=lepiller.eu header.s=dkim header.b=blP+zTLZ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: 707F59403AC X-Spam-Score: -1.26 X-Migadu-Scanner: scn1.migadu.com X-TUID: yAlM4lIPXeID --MP_/HMfGdeue67HATiQgj_SBCh/ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Le Fri, 11 Dec 2020 10:50:36 +0100, Ludovic Court=C3=A8s a =C3=A9crit : > Hi! >=20 > As reported by mange on #guix, it seems that =E2=80=98guix substitute=E2= =80=99 does > not follow redirects: >=20 > --8<---------------cut here---------------start------------->8--- > $ guix weather icecat emacs --substitute-urls=3Dhttps://ci.guix.gnu.org > computing 2 package derivations for x86_64-linux... > looking for 2 store items on https://ci.guix.gnu.org... > updating substitutes from 'https://ci.guix.gnu.org'... 100.0% > https://ci.guix.gnu.org > 100.0% substitutes available (2 out of 2) > at least 201.3 MiB of nars (compressed) > 293.5 MiB on disk (uncompressed) > 0.084 seconds per request (0.2 seconds in total) > 11.9 requests per second >=20 > at least 1,000 queued builds > x86_64-linux: 368 (36.8%) > i686-linux: 556 (55.6%) > armhf-linux: 6 (.6%) > aarch64-linux: 69 (6.9%) > i586-gnu: 1 (.1%) > build rate: 154.41 builds per hour > i686-linux: 40.77 builds per hour > x86_64-linux: 37.06 builds per hour > armhf-linux: 40.30 builds per hour > aarch64-linux: 35.83 builds per hour > i586-gnu: 0.55 builds per hour > $ guix weather icecat emacs --substitute-urls=3Dhttps://ci.guix.info > computing 2 package derivations for x86_64-linux... > looking for 2 store items on https://ci.guix.info... > updating substitutes from 'https://ci.guix.info'... 100.0% > https://ci.guix.info > 0.0% substitutes available (0 out of 2) > unknown substitute sizes > 0.0 MiB on disk (uncompressed) > 0.069 seconds per request (0.1 seconds in total) > 14.4 requests per second > ni sekvas la redirektigon al 'https://ci.guix.gnu.org/api/queue'... > 'https://ci.guix.gnu.org/api/queue' returned 500 ("Internal Server > Error") --8<---------------cut > here---------------end--------------->8--- >=20 > This might explain things like . >=20 > (*.guix.info were turned into HTTP redirects a few days ago, see > .) >=20 > Ludo=E2=80=99. >=20 >=20 >=20 Here is a patch to fix that issue. Since ci.guix.info now returns 200, it's difficult to test the patch. I created a location block on my website to redirect lepiller.eu/*.narinfo -> ci.guix.gnu.org/*.narinfo. Here's the result: $ guix weather icecat emacs --substitute-urls=3Dhttps://lepiller.eu calcul de 2 d=C3=A9rivations de paquets pour x86_64-linux=E2=80=A6 recherche de 2 =C3=A9l=C3=A9ments du d=C3=A9p=C3=B4t sur https://lepiller.e= u... mise =C3=A0 jour des substituts depuis =C2=AB=C2=A0https://lepiller.eu=C2= =A0=C2=BB... 100.0 % https://lepiller.eu 0.0 % des substituts sont disponibles (0 sur 2) taille des substituts inconnue 0,0 Mo sur le disque (d=C3=A9compress=C3=A9) 0,207 secondes par requ=C3=AAte (0,4 secondes en tout) 4,8 requ=C3=AAtes par seconde $ ./pre-inst-env guix weather icecat emacs --substitute-urls=3Dhttps://lepiller.eu computing 2 package derivations for x86_64-linux... looking for 2 store items on https://lepiller.eu... updating substitutes from 'https://lepiller.eu'... 100.0% https://lepiller.eu 100.0% substitutes available (2 out of 2) at least 201,3 MiB of nars (compressed) 293,5 MiB on disk (uncompressed) 0,525 seconds per request (1,1 seconds in total) 1,9 requests per second (note that I didn't redirect the ci API on my server, so the rest of the weather command fails with a backtrace, but it's unrelated to this patch and this issue). --MP_/HMfGdeue67HATiQgj_SBCh/ Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-substitute-Follow-narinfo-redirections.patch >From f20e01f2a8df538519660772a7431b53d650d64f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 12 Jan 2021 18:07:25 +0100 Subject: [PATCH] substitute: Follow narinfo redirections. * guix/scripts/substitute.scm (fetch-narinfos): Follow redirections. --- guix/scripts/substitute.scm | 38 +++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index e53de8c304..790168091e 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -663,18 +663,36 @@ port to it, or, if connection failed, print a warning and return #f. Pass (len (response-content-length response)) (cache (response-cache-control response)) (ttl (and cache (assoc-ref cache 'max-age)))) - (update-progress!) ;; Make sure to read no more than LEN bytes since subsequent bytes may ;; belong to the next response. - (if (= code 200) ; hit - (let ((narinfo (read-narinfo port url #:size len))) - (if (string=? (dirname (narinfo-path narinfo)) - (%store-prefix)) - (begin - (cache-narinfo! url (narinfo-path narinfo) narinfo ttl) - (cons narinfo result)) - result)) + (case code + ((200) ; hit + (update-progress!) + (let ((narinfo (read-narinfo port url #:size len))) + (if (string=? (dirname (narinfo-path narinfo)) + (%store-prefix)) + (begin + (cache-narinfo! url (narinfo-path narinfo) narinfo ttl) + (cons narinfo result)) + result))) + ((301 302 303 307 308) ; redirect + (let* ((uri (response-location response)) + (new-request (build-request + uri #:headers '((User-Agent . "GNU Guile"))))) + (if len + (get-bytevector-n port len) + (read-to-eof port)) + (append + (http-multiple-get uri + handle-narinfo-response '() + (list new-request) + #:open-connection + open-connection-for-uri/cached + #:verify-certificate? #f) + result))) + (else + (update-progress!) (let* ((path (uri-path (request-uri request))) (hash-part (basename (string-drop-right path 8)))) ;drop ".narinfo" @@ -685,7 +703,7 @@ port to it, or, if connection failed, print a warning and return #f. Pass (if (or (= 404 code) (= 202 code)) ttl %narinfo-transient-error-ttl)) - result)))) + result))))) (define (do-fetch uri) (case (and=> uri uri-scheme) -- 2.29.2 --MP_/HMfGdeue67HATiQgj_SBCh/--