From nobody Sun Feb 8 16:26:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.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 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542383921389476.46196477849855; Fri, 16 Nov 2018 07:58:41 -0800 (PST) Received: from localhost ([::1]:45454 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNgW0-0006WY-Cc for importer@patchew.org; Fri, 16 Nov 2018 10:58:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54316) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNgRT-0002RF-Uh for qemu-devel@nongnu.org; Fri, 16 Nov 2018 10:54:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gNgRO-0000eF-Br for qemu-devel@nongnu.org; Fri, 16 Nov 2018 10:53:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52078) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gNgR8-0000YK-Nm; Fri, 16 Nov 2018 10:53:42 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 43A97307D926; Fri, 16 Nov 2018 15:53:33 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-53.ams2.redhat.com [10.36.112.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id CDAC8672E9; Fri, 16 Nov 2018 15:53:30 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 16 Nov 2018 15:53:20 +0000 Message-Id: <20181116155325.22428-2-berrange@redhat.com> In-Reply-To: <20181116155325.22428-1-berrange@redhat.com> References: <20181116155325.22428-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Fri, 16 Nov 2018 15:53:33 +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 1/6 for-3.1] nbd: fix whitespace in server error message 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 , 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" A space was missing after the option number was printed: Option 0x8not permitted before TLS becomes Option 0x8 not permitted before TLS This fixes commit 3668328303429f3bc93ab3365c66331600b06a2d Author: Eric Blake Date: Fri Oct 14 13:33:09 2016 -0500 nbd: Send message along with server NBD_REP_ERR errors Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- nbd/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nbd/server.c b/nbd/server.c index 4e8f5ae51b..12e8139f95 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -1135,7 +1135,7 @@ static int nbd_negotiate_options(NBDClient *client, u= int16_t myflags, =20 default: ret =3D nbd_opt_drop(client, NBD_REP_ERR_TLS_REQD, errp, - "Option 0x%" PRIx32 + "Option 0x%" PRIx32 " " "not permitted before TLS", option); /* Let the client keep trying, unless they asked to * quit. In this mode, we've already sent an error, so --=20 2.19.1 From nobody Sun Feb 8 16:26:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542383904898121.20227344020145; Fri, 16 Nov 2018 07:58:24 -0800 (PST) Received: from localhost ([::1]:45453 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNgVj-0006FT-GH for importer@patchew.org; Fri, 16 Nov 2018 10:58:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54337) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNgRU-0002Rz-LC for qemu-devel@nongnu.org; Fri, 16 Nov 2018 10:54:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gNgRT-0000gh-TF for qemu-devel@nongnu.org; Fri, 16 Nov 2018 10:54:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43960) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gNgRM-0000aT-5A; Fri, 16 Nov 2018 10:53:52 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C5F90C057E1F; Fri, 16 Nov 2018 15:53:41 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-53.ams2.redhat.com [10.36.112.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 178B660FE1; Fri, 16 Nov 2018 15:53:33 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 16 Nov 2018 15:53:21 +0000 Message-Id: <20181116155325.22428-3-berrange@redhat.com> In-Reply-To: <20181116155325.22428-1-berrange@redhat.com> References: <20181116155325.22428-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 16 Nov 2018 15:53:41 +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 2/6 for-3.1] nbd: stop waiting for a NBD response with NBD_CMD_DISC 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 , 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" When sending a NBD_CMD_DISC message there is no reply expected, however, the nbd_read_eof() coroutine is still waiting for a reply. In a plain NBD connection this doesn't matter as it will just get an EOF, however, on a TLS connection it will get an interrupted TLS data packet. The nbd_read_eof() will then print an error message on the console due to missing reply to NBD_CMD_DISC. This can be seen with qemu-img $ qemu-img info \ --object tls-creds-x509,dir=3Dtlsdir,id=3Dtls0,endpoint=3Dclient \ --image-opts driver=3Dnbd,host=3D127.0.0.1,port=3D9000,tls-creds=3Dtl= s0 qemu-img: Cannot read from TLS channel: Input/output error image: nbd://127.0.0.1:9000 file format: nbd virtual size: 10M (10485760 bytes) disk size: unavailable Simply setting the 'quit' flag after sending NBD_CMD_DISC is enough to get the coroutine to stop waiting for a reply and thus supress the error message. This fixes a regression introduced in commit be41c100c0d67f6072ddd4910c4b6f7d239f025f Author: Vladimir Sementsov-Ogievskiy Date: Fri May 26 14:09:13 2017 +0300 nbd/client.c: use errp instead of LOG Move to modern errp scheme from just LOGging errors. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20170526110913.89098-1-vsementsov@virtuozzo.com> Signed-off-by: Paolo Bonzini Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Eric Blake --- block/nbd-client.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/nbd-client.c b/block/nbd-client.c index 76e9ca3abe..5f63e4b8f1 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -961,6 +961,7 @@ void nbd_client_close(BlockDriverState *bs) } =20 nbd_send_request(client->ioc, &request); + client->quit =3D true; =20 nbd_teardown_connection(bs); } --=20 2.19.1 From nobody Sun Feb 8 16:26:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.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 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542384062847756.4262598304341; Fri, 16 Nov 2018 08:01:02 -0800 (PST) Received: from localhost ([::1]:45470 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNgYH-0008Mj-64 for importer@patchew.org; Fri, 16 Nov 2018 11:01:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54469) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNgRk-0002fy-Jx for qemu-devel@nongnu.org; Fri, 16 Nov 2018 10:54:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gNgRj-0000nA-Cj for qemu-devel@nongnu.org; Fri, 16 Nov 2018 10:54:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60998) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gNgRd-0000kw-45; Fri, 16 Nov 2018 10:54:09 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 79624307CDDE; Fri, 16 Nov 2018 15:54:08 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-53.ams2.redhat.com [10.36.112.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D184672EF; Fri, 16 Nov 2018 15:53:41 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 16 Nov 2018 15:53:22 +0000 Message-Id: <20181116155325.22428-4-berrange@redhat.com> In-Reply-To: <20181116155325.22428-1-berrange@redhat.com> References: <20181116155325.22428-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Fri, 16 Nov 2018 15:54:08 +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 3/6] tests: pull qemu-nbd iotest helpers into common.nbd file 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 , 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" The helpers for starting/stopping qemu-nbd in 058 will be useful in other test cases, so move them into a common.nbd file. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Eric Blake --- tests/qemu-iotests/058 | 47 +++++------------------------ tests/qemu-iotests/common.nbd | 56 +++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 39 deletions(-) create mode 100644 tests/qemu-iotests/common.nbd diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058 index 5eb8784669..cd73250c48 100755 --- a/tests/qemu-iotests/058 +++ b/tests/qemu-iotests/058 @@ -29,55 +29,19 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 -nbd_unix_socket=3D$TEST_DIR/test_qemu_nbd_socket -nbd_snapshot_img=3D"nbd:unix:$nbd_unix_socket" -rm -f "${TEST_DIR}/qemu-nbd.pid" - -_cleanup_nbd() -{ - local NBD_SNAPSHOT_PID - if [ -f "${TEST_DIR}/qemu-nbd.pid" ]; then - read NBD_SNAPSHOT_PID < "${TEST_DIR}/qemu-nbd.pid" - rm -f "${TEST_DIR}/qemu-nbd.pid" - if [ -n "$NBD_SNAPSHOT_PID" ]; then - kill "$NBD_SNAPSHOT_PID" - fi - fi - rm -f "$nbd_unix_socket" -} - -_wait_for_nbd() -{ - for ((i =3D 0; i < 300; i++)) - do - if [ -r "$nbd_unix_socket" ]; then - return - fi - sleep 0.1 - done - echo "Failed in check of unix socket created by qemu-nbd" - exit 1 -} - -converted_image=3D$TEST_IMG.converted - _export_nbd_snapshot() { - _cleanup_nbd - $QEMU_NBD -v -t -k "$nbd_unix_socket" "$TEST_IMG" -l $1 & - _wait_for_nbd + nbd_server_start_unix_socket "$TEST_IMG" -l $1 } =20 _export_nbd_snapshot1() { - _cleanup_nbd - $QEMU_NBD -v -t -k "$nbd_unix_socket" "$TEST_IMG" -l snapshot.name=3D$= 1 & - _wait_for_nbd + nbd_server_start_unix_socket "$TEST_IMG" -l snapshot.name=3D$1 } =20 _cleanup() { - _cleanup_nbd + nbd_server_stop _cleanup_test_img rm -f "$converted_image" } @@ -87,6 +51,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.rc . ./common.filter . ./common.pattern +. ./common.nbd =20 _supported_fmt qcow2 _supported_proto file @@ -95,6 +60,10 @@ _require_command QEMU_NBD # Internal snapshots are (currently) impossible with refcount_bits=3D1 _unsupported_imgopts 'refcount_bits=3D1[^0-9]' =20 +nbd_snapshot_img=3D"nbd:unix:$nbd_unix_socket" + +converted_image=3D$TEST_IMG.converted + # Use -f raw instead of -f $IMGFMT for the NBD connection QEMU_IO_NBD=3D"$QEMU_IO -f raw --cache=3D$CACHEMODE" =20 diff --git a/tests/qemu-iotests/common.nbd b/tests/qemu-iotests/common.nbd new file mode 100644 index 0000000000..f920a578f1 --- /dev/null +++ b/tests/qemu-iotests/common.nbd @@ -0,0 +1,56 @@ +#!/bin/bash +# -*- shell-script-mode -*- +# +# Helpers for NBD server related config +# +# Copyright (C) 2018 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +nbd_unix_socket=3D"${TEST_DIR}/qemu-nbd.sock" +nbd_pid_file=3D"${TEST_DIR}/qemu-nbd.pid" + +function nbd_server_stop() +{ + local NBD_PID + if [ -f "$nbd_pid_file" ]; then + read NBD_PID < "$nbd_pid_file" + rm -f "$nbd_pid_file" + if [ -n "$NBD_PID" ]; then + kill "$NBD_PID" + fi + fi + rm -f "$nbd_unix_socket" +} + +function nbd_server_wait_for_unix_socket() +{ + for ((i =3D 0; i < 300; i++)) + do + if [ -r "$nbd_unix_socket" ]; then + return + fi + sleep 0.1 + done + echo "Failed in check of unix socket created by qemu-nbd" + exit 1 +} + +function nbd_server_start_unix_socket() +{ + nbd_server_stop + $QEMU_NBD -v -t -k "$nbd_unix_socket" $@ & + nbd_server_wait_for_unix_socket +} --=20 2.19.1 From nobody Sun Feb 8 16:26:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.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 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542383950388204.44293913936087; Fri, 16 Nov 2018 07:59:10 -0800 (PST) Received: from localhost ([::1]:45455 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNgWT-0006uE-7w for importer@patchew.org; Fri, 16 Nov 2018 10:59:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54458) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNgRk-0002fP-2b for qemu-devel@nongnu.org; Fri, 16 Nov 2018 10:54:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gNgRj-0000n5-2P for qemu-devel@nongnu.org; Fri, 16 Nov 2018 10:54:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44394) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gNgRh-0000mD-45; Fri, 16 Nov 2018 10:54:13 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 75E4F46233; Fri, 16 Nov 2018 15:54:12 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-53.ams2.redhat.com [10.36.112.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A3D46EE38; Fri, 16 Nov 2018 15:54:08 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 16 Nov 2018 15:53:23 +0000 Message-Id: <20181116155325.22428-5-berrange@redhat.com> In-Reply-To: <20181116155325.22428-1-berrange@redhat.com> References: <20181116155325.22428-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 16 Nov 2018 15:54:12 +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 4/6] tests: check if qemu-nbd is still alive before waiting 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 , 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" If the qemu-nbd UNIX socket has not shown up, the tests will sleep a bit and then check again repeatedly for upto 30 seconds. This is pointless if the qemu-nbd process has quit due to an error, so check whether the pid is still alive before waiting and retrying. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Eric Blake --- tests/qemu-iotests/common.nbd | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/common.nbd b/tests/qemu-iotests/common.nbd index f920a578f1..61e9e90fee 100644 --- a/tests/qemu-iotests/common.nbd +++ b/tests/qemu-iotests/common.nbd @@ -37,11 +37,19 @@ function nbd_server_stop() =20 function nbd_server_wait_for_unix_socket() { + pid=3D$1 + for ((i =3D 0; i < 300; i++)) do if [ -r "$nbd_unix_socket" ]; then return fi + kill -s 0 $pid 2>/dev/null + if test $? !=3D 0 + then + echo "qemu-nbd unexpectedly quit" + exit 1 + fi sleep 0.1 done echo "Failed in check of unix socket created by qemu-nbd" @@ -52,5 +60,5 @@ function nbd_server_start_unix_socket() { nbd_server_stop $QEMU_NBD -v -t -k "$nbd_unix_socket" $@ & - nbd_server_wait_for_unix_socket + nbd_server_wait_for_unix_socket $! } --=20 2.19.1 From nobody Sun Feb 8 16:26:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.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 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542384309893305.253065688338; Fri, 16 Nov 2018 08:05:09 -0800 (PST) Received: from localhost ([::1]:45496 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNgcD-0003W8-G2 for importer@patchew.org; Fri, 16 Nov 2018 11:05:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54610) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNgSE-000393-MN for qemu-devel@nongnu.org; Fri, 16 Nov 2018 10:54:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gNgS5-0000tH-9k for qemu-devel@nongnu.org; Fri, 16 Nov 2018 10:54:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37866) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gNgRp-0000nv-BU; Fri, 16 Nov 2018 10:54:23 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E09BE300250A; Fri, 16 Nov 2018 15:54:16 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-53.ams2.redhat.com [10.36.112.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20CE56EE2A; Fri, 16 Nov 2018 15:54:11 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 16 Nov 2018 15:53:24 +0000 Message-Id: <20181116155325.22428-6-berrange@redhat.com> In-Reply-To: <20181116155325.22428-1-berrange@redhat.com> References: <20181116155325.22428-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Fri, 16 Nov 2018 15:54:17 +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 5/6] tests: add iotests helpers for dealing with TLS certificates 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 , 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" Add helpers to common.tls for creating TLS certificates for a CA, server and client. Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/qemu-iotests/common.tls | 139 ++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) create mode 100644 tests/qemu-iotests/common.tls diff --git a/tests/qemu-iotests/common.tls b/tests/qemu-iotests/common.tls new file mode 100644 index 0000000000..6178ca5764 --- /dev/null +++ b/tests/qemu-iotests/common.tls @@ -0,0 +1,139 @@ +#!/bin/bash +# +# Helpers for TLS related config +# +# Copyright (C) 2018 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +tls_dir=3D"${TEST_DIR}/tls" + +function tls_x509_cleanup() +{ + rm -f ${tls_dir}/*.pem + rm -f ${tls_dir}/*/*.pem + rmdir ${tls_dir}/* + rmdir ${tls_dir} +} + + +function tls_x509_init() +{ + mkdir "${tls_dir}" + + # use a fixed key so we don't waste system entropy on + # each test run + cat > ${tls_dir}/key.pem < ${tls_dir}/ca.info <&1 | head -1 + + rm -f ${tls_dir}/ca.info +} + + +function tls_x509_create_server() +{ + caname=3D$1 + name=3D$2 + + mkdir ${tls_dir}/$name + cat > ${tls_dir}/cert.info <&1 | head -1 + 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 + + rm -f ${tls_dir}/cert.info +} + + +function tls_x509_create_client() +{ + caname=3D$1 + name=3D$2 + + mkdir ${tls_dir}/$name + cat > ${tls_dir}/cert.info <&1 | head -1 + 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 + + rm -f ${tls_dir}/cert.info +} --=20 2.19.1 From nobody Sun Feb 8 16:26:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.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 [208.118.235.17]) by mx.zohomail.com with SMTPS id 154238411500477.2206999795385; Fri, 16 Nov 2018 08:01:55 -0800 (PST) Received: from localhost ([::1]:45480 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNgZ7-0000bX-Nt for importer@patchew.org; Fri, 16 Nov 2018 11:01:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54607) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNgSE-00038Z-7n for qemu-devel@nongnu.org; Fri, 16 Nov 2018 10:54:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gNgS5-0000tI-9i for qemu-devel@nongnu.org; Fri, 16 Nov 2018 10:54:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:29616) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gNgRp-0000oO-Bp; Fri, 16 Nov 2018 10:54:26 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4C10D307D96F; Fri, 16 Nov 2018 15:54:19 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-53.ams2.redhat.com [10.36.112.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6CE2882786; Fri, 16 Nov 2018 15:54:15 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 16 Nov 2018 15:53:25 +0000 Message-Id: <20181116155325.22428-7-berrange@redhat.com> In-Reply-To: <20181116155325.22428-1-berrange@redhat.com> References: <20181116155325.22428-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Fri, 16 Nov 2018 15:54:19 +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 6/6] tests: exercise NBD server in TLS mode 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 , 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" Add tests that validate it is possible to connect to an NBD server running TLS mode. Also test mis-matched TLS vs non-TLS connections correctly fail. Reviewed-by: Eric Blake Tested-by: Eric Blake --- tests/qemu-iotests/233 | 99 +++++++++++++++++++++++++++++++++++ tests/qemu-iotests/233.out | 33 ++++++++++++ tests/qemu-iotests/common.nbd | 47 +++++++++++++++++ tests/qemu-iotests/group | 1 + 4 files changed, 180 insertions(+) create mode 100755 tests/qemu-iotests/233 create mode 100644 tests/qemu-iotests/233.out diff --git a/tests/qemu-iotests/233 b/tests/qemu-iotests/233 new file mode 100755 index 0000000000..8f3d5bd013 --- /dev/null +++ b/tests/qemu-iotests/233 @@ -0,0 +1,99 @@ +#!/bin/bash +# +# Test NBD TLS certificate / authorization integration +# +# Copyright (C) 2018 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +# creator +owner=3Dberrange@redhat.com + +seq=3D`basename $0` +echo "QA output created by $seq" + +here=3D`pwd` +status=3D1 # failure is the default! + +_cleanup() +{ + nbd_server_stop + _cleanup_test_img + tls_x509_cleanup +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter +. ./common.pattern +. ./common.tls +. ./common.nbd + +_supported_fmt raw qcow2 +_supported_proto file +_supported_os Linux +_require_command QEMU_NBD + +nbd_server_set_tcp_port +tls_x509_init + +echo +echo "=3D=3D preparing TLS creds =3D=3D" + +tls_x509_create_root_ca "ca1" +tls_x509_create_root_ca "ca2" +tls_x509_create_server "ca1" "server1" +tls_x509_create_client "ca1" "client1" +tls_x509_create_client "ca2" "client2" + +echo +echo "=3D=3D preparing image =3D=3D" +_make_test_img 64M + + +echo +echo "=3D=3D check TLS client to plain server fails =3D=3D" +nbd_server_start_tcp_socket "$TEST_IMG" + +$QEMU_IMG info --image-opts \ + --object tls-creds-x509,dir=3D${tls_dir}/client1,endpoint=3Dclient,id= =3Dtls0 \ + driver=3Dnbd,host=3D$nbd_tcp_addr,port=3D$nbd_tcp_port,tls-creds=3Dtls0 + +nbd_server_stop + +echo +echo "=3D=3D check plain client to TLS server fails =3D=3D" + +nbd_server_start_tcp_socket --object tls-creds-x509,dir=3D${tls_dir}/serve= r1,endpoint=3Dserver,id=3Dtls0,verify-peer=3Dyes --tls-creds tls0 "$TEST_IM= G" + +$QEMU_IMG info nbd://localhost:$nbd_tcp_port + +echo +echo "=3D=3D check TLS works =3D=3D" +$QEMU_IMG info --image-opts \ + --object tls-creds-x509,dir=3D${tls_dir}/client1,endpoint=3Dclient,id= =3Dtls0 \ + driver=3Dnbd,host=3D$nbd_tcp_addr,port=3D$nbd_tcp_port,tls-creds=3Dtls0 + +echo +echo "=3D=3D check TLS with different CA fails =3D=3D" +$QEMU_IMG info --image-opts \ + --object tls-creds-x509,dir=3D${tls_dir}/client2,endpoint=3Dclient,id= =3Dtls0 \ + driver=3Dnbd,host=3D$nbd_tcp_addr,port=3D$nbd_tcp_port,tls-creds=3Dtls0 + +# success, all done +echo "*** done" +rm -f $seq.full +status=3D0 diff --git a/tests/qemu-iotests/233.out b/tests/qemu-iotests/233.out new file mode 100644 index 0000000000..eaa410c270 --- /dev/null +++ b/tests/qemu-iotests/233.out @@ -0,0 +1,33 @@ +QA output created by 233 + +=3D=3D preparing TLS creds =3D=3D +Generating a self signed certificate... +Generating a self signed certificate... +Generating a signed certificate... +Generating a signed certificate... +Generating a signed certificate... + +=3D=3D preparing image =3D=3D +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 + +=3D=3D check TLS client to plain server fails =3D=3D +option negotiation failed: read failed: Unexpected end-of-file before all = bytes were read +qemu-img: Could not open 'driver=3Dnbd,host=3D127.0.0.1,port=3D10809,tls-c= reds=3Dtls0': Denied by server for option 5 (starttls) +server reported: TLS not configured + +=3D=3D check plain client to TLS server fails =3D=3D +option negotiation failed: read failed: Unexpected end-of-file before all = bytes were read +qemu-img: Could not open 'nbd://localhost:10809': TLS negotiation required= before option 8 (structured reply) +server reported: Option 0x8 not permitted before TLS +write failed (error message): Unable to write to socket: Broken pipe + +=3D=3D check TLS works =3D=3D +image: nbd://127.0.0.1:10809 +file format: nbd +virtual size: 64M (67108864 bytes) +disk size: unavailable + +=3D=3D check TLS with different CA fails =3D=3D +option negotiation failed: Verify failed: No certificate was found. +qemu-img: Could not open 'driver=3Dnbd,host=3D127.0.0.1,port=3D10809,tls-c= reds=3Dtls0': The certificate hasn't got a known issuer +*** done diff --git a/tests/qemu-iotests/common.nbd b/tests/qemu-iotests/common.nbd index 61e9e90fee..0483ea7c55 100644 --- a/tests/qemu-iotests/common.nbd +++ b/tests/qemu-iotests/common.nbd @@ -20,6 +20,7 @@ # =20 nbd_unix_socket=3D"${TEST_DIR}/qemu-nbd.sock" +nbd_tcp_addr=3D"127.0.0.1" nbd_pid_file=3D"${TEST_DIR}/qemu-nbd.pid" =20 function nbd_server_stop() @@ -62,3 +63,49 @@ function nbd_server_start_unix_socket() $QEMU_NBD -v -t -k "$nbd_unix_socket" $@ & nbd_server_wait_for_unix_socket $! } + +function nbd_server_set_tcp_port() +{ + for port in `seq 10809 10909` + do + socat TCP:$nbd_tcp_addr:$port STDIO < /dev/null 1>/dev/null 2>&1 + if test $? !=3D 0 + then + nbd_tcp_port=3D$port + return + fi + done + + echo "Cannot find free TCP port for nbd in range 10809-10909" + exit 1 +} + +function nbd_server_wait_for_tcp_socket() +{ + pid=3D$1 + + for ((i =3D 0; i < 300; i++)) + do + socat TCP:localhost:$nbd_tcp_port STDIO < /dev/null 1>/dev/null 2>= &1 + if test $? =3D=3D 0 + then + return + fi + kill -s 0 $pid 2>/dev/null + if test $? !=3D 0 + then + echo "qemu-nbd unexpectedly quit" + exit 1 + fi + sleep 0.1 + done + echo "Failed in check of unix socket created by qemu-nbd" + exit 1 +} + +function nbd_server_start_tcp_socket() +{ + nbd_server_stop + $QEMU_NBD -v -t -b $nbd_tcp_addr -p $nbd_tcp_port $@ & + nbd_server_wait_for_tcp_socket $! +} diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index ebe4fe78bc..e4327efa42 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -228,3 +228,4 @@ 229 auto quick 231 auto quick 232 auto quick +233 auto quick --=20 2.19.1