| Message ID | 20210804180330.3469683-1-berrange@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [for,6.1] tests: filter out TLS distinguished name in certificate checks | expand |
On Wed, Aug 04, 2021 at 07:03:30PM +0100, Daniel P. Berrangé wrote: > The version of GNUTLS in Fedora 34 has changed the order in which encodes > fields when generating new TLS certificates. This in turn changes the > order seen when querying the distinguished name. This ultimately breaks > the expected output in the NBD TLS iotests. We don't need to be > comparing the exact distinguished name text for the purpose of the test > though, so it is fine to filter it out. > > Reported-by: Eric Blake <eblake@redhat.com> > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > --- Reviewed-by: Eric Blake <eblake@redhat.com> Tested-by: Eric Blake <eblake@redhat.com>
On 04.08.21 20:03, Daniel P. Berrangé wrote: > The version of GNUTLS in Fedora 34 has changed the order in which encodes > fields when generating new TLS certificates. This in turn changes the > order seen when querying the distinguished name. This ultimately breaks > the expected output in the NBD TLS iotests. We don't need to be > comparing the exact distinguished name text for the purpose of the test > though, so it is fine to filter it out. > > Reported-by: Eric Blake <eblake@redhat.com> > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > --- > tests/qemu-iotests/233 | 2 +- > tests/qemu-iotests/233.out | 4 ++-- > tests/qemu-iotests/common.filter | 5 +++++ > 3 files changed, 8 insertions(+), 3 deletions(-) Thanks, applied to my block branch: https://github.com/XanClic/qemu/commits/block (Given my email address change today, I don’t know yet how well the pull request will go. Perhaps I’ll have to ask Kevin or Eric to step in on this one.) Hanna
diff --git a/tests/qemu-iotests/233 b/tests/qemu-iotests/233 index da150cd27b..9ca7b68f42 100755 --- a/tests/qemu-iotests/233 +++ b/tests/qemu-iotests/233 @@ -148,7 +148,7 @@ $QEMU_IMG info --image-opts \ echo echo "== final server log ==" -cat "$TEST_DIR/server.log" +cat "$TEST_DIR/server.log" | _filter_authz_check_tls rm -f "$TEST_DIR/server.log" # success, all done diff --git a/tests/qemu-iotests/233.out b/tests/qemu-iotests/233.out index c3c344811b..4b1f6a0e15 100644 --- a/tests/qemu-iotests/233.out +++ b/tests/qemu-iotests/233.out @@ -65,6 +65,6 @@ qemu-img: Could not open 'driver=nbd,host=127.0.0.1,port=PORT,tls-creds=tls0': F == final server log == qemu-nbd: option negotiation failed: Verify failed: No certificate was found. qemu-nbd: option negotiation failed: Verify failed: No certificate was found. -qemu-nbd: option negotiation failed: TLS x509 authz check for CN=localhost,O=Cthulhu Dark Lord Enterprises client1,L=R'lyeh,C=South Pacific is denied -qemu-nbd: option negotiation failed: TLS x509 authz check for CN=localhost,O=Cthulhu Dark Lord Enterprises client3,L=R'lyeh,C=South Pacific is denied +qemu-nbd: option negotiation failed: TLS x509 authz check for DISTINGUISHED-NAME is denied +qemu-nbd: option negotiation failed: TLS x509 authz check for DISTINGUISHED-NAME is denied *** done diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index 268b749e2f..2b2b53946c 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -332,5 +332,10 @@ for fname in fnames: sys.stdout.write(result)' } +_filter_authz_check_tls() +{ + $SED -e 's/TLS x509 authz check for .* is denied/TLS x509 authz check for DISTINGUISHED-NAME is denied/' +} + # make sure this script returns success true
The version of GNUTLS in Fedora 34 has changed the order in which encodes fields when generating new TLS certificates. This in turn changes the order seen when querying the distinguished name. This ultimately breaks the expected output in the NBD TLS iotests. We don't need to be comparing the exact distinguished name text for the purpose of the test though, so it is fine to filter it out. Reported-by: Eric Blake <eblake@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- tests/qemu-iotests/233 | 2 +- tests/qemu-iotests/233.out | 4 ++-- tests/qemu-iotests/common.filter | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-)