diff options
| author | Eric Blake <eblake@redhat.com> | 2019-08-24 12:28:13 -0500 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2019-09-05 15:57:37 -0500 |
| commit | 5de47735c79a030edc3e6258ab5476b630c61765 (patch) | |
| tree | 82a973c886ff32e2c72a5923b2670e100d67f153 /tests | |
| parent | df18c04edf57b55737ed5125bffe71a8196938a0 (diff) | |
| download | qemu-5de47735c79a030edc3e6258ab5476b630c61765.zip qemu-5de47735c79a030edc3e6258ab5476b630c61765.tar.gz qemu-5de47735c79a030edc3e6258ab5476b630c61765.tar.bz2 | |
nbd: Tolerate more errors to structured reply request
A server may have a reason to reject a request for structured replies,
beyond just not recognizing them as a valid request; similarly, it may
have a reason for rejecting a request for a meta context. It doesn't
hurt us to continue talking to such a server; otherwise 'qemu-nbd
--list' of such a server fails to display all available details about
the export.
Encountered when temporarily tweaking nbdkit to reply with
NBD_REP_ERR_POLICY. Present since structured reply support was first
added (commit d795299b reused starttls handling, but starttls is
different in that we can't fall back to other behavior on any error).
Note that for an unencrypted client trying to connect to a server that
requires encryption, this defers the point of failure to when we
finally execute a strict command (such as NBD_OPT_GO or NBD_OPT_LIST),
now that the intermediate NBD_OPT_STRUCTURED_REPLY does not diagnose
NBD_REP_ERR_TLS_REQD as fatal; but as the protocol eventually gets us
to a command where we can't continue onwards, the changed error
message doesn't cause any security concerns.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20190824172813.29720-3-eblake@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
[eblake: fix iotest 233]
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qemu-iotests/233.out | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/qemu-iotests/233.out b/tests/qemu-iotests/233.out index 9b46284..a3ecc4e 100644 --- a/tests/qemu-iotests/233.out +++ b/tests/qemu-iotests/233.out @@ -20,10 +20,10 @@ qemu-nbd: Denied by server for option 5 (starttls) server reported: TLS not configured == check plain client to TLS server fails == -qemu-img: Could not open 'nbd://localhost:PORT': TLS negotiation required before option 8 (structured reply) -server reported: Option 0x8 not permitted before TLS -qemu-nbd: TLS negotiation required before option 8 (structured reply) -server reported: Option 0x8 not permitted before TLS +qemu-img: Could not open 'nbd://localhost:PORT': TLS negotiation required before option 7 (go) +server reported: Option 0x7 not permitted before TLS +qemu-nbd: TLS negotiation required before option 3 (list) +server reported: Option 0x3 not permitted before TLS == check TLS works == image: nbd://127.0.0.1:PORT |