From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id yIrZCnyVEGCHWwAA0tVLHw (envelope-from ) for ; Tue, 26 Jan 2021 22:19:40 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id h/GqBnyVEGBpMwAA1q6Kng (envelope-from ) for ; Tue, 26 Jan 2021 22:19:40 +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 ABFBF940481 for ; Tue, 26 Jan 2021 22:19:39 +0000 (UTC) Received: from localhost ([::1]:51470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4WgU-0001ht-2C for larch@yhetil.org; Tue, 26 Jan 2021 17:19:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4Wfu-0001hX-HQ for guix-patches@gnu.org; Tue, 26 Jan 2021 17:19:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59577) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l4Wfu-0001Oj-95 for guix-patches@gnu.org; Tue, 26 Jan 2021 17:19:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l4Wfu-0006q8-5L for guix-patches@gnu.org; Tue, 26 Jan 2021 17:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45983] [PATCH 0/3] Fix non-recursive importers gnu and json Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Jan 2021 22:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45983 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: zimoun Received: via spool by 45983-submit@debbugs.gnu.org id=B45983.161169948626226 (code B ref 45983); Tue, 26 Jan 2021 22:19:02 +0000 Received: (at 45983) by debbugs.gnu.org; 26 Jan 2021 22:18:06 +0000 Received: from localhost ([127.0.0.1]:42890 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4Wez-0006ow-Nj for submit@debbugs.gnu.org; Tue, 26 Jan 2021 17:18:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47772) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4Wex-0006oR-PP for 45983@debbugs.gnu.org; Tue, 26 Jan 2021 17:18:04 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:34174) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4Wes-00015S-K8; Tue, 26 Jan 2021 17:17:58 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=44086 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1l4Wes-0000US-7j; Tue, 26 Jan 2021 17:17:58 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20210119152737.4344-1-zimon.toutoune@gmail.com> <20210119152737.4344-3-zimon.toutoune@gmail.com> Date: Tue, 26 Jan 2021 23:17:56 +0100 In-Reply-To: <20210119152737.4344-3-zimon.toutoune@gmail.com> (zimoun's message of "Tue, 19 Jan 2021 16:27:37 +0100") Message-ID: <87o8hbwdez.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: , Cc: 45983@debbugs.gnu.org Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.85 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; 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: ABFBF940481 X-Spam-Score: -2.85 X-Migadu-Scanner: scn0.migadu.com X-TUID: KVs2uCLTRr6K zimoun skribis: > Fixes partially . > > * guix/scripts/import/json.scm (guix-import-json): Handle error. [...] > - (or (json->code file-name) > - (leave (G_ "invalid JSON in file '~a'~%") file-name))) > + (if (file-exists? file-name) > + (or (json->code file-name) > + (leave (G_ "invalid JSON in file '~a'~%") file-name)) > + (leave (G_ "invalid file name~%")))) I=E2=80=99d suggest this: (catch 'system-error (lambda () (or (json->code =E2=80=A6) =E2=80=A6)) (lambda args (leave (G_ "failed to access '~a': ~a~%") file-name (strerror (system-error-errno args))))) This avoids TOCTTOU and gives details about the failure. Could you send updated patches? Thanks, Ludo=E2=80=99.