iotests: Avoid SIGPIPE death to certtool
PATCH 1/1 iotests: Avoid SIGPIPE death to certtool
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:
== check TLS client to plain server fails ==
-qemu-img: Could not open 'driver=nbd,host=127.0.0.1,port=PORT,tls-creds=tls0': 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-28354/tls/client1/client-cert.pem: Base64 unexpected header error.
Fix the pipelines to consume all output.
--- tests/qemu-iotests/common.tls | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tests/qemu-iotests/common.tls +3 -3
@@ -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"
Signature · 1 line
2.20.1
Quoted 44 lines · Eric Blake
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:
== check TLS client to plain server fails ==
-qemu-img: Could not open 'driver=nbd,host=127.0.0.1,port=PORT,tls-creds=tls0': 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-28354/tls/client1/client-cert.pem: Base64 unexpected header error.Fix the pipelines to consume all output.
Reported-by Thomas Huth <[email protected]>Signed-off-by Eric Blake <[email protected]>--- tests/qemu-iotests/common.tls | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)tests/qemu-iotests/common.tls +2
-2@@ -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"
tests/qemu-iotests/common.tls EOF · line 138
Quoted 8 lines
tests/qemu-iotests/common.tls +1
-1@@ -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"
Thanks, this fixes the issue for me!
Quoted 26 lines · Eric Blake
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:
== check TLS client to plain server fails ==
-qemu-img: Could not open 'driver=nbd,host=127.0.0.1,port=PORT,tls-creds=tls0': 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-28354/tls/client1/client-cert.pem: Base64 unexpected header error.Fix the pipelines to consume all output.
Reported-by Thomas Huth <[email protected]>Signed-off-by Eric Blake <[email protected]>--- tests/qemu-iotests/common.tls | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)tests/qemu-iotests/common.tls +0
-0
tests/qemu-iotests/common.tls EOF · line 77
Quoted 5 lines
tests/qemu-iotests/common.tls +1
-1@@ -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
I've actually prepared a patch which gets rid of the pipe entirely, because in debugging this problem I found it unhelpful that we culled stderr when certtool failed.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|