Attachment 1486741 Details for Bug 1632231 – 0001-tests-tls-Use-selinux-label-flag-if-using-SVirt-RHBZ.patch

0001-tests-tls-Use-selinux-label-flag-if-using-SVirt-RHBZ.patch

0001-tests-tls-Use-selinux-label-flag-if-using-SVirt-RHBZ.patch (text/plain), 1.43 KB, created by Richard W.M. Jones on 2018-09-25 13:13:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Richard W.M. Jones

Created: 2018-09-25 13:13:32 UTC

Size: 1.43 KB

patch

obsolete

>From 863e0ddf1752fb4fb540fea63cc84e1b8a583c8e Mon Sep 17 00:00:00 2001
>From: "Richard W.M. Jones" <rjones@redhat.com>
>Date: Tue, 25 Sep 2018 13:42:42 +0100
>Subject: [PATCH] tests: tls: Use --selinux-label flag if using SVirt
> (RHBZ#1632231).
>
>---
> tests/test-tls.sh | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
>diff --git a/tests/test-tls.sh b/tests/test-tls.sh
>index e41c1d5..722642c 100755
>--- a/tests/test-tls.sh
>+++ b/tests/test-tls.sh
>@@ -63,6 +63,15 @@ if [ ! -f "$pkidir/ca-cert.pem" ]; then
>     exit 77
> fi
> 
>+# If we're using SELinux + SVirt then we probably need to add a label
>+# to the socket from nbdkit.  See https://bugzilla.redhat.com/1632231
>+# The test here is the same one that is done in virt-v2v.
>+selinux_label=""
>+if getenforce 2>/dev/null | grep -isq Enforcing && \
>+    nbdkit --dump-config | grep -sq selinux=yes; then
>+    selinux_label="--selinux-label=system_u:object_r:svirt_t:s0"
>+fi
>+
> # Unfortunately qemu cannot do TLS over a Unix domain socket (nbdkit
> # probably can, although it is not tested).  Find an unused port to
> # listen on.
>@@ -72,8 +81,9 @@ done
> echo picked unused port $port
> 
> cleanup_fn rm -f tls.pid tls.out
>-start_nbdkit -P tls.pid -p $port -n --tls=require \
>-       --tls-certificates="$pkidir" example1
>+start_nbdkit -P tls.pid -p $port -n \
>+    --tls=require --tls-certificates="$pkidir" \
>+    $selinux_label example1
> 
> # Run qemu-img against the server.
> LANG=C \
>-- 
>1.8.3.1
>

Actions: View

Attachments on bug 1632231: 1486404 | 1486405 | 1486707 | 1486708 | 1486741