From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB76FC433E0 for ; Thu, 21 May 2020 19:54:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6DFE420738 for ; Thu, 21 May 2020 19:54:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729091AbgEUTy0 (ORCPT ); Thu, 21 May 2020 15:54:26 -0400 Received: from mx1.polytechnique.org ([129.104.30.34]:41902 "EHLO mx1.polytechnique.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728635AbgEUTy0 (ORCPT ); Thu, 21 May 2020 15:54:26 -0400 Received: from mail-ot1-f41.google.com (mail-ot1-f41.google.com [209.85.210.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ssl.polytechnique.org (Postfix) with ESMTPSA id E74A8564721 for ; Thu, 21 May 2020 21:54:20 +0200 (CEST) Received: by mail-ot1-f41.google.com with SMTP id x22so6494682otq.4 for ; Thu, 21 May 2020 12:54:20 -0700 (PDT) X-Gm-Message-State: AOAM532uCRXeb4bwbSZ9ZnlMx7yTC3vaHTRhhfPfsXIi2EfH9H2ELkJQ KHj9ryvA1H7RvlwnKlMkXl1/msaisUf6eSvHe9M= X-Google-Smtp-Source: ABdhPJxJDn/QmyAKlT5eqdqCbjXt2FuFJSwXluE3SU6/syDwhtmvFd3haMn/PW5rKPCqfv2QU7/ozO1vCRVpFZECynw= X-Received: by 2002:a9d:476:: with SMTP id 109mr7856384otc.96.1590090859735; Thu, 21 May 2020 12:54:19 -0700 (PDT) MIME-Version: 1.0 References: <20200520163421.27965-1-william.c.roberts@intel.com> <20200520163421.27965-2-william.c.roberts@intel.com> In-Reply-To: <20200520163421.27965-2-william.c.roberts@intel.com> From: Nicolas Iooss Date: Thu, 21 May 2020 21:54:08 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v2] ci: run SELinux kernel test suite To: William Roberts , SElinux list , William Roberts Cc: Paul Moore Content-Type: text/plain; charset="UTF-8" X-AV-Checked: ClamAV using ClamSMTP at svoboda.polytechnique.org (Thu May 21 21:54:21 2020 +0200 (CEST)) X-Org-Mail: nicolas.iooss.2010@polytechnique.org Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org On Wed, May 20, 2020 at 6:34 PM wrote: > > From: William Roberts > > The current Travis CI runs the userspace tooling and libraries against > policy files, but cannot test against an SELinux enabled kernel. Thus, > some tests are not being done in the CI. Travis, unfortunately only > provides Ubuntu images, so in order to run against a modern distro with > SELinux in enforcing mode, we need to launch a KVM with something like > Fedora. > > This patch enables this support by launching a Fedora32 Cloud Image with > the SELinux userspace library passed on from the Travis clone, it then > builds and replaces the current SELinux bits on the Fedora32 image and > runs the SELinux testsuite. > > Signed-off-by: William Roberts Hi, Thanks for working on this. The CI scripts are quite easy to follow, thanks to all the comments :) Anyway, here are some suggestions/comments in order to make this patch even better (if you want to do a v3): * ShellCheck detects that some strings are not quoted, that using *-CHECKSUM is dangerous (using ./*-CHECKSUM prevents ill things from happening if a file in the directory happens to match the pattern and start with a dash), etc. Most issues reported by ShellCheck are not relevant here, but one: ipaddy=$(grep fedoravm dhcp-leases.txt | awk {'print $5'} | cut -d'/' -f 1-1) ^-- SC1083: This { is literal. Check expression (missing ;/\n?) or quote it. Using awk '{print $5}' (single quotes outside of the braces) seems to better match the intent. Moreover the whole $(...) expression could be double-quoted. * fedora-test-runner.sh uses ~, which is expanded to /root as it does not make sense to run this script as non-root user. In my humble opinion, using /root instead of ~ makes the script even easier to read. * There is a comment about issues with -jX with "make LIBDIR=/usr/lib64 SHLIBDIR=/lib64 install install-pywrap relabel". I usually split the targets when using "make -jX" (ie. make -j$(nproc) install && make -j$(nproc) install-pywrap && make relabel), so if not using -jX is really an issue, this could be considered. * Does the script runs "make test" in selinux/? I see the "make test" for selinux-testsuite, but if the main point of fedora-test-runner.sh is to run selinux's tests (in a VM), I missed the command that does so. Thanks, Nicolas > --- > .travis.yml | 8 +++ > scripts/ci/README.md | 8 +++ > scripts/ci/fedora-test-runner.sh | 89 ++++++++++++++++++++++++ > scripts/ci/travis-kvm-setup.sh | 113 +++++++++++++++++++++++++++++++ > 4 files changed, 218 insertions(+) > create mode 100644 scripts/ci/README.md > create mode 100755 scripts/ci/fedora-test-runner.sh > create mode 100755 scripts/ci/travis-kvm-setup.sh > > diff --git a/.travis.yml b/.travis.yml > index c36e721a5e1d..63a856672f9b 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -34,6 +34,14 @@ matrix: > env: PYVER=python3.8 RUBYLIBVER=2.7 LINKER=gold > - compiler: clang > env: PYVER=python3.8 RUBYLIBVER=2.7 LINKER=bfd > + include: > + - compiler: gcc > + env: TRAVIS_RUN_KVM=true > + install: > + - skip > + before_script: > + - skip > + script: scripts/ci/travis-kvm-setup.sh > > # Use Travis-CI Ubuntu 18.04 Bionic Beaver, "full image" variant > sudo: required > diff --git a/scripts/ci/README.md b/scripts/ci/README.md > new file mode 100644 > index 000000000000..04a134a438c2 > --- /dev/null > +++ b/scripts/ci/README.md > @@ -0,0 +1,8 @@ > +# Continuous Integration Scripts > + > +The scripts under `scripts/ci` are designed specifically > +for the Travis CI system. While nothing prevents you > +from mimicking that environment and using them locally, > +they are not applicable for general consumption. Any > +thing in this directory should never be considered as > +a stable API. > diff --git a/scripts/ci/fedora-test-runner.sh b/scripts/ci/fedora-test-runner.sh > new file mode 100755 > index 000000000000..14bcf5fc469d > --- /dev/null > +++ b/scripts/ci/fedora-test-runner.sh > @@ -0,0 +1,89 @@ > +#!/usr/bin/env bash > + > +set -ev > + > +# CI Debug output if things go squirrely. > +getenforce > +id -Z > +nproc > +pwd > + > +# Turn off enforcing for the setup to prevent any weirdness from breaking > +# the CI. > +setenforce 0 > + > +dnf clean all -y > +dnf install -y \ > + --allowerasing \ > + --skip-broken \ > + git \ > + audit-libs-devel \ > + bison \ > + bzip2-devel \ > + CUnit-devel \ > + diffutils \ > + flex \ > + gcc \ > + gettext \ > + glib2-devel \ > + make \ > + libcap-devel \ > + libcap-ng-devel \ > + pam-devel \ > + pcre-devel \ > + xmlto \ > + python3-devel \ > + ruby-devel \ > + swig \ > + perl-Test \ > + perl-Test-Harness \ > + perl-Test-Simple \ > + selinux-policy-devel \ > + gcc \ > + libselinux-devel \ > + net-tools \ > + netlabel_tools \ > + iptables \ > + lksctp-tools-devel \ > + attr \ > + libbpf-devel \ > + keyutils-libs-devel \ > + kernel-devel \ > + quota \ > + xfsprogs-devel \ > + libuuid-devel \ > + kernel-devel-$(uname -r) \ > + kernel-modules-$(uname -r) > + > +# > +# Move to selinux code and build > +# > +cd ~/selinux > + > +# Show HEAD commit for sanity checking > +git log -1 > + > +# > +# Build and replace userspace components > +# > +# Note: You can't use parallel builds here (make -jX), you'll end up > +# with race conditions that manifest like: > +# semanage_store.lo: file not recognized: file format not recognized > +# > +make LIBDIR=/usr/lib64 SHLIBDIR=/lib64 install install-pywrap relabel > + > +# > +# Get the selinux testsuite, but don't clone it in ~/selinux, move to ~ > +# first. > +# > +cd ~ > +git clone --depth=1 https://github.com/SELinuxProject/selinux-testsuite.git > +cd selinux-testsuite > + > +# The testsuite must be run in enforcing mode > +setenforce 1 > + > +# > +# Run the test suite > +# > +make test > diff --git a/scripts/ci/travis-kvm-setup.sh b/scripts/ci/travis-kvm-setup.sh > new file mode 100755 > index 000000000000..66606e9d4a5b > --- /dev/null > +++ b/scripts/ci/travis-kvm-setup.sh > @@ -0,0 +1,113 @@ > +#!/usr/bin/env bash > + > +set -ev > + > +TEST_RUNNER="scripts/ci/fedora-test-runner.sh" > + > +# > +# Travis gives us 7.5GB of RAM and two cores: > +# https://docs.travis-ci.com/user/reference/overview/ > +# > +MEMORY=4096 > +VCPUS=2 > + > +# Install these here so other builds don't have to wait on these deps to download and install > +sudo apt-get install qemu-kvm libvirt-bin virtinst bridge-utils cpu-checker libguestfs-tools > + > +sudo usermod -a -G kvm,libvirt,libvirt-qemu $USER > + > +# Verify that KVM is working, useful if Travis every changes anything. > +kvm-ok > + > +sudo systemctl enable libvirtd > +sudo systemctl start libvirtd > + > +# Set up a key so we can ssh into the VM > +ssh-keygen -N "" -f "$HOME/.ssh/id_rsa" > + > +# > +# Get the Fedora Cloud Image, It is a base image that small and ready to go, extract it and modify it with virt-sysprep > +# - https://alt.fedoraproject.org/en/verify.html > +cd $HOME > +wget https://download.fedoraproject.org/pub/fedora/linux/releases/32/Cloud/x86_64/images/Fedora-Cloud-Base-32-1.6.x86_64.raw.xz > + > +# Verify the image > +curl https://getfedora.org/static/fedora.gpg | gpg --import > +wget https://getfedora.org/static/checksums/Fedora-Cloud-32-1.6-x86_64-CHECKSUM > +gpg --verify-files *-CHECKSUM > +sha256sum --ignore-missing -c *-CHECKSUM > + > +# Extract the image > +unxz -T0 Fedora-Cloud-Base-32-1.6.x86_64.raw.xz > + > +# Search is needed for $HOME so virt service can access the image file. > +chmod a+x $HOME > + > +# > +# Modify the virtual image to: > +# - Enable a login, we just use root > +# - Enable passwordless login > +# - Force a relabel to fix labels on ssh keys > +# > +sudo virt-sysprep -a "$HOME/Fedora-Cloud-Base-32-1.6.x86_64.raw" \ > + --root-password password:123456 \ > + --hostname fedoravm \ > + --append-line '/etc/ssh/sshd_config:PermitRootLogin yes' \ > + --append-line '/etc/ssh/sshd_config:PubkeyAuthentication yes' \ > + --mkdir /root/.ssh \ > + --upload "$HOME/.ssh/id_rsa.pub:/root/.ssh/authorized_keys" \ > + --chmod '0600:/root/.ssh/authorized_keys' \ > + --run-command 'chown root:root /root/.ssh/authorized_keys' \ > + --copy-in "$TRAVIS_BUILD_DIR:/root" \ > + --network \ > + --selinux-relabel > + > +# > +# Now we create a domain by using virt-install. This not only creates the domain, but runs the VM as well > +# It should be ready to go for ssh, once ssh starts. > +# > +sudo virt-install \ > + --name fedoravm \ > + --memory $MEMORY \ > + --vcpus $VCPUS \ > + --disk "$HOME/Fedora-Cloud-Base-32-1.6.x86_64.raw" \ > + --import --noautoconsole > + > +# > +# Here comes the tricky part, we have to figure out when the VM comes up AND we need the ip address for ssh. So we > +# can check the net-dhcp leases, for our host. We have to poll, and we will poll for up 3 minutes in 6 second > +# intervals, so 30 poll attempts (0-29 inclusive). I don't know of a better way to do this. > +# > +# We have a full reboot + relabel, so first sleep gets us close > +# > +sleep 30 > +for i in $(seq 0 29); do > + echo "loop $i" > + sleep 6s > + # Get the leases, but tee it so it's easier to debug > + sudo virsh net-dhcp-leases default | tee dhcp-leases.txt > + > + # get our ipaddress > + ipaddy=$(grep fedoravm dhcp-leases.txt | awk {'print $5'} | cut -d'/' -f 1-1) > + if [ -n "$ipaddy" ]; then > + # found it, we're done looking, print it for debug logs > + echo "ipaddy: $ipaddy" > + break > + fi > + # it's empty/not found, loop back and try again. > +done > + > +# Did we find it? If not die. > +if [ -z "$ipaddy" ]; then > + echo "ipaddy zero length, exiting with error 1" > + exit 1 > +fi > + > +# > +# Great we have a host running, ssh into it. We specify -o so > +# we don't get blocked on asking to add the servers key to > +# our known_hosts. > +# > +ssh -tt -o StrictHostKeyChecking=no -o LogLevel=QUIET "root@$ipaddy" "/root/selinux/$TEST_RUNNER" > + > +exit 0 > -- > 2.17.1 >