udica-0.2.5-2.el9

- New rebase https://github.com/containers/udica/releases/tag/v0.2.5 (#1995041)
- Replace capability dictionary with str.lower()
- Enable udica to generate policies with fifo class
- Sort container inspect data before processing
- Update templates to work properly with new cil parser
- Related: #2000051

Signed-off-by: Jindrich Novy <jnovy@redhat.com>

.gitignore

@@ -1,15 +1,6 @@
-/v0.1.1.tar.gz
-/v0.1.2.tar.gz
-/v0.1.3.tar.gz
-/v0.1.4.tar.gz
 /v0.1.5.tar.gz
 /v0.1.6.tar.gz
-/v0.1.7.tar.gz
 /v0.1.8.tar.gz
-/v0.1.9.tar.gz
 /v0.2.0.tar.gz
 /v0.2.1.tar.gz
-/v0.2.2.tar.gz
-/v0.2.3.tar.gz
-/v0.2.4.tar.gz
 /v0.2.5.tar.gz

README.md

@@ -1,3 +0,0 @@
-# udica
-
-The udica package

gating.yaml

@@ -1,7 +1,7 @@
 #recipients: mmalik
 --- !Policy
 product_versions:
-  - rhel-9
+  - rhel-8
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

tests/docker/runtest.sh

@@ -1,65 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Description: Compare udica output between podman and docker
-#   Author: Jan Zarsky <jzarsky@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2019 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="udica"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm "udica"
-        rlAssertRpm "policycoreutils"
-        rlAssertRpm "podman"
-        rlAssertRpm "docker"
-        rlRun "rlServiceStart docker"
-        OUTPUT_FILE=$(mktemp)
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        for BACKEND in podman docker ; do
-            rlRun "$BACKEND run -dit --name test -v /home:/home:ro -v /var/spool:/var/spool:rw -p 21:21 fedora"
-            rlRun "$BACKEND ps | grep test"
-            CONT_ID=$($BACKEND ps | grep test | cut -d ' ' -f 1)
-            rlRun "udica -i $CONT_ID my_container"
-            rlRun "mv my_container.cil my_cont_$BACKEND.cil"
-            rlRun "$BACKEND stop test"
-            rlRun "$BACKEND rm test"
-        done
-
-        rlRun "sed -i '/capability/d' my_cont_podman.cil"
-        rlRun "diff -b -B my_cont_podman.cil my_cont_docker.cil"
-
-        rlRun "rm my_cont_podman.cil my_cont_docker.cil"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "rm -f $OUTPUT_FILE"
-        rlRun "rlServiceRestore docker"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd

tests/sanity/runtest.sh

