From nobody Sat Dec 21 17:05:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1727189479457345.97671965174254; Tue, 24 Sep 2024 07:51:19 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6A8C41369; Tue, 24 Sep 2024 10:51:17 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 608B912F2; Tue, 24 Sep 2024 10:50:57 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id A34F512E9; Tue, 24 Sep 2024 10:50:54 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 9417C12E2 for ; Tue, 24 Sep 2024 10:50:53 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-460--M646YHvM1iCmd1oxMhApA-1; Tue, 24 Sep 2024 10:50:49 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (unknown [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F3D20193E8D7 for ; Tue, 24 Sep 2024 14:50:48 +0000 (UTC) Received: from worklaptop.home (unknown [10.22.9.161]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3D8FC1956052; Tue, 24 Sep 2024 14:50:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727189453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/FZW1PeWHT+WcVP23IwN7T++uD8Hzp8POpkFwubbJ60=; b=VU1+nFMbmLCyqEVP9hcRkZVi+9ALykL973/L/wnVFV2He4VfgbijyUaM3U5WNpLB4UN9Ew /T0sLrKszqH2icKAMoQdyO8rEL9DdQ/7V7bnhcXFHJGYyxN78S9G/9NQv0mOSpi3XFdXpa LahFLXQQEdaS7dZHqqxnrpvD7aRe+Pk= X-MC-Unique: -M646YHvM1iCmd1oxMhApA-1 From: Cole Robinson To: devel@lists.libvirt.org Subject: [PATCH] rpc: ssh: Allow SSH_ASKPASS_REQUIRE Date: Tue, 24 Sep 2024 10:50:45 -0400 Message-ID: <35c49df73cf2f1b3f1e3805fc22a663b916d4655.1727189445.git.crobinso@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: FVKSYSLKAFMWRXGK345DDDC2IVW2MMU3 X-Message-ID-Hash: FVKSYSLKAFMWRXGK345DDDC2IVW2MMU3 X-MailFrom: crobinso@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Cole Robinson X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1727189480886116600 Content-Type: text/plain; charset="utf-8" openssh 8.4p1 released in Sep 2020 added a feature to force use of SSH_ASKPASS https://man.openbsd.org/ssh.1#SSH_ASKPASS_REQUIRE Don't strip it from the environment Signed-off-by: Cole Robinson Reviewed-by: Daniel P. Berrang=C3=A9 --- src/rpc/virnetsocket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 79bf8e511a..e8fc2d5f7d 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -850,6 +850,7 @@ int virNetSocketNewConnectSSH(const char *nodename, virCommandAddEnvPass(cmd, "KRB5CCNAME"); virCommandAddEnvPass(cmd, "SSH_AUTH_SOCK"); virCommandAddEnvPass(cmd, "SSH_ASKPASS"); + virCommandAddEnvPass(cmd, "SSH_ASKPASS_REQUIRE"); virCommandAddEnvPass(cmd, "OPENSSL_CONF"); virCommandAddEnvPass(cmd, "DISPLAY"); virCommandAddEnvPass(cmd, "XAUTHORITY"); --=20 2.46.0