From patchwork Thu Jan 6 22:48:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 36065 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 DDAB227BBEA; Thu, 6 Jan 2022 22:52:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A455F27BBE9 for ; Thu, 6 Jan 2022 22:52:12 +0000 (GMT) Received: from localhost ([::1]:50264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n5bcB-0003tC-Ls for patchwork@mira.cbaines.net; Thu, 06 Jan 2022 17:52:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5bZE-0007dp-Iy for guix-patches@gnu.org; Thu, 06 Jan 2022 17:49:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49735) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n5bZD-000769-8O for guix-patches@gnu.org; Thu, 06 Jan 2022 17:49:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n5bZD-00006X-8T for guix-patches@gnu.org; Thu, 06 Jan 2022 17:49:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53063] [PATCH wip-harden-installer 14/14] installer: Add confirmation page when running external commands. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 06 Jan 2022 22:49:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53063 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53063@debbugs.gnu.org Cc: Josselin Poiret Received: via spool by 53063-submit@debbugs.gnu.org id=B53063.164150932832740 (code B ref 53063); Thu, 06 Jan 2022 22:49:07 +0000 Received: (at 53063) by debbugs.gnu.org; 6 Jan 2022 22:48:48 +0000 Received: from localhost ([127.0.0.1]:42624 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n5bYu-0008Vu-7T for submit@debbugs.gnu.org; Thu, 06 Jan 2022 17:48:48 -0500 Received: from jpoiret.xyz ([206.189.101.64]:36774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n5bYp-0008V0-K8 for 53063@debbugs.gnu.org; Thu, 06 Jan 2022 17:48:44 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id CF382184D98; Thu, 6 Jan 2022 22:48:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1641509323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LV18XgneVGVIkuSVz2ReEPeLl642XDRL1w7A6TYk8Xg=; b=ivcgmSzKdJhNzCPYyil1MK4RsP6kZwOfaQDNqrq5qCpHCf8kZDdIB1F/vX0OyUi4QKIB/U p0ecUY37RjbT5+HycB8Z2GlBvKx9oXQ0xDitYpb0t/Fjwv2JjDt4WQUsUeMmNKTL8ZIMFL uDpcQsa8x3hDA2XMn+amdtppe5gDgUOskFQfC0QzON4MWfBctIBTP7R9qky/STSan4KOp2 w9qx13FK8YT7g194OA9p315HGcYxVBMQklMAwNQ9G7SHrg1kXmD8R4ydKXOp/XmRiRLuAa +s+Lonnv63pY6VUGG9Ig6esLTsVWEbVlFoxKrx5q1odgfs6zz/lB6Y+IvmF0Pw== Date: Thu, 6 Jan 2022 23:48:12 +0100 Message-Id: <393a78f61a46d3030a8d8bde9d415d031bb4f190.1641507696.git.dev@jpoiret.xyz> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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" Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret X-getmail-retrieved-from-mailbox: Patches * gnu/installer/newt.scm (newt-run-command): Add it. --- gnu/installer/newt.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/installer/newt.scm b/gnu/installer/newt.scm index fc851339d1..4830667d4d 100644 --- a/gnu/installer/newt.scm +++ b/gnu/installer/newt.scm @@ -80,6 +80,16 @@ (define (exit-error file report key args) (clear-screen)) (define (newt-run-command . args) + (define displayed-command + (string-join + (map (lambda (s) (string-append "\"" s "\"")) args) + " ")) + (run-confirmation-page + (format #f "The installer will run the following command:~%~a~%" + displayed-command) + "External command" + #:exit-button-procedure (lambda () + (abort-to-prompt 'installer-step 'abort))) (newt-suspend) (clear-screen) (define result (run-command args))