@@ -1,129 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Description: Test basic functionality of udica
-#   Author: Jan Zarsky <jzarsky@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2019 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="udica"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm "udica"
-        rlAssertRpm "policycoreutils"
-        rlAssertRpm "podman"
-        OUTPUT_FILE=$(mktemp)
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "udica --help"
-        rlRun "PAGER=cat man udica"
-    rlPhaseEnd
-
-    rlPhaseStartTest "Test basic scenario"
-        rlRun "podman run -dit --name test -v /home:/home:ro -v /var/spool:/var/spool:rw -p 21:21 fedora"
-        rlRun "podman ps | grep test"
-        rlRun "ps -efZ | grep bash"
-        rlRun "ps -efZ | grep bash | grep container_t"
-
-        rlRun "podman exec test ls /home" 1,2
-        rlRun "podman exec test touch /var/spool/test" 1
-        rlRun "podman exec test dnf install nmap-ncat -y" 0
-        rlWatchdog "rlRun \"podman exec test nc -l 53\"" 3
-
-        CONT_ID=$(podman ps | grep test | cut -d ' ' -f 1)
-        rlRun "podman inspect $CONT_ID | udica my_container >$OUTPUT_FILE"
-        rlRun "podman stop test"
-        rlRun "podman rm --force test"
-
-        rlRun "cat $OUTPUT_FILE"
-        rlAssertExists "my_container.cil"
-        SEMODULE=$(cat $OUTPUT_FILE | grep "semodule -i" | cut -d '#' -f 2)
-        rlRun "$SEMODULE"
-
-        PODMAN_OPT=$(cat $OUTPUT_FILE | grep "security-opt" | cut -d '"' -f 2)
-        rlRun "podman run -dit --name test2 $PODMAN_OPT -v /home:/home:ro -v /var/spool:/var/spool:rw -p 21:21 fedora"
-        rlRun "podman ps | grep test2"
-        rlRun "ps -efZ | grep bash"
-        rlRun "ps -efZ | grep bash | grep my_container.process"
-
-        rlRun "podman exec test2 ls /home" 0
-        rlRun "podman exec test2 touch /var/spool/test" 0
-        rlRun "podman exec test2 dnf install nmap-ncat -y" 0
-        rlWatchdog "rlRun \"podman exec test2 nc -l 53\" 2" 3
-
-        rlRun "podman stop test2"
-        rlRun "podman rm --force test2"
-
-        rlRun "semodule -r my_container base_container net_container home_container"
-        rlRun "rm my_container.cil"
-    rlPhaseEnd
-
-    rlPhaseStartTest "Compare different ways of obtaining policy"
-        rlRun "podman run -dit --name test -v /home:/home:ro -v /var/spool:/var/spool:rw -p 21:21 fedora"
-        rlRun "podman ps | grep test"
-
-        CONT_ID=$(podman ps | grep test | cut -d ' ' -f 1)
-        rlRun "podman inspect $CONT_ID | udica my_container >pipe.result"
-
-        rlRun "podman inspect $CONT_ID >container.json"
-        rlRun "udica -j container.json my_container >json.result"
-
-        rlRun "udica -i $CONT_ID my_container >id.result"
-
-        rlRun "diff pipe.result json.result"
-        rlRun "diff pipe.result id.result"
-
-        rlRun "rm -f pipe.result json.result id.result container.json"
-        rlRun "podman stop test"
-        rlRun "podman rm test"
-    rlPhaseEnd
-
-    rlPhaseStartTest "Test loading modules"
-        rlRun "podman run -dit --name test -v /home:/home:ro -v /var/spool:/var/spool:rw -p 21:21 fedora"
-        rlRun "podman ps | grep test"
-
-        CONT_ID=$(podman ps | grep test | cut -d ' ' -f 1)
-        rlRun "podman inspect $CONT_ID | udica -l my_container"
-
-        rlRun "podman stop test"
-        rlRun "podman rm test"
-
-        rlRun "semodule -l >$OUTPUT_FILE"
-        rlAssertGrep "my_container" $OUTPUT_FILE
-        rlAssertGrep "base_container" $OUTPUT_FILE
-        rlAssertGrep "net_container" $OUTPUT_FILE
-        rlAssertGrep "home_container" $OUTPUT_FILE
-
-        rlRun "semodule -r my_container base_container net_container home_container"
-        rlRun "rm my_container.cil"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "rm -f $OUTPUT_FILE"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd

tests/tests.yml

@@ -7,19 +7,16 @@
 
   - role: standard-test-basic
     required_packages:
+    - make
     - python3
+    - udica
     tests:
+    - build_test:
+        dir: ./source
+        run: make
     - smoke:
         dir: ./source
         run: python3 -m unittest -v tests/test_unit.py
     - smoke2:
         dir: ./source
         run: python3 tests/test_integration.py
-
-  - role: standard-test-beakerlib
-    tags:
-        - classic
-    tests:
-        - sanity
-    required_packages:
-        - podman

udica.spec

@@ -1,14 +1,19 @@
 Summary: A tool for generating SELinux security policies for containers
 Name: udica
 Version: 0.2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: https://github.com/containers/udica/archive/v%{version}.tar.gz
 Patch001: 0001-Update-templates-to-work-properly-with-new-cil-parse.patch
 License: GPLv3+
 BuildArch: noarch
 Url: https://github.com/containers/udica
+%if 0%{?fedora} || 0%{?rhel} > 7
 BuildRequires: python3 python3-devel python3-setuptools
 Requires: python3 python3-libsemanage python3-libselinux
+%else
+BuildRequires: python2 python2-devel python2-setuptools
+Requires: python2 libsemanage-python libselinux-python
+%endif
 
 %description
 Tool for generating SELinux security profiles for containers based on
@@ -56,6 +61,14 @@ install -m 0644 udica/man/man8/udica.8 %{buildroot}%{_mandir}/man8/udica.8
 %endif
 
 %changelog
+* Fri Sep 03 2021 Jindrich Novy <jnovy@redhat.com> - 0.2.5-2
+- New rebase https://github.com/containers/udica/releases/tag/v0.2.5 (#1995041)
+- Replace capability dictionary with str.lower()
+- Enable udica to generate policies with fifo class
+- Sort container inspect data before processing
+- Update templates to work properly with new cil parser
+- Related: #2000051
+
 * Wed Aug 25 2021 Vit Mojzis <vmojzis@redhat.com> - 0.2.5-1
 - New rebase https://github.com/containers/udica/releases/tag/v0.2.5 (#1995046)
 - Replace capability dictionary with str.lower()