Fix refpolicy build & build test_policy.pp in Travis
v3 cover Fix refpolicy build & build test_policy.pp in Travis
This series fixes the remaining test_policy.pp build errors under refpolicy and enables building the test policy under both Fedora policy and refpolicy in Travis CI.
Passed Travis run: https://travis-ci.org/WOnder93/selinux-testsuite/builds/613471070
Changes in v3:
- drop the first patch, replace with the following:
- add patch to replace userdom_search_generic_user_home_dirs() directly with userdom_search_user_home_dirs()
- add a fallback for userdom_search_admin_dir()
Changes in v2:
- report policy version 999 in the fake selinuxfs to force building latest version
- install userspace tools and libraries straight from source instead of working around missing features in the Ubuntu builds
- install also latest keyutils from source to allow the new 'keys' subtest helpers to build
Ondrej Mosnacek (3):
policy: drop the unneeded userdom_search_generic_user_home_dirs()
policy: add fallbacks for Fedora-specific macros
travis: test building the test policy package
.travis.yml | 48 ++++++++++++++++++++++++++--- policy/Makefile | 11 ++++--- policy/test_ipc.te | 2 +- policy/test_policy.if | 21 +++++++++++-- policy/test_ptrace.te | 2 +- travis-ci/enable-policy.sh | 10 ++++++ travis-ci/setup-policy-fedora.sh | 33 ++++++++++++++++++++ travis-ci/setup-policy-refpolicy.sh | 19 ++++++++++++ 8 files changed, 133 insertions(+), 13 deletions(-) create mode 100644 travis-ci/enable-policy.sh create mode 100644 travis-ci/setup-policy-fedora.sh create mode 100644 travis-ci/setup-policy-refpolicy.sh
Signature · 1 line
2.23.0
PATCH v3 1/3 policy: drop the unneeded userdom_search_generic_user_home_dirs()
userdom_search_generic_user_home_dirs() is not defined in neither Fedora policy nor refpolicy. userdom_search_user_home_dirs() is already defined in both, so just use that directly.
--- policy/test_ipc.te | 2 +- policy/test_policy.if | 6 ------ policy/test_ptrace.te | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-)
policy/test_ipc.te +1 -1
@@ -83,4 +83,4 @@ sysadm_bin_spec_domtrans_to(ipcdomain) allow test_ipc_base_t self:sem create_sem_perms; allow test_ipc_base_t self:shm create_shm_perms; # ipcrm needs this... -userdom_search_generic_user_home_dirs(test_ipc_base_t) +userdom_search_user_home_dirs(test_ipc_base_t)
policy/test_policy.if +0 -6
@@ -60,9 +60,3 @@ interface(`userdom_sysadm_entry_spec_domtrans_to',` allow $1 sysadm_t:process sigchld; ') ') - -ifdef(`userdom_search_generic_user_home_dirs', `', ` dnl -interface(`userdom_search_generic_user_home_dirs', ` - userdom_search_user_home_dirs($1) -') -')
policy/test_ptrace.te +1 -1
@@ -34,7 +34,7 @@ allow test_ptrace_traced_t test_file_t:fifo_file rw_file_perms; # Allow the tracer domain to trace the traced domain. allow test_ptrace_tracer_t test_ptrace_traced_t:process ptrace; -userdom_search_generic_user_home_dirs(test_ptrace_traced_t) +userdom_search_user_home_dirs(test_ptrace_traced_t) # Let the tracer wait on the traced domain. allow test_ptrace_traced_t test_ptrace_tracer_t:process sigchld;
Signature · 1 line
2.23.0
PATCH v3 2/3 policy: add fallbacks for Fedora-specific macros
In reply to Ondrej Mosnacekdev_rw_infiniband_dev() and mount_rw_pid_files() are not defined in refpolicy. Fall back to dev_rw_generic_files() and mount_rw_runtime_files() if they are not defined.
Also, userdom_search_admin_dir() is not defined in refpolicy because it doesn't have admin_home_t. Fall back to userdom_search_user_home_content(), which should apply for root's home directory under refpolicy.
--- policy/test_policy.if | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
policy/test_policy.if +21 -0
@@ -60,3 +60,24 @@ interface(`userdom_sysadm_entry_spec_domtrans_to',` allow $1 sysadm_t:process sigchld; ') ') + +# Workarounds for refpolicy: + +ifdef(`dev_rw_infiniband_dev', `', ` dnl +interface(`dev_rw_infiniband_dev', ` + dev_rw_generic_files($1) +') +') + +ifdef(`mount_rw_pid_files', `', ` dnl +interface(`mount_rw_pid_files', ` + mount_rw_runtime_files($1) +') +') + +# Refpolicy doesn't have admin_home_t - assume /root will be user_home_dir_t. +ifdef(`userdom_search_admin_dir', `', ` dnl +interface(`userdom_search_admin_dir', ` + userdom_search_user_home_content($1) +') +')
Signature · 1 line
2.23.0
Re: [PATCH testsuite v3 2/3] policy: add fallbacks for Fedora-specific macros
Quoted 10 lines · Ondrej Mosnacek
dev_rw_infiniband_dev()andmount_rw_pid_files()are not defined in refpolicy. Fall back todev_rw_generic_files()andmount_rw_runtime_files()if they are not defined.Also,
userdom_search_admin_dir()is not defined in refpolicy because it doesn't haveadmin_home_t. Fall back touserdom_search_user_home_content(), which should apply for root's home directory under refpolicy.Signed-off-by Ondrej Mosnacek <[email protected]>
Is there a reason you didn't make the changes I suggested to dev_rw_infiniband_dev()?
Quoted 34 lines
--- policy/test_policy.if | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)policy/test_policy.if +21
-0@@ -60,3 +60,24 @@ interface(`userdom_sysadm_entry_spec_domtrans_to',` allow $1 sysadm_t:process sigchld; ') ') + +# Workarounds for refpolicy: + +ifdef(`dev_rw_infiniband_dev', `', ` dnl +interface(`dev_rw_infiniband_dev', ` + dev_rw_generic_files($1) +') +') + +ifdef(`mount_rw_pid_files', `', ` dnl +interface(`mount_rw_pid_files', ` + mount_rw_runtime_files($1) +') +') + +# Refpolicy doesn't have admin_home_t - assume /root will be user_home_dir_t. +ifdef(`userdom_search_admin_dir', `', ` dnl +interface(`userdom_search_admin_dir', ` + userdom_search_user_home_content($1) +') +')
Re: [PATCH testsuite v3 2/3] policy: add fallbacks for Fedora-specific macros
Quoted 10 lines · Stephen Smalley
Quoted 9 lines · Ondrej Mosnacek
dev_rw_infiniband_dev()andmount_rw_pid_files()are not defined in refpolicy. Fall back todev_rw_generic_files()andmount_rw_runtime_files()if they are not defined.Also,
userdom_search_admin_dir()is not defined in refpolicy because it doesn't haveadmin_home_t. Fall back touserdom_search_user_home_content(), which should apply for root's home directory under refpolicy.
Quoted 4 lines
Quoted 1 line
Signed-off-by Ondrej Mosnacek <[email protected]>Is there a reason you didn't make the changes I suggested to
dev_rw_infiniband_dev()?
No, sorry, I forgot to address that part... again :|
Quoted 27 lines
Quoted 27 lines
--- policy/test_policy.if | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)policy/test_policy.if +14
-0@@ -60,3 +60,24 @@ interface(`userdom_sysadm_entry_spec_domtrans_to',` allow $1 sysadm_t:process sigchld; ') ') + +# Workarounds for refpolicy: + +ifdef(`dev_rw_infiniband_dev', `', ` dnl +interface(`dev_rw_infiniband_dev', ` + dev_rw_generic_files($1) +') +') + +ifdef(`mount_rw_pid_files', `', ` dnl +interface(`mount_rw_pid_files', ` + mount_rw_runtime_files($1) +') +')
Quoted 9 lines
policy/test_policy.if interface(`userdom_sysadm_entry_spec_domtrans_to',` · line 83
Quoted 8 lines
policy/test_policy.if +7
-0+ +# Refpolicy doesn't have admin_home_t - assume /root will be user_home_dir_t. +ifdef(`userdom_search_admin_dir', `', ` dnl +interface(`userdom_search_admin_dir', ` + userdom_search_user_home_content($1) +') +')
--
Ondrej Mosnacek <omosnace at redhat dot com>
Software Engineer, Security Technologies
Red Hat, Inc.
PATCH v3 3/3 travis: test building the test policy package
In reply to Ondrej MosnacekDownload, build, and install Fedora policy & refpolicy and try building the test policy package against both of them.
--- .travis.yml | 48 ++++++++++++++++++++++++++--- policy/Makefile | 11 ++++--- travis-ci/enable-policy.sh | 10 ++++++ travis-ci/setup-policy-fedora.sh | 33 ++++++++++++++++++++ travis-ci/setup-policy-refpolicy.sh | 19 ++++++++++++ 5 files changed, 113 insertions(+), 8 deletions(-) create mode 100644 travis-ci/enable-policy.sh create mode 100644 travis-ci/setup-policy-fedora.sh create mode 100644 travis-ci/setup-policy-refpolicy.sh
.travis.yml +44 -4
@@ -1,6 +1,6 @@ language: c -dist: xenial +dist: bionic addons: apt:
@@ -8,16 +8,56 @@ addons: - astyle - libselinux1-dev - libsctp-dev + - libaudit-dev + - libcap-dev + - libdbus-glib-1-dev + - xmlto + +cache: + directories: + - selinux-policy + - container-selinux + - refpolicy before_install: + - export LIBRARY_PATH=/usr/local/lib + - export LD_LIBRARY_PATH=/usr/local/lib # FYI: known good with HEAD at 8551fc60fc515cd290ba38ee8c758c1f4df52b56 - git clone https://github.com/perltidy/perltidy.git perltidy - | (cd perltidy && perl Makefile.PL && - make && - sudo make install) + make PREFIX=/usr/local && + sudo make install PREFIX=/usr/local) + # install libbpf from sources + - git clone https://github.com/libbpf/libbpf + - (cd libbpf/src && make PREFIX=/usr/local) + - (cd libbpf/src && sudo make install PREFIX=/usr/local) + # install keyutils from sources + - git clone https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git + - KEYUTILS_OPTS="" + - KEYUTILS_OPTS+="BINDIR=/usr/local/bin SBINDIR=/usr/local/sbin " + - KEYUTILS_OPTS+="LIBDIR=/usr/local/lib USRLIBDIR=/usr/local/lib " + - KEYUTILS_OPTS+="INCLUDEDIR=/usr/local/include " + - KEYUTILS_OPTS+="SHAREDIR=/usr/local/share/keyutils MANDIR=/usr/local/share/man" + - (cd keyutils && make $KEYUTILS_OPTS) + - (cd keyutils && sudo make install $KEYUTILS_OPTS) + # install SELinux userspace from source + - git clone https://github.com/SELinuxProject/selinux + - (cd selinux && sudo make install PREFIX=/usr/local SHLIBDIR=/usr/local/lib) + # install Fedora policy and refpolicy + - bash travis-ci/setup-policy-fedora.sh + - bash travis-ci/setup-policy-refpolicy.sh + # establish a fake "selinuxfs" mount (policy/Makefile just greps for selinuxfs) + - sudo mkdir -p /tmp/fake-selinuxfs + - sudo mount -t tmpfs tmpfs /tmp/fake-selinuxfs + - echo 999 >/tmp/fake-selinuxfs/policyvers script: - tools/check-syntax -f && git diff --exit-code - - make + - | + bash travis-ci/enable-policy.sh targeted && + make PREFIX=/usr/local POLDEV=/usr/share/selinux/targeted + - | + bash travis-ci/enable-policy.sh refpolicy && + make PREFIX=/usr/local POLDEV=/usr/share/selinux/refpolicy
policy/Makefile +7 -4
@@ -1,8 +1,11 @@ -POLDEV ?= /usr/share/selinux/devel -SEMODULE = /usr/sbin/semodule -CHECKPOLICY = /usr/bin/checkpolicy -CHECKMODULE = /usr/bin/checkmodule +PREFIX ?= /usr +BINDIR ?= $(PREFIX)/bin +SBINDIR ?= $(PREFIX)/sbin +POLDEV ?= $(PREFIX)/share/selinux/devel +SEMODULE = $(SBINDIR)/semodule +CHECKPOLICY = $(BINDIR)/checkpolicy +CHECKMODULE = $(BINDIR)/checkmodule DISTRO=$(shell ../tests/os_detect)
travis-ci/enable-policy.sh new file +10 -0
@@ -0,0 +1,10 @@ +#!/bin/bash + +set -e + +# create a dummy /etc/selinux/config +sudo mkdir -p /etc/selinux +sudo tee /etc/selinux/config >/dev/null <<EOF +SELINUX=disabled +SELINUXTYPE=$1 +EOF
travis-ci/setup-policy-fedora.sh new file +33 -0
@@ -0,0 +1,33 @@ +#!/bin/bash + +set -ex + +if ! [ -d selinux-policy/.git ]; then + git clone --recursive https://github.com/fedora-selinux/selinux-policy + (cd selinux-policy/policy/modules/contrib && git checkout rawhide) +else + (cd selinux-policy && git pull || { git checkout '*' && git pull; }) + (cd selinux-policy/policy/modules/contrib && git pull) +fi + +if ! [ -d container-selinux/.git ]; then + git clone https://github.com/containers/container-selinux.git + for f in container.if container.te; do + ln -s ../../../../container-selinux/$f \ + selinux-policy/policy/modules/contrib/$f + done +else + (cd container-selinux && git pull) +fi + +cd selinux-policy + +grep -q refpolicy build.conf && sed -i 's/refpolicy/targeted/' build.conf + +[ -f policy/modules.conf ] || make conf + +make -j`nproc --all` BINDIR=/usr/local/bin SBINDIR=/usr/local/sbin +sudo make install install-headers + +# workaround for different Makefile location in Fedora RPMs +sudo ln -s include/Makefile /usr/share/selinux/targeted/Makefile
travis-ci/setup-policy-refpolicy.sh new file +19 -0
@@ -0,0 +1,19 @@ +#!/bin/bash + +set -ex + +if ! [ -d refpolicy/.git ]; then + git clone https://github.com/SELinuxProject/refpolicy +else + git pull || { git checkout '*' && git pull; } +fi + +cd refpolicy + +[ -f policy/modules.conf ] || make conf + +make -j`nproc --all` BINDIR=/usr/local/bin SBINDIR=/usr/local/sbin +sudo make install install-headers + +# workaround for different Makefile location in Fedora RPMs +sudo ln -s include/Makefile /usr/share/selinux/refpolicy/Makefile
Signature · 1 line
2.23.0