From patchwork Sat Jul 29 12:02:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Attila Lendvai X-Patchwork-Id: 52352 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 0AADB27BBE9; Sat, 29 Jul 2023 13:46:48 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham 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 B261627BBE2 for ; Sat, 29 Jul 2023 13:46:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qPj8p-0004A3-BX; Sat, 29 Jul 2023 08:33:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPig3-0004wK-HX for guix-patches@gnu.org; Sat, 29 Jul 2023 08:04:07 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qPig3-0002tY-9i; Sat, 29 Jul 2023 08:04:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qPifx-0002rm-UJ; Sat, 29 Jul 2023 08:04:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64930] [PATCH] guix: Also print the user when SSH auth fails. Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: mail@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sat, 29 Jul 2023 12:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64930 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64930@debbugs.gnu.org Cc: Attila Lendvai , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by submit@debbugs.gnu.org id=B.169063222310978 (code B ref -1); Sat, 29 Jul 2023 12:04:01 +0000 Received: (at submit) by debbugs.gnu.org; 29 Jul 2023 12:03:43 +0000 Received: from localhost ([127.0.0.1]:46541 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPife-0002r0-IK for submit@debbugs.gnu.org; Sat, 29 Jul 2023 08:03:42 -0400 Received: from lists.gnu.org ([2001:470:142::17]:48228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPifd-0002qo-5t for submit@debbugs.gnu.org; Sat, 29 Jul 2023 08:03:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPifX-0004ty-UP for guix-patches@gnu.org; Sat, 29 Jul 2023 08:03:35 -0400 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qPifW-0002qG-Ef for guix-patches@gnu.org; Sat, 29 Jul 2023 08:03:35 -0400 Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-99bf1f632b8so199122266b.1 for ; Sat, 29 Jul 2023 05:03:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690632213; x=1691237013; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=3kYeik7+9HaqELFrYmfH+HE43PO491tiu/3CEtYlfyI=; b=op8h+pC6xUSJhBjTOskgLZEYOgiZahb/N7tgu+HtnJGfZhNNrWtD6dScs97VvuWZRi bnATIV0g7nBkzx9r2rqGkIbPR3qBmgsFz3T+MnGEbP9Aos+DG5bhRFKeIjMdUrZAKMk8 L6R4dfZorMqPs1wDDdmAfm7nPIvlbsvV0QktgvVbsKqmZFcQ/tErhuwdXde9WjM0Nyw9 xBL6Fhsbk/GJTvtP+Cxp1DFHTKeVgXpVlunpnio8MdGhRBzea7fV9dduv0XBPN9BtSd+ hJqAhUAFGFtvSqVA12W7rzzQgtOzWK8sh2fWWSGfzhLrMi0Xu+uHMdyZspkjkteCw2aJ i7Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690632213; x=1691237013; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=3kYeik7+9HaqELFrYmfH+HE43PO491tiu/3CEtYlfyI=; b=J+oD6I6noAKd6IG59CgV4PzGg7KlfcStNx6/4TtH0ZLF37x4K2q20+Gm3hjxcB2xHg AWciWUNbX75JUeybxSyoh5BQssF7T9NOiNIkBhumu218/eQHV8ipJzrAFEHawmNwmeGF Udl/Quy3QP5a5GGW6C5GwBtErTz2Wp5U3h/nzopsZWKV2J8UxcHKU9apYcKqT3SSKAYO Y9zR+U4Y5idhjCRdkmEvzkU/wC2sPsyAiZ8NHVIfNm4GJNZzHtIDipXi0hxgUkGoCd9g Q5hwWW1/jsVLNiGsevOzdSyxfe04bfhLhJ/OrPDn+bK28a1mnzIECbrBlTKTicqAmphr HHZw== X-Gm-Message-State: ABy/qLbZz4nswJjcI5Gqsg/XrGCZ8AvdJzeY0bQwPfVTR53oCQ+EJgZ1 oh8s6kGW9MYsMO61WgnYggaAiWR6A10= X-Google-Smtp-Source: APBJJlEZOupoBRIJ8BH74PaqOKBw27a+22Vu0aEqLut2jBmQL69/qDuhbeuCKXFQJ9IexPC/EdB5xg== X-Received: by 2002:a17:906:194:b0:991:c9da:70da with SMTP id 20-20020a170906019400b00991c9da70damr2329979ejb.61.1690632212560; Sat, 29 Jul 2023 05:03:32 -0700 (PDT) Received: from lelap.lan (catv-80-98-247-145.catv.fixed.vodafone.hu. [80.98.247.145]) by smtp.gmail.com with ESMTPSA id j20-20020a170906051400b00992b8d56f3asm3183245eja.105.2023.07.29.05.03.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Jul 2023 05:03:32 -0700 (PDT) From: Attila Lendvai X-Google-Original-From: Attila Lendvai Date: Sat, 29 Jul 2023 14:02:37 +0200 Message-Id: <5e86c8256e44eb5516631fc455c6c4d1de271eb1.1690632156.git.attila@lendvai.name> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=attila.lendvai@gmail.com; helo=mail-ej1-x631.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 29 Jul 2023 08:33:48 -0400 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches --- i have added this when i was debugging a guix deploy issue, and i thought it should be useful for others, too. guix/ssh.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: e43cbeafd1b632f39b08b3644af5230d5350a656 prerequisite-patch-id: 6793c8ad24215c5f14ce71a4741fff5f6ccd7eeb prerequisite-patch-id: 3a8dd737d11f37987641af9bc7f512a0bb1a1591 prerequisite-patch-id: f6456f2bf0b7b078318d16b958c14816eb45ace5 prerequisite-patch-id: 52e0d371350dbeb839990acd0bbe70bc5b5b995b diff --git a/guix/ssh.scm b/guix/ssh.scm index b7b9807ebf..91d61fc3c0 100644 --- a/guix/ssh.scm +++ b/guix/ssh.scm @@ -175,8 +175,8 @@ (define* (open-ssh-session host #:key user port identity (disconnect! session) (raise (condition (&message - (message (format #f (G_ "SSH authentication failed for '~a': ~a~%") - host (get-error session))))))))))) + (message (format #f (G_ "SSH authentication failed for '~a@~a': ~a~%") + user host (get-error session))))))))))) (x ;; Connection failed or timeout expired. (raise (formatted-message (G_ "SSH connection to '~a' failed: ~a~%")