From 3d19cbc8ffcd75d8271590ba8ea2e20ef5b80140 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 10:26:26 +0000 Subject: [PATCH 01/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libcap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcap.spec b/libcap.spec index c5d5c92..e93fa00 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap Version: 2.48 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ License: BSD or GPLv2 @@ -83,6 +83,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 2.48-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 2.48-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From e6e70f005a4fd39c8461bb5c11eb3d57ba1890ba Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Mon, 20 Nov 2023 08:36:39 -0700 Subject: [PATCH 02/32] update to 2.69 and modernize tests --- .fmf/version | 1 + .gitignore | 3 + capfaq-0.2.txt | 264 ------------------ getpcaps.8 | 23 -- libcap-use-compiler-flag-options.patch | 37 --- libcap.spec | 63 +++-- plans/main.fmf | 5 + tests/capsh-basic-functionality/Makefile | 64 ----- tests/capsh-basic-functionality/PURPOSE | 3 - tests/capsh-basic-functionality/runtest.sh | 123 -------- tests/capsh/main.fmf | 2 + tests/capsh/test.sh | 94 +++++++ tests/getcap-setcap/main.fmf | 2 + tests/getcap-setcap/test.sh | 98 +++++++ tests/libcap-devel/main.fmf | 2 + .../test-libcap.c | 0 tests/libcap-devel/test.sh | 17 ++ tests/main.fmf | 9 + tests/manpages/main.fmf | 2 + tests/manpages/test.sh | 21 ++ tests/pam_cap-so-sanity-test/Makefile | 64 ----- tests/pam_cap-so-sanity-test/PURPOSE | 5 - tests/pam_cap-so-sanity-test/runtest.sh | 63 ----- tests/pam_cap/main.fmf | 2 + tests/pam_cap/test.sh | 32 +++ tests/pkg-config-libcap-pc-addition/Makefile | 65 ----- tests/pkg-config-libcap-pc-addition/PURPOSE | 7 - .../pkg-config-libcap-pc-addition/runtest.sh | 62 ---- tests/pkg-configs/main.fmf | 2 + tests/pkg-configs/test.sh | 44 +++ tests/sanity-tests/Makefile | 46 --- tests/sanity-tests/runtest.sh | 34 --- .../Makefile | 64 ----- .../setcap-getcap-basic-functionality/PURPOSE | 3 - .../runtest.sh | 98 ------- tests/tests.yml | 28 -- 36 files changed, 378 insertions(+), 1074 deletions(-) create mode 100644 .fmf/version delete mode 100644 capfaq-0.2.txt delete mode 100644 getpcaps.8 delete mode 100644 libcap-use-compiler-flag-options.patch create mode 100644 plans/main.fmf delete mode 100644 tests/capsh-basic-functionality/Makefile delete mode 100644 tests/capsh-basic-functionality/PURPOSE delete mode 100755 tests/capsh-basic-functionality/runtest.sh create mode 100644 tests/capsh/main.fmf create mode 100755 tests/capsh/test.sh create mode 100644 tests/getcap-setcap/main.fmf create mode 100755 tests/getcap-setcap/test.sh create mode 100644 tests/libcap-devel/main.fmf rename tests/{sanity-tests => libcap-devel}/test-libcap.c (100%) create mode 100755 tests/libcap-devel/test.sh create mode 100644 tests/main.fmf create mode 100644 tests/manpages/main.fmf create mode 100755 tests/manpages/test.sh delete mode 100644 tests/pam_cap-so-sanity-test/Makefile delete mode 100644 tests/pam_cap-so-sanity-test/PURPOSE delete mode 100755 tests/pam_cap-so-sanity-test/runtest.sh create mode 100644 tests/pam_cap/main.fmf create mode 100755 tests/pam_cap/test.sh delete mode 100644 tests/pkg-config-libcap-pc-addition/Makefile delete mode 100644 tests/pkg-config-libcap-pc-addition/PURPOSE delete mode 100755 tests/pkg-config-libcap-pc-addition/runtest.sh create mode 100644 tests/pkg-configs/main.fmf create mode 100755 tests/pkg-configs/test.sh delete mode 100644 tests/sanity-tests/Makefile delete mode 100755 tests/sanity-tests/runtest.sh delete mode 100644 tests/setcap-getcap-basic-functionality/Makefile delete mode 100644 tests/setcap-getcap-basic-functionality/PURPOSE delete mode 100755 tests/setcap-getcap-basic-functionality/runtest.sh delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index dd63848..af0feb9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ /libcap-*.tar.gz +/libcap-*.tar.sign +/*.asc +/*.src.rpm diff --git a/capfaq-0.2.txt b/capfaq-0.2.txt deleted file mode 100644 index e3e272b..0000000 --- a/capfaq-0.2.txt +++ /dev/null @@ -1,264 +0,0 @@ -This is the Linux kernel capabilities FAQ - -Its history, to the extent that I am able to reconstruct it is that -v2.0 was posted to the Linux kernel list on 1999/04/02 by Boris -Tobotras. Thanks to Denis Ducamp for forwarding me a copy. - -Cheers - -Andrew - -Linux Capabilities FAQ 0.2 -========================== - -1) What is a capability? - -The name "capabilities" as used in the Linux kernel can be confusing. -First there are Capabilities as defined in computer science. A -capability is a token used by a process to prove that it is allowed to -do an operation on an object. The capability identifies the object -and the operations allowed on that object. A file descriptor is a -capability. You create the file descriptor with the "open" call and -request read or write permissions. Later, when doing a read or write -operation, the kernel uses the file descriptor as an index into a -data structure that indicates what operations are allowed. This is an -efficient way to check permissions. The necessary data structures are -created once during the "open" call. Later read and write calls only -have to do a table lookup. Operations on capabilities include copying -capabilities, transferring capabilities between processes, modifying a -capability, and revoking a capability. Modifying a capability can be -something like taking a read-write filedescriptor and making it -read-only. A capability often has a notion of an "owner" which is -able to invalidate all copies and derived versions of a capability. -Entire OSes are based on this "capability" model, with varying degrees -of purity. There are other ways of implementing capabilities than the -file descriptor model - traditionally special hardware has been used, -but modern systems also use the memory management unit of the CPU. - -Then there is something quite different called "POSIX capabilities" -which is what Linux uses. These capabilities are a partitioning of -the all powerful root privilege into a set of distinct privileges (but -look at securelevel emulation to find out that this isn't necessary -the whole truth). Users familiar with VMS or "Trusted" versions of -other UNIX variants will know this under the name "privileges". The -name "capabilities" comes from the now defunct POSIX draft 1003.1e -which used this name. - -2) So what is a "POSIX capability"? - -A process has three sets of bitmaps called the inheritable(I), -permitted(P), and effective(E) capabilities. Each capability is -implemented as a bit in each of these bitmaps which is either set or -unset. When a process tries to do a privileged operation, the -operating system will check the appropriate bit in the effective set -of the process (instead of checking whether the effective uid of the -process i 0 as is normally done). For example, when a process tries -to set the clock, the Linux kernel will check that the process has the -CAP_SYS_TIME bit (which is currently bit 25) set in its effective set. - -The permitted set of the process indicates the capabilities the -process can use. The process can have capabilities set in the -permitted set that are not in the effective set. This indicates that -the process has temporarily disabled this capability. A process is -allowed to set a bit in its effective set only if it is available in -the permitted set. The distinction between effective and permitted -exists so that processes can "bracket" operations that need privilege. - -The inheritable capabilities are the capabilities of the current -process that should be inherited by a program executed by the current -process. The permitted set of a process is masked against the -inheritable set during exec(). Nothing special happens during fork() -or clone(). Child processes and threads are given an exact copy of -the capabilities of the parent process. - -3) What about other entities in the system? Users, Groups, Files? - -Files have capabilities. Conceptually they have the same three -bitmaps that processes have, but to avoid confusion we call them by -other names. Only executable files have capabilities, libraries don't -have capabilities (yet). The three sets are called the allowed set, -the forced set, and the effective set. - -The allowed set indicates what capabilities the executable is allowed -to receive from an execing process. This means that during exec(), -the capabilities of the old process are first masked against a set -which indicates what the process gives away (the inheritable set of -the process), and then they are masked against a set which indicates -what capabilities the new process image is allowed to receive (the -allowed set of the executable). - -The forced set is a set of capabilities created out of thin air and -given to the process after execing the executable. The forced set is -similar in nature to the setuid feature. In fact, the setuid bit from -the filesystem is "read" as a full forced set by the kernel. - -The effective set indicates which bits in the permitted set of the new -process should be transferred to the effective set of the new process. -The effective set is best thought of as a "capability aware" set. It -should consist of only 1s if the executable is capability-dumb, or -only 0s if the executable is capability-smart. Since the effective -set consists of only 0s or only 1s, the filesystem can implement this -set using a single bit. - -NOTE: Filesystem support for capabilities is not part of Linux 2.2. - -Users and Groups don't have associated capabilities from the kernel's -point of view, but it is entirely reasonable to associate users or -groups with capabilities. By letting the "login" program set some -capabilities it is possible to make role users such as a backup user -that will have the CAP_DAC_READ_SEARCH capability and be able to do -backups. This could also be implemented as a PAM module, but nobody -has implemented one yet. - -4) What capabilities exist? - -The capabilities available in Linux are listed and documented in the -file /usr/src/linux/include/linux/capability.h. - -5) Are Linux capabilities hierarchical? - -No, you cannot make a "subcapability" out of a Linux capability as in -capability-based OSes. - -6) How can I use capabilities to make sure Mr. Evil Luser (eluser) -can't exploit my "suid" programs? - -This is the general outline of how this works given filesystem -capability support exists. First, you have a PAM module that sets the -inheritable capabilities of the login-shell of eluser. Then for all -"suid" programs on the system, you decide what capabilities they need -and set the _allowed_ set of the executable to that set of -capabilities. The capability rules - - new permitted = forced | (allowed & inheritable) - -means that you should be careful about setting forced capabilities on -executables. In a few cases, this can be useful though. For example -the login program needs to set the inheritable set of the new user and -therefore needs an almost full permitted set. So if you want eluser -to be able to run login and log in as a different user, you will have -to set some forced bits on that executable. - -7) What about passing capabilities between processes? - -Currently this is done by the system call "setcap" which can set the -capabilities of another process. This requires the CAP_SETPCAP -capability which you really only want to grant a _few_ processes. -CAP_SETPCAP was originally intended as a workaround to be able to -implement filesystem support for capabilities using a daemon outside -the kernel. - -There has been discussions about implementing socket-level capability -passing. This means that you can pass a capability over a socket. No -support for this exists in the official kernel yet. - -8) I see securelevel has been removed from 2.2 and are superceeded by -capabilities. How do I emulate securelevel using capabilities? - -The setcap system call can remove a capability from _all_ processes on -the system in one atomic operation. The setcap utility from the -libcap distribution will do this for you. The utility requires the -CAP_SETPCAP privilege to do this. The CAP_SETPCAP capability is not -enabled by default. - -libcap is available from -ftp://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.2/ - -9) I noticed that the capability.h file lacks some capabilities that -are needed to fully emulate 2.0 securelevel. Is there a patch for -this? - -Actually yes - funny you should ask :-). The problem with 2.0 -securelevel is that they for example stop root from accessing block -devices. At the same time they restrict the use of iopl. These two -changes are fundamentally different. Blocking access to block devices -means restricting something that usually isn't restricted. -Restricting access to the use of iopl on the other hand means -restricting (blocking) access to something that is already blocked. -Emulating the parts of 2.0 securelevel that restricts things that are -normally not restricted means that the capabilites in the kernel has -to have a set of capabilities that are usually _on_ for a normal -process (note that this breaks the explanation that capabilities are a -partitioning of the root privileges). There is an experimental patch at - -ftp://ftp.guardian.no/pub/free/linux/capabilities/patch-cap-exp-1 - -which implements a set of capabilities with the "CAP_USER" prefix: - -cap_user_sock - allowed to use socket() -cap_user_dev - allowed to open char/block devices -cap_user_fifo - allowed to use pipes - -These should be enough to emulate 2.0 securelevel (tell me if we need -something more). - -10) Seems I need a CAP_SETPCAP capability that I don't have to make use -of capabilities. How do I enable this capability? - -Change the definition of CAP_INIT_EFF_SET and CAP_INIT_INH_SET to the -following in include/linux/capability.h: - -#define CAP_INIT_EFF_SET { ~0 } -#define CAP_INIT_INH_SET { ~0 } - -This will start init with a full capability set and not with -CAP_SETPCAP removed. - -11) How do I start a process with a limited set of capabilities? - -Get the libcap library and use the execcap utility. The following -example starts the update daemon with only the CAP_SYS_ADMIN -capability. - -execcap 'cap_sys_admin=eip' update - -12) How do I start a process with a limited set of capabilities under -another uid? - -Use the sucap utility which changes uid from root without loosing any -capabilities. Normally all capabilities are cleared when changing uid -from root. The sucap utility requires the CAP_SETPCAP capability. -The following example starts updated under uid updated and gid updated -with CAP_SYS_ADMIN raised in the Effective set. - -sucap updated updated execcap 'cap_sys_admin=eip' update - -[ Sucap is currently available from -ftp://ftp.guardian.no/pub/free/linux/capabilities/sucap.c. Put it in -the progs directory of libcap to compile.] - -13) What are the "capability rules" - -The capability rules are the rules used to set the capabilities of the -new process image after an exec. They work like this: - - pI' = pI - (***) pP' = fP | (fI & pI) - pE' = pP' & fE [NB. fE is 0 or ~0] - - I=Inheritable, P=Permitted, E=Effective // p=process, f=file - ' indicates post-exec(). - -Now to make sense of the equations think of fP as the Forced set of -the executable, and fI as the Allowed set of the executable. Notice -how the Inheritable set isn't touched at all during exec(). - -14) What are the laws for setting capability bits in the Inheritable, -Permitted, and Effective sets? - -Bits can be transferred from Permitted to either Effective or -Inheritable set. - -Bits can be removed from all sets. - -15) Where is the standard on which the Linux capabilities are based? - -There used to be a POSIX draft called POSIX.6 and later POSIX 1003.1e. -However after the committee had spent over 10 years, POSIX decided -that enough is enough and dropped the draft. There will therefore not -be a POSIX standard covering security anytime soon. This may lead to -that the POSIX draft is available for free, however. - --- - Best regards, -- Boris. - diff --git a/getpcaps.8 b/getpcaps.8 deleted file mode 100644 index 6bbf46a..0000000 --- a/getpcaps.8 +++ /dev/null @@ -1,23 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.TH GETPCAPS 8 "2001-05-29" -.\" Please adjust this date whenever revising the manpage. -.SH NAME -getpcaps \- display process capabilities -.SH SYNOPSIS -.B getpcaps -.IR pid ... -.SH DESCRIPTION -.B getpcaps -displays the capabilities on the processes indicated by the -.I pid -value(s) given on the commandline. The capabilities -are displayed in the -.BR cap_from_text (3) -format. -.SH SEE ALSO -.BR execcap (8). -.br -.SH AUTHOR -This manual page was written by Robert Bihlmeyer , -for the Debian GNU/Linux system (but may be used by others). - diff --git a/libcap-use-compiler-flag-options.patch b/libcap-use-compiler-flag-options.patch deleted file mode 100644 index 9728330..0000000 --- a/libcap-use-compiler-flag-options.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7c13fa4e4c044941afd3b3766de71821cdc04397 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Sun, 14 Feb 2021 14:06:49 -0800 -Subject: [PATCH] Update Make.Rules for Fedora RPM build - ---- - Make.Rules | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Make.Rules b/Make.Rules -index ded9014..537cb6c 100644 ---- a/Make.Rules -+++ b/Make.Rules -@@ -56,10 +56,10 @@ IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include - - CC := $(CROSS_COMPILE)gcc - DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 --COPTS ?= -O2 -+COPTS ?= $(RPM_OPT_FLAGS) - CFLAGS ?= $(COPTS) $(DEFINES) - BUILD_CC ?= $(CC) --BUILD_COPTS ?= -O2 -+BUILD_COPTS ?= $(RPM_OPT_FLAGS) - BUILD_CFLAGS ?= $(BUILD_COPTS) $(DEFINES) $(IPATH) - AR := $(CROSS_COMPILE)ar - RANLIB := $(CROSS_COMPILE)ranlib -@@ -69,7 +69,7 @@ WARNINGS=-Wall -Wwrite-strings \ - -Wstrict-prototypes -Wmissing-prototypes \ - -Wnested-externs -Winline -Wshadow - LD=$(CC) -Wl,-x -shared --LDFLAGS ?= #-g -+LDFLAGS ?= $(RPM_LD_FLAGS) - LIBCAPLIB := -L$(topdir)/libcap -lcap - PSXLINKFLAGS := -lpthread -Wl,-wrap,pthread_create - LIBPSXLIB := -L$(topdir)/libcap -lpsx $(PSXLINKFLAGS) --- -2.29.2 diff --git a/libcap.spec b/libcap.spec index e93fa00..92aaa72 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,15 +1,22 @@ Name: libcap -Version: 2.48 -Release: 7%{?dist} +Version: 2.69 +Release: 1%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ -License: BSD or GPLv2 +License: BSD-3-Clause OR GPL-2.0-only -Source: https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/%{name}-%{version}.tar.gz -Patch0: libcap-use-compiler-flag-options.patch +Source0: https://mirrors.edge.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.gz +Source1: https://mirrors.edge.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.sign +Source2: https://git.kernel.org/pub/scm/docs/kernel/pgpkeys.git/plain/keys/29EE848AE2CCF3F4.asc -BuildRequires: libattr-devel pam-devel perl-interpreter gcc +BuildRequires: pam-devel gcc BuildRequires: make +BuildRequires: glibc-static +BuildRequires: gnupg2 + +%ifarch aarch64 armv7hl i686 ppc64le s390x x86_64 +BuildRequires: golang >= 1.11 +%endif %description libcap is a library for getting and setting POSIX.1e (formerly POSIX 6) @@ -39,20 +46,27 @@ draft 15 capabilities. Install libcap-devel if you want to develop or compile applications using libcap. +%package -n captree +Summary: Capability inspection utility + +%description -n captree +The captree program was inspired by the utility pstree, but it uses the +libcap/cap (Go package) API to explore process runtime state and display +the capability status of processes and threads. + %prep +gzip -cd %{SOURCE0} | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data=- %autosetup -p1 + %build -# libcap can not be build with _smp_mflags: -make prefix=%{_prefix} lib=%{_lib} LIBDIR=%{_libdir} SBINDIR=%{_sbindir} \ - INCDIR=%{_includedir} MANDIR=%{_mandir} PKGCONFIGDIR=%{_libdir}/pkgconfig/ +%make_build prefix=%{_prefix} lib=%{_lib} GO_BUILD_FLAGS="-ldflags=-linkmode=external" all + +%check +make test %install -make install RAISE_SETFCAP=no \ - DESTDIR=%{buildroot} \ - LIBDIR=%{_libdir} \ - SBINDIR=%{_sbindir} \ - PKGCONFIGDIR=%{_libdir}/pkgconfig/ +%make_install prefix=%{_prefix} lib=%{_lib} GO_BUILD_FLAGS="-ldflags=-linkmode=external" mkdir -p %{buildroot}/%{_mandir}/man{2,3,8} mv -f doc/*.3 %{buildroot}/%{_mandir}/man3/ @@ -63,11 +77,11 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %files %license License -%doc doc/capability.notes +%doc doc/capability.md %{_libdir}/*.so.* -%{_sbindir}/* -%{_mandir}/man1/* -%{_mandir}/man8/* +%{_sbindir}/{capsh,getcap,getpcaps,setcap} +%{_mandir}/man1/capsh.1* +%{_mandir}/man8/{getcap,getpcaps,setcap}.8* %{_libdir}/security/pam_cap.so %files static @@ -77,12 +91,19 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %files devel %{_includedir}/* %{_libdir}/*.so -%{_mandir}/man3/* -%{_libdir}/pkgconfig/libcap.pc -%{_libdir}/pkgconfig/libpsx.pc +%{_mandir}/man3/*.3* +%{_libdir}/pkgconfig/{libcap,libpsx}.pc +%files -n captree +%license License +%{_sbindir}/captree +%{_mandir}/man8/captree.8* %changelog +* Mon Nov 06 2023 Carlos Rodriguez-Fernandez - 2.69-1 +- Update to 2.69 (with contribs from Yanko Kaneti , and Andrew G. Morgan ) +- Update license to SPDX (by Anderson Toshiyuki Sasaki ) + * Thu Jul 20 2023 Fedora Release Engineering - 2.48-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/plans/main.fmf b/plans/main.fmf new file mode 100644 index 0000000..71d864c --- /dev/null +++ b/plans/main.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test for libcap +discover: + how: fmf +execute: + how: tmt diff --git a/tests/capsh-basic-functionality/Makefile b/tests/capsh-basic-functionality/Makefile deleted file mode 100644 index 49f35ed..0000000 --- a/tests/capsh-basic-functionality/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/libcap/Sanity/capsh-basic-functionality -# Description: tests basic functionality -# Author: Karel Srot -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2017 Red Hat, Inc. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# 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, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/CoreOS/libcap/Sanity/capsh-basic-functionality -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - test -x runtest.sh || chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Karel Srot " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: tests basic functionality" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 5m" >> $(METADATA) - @echo "RunFor: libcap" >> $(METADATA) - @echo "Requires: libcap" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5 -RHEL6" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/capsh-basic-functionality/PURPOSE b/tests/capsh-basic-functionality/PURPOSE deleted file mode 100644 index 810902f..0000000 --- a/tests/capsh-basic-functionality/PURPOSE +++ /dev/null @@ -1,3 +0,0 @@ -PURPOSE of /CoreOS/libcap/Sanity/capsh-basic-functionality -Description: tests basic functionality -Author: Karel Srot diff --git a/tests/capsh-basic-functionality/runtest.sh b/tests/capsh-basic-functionality/runtest.sh deleted file mode 100755 index 6102418..0000000 --- a/tests/capsh-basic-functionality/runtest.sh +++ /dev/null @@ -1,123 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/libcap/Sanity/capsh-basic-functionality -# Description: tests basic functionality -# Author: Karel Srot -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2017 Red Hat, Inc. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# 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, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/bin/rhts-environment.sh || exit 1 -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="libcap" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - rlRun "useradd -m libcap_tester" - rlPhaseEnd - - rlPhaseStartTest "Remove the listed capabilities from the prevailing bounding set" - rlRun -s "capsh --drop=cap_net_raw -- -c 'getpcaps \$\$'" - rlAssertGrep "Capabilities for" $rlRun_LOG - rlAssertNotGrep cap_net_raw $rlRun_LOG - rlRun -s "capsh --drop=cap_net_raw -- -c 'ping localhost -c 1'" 2,126 "Ping without cap_net_raw shoud fail" - rlAssertGrep "Operation not permitted" $rlRun_LOG - rlPhaseEnd - - rlPhaseStartTest "Set the prevailing process capabilities" - rlRun -s "capsh --caps=cap_chown+p --print" - rlAssertGrep "Current: = cap_chown+p" $rlRun_LOG - rlPhaseEnd - - rlPhaseStartTest "Set the inheritable set of capabilities" - rlRun -s "capsh --inh=cap_chown --print" - rlRun "grep 'Current: = ' $rlRun_LOG | grep 'cap_chown+eip'" - rlRun -s "capsh --inh=cap_chown -- -c 'getpcaps \$\$' 2>&1" - rlAssertGrep "cap_chown+eip" $rlRun_LOG - rlPhaseEnd - - rlPhaseStartTest "Assume the identity of the user nobody" - USERID=`id -u nobody` - GROUPID=`id -g nobody` - rlRun -s "capsh --user=nobody -- -c 'id'" - rlAssertGrep "uid=$USERID(nobody) gid=$GROUPID(nobody) groups=$GROUPID(nobody)" $rlRun_LOG - rlPhaseEnd - - rlPhaseStartTest "Force all uid values to equal to nobody" - rlRun -s "capsh --uid=$USERID -- -c 'id'" - rlAssertGrep "uid=$USERID(nobody) gid=0(root) groups=0(root)" $rlRun_LOG - rlPhaseEnd - - rlPhaseStartTest "Force all gid values to equal to nobody" - rlRun -s "capsh --gid=$GROUPID -- -c 'id'" - rlAssertGrep "uid=0(root) gid=$GROUPID(nobody)" $rlRun_LOG - rlPhaseEnd - - rlPhaseStartTest "Set the supplementary groups" - GROUP2ID=`id -g daemon` - rlRun -s "capsh --groups=${GROUPID},${GROUP2ID} -- -c id" - rlAssertGrep "uid=0(root) gid=0(root) groups=0(root),${GROUP2ID}(daemon),${GROUPID}(nobody)" $rlRun_LOG - rlPhaseEnd - - rlPhaseStartTest "Permit the process to retain its capabilities after a setuid" - CURRENT=`capsh --print | grep 'Current:' | cut -d '+' -f 1` - rlRun -s "capsh --keep=0 --uid=$USERID --print" - rlAssertGrep 'Current: =$' $rlRun_LOG -E - rlRun -s "capsh --keep=1 --uid=$USERID --print" - rlAssertGrep "$CURRENT" $rlRun_LOG - rlPhaseEnd - - rlPhaseStartTest "Decode capabilities" - rlRun "CODE=$( cat /proc/$$/status | awk '/CapEff/ { print $2 }' )" - rlRun "DECODE=$( capsh --decode=$CODE | cut -d '=' -f 2 )" - rlRun "capsh --print | grep 'Current: = $DECODE'" - rlPhaseEnd - - rlPhaseStartTest "Verify the existence of a capability on the system" - rlRun "capsh --supports=cap_net_raw" - rlRun -s "capsh --supports=cap_foo_bar" 1 - rlAssertGrep "cap\[cap_foo_bar\] not recognized by library" $rlRun_LOG - rlPhaseEnd - - rlPhaseStartTest "Verify exit code for unsupported option" - rlRun "capsh --foo bar" 1 - rlPhaseEnd - - rlPhaseStartTest "Run as a regular user" - USERID=`id -u libcap_tester` - rlRun -s "su - libcap_tester -c 'capsh --print'" - rlAssertGrep "Current: =\$" $rlRun_LOG -E - rlAssertGrep "uid=$USERID(libcap_tester)" $rlRun_LOG - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "userdel -r libcap_tester" - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/tests/capsh/main.fmf b/tests/capsh/main.fmf new file mode 100644 index 0000000..28d19cd --- /dev/null +++ b/tests/capsh/main.fmf @@ -0,0 +1,2 @@ +summary: capsh tests +description: tests basic capsh functionality diff --git a/tests/capsh/test.sh b/tests/capsh/test.sh new file mode 100755 index 0000000..92a59d0 --- /dev/null +++ b/tests/capsh/test.sh @@ -0,0 +1,94 @@ +#!/bin/bash + +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartSetup + rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" + rlRun "pushd $TmpDir" + rlRun "useradd -m libcap_tester" + rlPhaseEnd + + rlPhaseStartTest "Should remove capability" + rlRun -s "capsh --drop=cap_sys_admin -- -c 'getpcaps \$\$'" + rlAssertGrep "cap_sys_admin-ep" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "Should prevent the use of removed capability" + rlRun -s "capsh --drop=cap_net_raw -- -c 'ping localhost -e 0 -c 1'" 2,126 "Ping without cap_net_raw shoud fail" + rlAssertGrep "Operation not permitted" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "Should set the prevailing process capabilities" + rlRun -s "capsh --caps=cap_chown+p --print" + rlAssertGrep "^Current:.*cap_chown[+=][ei]?p[ei]?.*" $rlRun_LOG -E + rlPhaseEnd + + rlPhaseStartTest "Should set the inheritable set of capabilities" + rlRun -s "capsh --inh=cap_chown --print" + rlAssertGrep "^Current:.*cap_chown[+=][ep]?i[ep]?.*" $rlRun_LOG -E + rlPhaseEnd + + rlPhaseStartTest "Should set and show the inheritable set of capabilities" + rlRun -s "capsh --inh=cap_chown -- -c 'getpcaps \$\$' 2>&1" + rlAssertGrep ".*cap_chown[+=][ep]?i[ep]?.*" $rlRun_LOG -E + rlPhaseEnd + + rlPhaseStartTest "Should assume the identity of the user nobody" + USERID=`id -u nobody` + GROUPID=`id -g nobody` + rlRun -s "capsh --user=nobody -- -c 'id'" + rlAssertGrep "uid=$USERID(nobody) gid=$GROUPID(nobody) groups=$GROUPID(nobody)" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "Should assume the nobody identity with uid" + USERID=`id -u nobody` + rlRun -s "capsh --uid=$USERID -- -c 'id'" + rlAssertGrep "uid=$USERID(nobody) gid=0(root) groups=0(root)" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "Should assume guid of nobody" + GROUPID=`id -g nobody` + rlRun -s "capsh --gid=$GROUPID -- -c 'id'" + rlAssertGrep "uid=0(root) gid=$GROUPID(nobody)" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "Should assume the supplementary groups" + GROUPID=`id -g nobody` + GROUP2ID=`id -g daemon` + rlRun -s "capsh --groups=${GROUPID},${GROUP2ID} -- -c id" + rlAssertGrep "uid=0(root) gid=0(root) groups=0(root),${GROUP2ID}(daemon),${GROUPID}(nobody)" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "Should decode capabilities" + rlRun "CODE=$( cat /proc/$$/status | awk '/CapEff/ { print $2 }' )" + rlRun "DECODE=$( capsh --decode=$CODE | cut -d '=' -f 2 )" + rlRun "capsh --print | grep \"$DECODE\"" + rlPhaseEnd + + rlPhaseStartTest "Should detect the existence of a capability on the system" + rlRun "capsh --supports=cap_net_raw" + rlPhaseEnd + + rlPhaseStartTest "Should detect the absence of a capability on the system" + rlRun -s "capsh --supports=cap_foo_bar" 1 + rlAssertGrep "cap\[cap_foo_bar\] not recognized by library" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "Should error for unsupported option" + rlRun "capsh --foo bar" 1 + rlPhaseEnd + + rlPhaseStartTest "Should run as a regular user" + USERID=`id -u libcap_tester` + rlRun -s "su - libcap_tester -c 'capsh --print'" + rlAssertGrep "Current: =\$" $rlRun_LOG -E + rlAssertGrep "uid=$USERID(libcap_tester)" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "userdel -r libcap_tester" + rlRun "popd" + rlRun "rm -r $TmpDir" 0 "Removing tmp directory" + rlPhaseEnd +rlJournalEnd diff --git a/tests/getcap-setcap/main.fmf b/tests/getcap-setcap/main.fmf new file mode 100644 index 0000000..bce9fcd --- /dev/null +++ b/tests/getcap-setcap/main.fmf @@ -0,0 +1,2 @@ +summary: setcap and getcap tests +description: tests setcap and getcap basic functionality diff --git a/tests/getcap-setcap/test.sh b/tests/getcap-setcap/test.sh new file mode 100755 index 0000000..8384cbb --- /dev/null +++ b/tests/getcap-setcap/test.sh @@ -0,0 +1,98 @@ +#!/bin/bash +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartSetup + rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" + rlRun "pushd $TmpDir" + rlPhaseEnd + + rlPhaseStartTest "Should set and get capabilities on multiple files" + rlRun "touch test-file-0" + rlRun "touch test-file-1" + rlRun "setcap cap_net_admin+p test-file-0 cap_net_raw+ei test-file-1" + rlRun -s "getcap test-file-0 test-file-1" + rlAssertGrep "test-file-0.*cap_net_admin[+=]p" $rlRun_LOG -E + rlAssertGrep "test-file-1.*cap_net_raw[+=]ei" $rlRun_LOG -E + rlRun "rm -f test-file-0 test-file-1" + rlPhaseEnd + + rlPhaseStartTest "Should set capabilities via stdin" + rlRun "touch test-file-0" + rlRun "echo -e 'cap_net_raw+p\ncap_net_admin+p' > input" + rlRun -s "setcap - test-file-0 < input" + rlAssertGrep "Please" $rlRun_LOG + rlRun -s "getcap test-file-0" + rlAssertGrep "cap_net_admin,cap_net_raw[+=]p" $rlRun_LOG -E + rlRun "rm -f test-file-0" + rlPhaseEnd + + rlPhaseStartTest "Should set capabilities quietly via stdin" + rlRun "touch test-file-0" + rlRun "echo -e 'cap_net_raw+p' > input" + rlRun -s "setcap -q - test-file-0 < input" + rlAssertNotGrep "Please" $rlRun_LOG + rlRun -s "getcap test-file-0" + rlAssertGrep "cap_net_raw[+=]p" $rlRun_LOG -E + rlRun "rm -f test-file-0" + rlPhaseEnd + + rlPhaseStartTest "Should remove capabilities" + rlRun "touch test-file-0" + rlRun "setcap cap_net_admin+p test-file-0" + rlRun "setcap -r test-file-0" + rlRun -s "getcap test-file-0" + rlAssertNotGrep "cap_net_admin" $rlRun_LOG + rlRun "rm -f test-file-0" + rlPhaseEnd + + rlPhaseStartTest "Should list capabilities recursively" + rlRun "touch test-file-0" + rlRun "mkdir test-dir-1" + rlRun "touch test-dir-1/test-file-1" + rlRun "setcap cap_net_admin+p test-file-0 cap_net_raw+ei test-dir-1/test-file-1" + rlRun -s "getcap -r *" + rlAssertGrep "^test-file-0.*cap_net_admin[+=]p\$" $rlRun_LOG -E + rlAssertGrep "^test-dir-1/test-file-1.*cap_net_raw[+=]ei\$" $rlRun_LOG -E + rlRun "rm -f test-file-0" + rlRun "rm -rf test-dir-1" + rlPhaseEnd + + rlPhaseStartTest "listing capabilities verbosely" + rlRun "touch test-file-0" + rlRun "mkdir test-dir-1" + rlRun "touch test-dir-1/test-file-1" + rlRun "touch test-dir-1/test-file-2" + rlRun "setcap cap_net_admin+p test-file-0 cap_net_raw+ei test-dir-1/test-file-1" + rlRun -s "getcap -v -r *" + rlAssertGrep "^test-file-0.*cap_net_admin[+=]p\$" $rlRun_LOG -E + rlAssertGrep "^test-dir-1/test-file-1.*cap_net_raw[+=]ei\$" $rlRun_LOG -E + rlAssertGrep "^test-dir-1/test-file-2\$" $rlRun_LOG -E + rlRun "rm -f test-file-0" + rlRun "rm -rf test-dir-1" + rlPhaseEnd + + rlPhaseStartTest "Should setcap print help" + rlRun -s "setcap -h" + rlAssertGrep "usage" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "Should getcap print help" + rlRun -s "getcap -h" + rlAssertGrep "usage" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "setcap should exit with 1 on invalid arguments" + rlRun -s "setcap foo bar" 1 + rlAssertGrep "Invalid" $rlRun_LOG -i + rlPhaseEnd + rlPhaseStartTest "getcap should exit with 1 on invalid arguments" + rlRun -s "getcap -f oo" 1 + rlAssertGrep "Invalid" $rlRun_LOG -i + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -r $TmpDir" 0 "Removing tmp directory" + rlPhaseEnd +rlJournalEnd diff --git a/tests/libcap-devel/main.fmf b/tests/libcap-devel/main.fmf new file mode 100644 index 0000000..3381c96 --- /dev/null +++ b/tests/libcap-devel/main.fmf @@ -0,0 +1,2 @@ +summary: libcap-devel tests +description: tests libcap-devel functionality diff --git a/tests/sanity-tests/test-libcap.c b/tests/libcap-devel/test-libcap.c similarity index 100% rename from tests/sanity-tests/test-libcap.c rename to tests/libcap-devel/test-libcap.c diff --git a/tests/libcap-devel/test.sh b/tests/libcap-devel/test.sh new file mode 100755 index 0000000..3c4fd93 --- /dev/null +++ b/tests/libcap-devel/test.sh @@ -0,0 +1,17 @@ +#!/bin/bash +. /usr/share/beakerlib/beakerlib.sh || exit 1 + + +rlJournalStart + rlPhaseStartSetup + rlRun "gcc -lcap -lcmocka -Wall -g3 -o test-libcap test-libcap.c" + rlPhaseEnd + + rlPhaseStartTest + rlRun "./test-libcap" + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "rm test-libcap" + rlPhaseEnd +rlJournalEnd diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..c7122a2 --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,9 @@ +test: ./test.sh +framework: beakerlib +require: + - libcap + - libcap-devel + - libcmocka + - libcmocka-devel + - gcc + - iputils diff --git a/tests/manpages/main.fmf b/tests/manpages/main.fmf new file mode 100644 index 0000000..3a97d78 --- /dev/null +++ b/tests/manpages/main.fmf @@ -0,0 +1,2 @@ +summary: man pages install smoke tests +description: verify that the man pages are installed correctly diff --git a/tests/manpages/test.sh b/tests/manpages/test.sh new file mode 100755 index 0000000..b4afd94 --- /dev/null +++ b/tests/manpages/test.sh @@ -0,0 +1,21 @@ +#!/bin/bash +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +expected_manpages=( + 'capsh(1)' + 'libcap(3)' # there are many more but if these are present then it verifies it because of the glob install + 'libpsx(3)' + 'getcap(8)' + 'getpcaps(8)' + 'setcap(8)' + 'captree(8)' + +) + +rlJournalStart + for page in "${expected_manpages[@]}"; do + rlPhaseStartTest "test ${page}" + rlRun "man --pager=cat '${page}'" + rlPhaseEnd + done +rlJournalEnd diff --git a/tests/pam_cap-so-sanity-test/Makefile b/tests/pam_cap-so-sanity-test/Makefile deleted file mode 100644 index 3f30e80..0000000 --- a/tests/pam_cap-so-sanity-test/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/libcap/Sanity/pam_cap-so-sanity-test -# Description: basic functionality test for pam_cap.so module -# Author: Karel Srot -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2017 Red Hat, Inc. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# 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, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/CoreOS/libcap/Sanity/pam_cap-so-sanity-test -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - test -x runtest.sh || chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Karel Srot " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: basic functionality test for pam_cap.so module" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 5m" >> $(METADATA) - @echo "RunFor: libcap" >> $(METADATA) - @echo "Requires: libcap" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/pam_cap-so-sanity-test/PURPOSE b/tests/pam_cap-so-sanity-test/PURPOSE deleted file mode 100644 index 9edc2b0..0000000 --- a/tests/pam_cap-so-sanity-test/PURPOSE +++ /dev/null @@ -1,5 +0,0 @@ -PURPOSE of /CoreOS/libcap/Sanity/pam_cap-so-sanity-test -Description: basic functionality test for pam_cap.so module -Author: Karel Srot - -Test if a test user can be granted capabilities via pam_cap.so module. diff --git a/tests/pam_cap-so-sanity-test/runtest.sh b/tests/pam_cap-so-sanity-test/runtest.sh deleted file mode 100755 index be93b30..0000000 --- a/tests/pam_cap-so-sanity-test/runtest.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/libcap/Sanity/pam_cap-so-sanity-test -# Description: basic functionality test for pam_cap.so module -# Author: Karel Srot -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2017 Red Hat, Inc. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# 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, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/bin/rhts-environment.sh || exit 1 -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="libcap" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - rlRun "useradd -m pam_cap_user" - rlRun "useradd -m pam_cap_user2" - rlFileBackup /etc/pam.d/su - [ -f /etc/security/capability.conf ] && rlFileBackup /etc/security/capability.conf - rlRun "echo -e 'cap_net_raw pam_cap_user\nnone *' > /etc/security/capability.conf" - rlRun "sed '1 s/^/auth required pam_cap.so/' -i /etc/pam.d/su" 0 "Configure pam_cap.so in /etc/pam.d/su" - rlPhaseEnd - - rlPhaseStartTest - rlRun "su - pam_cap_user -c 'getpcaps \$\$' &> user1.log" - rlAssertGrep "Capabilities for.* = cap_net_raw" user1.log -E - rlRun "su - pam_cap_user2 -c 'getpcaps \$\$' &> user2.log" - rlAssertNotGrep "cap_net_raw" user2.log - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "userdel -r pam_cap_user" - rlRun "userdel -r pam_cap_user2" - rlFileRestore - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/tests/pam_cap/main.fmf b/tests/pam_cap/main.fmf new file mode 100644 index 0000000..15277dc --- /dev/null +++ b/tests/pam_cap/main.fmf @@ -0,0 +1,2 @@ +summary: pam_cap.so tests +description: tests pam_cap.so functionality diff --git a/tests/pam_cap/test.sh b/tests/pam_cap/test.sh new file mode 100755 index 0000000..035edd9 --- /dev/null +++ b/tests/pam_cap/test.sh @@ -0,0 +1,32 @@ +#!/bin/bash +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartSetup + rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" + rlRun "pushd $TmpDir" + rlRun "useradd -m pam_cap_user" + rlRun "useradd -m pam_cap_user2" + rlFileBackup /etc/pam.d/su + [ -f /etc/security/capability.conf ] && rlFileBackup /etc/security/capability.conf + rlRun "echo -e 'cap_net_raw pam_cap_user\nnone *' > /etc/security/capability.conf" + rlRun "sed '1 s/^/auth required pam_cap.so/' -i /etc/pam.d/su" 0 "Configure pam_cap.so in /etc/pam.d/su" + rlPhaseEnd + + rlPhaseStartTest "Should given pam_cap_user the cap_net_raw capability" + rlRun -s "su - pam_cap_user -c 'getpcaps \$\$'" + rlAssertGrep ".*cap_net_raw[+=].*" $rlRun_LOG -E + rlPhaseEnd + rlPhaseStartTest "The user pam_cap_user2 should not have the cap_net_raw capability" + rlRun -s "su - pam_cap_user2 -c 'getpcaps \$\$'" + rlAssertNotGrep "cap_net_raw" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "userdel -r pam_cap_user" + rlRun "userdel -r pam_cap_user2" + rlFileRestore + rlRun "popd" + rlRun "rm -r $TmpDir" 0 "Removing tmp directory" + rlPhaseEnd +rlJournalEnd diff --git a/tests/pkg-config-libcap-pc-addition/Makefile b/tests/pkg-config-libcap-pc-addition/Makefile deleted file mode 100644 index 57b4cd6..0000000 --- a/tests/pkg-config-libcap-pc-addition/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/libcap/Sanity/pkg-config-libcap-pc-addition -# Description: Test for BZ#1425490 (Missing libcap.pc) -# Author: Karel Srot -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2017 Red Hat, Inc. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# 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, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/CoreOS/libcap/Sanity/pkg-config-libcap-pc-addition -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - test -x runtest.sh || chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Karel Srot " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Test for BZ#1425490 (Missing libcap.pc)" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 5m" >> $(METADATA) - @echo "RunFor: libcap" >> $(METADATA) - @echo "Requires: libcap libcap-devel pkgconfig" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Bug: 1425490" >> $(METADATA) - @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5 -RHEL6" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/pkg-config-libcap-pc-addition/PURPOSE b/tests/pkg-config-libcap-pc-addition/PURPOSE deleted file mode 100644 index 68dbb0b..0000000 --- a/tests/pkg-config-libcap-pc-addition/PURPOSE +++ /dev/null @@ -1,7 +0,0 @@ -PURPOSE of /CoreOS/libcap/Sanity/pkg-config-libcap-pc-addition -Description: Test for BZ#1425490 (Missing libcap.pc) -Author: Karel Srot -Bug summary: Missing libcap.pc -Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1425490 - -Checking the presence and sanity of the libcap.pc file. diff --git a/tests/pkg-config-libcap-pc-addition/runtest.sh b/tests/pkg-config-libcap-pc-addition/runtest.sh deleted file mode 100755 index b63ad04..0000000 --- a/tests/pkg-config-libcap-pc-addition/runtest.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/libcap/Sanity/pkg-config-libcap-pc-addition -# Description: Test for BZ#1425490 (Missing libcap.pc) -# Author: Karel Srot -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2017 Red Hat, Inc. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# 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, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/bin/rhts-environment.sh || exit 1 -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="libcap" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - rlPhaseEnd - - rlPhaseStartTest - rlRun "rpm -ql libcap-devel | grep libcap.pc" 0 "There must be libcap.pc" - if [ $? -eq 0 ]; then - PCFILE=$(rpm -ql libcap-devel | grep libcap.pc) - rlRun "pkg-config --libs libcap | grep -- '-lcap'" - VER=$(awk '/Version:/ { print $2 }' $PCFILE | tail -1) - rlRun "pkg-config --modversion libcap | grep $VER" - rlRun -s "pkg-config --print-variables libcap" - rlAssertGrep "^prefix" $rlRun_LOG - rlAssertGrep "^exec_prefix" $rlRun_LOG - rlAssertGrep "^libdir" $rlRun_LOG - rlAssertGrep "^includedir" $rlRun_LOG - fi - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/tests/pkg-configs/main.fmf b/tests/pkg-configs/main.fmf new file mode 100644 index 0000000..fca923f --- /dev/null +++ b/tests/pkg-configs/main.fmf @@ -0,0 +1,2 @@ +summary: validates pkg-configs presence. +description: ensures libcap.pc and libpsx.pc are installed diff --git a/tests/pkg-configs/test.sh b/tests/pkg-configs/test.sh new file mode 100755 index 0000000..45f98a4 --- /dev/null +++ b/tests/pkg-configs/test.sh @@ -0,0 +1,44 @@ +#!/bin/bash +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartSetup + rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" + rlRun "pushd $TmpDir" + rlPhaseEnd + + rlPhaseStartTest "libcap pkg-config should be present and valid" + rlRun "rpm -ql libcap-devel | grep libcap.pc" 0 "There must be libcap.pc" + if [ $? -eq 0 ]; then + PCFILE=$(rpm -ql libcap-devel | grep libcap.pc) + rlRun "pkg-config --libs libcap | grep -- '-lcap'" + VER=$(awk '/Version:/ { print $2 }' $PCFILE | tail -1) + rlRun "pkg-config --modversion libcap | grep $VER" + rlRun -s "pkg-config --print-variables libcap" + rlAssertGrep "^prefix" $rlRun_LOG + rlAssertGrep "^exec_prefix" $rlRun_LOG + rlAssertGrep "^libdir" $rlRun_LOG + rlAssertGrep "^includedir" $rlRun_LOG + fi + rlPhaseEnd + + rlPhaseStartTest "libcap pkg-config should be present and valid" + rlRun "rpm -ql libcap-devel | grep libpsx.pc" 0 "There must be libpsx.pc" + if [ $? -eq 0 ]; then + PCFILE=$(rpm -ql libcap-devel | grep libpsx.pc) + rlRun "pkg-config --libs libpsx | grep -- '-lpsx -lpthread -Wl,-wrap,pthread_create'" + VER=$(awk '/Version:/ { print $2 }' $PCFILE | tail -1) + rlRun "pkg-config --modversion libpsx | grep $VER" + rlRun -s "pkg-config --print-variables libpsx" + rlAssertGrep "^prefix" $rlRun_LOG + rlAssertGrep "^exec_prefix" $rlRun_LOG + rlAssertGrep "^libdir" $rlRun_LOG + rlAssertGrep "^includedir" $rlRun_LOG + fi + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -r $TmpDir" 0 "Removing tmp directory" + rlPhaseEnd +rlJournalEnd diff --git a/tests/sanity-tests/Makefile b/tests/sanity-tests/Makefile deleted file mode 100644 index 9e75815..0000000 --- a/tests/sanity-tests/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1+ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/libcap -# Description: Test if libcap working ok -# Author: Susant Sahani -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -export TEST=/CoreOS/libcap -export TESTVERSION=1.0 - -OBJS = test-libcap.c -CFLAG = -Wall -g3 -CC = gcc -LIBS = -lcap -lcmocka - -test-libcap:${OBJ} - ${CC} ${CFLAGS} ${INCLUDES} -o $@ ${OBJS} ${LIBS} - -run: test-libcap - ./runtest.sh -clean: - -rm -f *~ test-libcap - -.c.o: - ${CC} ${CFLAGS} ${INCLUDES} -c $< - -CC = gcc - -include /usr/share/rhts/lib/rhts-make.include -$(METADATA): Makefile - @echo "Owner: Susant Sahani" > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Test libcap works ok" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 5m" >> $(METADATA) - @echo "RunFor: libcap" >> $(METADATA) - @echo "Requires: libcap libcap-devel" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Releases: -Fedora 29" >> $(METADATA) - rhts-lint $(METADATA) diff --git a/tests/sanity-tests/runtest.sh b/tests/sanity-tests/runtest.sh deleted file mode 100755 index 17d83e3..0000000 --- a/tests/sanity-tests/runtest.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# SPDX-License-Identifier: LGPL-2.1+ -# ~~~ -# runtest.sh of libcap -# Description: Tests for libcap -# -# Author: Susant Sahani -# Copyright (c) 2018 Red Hat, Inc. -# ~~~ - -# Include Beaker environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="libcap" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "cp test-libcap /usr/bin/" - rlPhaseEnd - - rlPhaseStartTest - rlLog "Starting libcap tests ..." - rlRun "/usr/bin/test-libcap" - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "rm /usr/bin/test-libcap" - rlLog "libcap tests done" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd - -rlGetTestState diff --git a/tests/setcap-getcap-basic-functionality/Makefile b/tests/setcap-getcap-basic-functionality/Makefile deleted file mode 100644 index 02ce5d5..0000000 --- a/tests/setcap-getcap-basic-functionality/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/libcap/Sanity/setcap-getcap-basic-functionality -# Description: test basic functionality -# Author: Karel Srot -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2017 Red Hat, Inc. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# 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, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/CoreOS/libcap/Sanity/setcap-getcap-basic-functionality -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - test -x runtest.sh || chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Karel Srot " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: test basic functionality" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 5m" >> $(METADATA) - @echo "RunFor: libcap" >> $(METADATA) - @echo "Requires: libcap" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/setcap-getcap-basic-functionality/PURPOSE b/tests/setcap-getcap-basic-functionality/PURPOSE deleted file mode 100644 index a6ea33d..0000000 --- a/tests/setcap-getcap-basic-functionality/PURPOSE +++ /dev/null @@ -1,3 +0,0 @@ -PURPOSE of /CoreOS/libcap/Sanity/setcap-getcap-basic-functionality -Description: test basic functionality -Author: Karel Srot diff --git a/tests/setcap-getcap-basic-functionality/runtest.sh b/tests/setcap-getcap-basic-functionality/runtest.sh deleted file mode 100755 index 3639367..0000000 --- a/tests/setcap-getcap-basic-functionality/runtest.sh +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/libcap/Sanity/setcap-getcap-basic-functionality -# Description: test basic functionality -# Author: Karel Srot -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2017 Red Hat, Inc. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# 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, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/bin/rhts-environment.sh || exit 1 -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="libcap" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - rlRun "mkdir mydir && touch file1 mydir/file2 mydir/file3" - rlPhaseEnd - - rlPhaseStartTest "set and get capabilities" - rlRun "setcap cap_net_admin+p file1 cap_net_raw+ei mydir/file2" - rlRun -s "getcap file1 mydir/file2" - rlAssertGrep "file1 = cap_net_admin+p" $rlRun_LOG - rlAssertGrep "mydir/file2 = cap_net_raw+ei" $rlRun_LOG - rlPhaseEnd - - rlPhaseStartTest "set capabilities via stdin" - rlRun "echo -e 'cap_net_raw+p\ncap_net_admin+p' > input" - rlRun -s "setcap - mydir/file3 < input" - rlAssertGrep "Please enter caps for file \[empty line to end\]:" $rlRun_LOG - rlRun "getcap mydir/file3 | grep 'mydir/file3 = cap_net_admin,cap_net_raw+p'" - rlPhaseEnd - - rlPhaseStartTest "set capabilities quietly via stdin" - rlRun "echo -e 'cap_net_raw+p' > input" - rlRun -s "setcap -q - mydir/file3 < input" - rlAssertNotGrep "Please enter caps for file" $rlRun_LOG - rlRun "getcap mydir/file3 | grep 'mydir/file3 = cap_net_raw+p'" - rlPhaseEnd - - rlPhaseStartTest "remove capabilities" - rlRun "setcap -r mydir/file3" - rlRun "getcap | grep file3" 1 "There should be no capabilities listed for file1" - rlPhaseEnd - - rlPhaseStartTest "listing capabilities recursively" - rlRun -s "getcap -r *" - rlAssertGrep "file1 = cap_net_admin+p" $rlRun_LOG - rlAssertGrep "mydir/file2 = cap_net_raw+ei" $rlRun_LOG - rlPhaseEnd - - rlPhaseStartTest "listing capabilities verbosely" - rlRun -s "getcap -v mydir/*" - rlAssertGrep "mydir/file2 = cap_net_raw+ei" $rlRun_LOG - rlAssertGrep "mydir/file3\$" $rlRun_LOG -E - rlPhaseEnd - - rlPhaseStartTest "print help" - rlRun "setcap -h | grep 'usage: setcap'" 1 - rlRun "getcap -h | grep 'usage: getcap'" 1 - rlPhaseEnd - - rlPhaseStartTest "exit with 1 on error" - rlRun -s "setcap foo bar" 1 - rlAssertGrep "fatal error: Invalid argument" $rlRun_LOG - rlRun -s "getcap -f oo" 1 - rlAssertGrep "getcap: invalid option -- 'f'" $rlRun_LOG - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index fbbca7f..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,28 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-beakerlib - tags: - - classic - - container - tests: - - sanity-tests - - pam_cap-so-sanity-test - - setcap-getcap-basic-functionality - required_packages: - - libcap # libcap package required for all tests - - libcap-devel - - libcmocka - - libcmocka-devel - - gcc - - iputils # ping command required for capsh-basic-functionality - -# Tests that run in atomic -- hosts: localhost - roles: - - role: standard-test-beakerlib - tags: - - atomic - tests: - - capsh-basic-functionality - - pam_cap-so-sanity-test - - setcap-getcap-basic-functionality From 75bb5af48b3bcabf59ce7d4a2ff63fc9752ad64d Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 20 Nov 2023 21:54:28 +0100 Subject: [PATCH 03/32] upload sources and add GPG key to git --- .gitignore | 1 - 29EE848AE2CCF3F4.asc | 105 +++++++++++++++++++++++++++++++++++++++++++ sources | 3 +- 3 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 29EE848AE2CCF3F4.asc diff --git a/.gitignore b/.gitignore index af0feb9..e3dc947 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /libcap-*.tar.gz /libcap-*.tar.sign -/*.asc /*.src.rpm diff --git a/29EE848AE2CCF3F4.asc b/29EE848AE2CCF3F4.asc new file mode 100644 index 0000000..6d95430 --- /dev/null +++ b/29EE848AE2CCF3F4.asc @@ -0,0 +1,105 @@ +pub rsa4096 2011-10-07 [SC] + 38A644698C69787344E954CE29EE848AE2CCF3F4 +uid Andrew G. Morgan +uid Andrew G. Morgan (Work Address) +sub rsa4096 2011-10-07 [E] + E8BBFE9EBCE94FB48D2F98FC61B996743B143E89 + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=6WX5 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/sources b/sources index 22a2095..7857c6f 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (libcap-2.48.tar.gz) = 90ac6e46531e4893b78b14171537c6dfd06cf617af9e90f38ea0ce4b50161451528aefff41dbe983719e76582cf39f8d7d432f99756e976f62403d5bc3c209c8 +SHA512 (libcap-2.69.tar.gz) = 75ee0fe8e1ac835f29cb76d233f731dcf126b73eed5229a130bbe4308a42441934d4e9cefeaaab45f774de2ed6859c752fbbfb9908e792f2f9f3d0f841e01aee +SHA512 (libcap-2.69.tar.sign) = 00f323444463b020c999f6fab255a61bd719f8d0ec1b619352e4f1b13407acee9a8e176861e5b408f64a871dc4095c6a26af541c3a0d4efca364c2d4b3679d30 From 34559e0319207408ab2fba9aa65825316da4f1a4 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 20 Nov 2023 23:01:57 +0100 Subject: [PATCH 04/32] Make file lists more explicit to avoid accidental ABI changes --- libcap.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/libcap.spec b/libcap.spec index 92aaa72..93959cd 100644 --- a/libcap.spec +++ b/libcap.spec @@ -78,7 +78,8 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %files %license License %doc doc/capability.md -%{_libdir}/*.so.* +%{_libdir}/libcap.so.2{,.*} +%{_libdir}/libpsx.so.2{,.*} %{_sbindir}/{capsh,getcap,getpcaps,setcap} %{_mandir}/man1/capsh.1* %{_mandir}/man8/{getcap,getpcaps,setcap}.8* @@ -89,9 +90,15 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %{_libdir}/libpsx.a %files devel -%{_includedir}/* -%{_libdir}/*.so -%{_mandir}/man3/*.3* +%{_includedir}/sys/capability.h +%{_includedir}/sys/psx_syscall.h +%{_libdir}/libcap.so +%{_libdir}/libpsx.so +%{_mandir}/man3/cap*.3* +%{_mandir}/man3/libcap.3* +%{_mandir}/man3/libpsx.3* +%{_mandir}/man3/psx_*.3* +%{_mandir}/man3/__psx_syscall.3* %{_libdir}/pkgconfig/{libcap,libpsx}.pc %files -n captree @@ -103,6 +110,7 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* * Mon Nov 06 2023 Carlos Rodriguez-Fernandez - 2.69-1 - Update to 2.69 (with contribs from Yanko Kaneti , and Andrew G. Morgan ) - Update license to SPDX (by Anderson Toshiyuki Sasaki ) +- Make file lists more explicit to avoid accidental ABI changes (Dominik Mierzejewski ) * Thu Jul 20 2023 Fedora Release Engineering - 2.48-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 0476c6eb3a4b3c031400effc213ac8b17edd846c Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Thu, 23 Nov 2023 22:36:32 -0700 Subject: [PATCH 05/32] fix gating --- gating.yaml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gating.yaml b/gating.yaml index 4a1c38a..fba44d0 100644 --- a/gating.yaml +++ b/gating.yaml @@ -2,6 +2,19 @@ product_versions: - fedora-* decision_context: bodhi_update_push_testing +subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: dist.depcheck} - - !PassingTestCaseRule {test_case_name: dist.abicheck} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} From a0bcf8dd16fb2c93334d44d696f903e5ec7bf743 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Sat, 25 Nov 2023 11:50:03 -0700 Subject: [PATCH 06/32] ignore known lint issues --- libcap.rpmlintrc | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 libcap.rpmlintrc diff --git a/libcap.rpmlintrc b/libcap.rpmlintrc new file mode 100644 index 0000000..e7a5e81 --- /dev/null +++ b/libcap.rpmlintrc @@ -0,0 +1,2 @@ +addFilter('.*static-library-without-debuginfo.*') +addFilter('.*pam-unauthorized-module.*') From a3e0bbb8fc94d9600a44cd7da2f7c81575f7dfed Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 7 Dec 2023 22:25:34 -0500 Subject: [PATCH 07/32] Limit captree to %golang_arches RHEL has dropped i686 from golang, without which the build of captree (but not its manpage) is disabled. --- libcap.spec | 7 ++++++- tests/manpages/test.sh | 7 +++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libcap.spec b/libcap.spec index 93959cd..4c7971d 100644 --- a/libcap.spec +++ b/libcap.spec @@ -14,7 +14,7 @@ BuildRequires: make BuildRequires: glibc-static BuildRequires: gnupg2 -%ifarch aarch64 armv7hl i686 ppc64le s390x x86_64 +%ifarch %{golang_arches} BuildRequires: golang >= 1.11 %endif @@ -46,6 +46,7 @@ draft 15 capabilities. Install libcap-devel if you want to develop or compile applications using libcap. +%ifarch %{golang_arches} %package -n captree Summary: Capability inspection utility @@ -53,6 +54,7 @@ Summary: Capability inspection utility The captree program was inspired by the utility pstree, but it uses the libcap/cap (Go package) API to explore process runtime state and display the capability status of processes and threads. +%endif %prep gzip -cd %{SOURCE0} | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data=- @@ -84,6 +86,7 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %{_mandir}/man1/capsh.1* %{_mandir}/man8/{getcap,getpcaps,setcap}.8* %{_libdir}/security/pam_cap.so +%exclude %{_mandir}/man8/captree.8* %files static %{_libdir}/libcap.a @@ -101,10 +104,12 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %{_mandir}/man3/__psx_syscall.3* %{_libdir}/pkgconfig/{libcap,libpsx}.pc +%ifarch %{golang_arches} %files -n captree %license License %{_sbindir}/captree %{_mandir}/man8/captree.8* +%endif %changelog * Mon Nov 06 2023 Carlos Rodriguez-Fernandez - 2.69-1 diff --git a/tests/manpages/test.sh b/tests/manpages/test.sh index b4afd94..f9b20ac 100755 --- a/tests/manpages/test.sh +++ b/tests/manpages/test.sh @@ -8,8 +8,6 @@ expected_manpages=( 'getcap(8)' 'getpcaps(8)' 'setcap(8)' - 'captree(8)' - ) rlJournalStart @@ -18,4 +16,9 @@ rlJournalStart rlRun "man --pager=cat '${page}'" rlPhaseEnd done + if rpm --eval '%{golang_arches}' | tr ' ' '\n' | grep -q -e "$(rpm --eval '%{_arch}')"; then + rlPhaseStartTest 'test captree(8)' + rlRun "man --pager=cat 'captree(8)'" + rlPhaseEnd + fi rlJournalEnd From 929882363058b03ecdecb0812cdb153e23e06f8e Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Sun, 10 Dec 2023 22:13:31 -0700 Subject: [PATCH 08/32] run captree smoke tests --- tests/captree/main.fmf | 2 ++ tests/captree/test.sh | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 tests/captree/main.fmf create mode 100755 tests/captree/test.sh diff --git a/tests/captree/main.fmf b/tests/captree/main.fmf new file mode 100644 index 0000000..e401668 --- /dev/null +++ b/tests/captree/main.fmf @@ -0,0 +1,2 @@ +summary: captree smoke test +description: tests basic captree functionality diff --git a/tests/captree/test.sh b/tests/captree/test.sh new file mode 100755 index 0000000..2992c2c --- /dev/null +++ b/tests/captree/test.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + +if rpm --eval '%{golang_arches}' | tr ' ' '\n' | grep -q -e "$(rpm --eval '%{_arch}')"; then + rlPhaseStartTest "Should display help" + rlRun "captree -h" + rlPhaseEnd + + rlPhaseStartTest "Should list capabilities of pid 1" + rlRun -s "captree --depth 1 1" + rlAssertGrep 'systemd.*=ep' $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "Should display sys admin capability" + rlRun -s "capsh --drop=cap_sys_admin -- -c 'captree --verbose \$\$'" + rlAssertGrep "!cap_sys_admin" $rlRun_LOG + rlPhaseEnd +fi + +rlJournalEnd From 027afa6099219bac06bd74e664685c97561475f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 03:42:20 +0000 Subject: [PATCH 09/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libcap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcap.spec b/libcap.spec index 4c7971d..b786023 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap Version: 2.69 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ License: BSD-3-Clause OR GPL-2.0-only @@ -112,6 +112,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %endif %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 2.69-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Nov 06 2023 Carlos Rodriguez-Fernandez - 2.69-1 - Update to 2.69 (with contribs from Yanko Kaneti , and Andrew G. Morgan ) - Update license to SPDX (by Anderson Toshiyuki Sasaki ) From eea486d2984cdcd978edf2c7dbff651164ce8fcc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 01:39:48 +0000 Subject: [PATCH 10/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libcap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcap.spec b/libcap.spec index b786023..534d4e9 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap Version: 2.69 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ License: BSD-3-Clause OR GPL-2.0-only @@ -112,6 +112,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %endif %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 2.69-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 2.69-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 478088c9969e6b557b0038351b1b4eda1f51f6e0 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sun, 11 Feb 2024 23:29:35 +0000 Subject: [PATCH 11/32] Rebuild for golang 1.22.0 --- libcap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcap.spec b/libcap.spec index 534d4e9..b8ab0a9 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap Version: 2.69 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ License: BSD-3-Clause OR GPL-2.0-only @@ -112,6 +112,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %endif %changelog +* Sun Feb 11 2024 Maxwell G - 2.69-4 +- Rebuild for golang 1.22.0 + * Thu Jan 25 2024 Fedora Release Engineering - 2.69-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d21909866942e731bbe765d8778c76dcbb415806 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Wed, 3 Apr 2024 12:16:45 -0700 Subject: [PATCH 12/32] Add manpages for pam_cap and capability.conf --- 0001-doc-document-pam_cap-and-its-conf.patch | 179 +++++++++++++++++++ libcap.spec | 9 +- tests/manpages/test.sh | 2 + 3 files changed, 188 insertions(+), 2 deletions(-) create mode 100644 0001-doc-document-pam_cap-and-its-conf.patch diff --git a/0001-doc-document-pam_cap-and-its-conf.patch b/0001-doc-document-pam_cap-and-its-conf.patch new file mode 100644 index 0000000..c87afb3 --- /dev/null +++ b/0001-doc-document-pam_cap-and-its-conf.patch @@ -0,0 +1,179 @@ +From 7787f4019a86b962ef3b44305cde5888a14cfe52 Mon Sep 17 00:00:00 2001 +From: Carlos Rodriguez-Fernandez +Date: Wed, 3 Apr 2024 11:57:14 -0700 +Subject: [PATCH] doc: document pam_cap and its conf + +Signed-off-by: Carlos Rodriguez-Fernandez +--- + doc/Makefile | 8 ++-- + doc/capability.conf.5 | 85 +++++++++++++++++++++++++++++++++++++++++++ + doc/pam_cap.8 | 35 ++++++++++++++++++ + 3 files changed, 125 insertions(+), 3 deletions(-) + create mode 100644 doc/capability.conf.5 + create mode 100644 doc/pam_cap.8 + +diff --git a/doc/Makefile b/doc/Makefile +index 6919488..9d1574c 100644 +--- a/doc/Makefile ++++ b/doc/Makefile +@@ -32,9 +32,10 @@ MAN3S = cap_init.3 cap_free.3 cap_dup.3 \ + psx_syscall.3 psx_syscall3.3 psx_syscall6.3 psx_set_sensitivity.3 \ + psx_load_syscalls.3 __psx_syscall.3 \ + libpsx.3 +-MAN8S = getcap.8 setcap.8 getpcaps.8 captree.8 ++MAN5S = capability.conf.5 ++MAN8S = getcap.8 setcap.8 getpcaps.8 captree.8 pam_cap.8 + +-MANS = $(MAN1S) $(MAN3S) $(MAN8S) ++MANS = $(MAN1S) $(MAN3S) $(MAN5S) $(MAN8S) + + all: $(MANS) + +@@ -54,10 +55,11 @@ html: + done + + install: +- mkdir -p -m 755 $(FAKEROOT)$(MANDIR)/man1 $(FAKEROOT)$(MANDIR)/man3 $(FAKEROOT)$(MANDIR)/man8 ++ mkdir -p -m 755 $(FAKEROOT)$(MANDIR)/man1 $(FAKEROOT)$(MANDIR)/man3 $(FAKEROOT)$(MANDIR)/man5 $(FAKEROOT)$(MANDIR)/man8 + for man in \ + $(FAKEROOT)$(MANDIR)/man1 $(MAN1S) \ + $(FAKEROOT)$(MANDIR)/man3 $(MAN3S) \ ++ $(FAKEROOT)$(MANDIR)/man5 $(MAN5S) \ + $(FAKEROOT)$(MANDIR)/man8 $(MAN8S) \ + ; \ + do \ +diff --git a/doc/capability.conf.5 b/doc/capability.conf.5 +new file mode 100644 +index 0000000..10ff63b +--- /dev/null ++++ b/doc/capability.conf.5 +@@ -0,0 +1,85 @@ ++.\" generated with Ronn-NG/v0.9.1 ++.\" http://github.com/apjanke/ronn-ng/tree/0.9.1 ++.TH "CAPABILITY\.CONF" "5" "April 2024" "" ++.SH "NAME" ++\fBcapability\.conf\fR \- pam_cap module configuration file ++.SH "SYNOPSIS" ++\fB/etc/security/capability\.conf\fR ++.SH "DESCRIPTION" ++The syntax for lines in this configuration file is: ++.P ++\fB# <\-\- \'#\' precedes a comment\fR ++.P ++\fB\fR ++.P ++Where \fB\fR refers to the text format for an inheritable IAB capability tuple, or the words \fBall\fR or \fBnone\fR\. ++.P ++The reserved word \fBall\fR does \fInot\fR grant \fIall the inheritable capabilities\fR, but acts as a simple \fIpass\-through\fR for any prevailing IAB tuple capabilities\. The reserved word \fBnone\fR refers to an empty \fIInheritable\fR capability set (and by extension an empty \fIAmbient\fR vector)\. ++.P ++Here \fB\fR refers to the space separated PAM username values that will be granted the specified \fIIAB\fR tuple\. A name prefixed with the character \fB@\fR refers to the locally defined \fB/etc/group\fR \fIetc\fR users listed under that group name\. ++.P ++The parsing of the file chooses the first line that applies to the authenticating user, and attempts to apply that and only that\. ++.P ++Examples of valid syntax are: ++.IP "" 4 ++.nf ++# only root gets to keep what it had ++ ++all root ++ ++ ++# this should fire for user beta only, who will have ++ ++# cap_chown dropped from their bounding set\. ++ ++!cap_chown beta ++ ++ ++# the next one should snag the members of the \'three\' group ++ ++# granting them cap_setuid and cap_chown ++ ++cap_setuid,cap_chown @three ++ ++ ++# this would apply to beta and gamma, but beta is already ++ ++# granted a lack of cap_chown above\. Further, if gamma is ++ ++# in the \'three\' group, it would not reach this line\. ++ ++cap_chown beta gamma ++ ++ ++# members of the \'one\' group are granted the cap_setuid Inheritable ++ ++# capability, but cap_chown is dropped from their bounding set\. ++ ++!cap_chown,cap_setuid @one ++ ++ ++# user alpha gets an ambient capability (unless it is also ++ ++# a member of the groups \'one\' or \'three\')\. ++ ++^cap_setuid alpha ++ ++ ++# user delta (if not a member of groups \'one\' and \'three\') will get ++ ++# cap_chown and cap_setgid Ambient capabilities, but have cap_setuid ++ ++# dropped from its bounding set\. ++ ++^cap_chown,^cap_setgid,!cap_setuid delta ++ ++ ++# any remaining members of group \'four\' will get the cap_setuid ++ ++# Inheritable capability\. ++ ++cap_setuid @four ++.fi ++.IP "" 0 ++.SH "SEE ALSO" ++pam_cap(8) +diff --git a/doc/pam_cap.8 b/doc/pam_cap.8 +new file mode 100644 +index 0000000..93c1a71 +--- /dev/null ++++ b/doc/pam_cap.8 +@@ -0,0 +1,35 @@ ++.\" generated with Ronn-NG/v0.9.1 ++.\" http://github.com/apjanke/ronn-ng/tree/0.9.1 ++.TH "PAM_CAP" "8" "April 2024" "" ++.SH "NAME" ++\fBpam_cap\fR \- Capabilities PAM module ++.SH "SYNOPSIS" ++[service\-name] \fBauth\fR control\-flag \fBpam_cap\fR [options] ++.SH "DESCRIPTION" ++The \fBpam_so\fR module can be used to specify \fIInheritable\fR capabilities to process trees rooted in the PAM application\. The module also supports blocking \fIBounding\fR vector capabilities and adding \fIAmbient\fR vector capabilities\. ++.P ++For general PAM apps to work correctly, the application must be run with at least \fBCAP_SETPCAP\fR raised in its \fIPermitted\fR capability flag\. Many PAM applications run as \fIroot\fR, which has all of the bits in the \fIBounding\fR set raised, so this requirement is typically met\. To grant an \fIAmbient\fR vector capability, the corresponding Permitted bit must be available to the application too\. ++.P ++The \fBpam_so\fR module is a Linux\-PAM \fIauth\fR module\. It provides functionality to back \fBpam_sm_authenticate()\fR and \fBpam_sm_setcred()\fR\. It is the latter that actually modifies the inheritable 3\-tuple of capability vectors: the configured \fIIAB\fR\. In a typical application configuration you might have a line like this: ++.IP "" 4 ++.nf ++auth optional pam_cap\.so ++.fi ++.IP "" 0 ++.P ++The module arguments are: ++.IP "\[ci]" 4 ++\fBdebug\fR: While supported, this is a no\-op at present\. ++.IP "\[ci]" 4 ++\fBconfig=\fR\fI/path/to/file\fR: Override the default config for the module\. The unspecified default value for this file is \fB/etc/security/capability\.conf\fR\. Note, \fBconfig=/dev/null\fR is a valid value\. See \fBdefault=\fR below for situations in which this might be appropriate\. ++.IP "\[ci]" 4 ++\fBkeepcaps\fR: This is as much as the \fBpam_cap\.so\fR module can do to help an application support use of the \fIAmbient\fR capability vector\. The application support for the \fIAmbient\fR set is poor at the present time\. ++.IP "\[ci]" 4 ++\fBautoauth\fR: This argument causes the \fBpam_cap\.so\fR module to return \fBPAM_SUCCESS\fR if the \fBPAM_USER\fR being authenticated exists\. The absence of this argument will cause \fBpam_cap\.so\fR to only return \fBPAM_SUCCESS\fR if the \fBPAM_USER\fR is covered by a specific rule in the prevailing config file\. ++.IP "\[ci]" 4 ++\fBdefault=\fR\fIIAB\fR: This argument is ignored if the prevailing configuration file contains a "\fB*\fR" rule\. If there is no such rule, the \fIIAB\fR 3\-tuple is inserted at the end of the config file and applies to all \fBPAM_USER\fRs not covered by an earlier rule\. Note, if you want all \fBPAM_USER\fRs to be covered by this default rule, you can supply the module argument \fBconfig=/dev/null\fR\. ++.IP "\[ci]" 4 ++\fBdefer\fR: This argument arranges for the \fIIAB\fR capabilities granted to a user to be added sufficiently late in the Linux\-PAM authentication stack that they stick\. That is, \fIafter\fR the application does its \fBsetuid(UID)\fR call\. As such, in conjunction with the \fBkeepcaps\fR module argument, such compliant applications can support granting \fIAmbient\fR vector capabilities with \fBpam_cap\.so\fR\. ++.IP "" 0 ++.SH "SEE ALSO" ++pam\.conf(5), capability\.conf(5), pam(8) +-- +2.44.0 + diff --git a/libcap.spec b/libcap.spec index b8ab0a9..8c248a6 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap Version: 2.69 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ License: BSD-3-Clause OR GPL-2.0-only @@ -8,6 +8,7 @@ License: BSD-3-Clause OR GPL-2.0-only Source0: https://mirrors.edge.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.gz Source1: https://mirrors.edge.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.sign Source2: https://git.kernel.org/pub/scm/docs/kernel/pgpkeys.git/plain/keys/29EE848AE2CCF3F4.asc +Patch0: 0001-doc-document-pam_cap-and-its-conf.patch BuildRequires: pam-devel gcc BuildRequires: make @@ -84,7 +85,8 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %{_libdir}/libpsx.so.2{,.*} %{_sbindir}/{capsh,getcap,getpcaps,setcap} %{_mandir}/man1/capsh.1* -%{_mandir}/man8/{getcap,getpcaps,setcap}.8* +%{_mandir}/man5/capability.conf.5* +%{_mandir}/man8/{getcap,getpcaps,setcap,pam_cap}.8* %{_libdir}/security/pam_cap.so %exclude %{_mandir}/man8/captree.8* @@ -112,6 +114,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %endif %changelog +* Wed Apr 03 2024 Carlos Rodriguez-Fernandez - 2.69-5 +- Add manpages for pam_cap and capability.conf + * Sun Feb 11 2024 Maxwell G - 2.69-4 - Rebuild for golang 1.22.0 diff --git a/tests/manpages/test.sh b/tests/manpages/test.sh index f9b20ac..db05935 100755 --- a/tests/manpages/test.sh +++ b/tests/manpages/test.sh @@ -5,9 +5,11 @@ expected_manpages=( 'capsh(1)' 'libcap(3)' # there are many more but if these are present then it verifies it because of the glob install 'libpsx(3)' + 'capability.conf(5)' 'getcap(8)' 'getpcaps(8)' 'setcap(8)' + 'pam_cap(8)' ) rlJournalStart From 9376ef2fc2a06e0fe6828a62c0465b4c2c0ea1d9 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Thu, 4 Apr 2024 20:32:51 -0700 Subject: [PATCH 13/32] Fix incompatibility of the build with go 1.22. --- libcap.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libcap.spec b/libcap.spec index 8c248a6..7979446 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap Version: 2.69 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ License: BSD-3-Clause OR GPL-2.0-only @@ -63,15 +63,15 @@ gzip -cd %{SOURCE0} | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1 %build -%make_build prefix=%{_prefix} lib=%{_lib} GO_BUILD_FLAGS="-ldflags=-linkmode=external" all +%make_build prefix=%{_prefix} lib=%{_lib} GO_BUILD_FLAGS="-ldflags='-B gobuildid'" all %check make test %install -%make_install prefix=%{_prefix} lib=%{_lib} GO_BUILD_FLAGS="-ldflags=-linkmode=external" +%make_install prefix=%{_prefix} lib=%{_lib} GO_BUILD_FLAGS="-ldflags='-B gobuildid'" -mkdir -p %{buildroot}/%{_mandir}/man{2,3,8} +mkdir -p %{buildroot}/%{_mandir}/man{2,3,5,8} mv -f doc/*.3 %{buildroot}/%{_mandir}/man3/ chmod +x %{buildroot}/%{_libdir}/*.so.* @@ -114,6 +114,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %endif %changelog +* Thu Apr 04 2024 Carlos Rodriguez-Fernandez - 2.69-6 +- Fix incompatibility of the build with go 1.22. + * Wed Apr 03 2024 Carlos Rodriguez-Fernandez - 2.69-5 - Add manpages for pam_cap and capability.conf From d105d70b42170c5c58354620d5cf8bb32e42ecd1 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Fri, 5 Apr 2024 12:18:03 -0700 Subject: [PATCH 14/32] reenable PIE in the captree tool --- libcap.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libcap.spec b/libcap.spec index 7979446..5999f33 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap Version: 2.69 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ License: BSD-3-Clause OR GPL-2.0-only @@ -63,13 +63,13 @@ gzip -cd %{SOURCE0} | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1 %build -%make_build prefix=%{_prefix} lib=%{_lib} GO_BUILD_FLAGS="-ldflags='-B gobuildid'" all +%make_build prefix=%{_prefix} lib=%{_lib} CGO_REQUIRED=1 GO_BUILD_FLAGS="-buildmode=pie -ldflags='-B gobuildid'" all %check make test %install -%make_install prefix=%{_prefix} lib=%{_lib} GO_BUILD_FLAGS="-ldflags='-B gobuildid'" +%make_install prefix=%{_prefix} lib=%{_lib} CGO_REQUIRED=1 GO_BUILD_FLAGS="-buildmode=pie -ldflags='-B gobuildid'" mkdir -p %{buildroot}/%{_mandir}/man{2,3,5,8} mv -f doc/*.3 %{buildroot}/%{_mandir}/man3/ @@ -114,6 +114,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %endif %changelog +* Fri Apr 05 2024 Carlos Rodriguez-Fernandez - 2.69-7 +- Reenable PIE in the captree tool + * Thu Apr 04 2024 Carlos Rodriguez-Fernandez - 2.69-6 - Fix incompatibility of the build with go 1.22. From deb9345a8c0ca3d04788bee9c72d384a9ca4edb6 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Fri, 5 Apr 2024 16:46:04 -0700 Subject: [PATCH 15/32] make correction to the capability.conf manpage --- ...ent-the-use-of-to-refer-to-all-users.patch | 26 +++++++++++++++++++ libcap.spec | 6 ++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 0001-doc-document-the-use-of-to-refer-to-all-users.patch diff --git a/0001-doc-document-the-use-of-to-refer-to-all-users.patch b/0001-doc-document-the-use-of-to-refer-to-all-users.patch new file mode 100644 index 0000000..9741d75 --- /dev/null +++ b/0001-doc-document-the-use-of-to-refer-to-all-users.patch @@ -0,0 +1,26 @@ +From 70783bddc65628a1afc3dd2f8b4b3f03fc839b8e Mon Sep 17 00:00:00 2001 +From: Carlos Rodriguez-Fernandez +Date: Fri, 5 Apr 2024 16:37:30 -0700 +Subject: [PATCH] doc: document the use of `*` to refer to all users + +Signed-off-by: Carlos Rodriguez-Fernandez +--- + doc/capability.conf.5 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/capability.conf.5 b/doc/capability.conf.5 +index 10ff63b..15535f4 100644 +--- a/doc/capability.conf.5 ++++ b/doc/capability.conf.5 +@@ -16,7 +16,7 @@ Where \fB\fR refers to the text format for an inheritable IAB capability tu + .P + The reserved word \fBall\fR does \fInot\fR grant \fIall the inheritable capabilities\fR, but acts as a simple \fIpass\-through\fR for any prevailing IAB tuple capabilities\. The reserved word \fBnone\fR refers to an empty \fIInheritable\fR capability set (and by extension an empty \fIAmbient\fR vector)\. + .P +-Here \fB\fR refers to the space separated PAM username values that will be granted the specified \fIIAB\fR tuple\. A name prefixed with the character \fB@\fR refers to the locally defined \fB/etc/group\fR \fIetc\fR users listed under that group name\. ++Here \fB\fR refers to the space separated PAM username values that will be granted the specified \fIIAB\fR tuple\. A name prefixed with the character \fB@\fR refers to the locally defined \fB/etc/group\fR \fIetc\fR users listed under that group name\. An asterisk "\fB*\fR" can be used to denote all users\. + .P + The parsing of the file chooses the first line that applies to the authenticating user, and attempts to apply that and only that\. + .P +-- +2.44.0 + diff --git a/libcap.spec b/libcap.spec index 5999f33..7955ee0 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap Version: 2.69 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ License: BSD-3-Clause OR GPL-2.0-only @@ -9,6 +9,7 @@ Source0: https://mirrors.edge.kernel.org/pub/linux/libs/security/linux-privs/lib Source1: https://mirrors.edge.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.sign Source2: https://git.kernel.org/pub/scm/docs/kernel/pgpkeys.git/plain/keys/29EE848AE2CCF3F4.asc Patch0: 0001-doc-document-pam_cap-and-its-conf.patch +Patch1: 0001-doc-document-the-use-of-to-refer-to-all-users.patch BuildRequires: pam-devel gcc BuildRequires: make @@ -114,6 +115,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %endif %changelog +* Fri Apr 05 2024 Carlos Rodriguez-Fernandez - 2.69-8 +- Make correction to the capability.conf manpage + * Fri Apr 05 2024 Carlos Rodriguez-Fernandez - 2.69-7 - Reenable PIE in the captree tool From 6b8df4ed5f78c311ddab1d491c2a30e21adab503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 9 Apr 2024 14:53:22 +0200 Subject: [PATCH 16/32] Actually use the sbindir location provided by rpm /usr/sbin was always used, which breaks build with https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin, because then %_sbindir in %files doesn't match the file locations. --- libcap.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libcap.spec b/libcap.spec index 7955ee0..866f59f 100644 --- a/libcap.spec +++ b/libcap.spec @@ -64,13 +64,13 @@ gzip -cd %{SOURCE0} | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1 %build -%make_build prefix=%{_prefix} lib=%{_lib} CGO_REQUIRED=1 GO_BUILD_FLAGS="-buildmode=pie -ldflags='-B gobuildid'" all +%make_build prefix=%{_prefix} lib=%{_lib} SBINDIR=%{_sbindir} CGO_REQUIRED=1 GO_BUILD_FLAGS="-buildmode=pie -ldflags='-B gobuildid'" all %check make test %install -%make_install prefix=%{_prefix} lib=%{_lib} CGO_REQUIRED=1 GO_BUILD_FLAGS="-buildmode=pie -ldflags='-B gobuildid'" +%make_install prefix=%{_prefix} lib=%{_lib} SBINDIR=%{_sbindir} CGO_REQUIRED=1 GO_BUILD_FLAGS="-buildmode=pie -ldflags='-B gobuildid'" mkdir -p %{buildroot}/%{_mandir}/man{2,3,5,8} mv -f doc/*.3 %{buildroot}/%{_mandir}/man3/ From bac8f5e536522c838b97ea5ace202eca058e9b1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 14 Apr 2024 15:31:35 +0200 Subject: [PATCH 17/32] Add compat sbin Provides In preparation for https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin. dwarftherapist requires /usr/sbin/setcap. --- libcap.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libcap.spec b/libcap.spec index 866f59f..29bc5b8 100644 --- a/libcap.spec +++ b/libcap.spec @@ -20,6 +20,13 @@ BuildRequires: gnupg2 BuildRequires: golang >= 1.11 %endif +%if "%{_sbindir}" == "%{_bindir}" +# Compat symlinks for Requires in other packages. +# We rely on filesystem to create the symlinks for us. +Requires: filesystem(unmerged-sbin-symlinks) +Provides: /usr/sbin/setcap +%endif + %description libcap is a library for getting and setting POSIX.1e (formerly POSIX 6) draft 15 capabilities. From 98e4da842f0c46f88a28c0dab8d222eaccfd433d Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Sun, 14 Apr 2024 21:28:04 -0700 Subject: [PATCH 18/32] fix golang version dependency --- libcap.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcap.spec b/libcap.spec index 29bc5b8..a46c131 100644 --- a/libcap.spec +++ b/libcap.spec @@ -17,7 +17,7 @@ BuildRequires: glibc-static BuildRequires: gnupg2 %ifarch %{golang_arches} -BuildRequires: golang >= 1.11 +BuildRequires: golang >= 1.22 %endif %if "%{_sbindir}" == "%{_bindir}" From 120b640485cb29646adcd7d06d7caad2110875ce Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Mon, 20 May 2024 08:31:30 -0700 Subject: [PATCH 19/32] update to 2.70 --- 0001-doc-document-pam_cap-and-its-conf.patch | 179 ------------------ ...ent-the-use-of-to-refer-to-all-users.patch | 26 --- libcap.spec | 9 +- sources | 4 +- 4 files changed, 7 insertions(+), 211 deletions(-) delete mode 100644 0001-doc-document-pam_cap-and-its-conf.patch delete mode 100644 0001-doc-document-the-use-of-to-refer-to-all-users.patch diff --git a/0001-doc-document-pam_cap-and-its-conf.patch b/0001-doc-document-pam_cap-and-its-conf.patch deleted file mode 100644 index c87afb3..0000000 --- a/0001-doc-document-pam_cap-and-its-conf.patch +++ /dev/null @@ -1,179 +0,0 @@ -From 7787f4019a86b962ef3b44305cde5888a14cfe52 Mon Sep 17 00:00:00 2001 -From: Carlos Rodriguez-Fernandez -Date: Wed, 3 Apr 2024 11:57:14 -0700 -Subject: [PATCH] doc: document pam_cap and its conf - -Signed-off-by: Carlos Rodriguez-Fernandez ---- - doc/Makefile | 8 ++-- - doc/capability.conf.5 | 85 +++++++++++++++++++++++++++++++++++++++++++ - doc/pam_cap.8 | 35 ++++++++++++++++++ - 3 files changed, 125 insertions(+), 3 deletions(-) - create mode 100644 doc/capability.conf.5 - create mode 100644 doc/pam_cap.8 - -diff --git a/doc/Makefile b/doc/Makefile -index 6919488..9d1574c 100644 ---- a/doc/Makefile -+++ b/doc/Makefile -@@ -32,9 +32,10 @@ MAN3S = cap_init.3 cap_free.3 cap_dup.3 \ - psx_syscall.3 psx_syscall3.3 psx_syscall6.3 psx_set_sensitivity.3 \ - psx_load_syscalls.3 __psx_syscall.3 \ - libpsx.3 --MAN8S = getcap.8 setcap.8 getpcaps.8 captree.8 -+MAN5S = capability.conf.5 -+MAN8S = getcap.8 setcap.8 getpcaps.8 captree.8 pam_cap.8 - --MANS = $(MAN1S) $(MAN3S) $(MAN8S) -+MANS = $(MAN1S) $(MAN3S) $(MAN5S) $(MAN8S) - - all: $(MANS) - -@@ -54,10 +55,11 @@ html: - done - - install: -- mkdir -p -m 755 $(FAKEROOT)$(MANDIR)/man1 $(FAKEROOT)$(MANDIR)/man3 $(FAKEROOT)$(MANDIR)/man8 -+ mkdir -p -m 755 $(FAKEROOT)$(MANDIR)/man1 $(FAKEROOT)$(MANDIR)/man3 $(FAKEROOT)$(MANDIR)/man5 $(FAKEROOT)$(MANDIR)/man8 - for man in \ - $(FAKEROOT)$(MANDIR)/man1 $(MAN1S) \ - $(FAKEROOT)$(MANDIR)/man3 $(MAN3S) \ -+ $(FAKEROOT)$(MANDIR)/man5 $(MAN5S) \ - $(FAKEROOT)$(MANDIR)/man8 $(MAN8S) \ - ; \ - do \ -diff --git a/doc/capability.conf.5 b/doc/capability.conf.5 -new file mode 100644 -index 0000000..10ff63b ---- /dev/null -+++ b/doc/capability.conf.5 -@@ -0,0 +1,85 @@ -+.\" generated with Ronn-NG/v0.9.1 -+.\" http://github.com/apjanke/ronn-ng/tree/0.9.1 -+.TH "CAPABILITY\.CONF" "5" "April 2024" "" -+.SH "NAME" -+\fBcapability\.conf\fR \- pam_cap module configuration file -+.SH "SYNOPSIS" -+\fB/etc/security/capability\.conf\fR -+.SH "DESCRIPTION" -+The syntax for lines in this configuration file is: -+.P -+\fB# <\-\- \'#\' precedes a comment\fR -+.P -+\fB\fR -+.P -+Where \fB\fR refers to the text format for an inheritable IAB capability tuple, or the words \fBall\fR or \fBnone\fR\. -+.P -+The reserved word \fBall\fR does \fInot\fR grant \fIall the inheritable capabilities\fR, but acts as a simple \fIpass\-through\fR for any prevailing IAB tuple capabilities\. The reserved word \fBnone\fR refers to an empty \fIInheritable\fR capability set (and by extension an empty \fIAmbient\fR vector)\. -+.P -+Here \fB\fR refers to the space separated PAM username values that will be granted the specified \fIIAB\fR tuple\. A name prefixed with the character \fB@\fR refers to the locally defined \fB/etc/group\fR \fIetc\fR users listed under that group name\. -+.P -+The parsing of the file chooses the first line that applies to the authenticating user, and attempts to apply that and only that\. -+.P -+Examples of valid syntax are: -+.IP "" 4 -+.nf -+# only root gets to keep what it had -+ -+all root -+ -+ -+# this should fire for user beta only, who will have -+ -+# cap_chown dropped from their bounding set\. -+ -+!cap_chown beta -+ -+ -+# the next one should snag the members of the \'three\' group -+ -+# granting them cap_setuid and cap_chown -+ -+cap_setuid,cap_chown @three -+ -+ -+# this would apply to beta and gamma, but beta is already -+ -+# granted a lack of cap_chown above\. Further, if gamma is -+ -+# in the \'three\' group, it would not reach this line\. -+ -+cap_chown beta gamma -+ -+ -+# members of the \'one\' group are granted the cap_setuid Inheritable -+ -+# capability, but cap_chown is dropped from their bounding set\. -+ -+!cap_chown,cap_setuid @one -+ -+ -+# user alpha gets an ambient capability (unless it is also -+ -+# a member of the groups \'one\' or \'three\')\. -+ -+^cap_setuid alpha -+ -+ -+# user delta (if not a member of groups \'one\' and \'three\') will get -+ -+# cap_chown and cap_setgid Ambient capabilities, but have cap_setuid -+ -+# dropped from its bounding set\. -+ -+^cap_chown,^cap_setgid,!cap_setuid delta -+ -+ -+# any remaining members of group \'four\' will get the cap_setuid -+ -+# Inheritable capability\. -+ -+cap_setuid @four -+.fi -+.IP "" 0 -+.SH "SEE ALSO" -+pam_cap(8) -diff --git a/doc/pam_cap.8 b/doc/pam_cap.8 -new file mode 100644 -index 0000000..93c1a71 ---- /dev/null -+++ b/doc/pam_cap.8 -@@ -0,0 +1,35 @@ -+.\" generated with Ronn-NG/v0.9.1 -+.\" http://github.com/apjanke/ronn-ng/tree/0.9.1 -+.TH "PAM_CAP" "8" "April 2024" "" -+.SH "NAME" -+\fBpam_cap\fR \- Capabilities PAM module -+.SH "SYNOPSIS" -+[service\-name] \fBauth\fR control\-flag \fBpam_cap\fR [options] -+.SH "DESCRIPTION" -+The \fBpam_so\fR module can be used to specify \fIInheritable\fR capabilities to process trees rooted in the PAM application\. The module also supports blocking \fIBounding\fR vector capabilities and adding \fIAmbient\fR vector capabilities\. -+.P -+For general PAM apps to work correctly, the application must be run with at least \fBCAP_SETPCAP\fR raised in its \fIPermitted\fR capability flag\. Many PAM applications run as \fIroot\fR, which has all of the bits in the \fIBounding\fR set raised, so this requirement is typically met\. To grant an \fIAmbient\fR vector capability, the corresponding Permitted bit must be available to the application too\. -+.P -+The \fBpam_so\fR module is a Linux\-PAM \fIauth\fR module\. It provides functionality to back \fBpam_sm_authenticate()\fR and \fBpam_sm_setcred()\fR\. It is the latter that actually modifies the inheritable 3\-tuple of capability vectors: the configured \fIIAB\fR\. In a typical application configuration you might have a line like this: -+.IP "" 4 -+.nf -+auth optional pam_cap\.so -+.fi -+.IP "" 0 -+.P -+The module arguments are: -+.IP "\[ci]" 4 -+\fBdebug\fR: While supported, this is a no\-op at present\. -+.IP "\[ci]" 4 -+\fBconfig=\fR\fI/path/to/file\fR: Override the default config for the module\. The unspecified default value for this file is \fB/etc/security/capability\.conf\fR\. Note, \fBconfig=/dev/null\fR is a valid value\. See \fBdefault=\fR below for situations in which this might be appropriate\. -+.IP "\[ci]" 4 -+\fBkeepcaps\fR: This is as much as the \fBpam_cap\.so\fR module can do to help an application support use of the \fIAmbient\fR capability vector\. The application support for the \fIAmbient\fR set is poor at the present time\. -+.IP "\[ci]" 4 -+\fBautoauth\fR: This argument causes the \fBpam_cap\.so\fR module to return \fBPAM_SUCCESS\fR if the \fBPAM_USER\fR being authenticated exists\. The absence of this argument will cause \fBpam_cap\.so\fR to only return \fBPAM_SUCCESS\fR if the \fBPAM_USER\fR is covered by a specific rule in the prevailing config file\. -+.IP "\[ci]" 4 -+\fBdefault=\fR\fIIAB\fR: This argument is ignored if the prevailing configuration file contains a "\fB*\fR" rule\. If there is no such rule, the \fIIAB\fR 3\-tuple is inserted at the end of the config file and applies to all \fBPAM_USER\fRs not covered by an earlier rule\. Note, if you want all \fBPAM_USER\fRs to be covered by this default rule, you can supply the module argument \fBconfig=/dev/null\fR\. -+.IP "\[ci]" 4 -+\fBdefer\fR: This argument arranges for the \fIIAB\fR capabilities granted to a user to be added sufficiently late in the Linux\-PAM authentication stack that they stick\. That is, \fIafter\fR the application does its \fBsetuid(UID)\fR call\. As such, in conjunction with the \fBkeepcaps\fR module argument, such compliant applications can support granting \fIAmbient\fR vector capabilities with \fBpam_cap\.so\fR\. -+.IP "" 0 -+.SH "SEE ALSO" -+pam\.conf(5), capability\.conf(5), pam(8) --- -2.44.0 - diff --git a/0001-doc-document-the-use-of-to-refer-to-all-users.patch b/0001-doc-document-the-use-of-to-refer-to-all-users.patch deleted file mode 100644 index 9741d75..0000000 --- a/0001-doc-document-the-use-of-to-refer-to-all-users.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 70783bddc65628a1afc3dd2f8b4b3f03fc839b8e Mon Sep 17 00:00:00 2001 -From: Carlos Rodriguez-Fernandez -Date: Fri, 5 Apr 2024 16:37:30 -0700 -Subject: [PATCH] doc: document the use of `*` to refer to all users - -Signed-off-by: Carlos Rodriguez-Fernandez ---- - doc/capability.conf.5 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/capability.conf.5 b/doc/capability.conf.5 -index 10ff63b..15535f4 100644 ---- a/doc/capability.conf.5 -+++ b/doc/capability.conf.5 -@@ -16,7 +16,7 @@ Where \fB\fR refers to the text format for an inheritable IAB capability tu - .P - The reserved word \fBall\fR does \fInot\fR grant \fIall the inheritable capabilities\fR, but acts as a simple \fIpass\-through\fR for any prevailing IAB tuple capabilities\. The reserved word \fBnone\fR refers to an empty \fIInheritable\fR capability set (and by extension an empty \fIAmbient\fR vector)\. - .P --Here \fB\fR refers to the space separated PAM username values that will be granted the specified \fIIAB\fR tuple\. A name prefixed with the character \fB@\fR refers to the locally defined \fB/etc/group\fR \fIetc\fR users listed under that group name\. -+Here \fB\fR refers to the space separated PAM username values that will be granted the specified \fIIAB\fR tuple\. A name prefixed with the character \fB@\fR refers to the locally defined \fB/etc/group\fR \fIetc\fR users listed under that group name\. An asterisk "\fB*\fR" can be used to denote all users\. - .P - The parsing of the file chooses the first line that applies to the authenticating user, and attempts to apply that and only that\. - .P --- -2.44.0 - diff --git a/libcap.spec b/libcap.spec index a46c131..0eb2b94 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap -Version: 2.69 -Release: 8%{?dist} +Version: 2.70 +Release: 1%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ License: BSD-3-Clause OR GPL-2.0-only @@ -8,8 +8,6 @@ License: BSD-3-Clause OR GPL-2.0-only Source0: https://mirrors.edge.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.gz Source1: https://mirrors.edge.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.sign Source2: https://git.kernel.org/pub/scm/docs/kernel/pgpkeys.git/plain/keys/29EE848AE2CCF3F4.asc -Patch0: 0001-doc-document-pam_cap-and-its-conf.patch -Patch1: 0001-doc-document-the-use-of-to-refer-to-all-users.patch BuildRequires: pam-devel gcc BuildRequires: make @@ -122,6 +120,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %endif %changelog +* Mon May 20 2024 Carlos Rodriguez-Fernandez - 2.70-1 +- Update to version 2.70 + * Fri Apr 05 2024 Carlos Rodriguez-Fernandez - 2.69-8 - Make correction to the capability.conf manpage diff --git a/sources b/sources index 7857c6f..62713c8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libcap-2.69.tar.gz) = 75ee0fe8e1ac835f29cb76d233f731dcf126b73eed5229a130bbe4308a42441934d4e9cefeaaab45f774de2ed6859c752fbbfb9908e792f2f9f3d0f841e01aee -SHA512 (libcap-2.69.tar.sign) = 00f323444463b020c999f6fab255a61bd719f8d0ec1b619352e4f1b13407acee9a8e176861e5b408f64a871dc4095c6a26af541c3a0d4efca364c2d4b3679d30 +SHA512 (libcap-2.70.tar.gz) = 2a4a5959958989e6a0d54ea795a706b0f12596778ac660b19b7b1479910af01b4d870111b060dac0b1cd4671b98d815ea5953cefd4edde1a0ba9efe22f897842 +SHA512 (libcap-2.70.tar.sign) = d8a7d631d74ecdfad731e5d36087d959f9279ed837b20ed57bb518129f1ba6d144927987ca50a5459cc72d5374fe3a987583c1d5c88213e7f57f344ed698c71f From f6cc8a0776fa090950252efd694805f6e4fefebb Mon Sep 17 00:00:00 2001 From: Anderson Toshiyuki Sasaki Date: Fri, 31 May 2024 16:51:56 +0200 Subject: [PATCH 20/32] Include CGO_CFLAGS and CGO_LDFLAGS in the make command Set the value of CGO_CFLAGS as the CFLAGS environment variable value and CGO_LDFLAGS as the LDFLAGS value as part of the make command. The goal is to include the hardening compilation flags when building the Go binaries with CGO enabled. Also add -compressdwarf=false to ldflags, make the build verbose by adding the options -v -x, and force rebuilding by adding the -a option. Signed-off-by: Anderson Toshiyuki Sasaki --- libcap.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libcap.spec b/libcap.spec index 0eb2b94..d79e912 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap Version: 2.70 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ License: BSD-3-Clause OR GPL-2.0-only @@ -69,13 +69,13 @@ gzip -cd %{SOURCE0} | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1 %build -%make_build prefix=%{_prefix} lib=%{_lib} SBINDIR=%{_sbindir} CGO_REQUIRED=1 GO_BUILD_FLAGS="-buildmode=pie -ldflags='-B gobuildid'" all +%make_build prefix=%{_prefix} lib=%{_lib} SBINDIR=%{_sbindir} CGO_REQUIRED=1 CGO_CFLAGS="${CFLAGS}" CGO_LDFLAGS="${LDFLAGS}" GO_BUILD_FLAGS="-buildmode=pie -a -v -x -ldflags='-compressdwarf=false -B gobuildid'" all %check make test %install -%make_install prefix=%{_prefix} lib=%{_lib} SBINDIR=%{_sbindir} CGO_REQUIRED=1 GO_BUILD_FLAGS="-buildmode=pie -ldflags='-B gobuildid'" +%make_install prefix=%{_prefix} lib=%{_lib} SBINDIR=%{_sbindir} CGO_REQUIRED=1 CGO_CFLAGS="${CFLAGS}" CGO_LDFLAGS="${LDFLAGS}" GO_BUILD_FLAGS="-buildmode=pie -ldflags='-compressdwarf=false -B gobuildid'" mkdir -p %{buildroot}/%{_mandir}/man{2,3,5,8} mv -f doc/*.3 %{buildroot}/%{_mandir}/man3/ @@ -120,6 +120,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %endif %changelog +* Tue Jun 04 2024 Anderson Toshiyuki Sasaki - 2.70-2 +- Set CGO_CFLAGS=$CFLAGS and CGO_LDFLAGS=$LDFLAGS to build Go code + * Mon May 20 2024 Carlos Rodriguez-Fernandez - 2.70-1 - Update to version 2.70 From f165102918a33eee70f6f25b507599413ac763f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 9 Jul 2024 13:29:27 +0200 Subject: [PATCH 21/32] Rebuilt for the bin-sbin merge https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin --- libcap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcap.spec b/libcap.spec index d79e912..99aba72 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap Version: 2.70 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ License: BSD-3-Clause OR GPL-2.0-only @@ -120,6 +120,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %endif %changelog +* Tue Jul 09 2024 Zbigniew Jędrzejewski-Szmek - 2.70-3 +- Rebuilt for the bin-sbin merge + * Tue Jun 04 2024 Anderson Toshiyuki Sasaki - 2.70-2 - Set CGO_CFLAGS=$CFLAGS and CGO_LDFLAGS=$LDFLAGS to build Go code From ea30cbed1e2d40990b4cdb88ac103abe2047e37c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 13:27:58 +0000 Subject: [PATCH 22/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- libcap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcap.spec b/libcap.spec index 99aba72..43a3e0c 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap Version: 2.70 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ License: BSD-3-Clause OR GPL-2.0-only @@ -120,6 +120,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %endif %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 2.70-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jul 09 2024 Zbigniew Jędrzejewski-Szmek - 2.70-3 - Rebuilt for the bin-sbin merge From 403c688803dbdfc057f2c88155e19dec2e70299a Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Mon, 28 Oct 2024 17:34:47 -0700 Subject: [PATCH 23/32] update to 2.71 --- libcap.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libcap.spec b/libcap.spec index 43a3e0c..edabdde 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap -Version: 2.70 -Release: 4%{?dist} +Version: 2.71 +Release: 1%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ License: BSD-3-Clause OR GPL-2.0-only @@ -120,6 +120,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %endif %changelog +* Mon Oct 28 2024 Carlos Rodriguez-Fernandez - 2.71-1 +- Update to version 2.71 + * Thu Jul 18 2024 Fedora Release Engineering - 2.70-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 62713c8..cd1d4df 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libcap-2.70.tar.gz) = 2a4a5959958989e6a0d54ea795a706b0f12596778ac660b19b7b1479910af01b4d870111b060dac0b1cd4671b98d815ea5953cefd4edde1a0ba9efe22f897842 -SHA512 (libcap-2.70.tar.sign) = d8a7d631d74ecdfad731e5d36087d959f9279ed837b20ed57bb518129f1ba6d144927987ca50a5459cc72d5374fe3a987583c1d5c88213e7f57f344ed698c71f +SHA512 (libcap-2.71.tar.gz) = 4ca378fda46a311cceaddede83be5300e40a81e8271ea5caa53ebd0f195b2cf70ba0751a58d22311715d8db773f601cf527201551359ed91704eee0fb3ca53e8 +SHA512 (libcap-2.71.tar.sign) = 1d03a41f5760a4fadad5301cc77ca02850d21158c3706cc921c42dde50541d0ad4abcde4ec208ef4f67045dc621aebdfb6755fc1048b5f97780127a7618eec2a From 4126e7676b42090f0e9263b38fa176641dde6b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 12 Jan 2025 14:33:14 +0100 Subject: [PATCH 24/32] Rebuilt for the bin-sbin merge (2nd attempt) https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin --- libcap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcap.spec b/libcap.spec index edabdde..bfc4b89 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap Version: 2.71 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ License: BSD-3-Clause OR GPL-2.0-only @@ -120,6 +120,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %endif %changelog +* Sun Jan 12 2025 Zbigniew Jędrzejewski-Szmek - 2.71-2 +- Rebuilt for the bin-sbin merge (2nd attempt) + * Mon Oct 28 2024 Carlos Rodriguez-Fernandez - 2.71-1 - Update to version 2.71 From 3f2c35c4b9ffe45d7ca8a7c88cd6b22f3bb57c9b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 10:46:02 +0000 Subject: [PATCH 25/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- libcap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcap.spec b/libcap.spec index bfc4b89..b5ad8d5 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap Version: 2.71 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ License: BSD-3-Clause OR GPL-2.0-only @@ -120,6 +120,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %endif %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 2.71-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Jan 12 2025 Zbigniew Jędrzejewski-Szmek - 2.71-2 - Rebuilt for the bin-sbin merge (2nd attempt) From 607880c702b8f29eb62b8fec66a45a96f4917e7b Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Fri, 24 Jan 2025 11:32:01 -0700 Subject: [PATCH 26/32] Update to 2.73 --- libcap.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libcap.spec b/libcap.spec index b5ad8d5..b0da397 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap -Version: 2.71 -Release: 3%{?dist} +Version: 2.73 +Release: 1%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ License: BSD-3-Clause OR GPL-2.0-only @@ -120,6 +120,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %endif %changelog +* Fri Jan 24 2025 Carlos Rodriguez-Fernandez - 2.73-1 +- Update to version 2.73 (rhbz#2340722) + * Fri Jan 17 2025 Fedora Release Engineering - 2.71-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index cd1d4df..ff42fc3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libcap-2.71.tar.gz) = 4ca378fda46a311cceaddede83be5300e40a81e8271ea5caa53ebd0f195b2cf70ba0751a58d22311715d8db773f601cf527201551359ed91704eee0fb3ca53e8 -SHA512 (libcap-2.71.tar.sign) = 1d03a41f5760a4fadad5301cc77ca02850d21158c3706cc921c42dde50541d0ad4abcde4ec208ef4f67045dc621aebdfb6755fc1048b5f97780127a7618eec2a +SHA512 (libcap-2.73.tar.gz) = 0311e2d955d1505eccd96a4b94d7153340d250c0b92be5b431e0f06759326d7d760e020bac92a8d46146782eaa99e1ef4a7576ac14d87571845174a929797c28 +SHA512 (libcap-2.73.tar.sign) = 2806018f3e6c145d558ac3623e3db8d453dec0cc837cf5710678ead5753865edf883d63915caff7fd174276ee76307c1f0bac0fd7058e5574a3525e88873eb2d From c0976890330a07be105a1df5708584839e2193dd Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Fri, 24 Jan 2025 13:30:13 -0700 Subject: [PATCH 27/32] Update internal CI tests --- libcap.spec | 5 ++++- tests/pkg-configs/test.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libcap.spec b/libcap.spec index b0da397..6c0ebca 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap Version: 2.73 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ License: BSD-3-Clause OR GPL-2.0-only @@ -120,6 +120,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %endif %changelog +* Fri Jan 24 2025 Carlos Rodriguez-Fernandez - 2.73-2 +- Update internal CI tests + * Fri Jan 24 2025 Carlos Rodriguez-Fernandez - 2.73-1 - Update to version 2.73 (rhbz#2340722) diff --git a/tests/pkg-configs/test.sh b/tests/pkg-configs/test.sh index 45f98a4..cc28259 100755 --- a/tests/pkg-configs/test.sh +++ b/tests/pkg-configs/test.sh @@ -26,7 +26,7 @@ rlJournalStart rlRun "rpm -ql libcap-devel | grep libpsx.pc" 0 "There must be libpsx.pc" if [ $? -eq 0 ]; then PCFILE=$(rpm -ql libcap-devel | grep libpsx.pc) - rlRun "pkg-config --libs libpsx | grep -- '-lpsx -lpthread -Wl,-wrap,pthread_create'" + rlRun "pkg-config --libs libpsx | grep -- '-lpsx'" VER=$(awk '/Version:/ { print $2 }' $PCFILE | tail -1) rlRun "pkg-config --modversion libpsx | grep $VER" rlRun -s "pkg-config --print-variables libpsx" From ecb8d1cb460374c3006583af3d4078d86752000d Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Mon, 14 Apr 2025 22:14:24 -0700 Subject: [PATCH 28/32] Update to version 2.76 --- libcap.spec | 9 +++++++-- sources | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libcap.spec b/libcap.spec index 6c0ebca..87af783 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap -Version: 2.73 -Release: 2%{?dist} +Version: 2.76 +Release: 1%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ License: BSD-3-Clause OR GPL-2.0-only @@ -92,6 +92,7 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %{_sbindir}/{capsh,getcap,getpcaps,setcap} %{_mandir}/man1/capsh.1* %{_mandir}/man5/capability.conf.5* +%{_mandir}/man7/cap_text_formats.7* %{_mandir}/man8/{getcap,getpcaps,setcap,pam_cap}.8* %{_libdir}/security/pam_cap.so %exclude %{_mandir}/man8/captree.8* @@ -120,6 +121,10 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %endif %changelog + +* Mon Apr 14 2025 Carlos Rodriguez-Fernandez - 2.76-1 +- Update to version 2.76 (rhbz#2349318, rhbz#2352529) + * Fri Jan 24 2025 Carlos Rodriguez-Fernandez - 2.73-2 - Update internal CI tests diff --git a/sources b/sources index ff42fc3..3859b1c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libcap-2.73.tar.gz) = 0311e2d955d1505eccd96a4b94d7153340d250c0b92be5b431e0f06759326d7d760e020bac92a8d46146782eaa99e1ef4a7576ac14d87571845174a929797c28 -SHA512 (libcap-2.73.tar.sign) = 2806018f3e6c145d558ac3623e3db8d453dec0cc837cf5710678ead5753865edf883d63915caff7fd174276ee76307c1f0bac0fd7058e5574a3525e88873eb2d +SHA512 (libcap-2.76.tar.gz) = 673ed11d46f0e7033f6094893f82e5a141be31fa23626e968b199baecf8f60b37a84248a826afc45a65851c1ce14ac25973ae982c8a3035823450259df4b4383 +SHA512 (libcap-2.76.tar.sign) = 277d64dc2e76ade6780e49d7fb4b8280cfabb1f4c2e553d97c0b35ae7fee8aafb660d8dd9962427525a2fd8111b019ff642448b4caa598afad736779f5f37520 From 2f86af5298c99109581e26220ef71a780d657ecd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 19:25:57 +0000 Subject: [PATCH 29/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- libcap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcap.spec b/libcap.spec index 87af783..16a21c8 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap Version: 2.76 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ License: BSD-3-Clause OR GPL-2.0-only @@ -121,6 +121,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %endif %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 2.76-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Apr 14 2025 Carlos Rodriguez-Fernandez - 2.76-1 - Update to version 2.76 (rhbz#2349318, rhbz#2352529) From 4f902f16663cf5bacfa59889d6721daea5183dd7 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 15 Aug 2025 18:24:12 -0500 Subject: [PATCH 30/32] Rebuild for golang-1.25.0 --- libcap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcap.spec b/libcap.spec index 16a21c8..408c4d1 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap Version: 2.76 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ License: BSD-3-Clause OR GPL-2.0-only @@ -121,6 +121,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %endif %changelog +* Fri Aug 15 2025 Maxwell G - 2.76-3 +- Rebuild for golang-1.25.0 + * Thu Jul 24 2025 Fedora Release Engineering - 2.76-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 73dd02815788e408af9b5503457aff9c0887a539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Fri, 10 Oct 2025 17:10:46 +0200 Subject: [PATCH 31/32] rebuild --- libcap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcap.spec b/libcap.spec index 408c4d1..0606c1e 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap Version: 2.76 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ License: BSD-3-Clause OR GPL-2.0-only @@ -121,6 +121,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %endif %changelog +* Fri Oct 10 2025 Alejandro Sáez - 2.76-4 +- rebuild + * Fri Aug 15 2025 Maxwell G - 2.76-3 - Rebuild for golang-1.25.0 From d3979ba09dfa5020ce71a12147eec800295dc5ae Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Thu, 30 Oct 2025 16:31:38 -0700 Subject: [PATCH 32/32] Update to 2.77 --- _makenames-build.patch | 13 +++++++++++++ gating.yaml | 2 -- libcap.spec | 8 ++++++-- sources | 4 ++-- 4 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 _makenames-build.patch diff --git a/_makenames-build.patch b/_makenames-build.patch new file mode 100644 index 0000000..460de75 --- /dev/null +++ b/_makenames-build.patch @@ -0,0 +1,13 @@ +diff --git a/libcap/Makefile b/libcap/Makefile +index f0eb87e..e90a950 100644 +--- a/libcap/Makefile ++++ b/libcap/Makefile +@@ -80,7 +80,7 @@ $(PSXTITLE).pc: $(PSXTITLE).pc.in + $< >$@ + + _makenames: _makenames.c cap_names.list.h +- $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@ $(BUILD_LDFLAGS) ++ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@ + + cap_names.h: _makenames + ./_makenames > cap_names.h diff --git a/gating.yaml b/gating.yaml index fba44d0..3738107 100644 --- a/gating.yaml +++ b/gating.yaml @@ -4,7 +4,6 @@ product_versions: decision_context: bodhi_update_push_testing subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} @@ -14,7 +13,6 @@ product_versions: decision_context: bodhi_update_push_stable subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/libcap.spec b/libcap.spec index 0606c1e..3476fd1 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap -Version: 2.76 -Release: 4%{?dist} +Version: 2.77 +Release: 1%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ License: BSD-3-Clause OR GPL-2.0-only @@ -8,6 +8,7 @@ License: BSD-3-Clause OR GPL-2.0-only Source0: https://mirrors.edge.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.gz Source1: https://mirrors.edge.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.sign Source2: https://git.kernel.org/pub/scm/docs/kernel/pgpkeys.git/plain/keys/29EE848AE2CCF3F4.asc +Patch0: _makenames-build.patch BuildRequires: pam-devel gcc BuildRequires: make @@ -121,6 +122,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %endif %changelog +* Tue Oct 28 2025 Carlos Rodriguez-Fernandez - 2.77-1 +- Update to version 2.77 (rhbz#2406446) + * Fri Oct 10 2025 Alejandro Sáez - 2.76-4 - rebuild diff --git a/sources b/sources index 3859b1c..3dbe9ea 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libcap-2.76.tar.gz) = 673ed11d46f0e7033f6094893f82e5a141be31fa23626e968b199baecf8f60b37a84248a826afc45a65851c1ce14ac25973ae982c8a3035823450259df4b4383 -SHA512 (libcap-2.76.tar.sign) = 277d64dc2e76ade6780e49d7fb4b8280cfabb1f4c2e553d97c0b35ae7fee8aafb660d8dd9962427525a2fd8111b019ff642448b4caa598afad736779f5f37520 +SHA512 (libcap-2.77.tar.gz) = e5471afc4f149a8330e6df07effe58cac44d8a773b1fff0686e7039c41888e33402e1942fe5271a142e159a6088abbdbb7a82133389b3a9351749c2bf797b6b8 +SHA512 (libcap-2.77.tar.sign) = c362eefb80bbc110b7d7c676cc2b37e04bd3dab1b8b4577d62a0774b6300258743156c57102e8dc11c35d2ea876053dc57eae44197137273413b959df33ef0c0