From nobody Mon May 6 04:34:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550592759744346.7893441132047; Tue, 19 Feb 2019 08:12:39 -0800 (PST) Received: from localhost ([127.0.0.1]:51144 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gw80Z-0006E8-HW for importer@patchew.org; Tue, 19 Feb 2019 11:12:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43228) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gw7xf-0004Lz-3E for qemu-devel@nongnu.org; Tue, 19 Feb 2019 11:09:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gw7xd-0000uF-40 for qemu-devel@nongnu.org; Tue, 19 Feb 2019 11:09:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37938) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gw7xX-0000q3-1Q; Tue, 19 Feb 2019 11:09:28 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9CE623DFCD; Tue, 19 Feb 2019 16:09:25 +0000 (UTC) Received: from blue.redhat.com (ovpn-116-222.phx2.redhat.com [10.3.116.222]) by smtp.corp.redhat.com (Postfix) with ESMTP id 108A619C56; Tue, 19 Feb 2019 16:09:24 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Tue, 19 Feb 2019 10:09:20 -0600 Message-Id: <20190219160920.32705-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 19 Feb 2019 16:09:25 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] iotests: Avoid SIGPIPE death to certtool X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , thuth@redhat.com, qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Our use of 'head -1' to log less output of certtool during iotest 233 could result in certtool dying early due to SIGPIPE if it generates enough output; if that happens, the certificate it was supposed to generate may be zero length, which causes failures such as: =3D=3D check TLS client to plain server fails =3D=3D -qemu-img: Could not open 'driver=3Dnbd,host=3D127.0.0.1,port=3DPORT,tls-c= reds=3Dtls0': Denied by server for option 5 (starttls) -server reported: TLS not configured -qemu-nbd: Denied by server for option 5 (starttls) -server reported: TLS not configured +qemu-nbd: Unable to import client certificate /tmp/qemu-iotests-quick-283= 54/tls/client1/client-cert.pem: Base64 unexpected header error. Fix the pipelines to consume all output. Reported-by: Thomas Huth Signed-off-by: Eric Blake Tested-by: Thomas Huth --- tests/qemu-iotests/common.tls | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/common.tls b/tests/qemu-iotests/common.tls index eae81789bbc..15c6e8c8425 100644 --- a/tests/qemu-iotests/common.tls +++ b/tests/qemu-iotests/common.tls @@ -74,7 +74,7 @@ EOF certtool --generate-self-signed \ --load-privkey "${tls_dir}/key.pem" \ --template "${tls_dir}/ca.info" \ - --outfile "${tls_dir}/$name-cert.pem" 2>&1 | head -1 + --outfile "${tls_dir}/$name-cert.pem" 2>&1 | sed -n 1p rm -f "${tls_dir}/ca.info" } @@ -103,7 +103,7 @@ EOF --load-ca-certificate "${tls_dir}/$caname-cert.pem" \ --load-privkey "${tls_dir}/key.pem" \ --template "${tls_dir}/cert.info" \ - --outfile "${tls_dir}/$name/server-cert.pem" 2>&1 | head -1 + --outfile "${tls_dir}/$name/server-cert.pem" 2>&1 | sed -n 1p ln -s "${tls_dir}/$caname-cert.pem" "${tls_dir}/$name/ca-cert.pem" ln -s "${tls_dir}/key.pem" "${tls_dir}/$name/server-key.pem" @@ -132,7 +132,7 @@ EOF --load-ca-certificate "${tls_dir}/$caname-cert.pem" \ --load-privkey "${tls_dir}/key.pem" \ --template "${tls_dir}/cert.info" \ - --outfile "${tls_dir}/$name/client-cert.pem" 2>&1 | head -1 + --outfile "${tls_dir}/$name/client-cert.pem" 2>&1 | sed -n 1p ln -s "${tls_dir}/$caname-cert.pem" "${tls_dir}/$name/ca-cert.pem" ln -s "${tls_dir}/key.pem" "${tls_dir}/$name/client-key.pem" --=20 2.20.1