Compare commits
No commits in common. 'c9' and 'c9-beta' have entirely different histories.
@ -1,75 +0,0 @@
|
||||
From 09ad91e1fb8640e48cef895ead49d9c770016915 Mon Sep 17 00:00:00 2001
|
||||
From: Vit Mojzis <vmojzis@redhat.com>
|
||||
Date: Thu, 4 May 2023 14:04:47 +0200
|
||||
Subject: [PATCH] python/chcat: Improve man pages
|
||||
Content-type: text/plain
|
||||
|
||||
- Explain applying range/list of categories
|
||||
- "-d" removes all categories of given file/user
|
||||
- Add examples
|
||||
|
||||
Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
|
||||
Acked-by: James Carter <jwcart2@gmail.com>
|
||||
---
|
||||
python/chcat/chcat.8 | 23 ++++++++++++++++-------
|
||||
1 file changed, 16 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/python/chcat/chcat.8 b/python/chcat/chcat.8
|
||||
index d095a2558d3a..3e1f7ca23361 100644
|
||||
--- a/python/chcat/chcat.8
|
||||
+++ b/python/chcat/chcat.8
|
||||
@@ -1,6 +1,6 @@
|
||||
.TH CHCAT "8" "September 2005" "chcat" "User Commands"
|
||||
.SH NAME
|
||||
-chcat \- change file SELinux security category
|
||||
+chcat \- change SELinux security categories of files/users
|
||||
.SH SYNOPSIS
|
||||
.B chcat
|
||||
\fIcategory file\fR...
|
||||
@@ -25,23 +25,33 @@ chcat \- change file SELinux security category
|
||||
.br
|
||||
.SH DESCRIPTION
|
||||
.PP
|
||||
-Change/Remove the security \fIcategory\fR for each \fIfile\fR or \fIuser\fR.
|
||||
-.PP
|
||||
-Use +/- to add/remove categories from a \fIfile\fR or \fIuser\fR.
|
||||
+Use +/- to add/remove categories from a \fIfile\fR or \fIuser\fR (only a single category can be specified at a time). Or specify the desired list/range of categories to be applied (replacing the existing categories).
|
||||
.PP
|
||||
.B
|
||||
Note:
|
||||
-When removing a category you must specify '\-\-' on the command line before using the \-Category syntax. This tells the command that you have finished entering options and are now specifying a category name instead.
|
||||
+When removing a category you must specify '\-\-' on the command line before using the \-Category syntax. This tells the command that you have finished entering options and are now specifying a category name instead.
|
||||
|
||||
.TP
|
||||
\fB\-d\fR
|
||||
-delete the category from each FILE/USER.
|
||||
+delete all categories from given FILE/USER.
|
||||
.TP
|
||||
\fB\-L\fR
|
||||
list available categories.
|
||||
.TP
|
||||
\fB\-l\fR
|
||||
Tells chcat to operate on users instead of files.
|
||||
+
|
||||
+.SH EXAMPLE
|
||||
+.nf
|
||||
+Replace categories of user "test" with c0.c6
|
||||
+# chcat -l c0.c6 test
|
||||
+Add category c1023 to user "test"
|
||||
+# chcat -l +c1023 test
|
||||
+Remove category c5 from file "file"
|
||||
+# chcat -- -c5 file
|
||||
+Remove all categories from file "file"
|
||||
+# chcat -d file
|
||||
+
|
||||
.SH "SEE ALSO"
|
||||
.TP
|
||||
chcon(1), selinux(8), semanage(8)
|
||||
@@ -52,4 +62,3 @@ When operating on files this script wraps the chcon command.
|
||||
/etc/selinux/{SELINUXTYPE}/setrans.conf
|
||||
.br
|
||||
/etc/selinux/{SELINUXTYPE}/seusers
|
||||
-
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@ -0,0 +1,264 @@
|
||||
From a87290f734ba136e7b648a9ce9754767cbb5eed3 Mon Sep 17 00:00:00 2001
|
||||
From: Petr Lautrbach <lautrbach@redhat.com>
|
||||
Date: Mon, 13 Nov 2023 13:37:36 +0100
|
||||
Subject: [PATCH] Revert "Do not automatically install Russian translations"
|
||||
Content-type: text/plain
|
||||
|
||||
This reverts commit 14f35fde50cd080650ac3b0136234464a3ea6fbe.
|
||||
---
|
||||
gui/Makefile | 2 +-
|
||||
policycoreutils/load_policy/Makefile | 2 +-
|
||||
policycoreutils/man/Makefile | 2 +-
|
||||
policycoreutils/newrole/Makefile | 2 +-
|
||||
policycoreutils/run_init/Makefile | 2 +-
|
||||
policycoreutils/scripts/Makefile | 2 +-
|
||||
policycoreutils/secon/Makefile | 2 +-
|
||||
policycoreutils/semodule/Makefile | 2 +-
|
||||
policycoreutils/sestatus/Makefile | 2 +-
|
||||
policycoreutils/setfiles/Makefile | 2 +-
|
||||
policycoreutils/setsebool/Makefile | 2 +-
|
||||
python/audit2allow/Makefile | 2 +-
|
||||
python/chcat/Makefile | 2 +-
|
||||
python/semanage/Makefile | 2 +-
|
||||
python/sepolicy/Makefile | 2 +-
|
||||
restorecond/Makefile | 2 +-
|
||||
sandbox/Makefile | 2 +-
|
||||
semodule-utils/semodule_expand/Makefile | 2 +-
|
||||
semodule-utils/semodule_link/Makefile | 2 +-
|
||||
semodule-utils/semodule_package/Makefile | 2 +-
|
||||
20 files changed, 20 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/gui/Makefile b/gui/Makefile
|
||||
index b29610d41b52..4035fb21b8c9 100644
|
||||
--- a/gui/Makefile
|
||||
+++ b/gui/Makefile
|
||||
@@ -1,5 +1,5 @@
|
||||
# Installation directories.
|
||||
-LINGUAS ?=
|
||||
+LINGUAS ?= ru
|
||||
PREFIX ?= /usr
|
||||
BINDIR ?= $(PREFIX)/bin
|
||||
SHAREDIR ?= $(PREFIX)/share/system-config-selinux
|
||||
diff --git a/policycoreutils/load_policy/Makefile b/policycoreutils/load_policy/Makefile
|
||||
index ad80d500e53c..c1ba805b6a9a 100644
|
||||
--- a/policycoreutils/load_policy/Makefile
|
||||
+++ b/policycoreutils/load_policy/Makefile
|
||||
@@ -1,5 +1,5 @@
|
||||
# Installation directories.
|
||||
-LINGUAS ?=
|
||||
+LINGUAS ?= ru
|
||||
PREFIX ?= /usr
|
||||
SBINDIR ?= $(PREFIX)/sbin
|
||||
MANDIR ?= $(PREFIX)/share/man
|
||||
diff --git a/policycoreutils/man/Makefile b/policycoreutils/man/Makefile
|
||||
index a4539f243b26..94bbf58652ad 100644
|
||||
--- a/policycoreutils/man/Makefile
|
||||
+++ b/policycoreutils/man/Makefile
|
||||
@@ -1,5 +1,5 @@
|
||||
# Installation directories.
|
||||
-LINGUAS ?=
|
||||
+LINGUAS ?= ru
|
||||
PREFIX ?= /usr
|
||||
MANDIR ?= $(PREFIX)/share/man
|
||||
MAN5DIR ?= $(MANDIR)/man5
|
||||
diff --git a/policycoreutils/newrole/Makefile b/policycoreutils/newrole/Makefile
|
||||
index 4b8145d35a8b..b3ccf671a9ae 100644
|
||||
--- a/policycoreutils/newrole/Makefile
|
||||
+++ b/policycoreutils/newrole/Makefile
|
||||
@@ -1,5 +1,5 @@
|
||||
# Installation directories.
|
||||
-LINGUAS ?=
|
||||
+LINGUAS ?= ru
|
||||
PREFIX ?= /usr
|
||||
BINDIR ?= $(PREFIX)/bin
|
||||
MANDIR ?= $(PREFIX)/share/man
|
||||
diff --git a/policycoreutils/run_init/Makefile b/policycoreutils/run_init/Makefile
|
||||
index 619ebc1d7554..e86364a496e6 100644
|
||||
--- a/policycoreutils/run_init/Makefile
|
||||
+++ b/policycoreutils/run_init/Makefile
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
# Installation directories.
|
||||
-LINGUAS ?=
|
||||
+LINGUAS ?= ru
|
||||
PREFIX ?= /usr
|
||||
SBINDIR ?= $(PREFIX)/sbin
|
||||
MANDIR ?= $(PREFIX)/share/man
|
||||
diff --git a/policycoreutils/scripts/Makefile b/policycoreutils/scripts/Makefile
|
||||
index 6d8196c672d6..75e75b80a100 100644
|
||||
--- a/policycoreutils/scripts/Makefile
|
||||
+++ b/policycoreutils/scripts/Makefile
|
||||
@@ -1,5 +1,5 @@
|
||||
# Installation directories.
|
||||
-LINGUAS ?=
|
||||
+LINGUAS ?= ru
|
||||
PREFIX ?= /usr
|
||||
SBINDIR ?= $(PREFIX)/sbin
|
||||
MANDIR ?= $(PREFIX)/share/man
|
||||
diff --git a/policycoreutils/secon/Makefile b/policycoreutils/secon/Makefile
|
||||
index 440503a14682..576a6203dfa3 100644
|
||||
--- a/policycoreutils/secon/Makefile
|
||||
+++ b/policycoreutils/secon/Makefile
|
||||
@@ -1,5 +1,5 @@
|
||||
# secon tool - command-line context
|
||||
-LINGUAS ?=
|
||||
+LINGUAS ?= ru
|
||||
PREFIX ?= /usr
|
||||
BINDIR ?= $(PREFIX)/bin
|
||||
MANDIR ?= $(PREFIX)/share/man
|
||||
diff --git a/policycoreutils/semodule/Makefile b/policycoreutils/semodule/Makefile
|
||||
index 9fbf99d6177e..73801e487a76 100644
|
||||
--- a/policycoreutils/semodule/Makefile
|
||||
+++ b/policycoreutils/semodule/Makefile
|
||||
@@ -1,5 +1,5 @@
|
||||
# Installation directories.
|
||||
-LINGUAS ?=
|
||||
+LINGUAS ?= ru
|
||||
PREFIX ?= /usr
|
||||
SBINDIR ?= $(PREFIX)/sbin
|
||||
MANDIR = $(PREFIX)/share/man
|
||||
diff --git a/policycoreutils/sestatus/Makefile b/policycoreutils/sestatus/Makefile
|
||||
index aebf050c2fb9..3dbb792bf5e5 100644
|
||||
--- a/policycoreutils/sestatus/Makefile
|
||||
+++ b/policycoreutils/sestatus/Makefile
|
||||
@@ -1,5 +1,5 @@
|
||||
# Installation directories.
|
||||
-LINGUAS ?=
|
||||
+LINGUAS ?= ru
|
||||
PREFIX ?= /usr
|
||||
BINDIR ?= $(PREFIX)/bin
|
||||
SBINDIR ?= $(PREFIX)/sbin
|
||||
diff --git a/policycoreutils/setfiles/Makefile b/policycoreutils/setfiles/Makefile
|
||||
index 84ffb08bf412..d7670a8ff54b 100644
|
||||
--- a/policycoreutils/setfiles/Makefile
|
||||
+++ b/policycoreutils/setfiles/Makefile
|
||||
@@ -1,5 +1,5 @@
|
||||
# Installation directories.
|
||||
-LINGUAS ?=
|
||||
+LINGUAS ?= ru
|
||||
PREFIX ?= /usr
|
||||
SBINDIR ?= /sbin
|
||||
MANDIR = $(PREFIX)/share/man
|
||||
diff --git a/policycoreutils/setsebool/Makefile b/policycoreutils/setsebool/Makefile
|
||||
index fc5b4ff63c01..c1440c1c04c8 100644
|
||||
--- a/policycoreutils/setsebool/Makefile
|
||||
+++ b/policycoreutils/setsebool/Makefile
|
||||
@@ -1,5 +1,5 @@
|
||||
# Installation directories.
|
||||
-LINGUAS ?=
|
||||
+LINGUAS ?= ru
|
||||
PREFIX ?= /usr
|
||||
SBINDIR ?= $(PREFIX)/sbin
|
||||
MANDIR = $(PREFIX)/share/man
|
||||
diff --git a/python/audit2allow/Makefile b/python/audit2allow/Makefile
|
||||
index fb04b8bdc72e..76bf4e37f9a3 100644
|
||||
--- a/python/audit2allow/Makefile
|
||||
+++ b/python/audit2allow/Makefile
|
||||
@@ -2,7 +2,7 @@ PYTHON ?= python3
|
||||
SECILC ?= secilc
|
||||
|
||||
# Installation directories.
|
||||
-LINGUAS ?=
|
||||
+LINGUAS ?= ru
|
||||
PREFIX ?= /usr
|
||||
BINDIR ?= $(PREFIX)/bin
|
||||
MANDIR ?= $(PREFIX)/share/man
|
||||
diff --git a/python/chcat/Makefile b/python/chcat/Makefile
|
||||
index 7b3ee17f49b1..e4873bf4ff8f 100644
|
||||
--- a/python/chcat/Makefile
|
||||
+++ b/python/chcat/Makefile
|
||||
@@ -1,5 +1,5 @@
|
||||
# Installation directories.
|
||||
-LINGUAS ?=
|
||||
+LINGUAS ?= ru
|
||||
PREFIX ?= /usr
|
||||
BINDIR ?= $(PREFIX)/bin
|
||||
MANDIR ?= $(PREFIX)/share/man
|
||||
diff --git a/python/semanage/Makefile b/python/semanage/Makefile
|
||||
index 628d135a8606..b53ee33db6ac 100644
|
||||
--- a/python/semanage/Makefile
|
||||
+++ b/python/semanage/Makefile
|
||||
@@ -1,7 +1,7 @@
|
||||
PYTHON ?= python3
|
||||
|
||||
# Installation directories.
|
||||
-LINGUAS ?=
|
||||
+LINGUAS ?= ru
|
||||
PREFIX ?= /usr
|
||||
SBINDIR ?= $(PREFIX)/sbin
|
||||
MANDIR = $(PREFIX)/share/man
|
||||
diff --git a/python/sepolicy/Makefile b/python/sepolicy/Makefile
|
||||
index 1a26cfdce6cc..4e9e93d0779e 100644
|
||||
--- a/python/sepolicy/Makefile
|
||||
+++ b/python/sepolicy/Makefile
|
||||
@@ -1,7 +1,7 @@
|
||||
PYTHON ?= python3
|
||||
|
||||
# Installation directories.
|
||||
-LINGUAS ?=
|
||||
+LINGUAS ?= ru
|
||||
PREFIX ?= /usr
|
||||
BINDIR ?= $(PREFIX)/bin
|
||||
MANDIR ?= $(PREFIX)/share/man
|
||||
diff --git a/restorecond/Makefile b/restorecond/Makefile
|
||||
index 1ddfcc9265ce..8e9a5ef1cfa1 100644
|
||||
--- a/restorecond/Makefile
|
||||
+++ b/restorecond/Makefile
|
||||
@@ -1,7 +1,7 @@
|
||||
PKG_CONFIG ?= pkg-config
|
||||
|
||||
# Installation directories.
|
||||
-LINGUAS ?=
|
||||
+LINGUAS ?= ru
|
||||
PREFIX ?= /usr
|
||||
SBINDIR ?= $(PREFIX)/sbin
|
||||
MANDIR = $(PREFIX)/share/man
|
||||
diff --git a/sandbox/Makefile b/sandbox/Makefile
|
||||
index 360a8bc5c125..84cb5a39bf7e 100644
|
||||
--- a/sandbox/Makefile
|
||||
+++ b/sandbox/Makefile
|
||||
@@ -1,7 +1,7 @@
|
||||
PYTHON ?= python3
|
||||
|
||||
# Installation directories.
|
||||
-LINGUAS ?=
|
||||
+LINGUAS ?= ru
|
||||
PREFIX ?= /usr
|
||||
SYSCONFDIR ?= /etc/sysconfig
|
||||
BINDIR ?= $(PREFIX)/bin
|
||||
diff --git a/semodule-utils/semodule_expand/Makefile b/semodule-utils/semodule_expand/Makefile
|
||||
index ad776b15166c..e63dcff246d9 100644
|
||||
--- a/semodule-utils/semodule_expand/Makefile
|
||||
+++ b/semodule-utils/semodule_expand/Makefile
|
||||
@@ -1,5 +1,5 @@
|
||||
# Installation directories.
|
||||
-LINGUAS ?=
|
||||
+LINGUAS ?= ru
|
||||
PREFIX ?= /usr
|
||||
BINDIR ?= $(PREFIX)/bin
|
||||
MANDIR ?= $(PREFIX)/share/man
|
||||
diff --git a/semodule-utils/semodule_link/Makefile b/semodule-utils/semodule_link/Makefile
|
||||
index 936d161cc16f..c5cf69cd9ca3 100644
|
||||
--- a/semodule-utils/semodule_link/Makefile
|
||||
+++ b/semodule-utils/semodule_link/Makefile
|
||||
@@ -1,5 +1,5 @@
|
||||
# Installation directories.
|
||||
-LINGUAS ?=
|
||||
+LINGUAS ?= ru
|
||||
PREFIX ?= /usr
|
||||
BINDIR ?= $(PREFIX)/bin
|
||||
MANDIR ?= $(PREFIX)/share/man
|
||||
diff --git a/semodule-utils/semodule_package/Makefile b/semodule-utils/semodule_package/Makefile
|
||||
index 6a289f732a7e..680ab836cfe6 100644
|
||||
--- a/semodule-utils/semodule_package/Makefile
|
||||
+++ b/semodule-utils/semodule_package/Makefile
|
||||
@@ -1,5 +1,5 @@
|
||||
# Installation directories.
|
||||
-LINGUAS ?=
|
||||
+LINGUAS ?= ru
|
||||
PREFIX ?= /usr
|
||||
BINDIR ?= $(PREFIX)/bin
|
||||
MANDIR ?= $(PREFIX)/share/man
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@ -1,80 +0,0 @@
|
||||
From b67240b8663c3df471e8ce06b087ec7fb8b9d57c Mon Sep 17 00:00:00 2001
|
||||
From: Vit Mojzis <vmojzis@redhat.com>
|
||||
Date: Thu, 4 May 2023 14:04:48 +0200
|
||||
Subject: [PATCH] python/audit2allow: Add missing options to man page
|
||||
Content-type: text/plain
|
||||
|
||||
Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
|
||||
---
|
||||
python/audit2allow/audit2allow.1 | 24 +++++++++++++++++++-----
|
||||
1 file changed, 19 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/python/audit2allow/audit2allow.1 b/python/audit2allow/audit2allow.1
|
||||
index 04ec32398011..c31021d39489 100644
|
||||
--- a/python/audit2allow/audit2allow.1
|
||||
+++ b/python/audit2allow/audit2allow.1
|
||||
@@ -40,10 +40,10 @@
|
||||
Read input from audit and message log, conflicts with \-i
|
||||
.TP
|
||||
.B "\-b" | "\-\-boot"
|
||||
-Read input from audit messages since last boot conflicts with \-i
|
||||
+Read input from audit messages since last boot, conflicts with \-i
|
||||
.TP
|
||||
.B "\-d" | "\-\-dmesg"
|
||||
-Read input from output of
|
||||
+Read input from output of
|
||||
.I /bin/dmesg.
|
||||
Note that all audit messages are not available via dmesg when
|
||||
auditd is running; use "ausearch \-m avc | audit2allow" or "\-a" instead.
|
||||
@@ -51,15 +51,22 @@ auditd is running; use "ausearch \-m avc | audit2allow" or "\-a" instead.
|
||||
.B "\-D" | "\-\-dontaudit"
|
||||
Generate dontaudit rules (Default: allow)
|
||||
.TP
|
||||
+.B "\-e" | "\-\-explain"
|
||||
+Fully explain generated output
|
||||
+.TP
|
||||
.B "\-h" | "\-\-help"
|
||||
Print a short usage message
|
||||
.TP
|
||||
.B "\-i <inputfile>" | "\-\-input <inputfile>"
|
||||
-read input from
|
||||
+Read input from
|
||||
.I <inputfile>
|
||||
.TP
|
||||
+.B "\-\-interface-info=<interface_info_file>"
|
||||
+Read interface information from
|
||||
+.I <interface_info_file>
|
||||
+.TP
|
||||
.B "\-l" | "\-\-lastreload"
|
||||
-read input only after last policy reload
|
||||
+Read input only after last policy reload
|
||||
.TP
|
||||
.B "\-m <modulename>" | "\-\-module <modulename>"
|
||||
Generate module/require output <modulename>
|
||||
@@ -70,8 +77,12 @@ Generate loadable module package, conflicts with \-o
|
||||
.B "\-p <policyfile>" | "\-\-policy <policyfile>"
|
||||
Policy file to use for analysis
|
||||
.TP
|
||||
+.B "\-\-perm-map <perm_map_file>"
|
||||
+Read permission map from
|
||||
+.I <perm_map_file>
|
||||
+.TP
|
||||
.B "\-o <outputfile>" | "\-\-output <outputfile>"
|
||||
-append output to
|
||||
+Append output to
|
||||
.I <outputfile>
|
||||
.TP
|
||||
.B "\-r" | "\-\-requires"
|
||||
@@ -85,6 +96,9 @@ This is the default behavior.
|
||||
Generate reference policy using installed macros.
|
||||
This attempts to match denials against interfaces and may be inaccurate.
|
||||
.TP
|
||||
+.B "\-t <type_regex>" | "\-\-type=<type_regex>"
|
||||
+Only process messages with a type that matches this regex
|
||||
+.TP
|
||||
.B "\-x" | "\-\-xperms"
|
||||
Generate extended permission access vector rules
|
||||
.TP
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@ -1,465 +0,0 @@
|
||||
From 4ebc1057f6e5494909045bbcc7ea8896bd32a094 Mon Sep 17 00:00:00 2001
|
||||
From: Vit Mojzis <vmojzis@redhat.com>
|
||||
Date: Thu, 4 May 2023 14:04:49 +0200
|
||||
Subject: [PATCH] python/semanage: Improve man pages
|
||||
Content-type: text/plain
|
||||
|
||||
- Add missing options
|
||||
- Add more examples
|
||||
- Note special cases
|
||||
|
||||
Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
|
||||
---
|
||||
python/semanage/semanage-boolean.8 | 9 ++++++---
|
||||
python/semanage/semanage-dontaudit.8 | 8 +++++---
|
||||
python/semanage/semanage-export.8 | 10 +++++++++-
|
||||
python/semanage/semanage-fcontext.8 | 17 +++++++++++------
|
||||
python/semanage/semanage-ibendport.8 | 6 ++++--
|
||||
python/semanage/semanage-ibpkey.8 | 6 ++++--
|
||||
python/semanage/semanage-import.8 | 10 +++++++++-
|
||||
python/semanage/semanage-interface.8 | 8 ++++++--
|
||||
python/semanage/semanage-login.8 | 14 ++++++++------
|
||||
python/semanage/semanage-module.8 | 15 ++++++++++-----
|
||||
python/semanage/semanage-node.8 | 16 +++++++++++++---
|
||||
python/semanage/semanage-permissive.8 | 8 +++++---
|
||||
python/semanage/semanage-port.8 | 10 ++++++----
|
||||
python/semanage/semanage-user.8 | 8 +++++---
|
||||
14 files changed, 101 insertions(+), 44 deletions(-)
|
||||
|
||||
diff --git a/python/semanage/semanage-boolean.8 b/python/semanage/semanage-boolean.8
|
||||
index 1282d10626ff..3b664023d3fe 100644
|
||||
--- a/python/semanage/semanage-boolean.8
|
||||
+++ b/python/semanage/semanage-boolean.8
|
||||
@@ -7,11 +7,14 @@ semanage\-boolean \- SELinux Policy Management boolean tool
|
||||
.SH "DESCRIPTION"
|
||||
semanage is used to configure certain elements of
|
||||
SELinux policy without requiring modification to or recompilation
|
||||
-from policy sources. semanage boolean command controls the settings of booleans in SELinux policy. booleans are if\-then\-else rules written in SELinux Policy. They can be used to customize the way that SELinux Policy rules effect a confined domain.
|
||||
+from policy sources.
|
||||
+.B semanage boolean
|
||||
+command controls the settings of booleans in SELinux policy. Booleans are if\-then\-else rules written in SELinux Policy. They can be used to customize the way that SELinux Policy rules effect a confined domain.
|
||||
+
|
||||
.SH "OPTIONS"
|
||||
.TP
|
||||
.I \-h, \-\-help
|
||||
-show this help message and exit
|
||||
+Show this help message and exit
|
||||
.TP
|
||||
.I \-n, \-\-noheading
|
||||
Do not print heading when listing the specified object type
|
||||
@@ -45,7 +48,7 @@ Disable the boolean
|
||||
|
||||
.SH EXAMPLE
|
||||
.nf
|
||||
-Turn on the apache can send mail boolean
|
||||
+Turn on the "apache can send mail" boolean (persistent version of #setsebool httpd_can_sendmail on)
|
||||
# semanage boolean \-m \-\-on httpd_can_sendmail
|
||||
|
||||
List customized booleans
|
||||
diff --git a/python/semanage/semanage-dontaudit.8 b/python/semanage/semanage-dontaudit.8
|
||||
index 81accc6f83de..51d1f4b6b0e0 100644
|
||||
--- a/python/semanage/semanage-dontaudit.8
|
||||
+++ b/python/semanage/semanage-dontaudit.8
|
||||
@@ -7,13 +7,15 @@
|
||||
.SH "DESCRIPTION"
|
||||
semanage is used to configure certain elements of
|
||||
SELinux policy without requiring modification to or recompilation
|
||||
-from policy sources. semanage dontaudit toggles whether or not dontaudit rules will be in the policy. Policy writers use dontaudit rules to cause
|
||||
-confined applications to use alternative paths. Dontaudit rules are denied but not reported in the logs. Some times dontaudit rules can cause bugs in applications but policy writers will not realize it since the AVC is not audited. Turning off dontaudit rules with this command to see if the kernel is blocking an access.
|
||||
+from policy sources.
|
||||
+.B semanage dontaudit
|
||||
+toggles whether or not dontaudit rules will be in the policy. Policy writers use dontaudit rules to cause
|
||||
+confined applications to use alternative paths. Dontaudit rules are denied but not reported in the logs. Sometimes dontaudit rules can cause bugs in applications but policy writers will not realize it since the AVC is not audited. Turn off dontaudit rules with this command to see if the kernel is blocking an access.
|
||||
|
||||
.SH "OPTIONS"
|
||||
.TP
|
||||
.I \-h, \-\-help
|
||||
-show this help message and exit
|
||||
+Show this help message and exit
|
||||
.TP
|
||||
.I \-S STORE, \-\-store STORE
|
||||
Select an alternate SELinux Policy Store to manage
|
||||
diff --git a/python/semanage/semanage-export.8 b/python/semanage/semanage-export.8
|
||||
index d422683bd5c8..5198479306df 100644
|
||||
--- a/python/semanage/semanage-export.8
|
||||
+++ b/python/semanage/semanage-export.8
|
||||
@@ -7,7 +7,15 @@
|
||||
.SH "DESCRIPTION"
|
||||
semanage is used to configure certain elements of
|
||||
SELinux policy without requiring modification to or recompilation
|
||||
-from policy sources. semanage import and export can be used to extract the SELinux modifications from one machine and apply them to another. You can put a whole group of semanage commands within a file and apply them to a machine in a single transaction.
|
||||
+from policy sources.
|
||||
+.B semanage import
|
||||
+and
|
||||
+.B export
|
||||
+can be used to extract the SELinux modifications from one machine and apply them to another. Please note that this will remove all current semanage customizations on the second machine as the command list generated using
|
||||
+.B semanage export
|
||||
+start with
|
||||
+.I <command> -D
|
||||
+for all semanage sub-commands. You can put a whole group of semanage commands within a file and apply them to a machine in a single transaction.
|
||||
|
||||
.SH "OPTIONS"
|
||||
.TP
|
||||
diff --git a/python/semanage/semanage-fcontext.8 b/python/semanage/semanage-fcontext.8
|
||||
index 1ebf085faed8..3e327d88d146 100644
|
||||
--- a/python/semanage/semanage-fcontext.8
|
||||
+++ b/python/semanage/semanage-fcontext.8
|
||||
@@ -8,8 +8,10 @@ semanage\-fcontext \- SELinux Policy Management file context tool
|
||||
.SH "DESCRIPTION"
|
||||
semanage is used to configure certain elements of
|
||||
SELinux policy without requiring modification to or recompilation
|
||||
-from policy sources. semanage fcontext is used to manage the default
|
||||
-file system labeling on an SELinux system. This command maps file paths using regular expressions to SELinux labels.
|
||||
+from policy sources.
|
||||
+.B semanage fcontext
|
||||
+is used to manage the default file system labeling on an SELinux system.
|
||||
+This command maps file paths using regular expressions to SELinux labels.
|
||||
|
||||
FILE_SPEC may contain either a fully qualified path,
|
||||
or a Perl compatible regular expression (PCRE),
|
||||
@@ -32,7 +34,7 @@ to avoid unintentionally impacting other parts of the filesystem.
|
||||
.SH "OPTIONS"
|
||||
.TP
|
||||
.I \-h, \-\-help
|
||||
-show this help message and exit
|
||||
+Show this help message and exit
|
||||
.TP
|
||||
.I \-n, \-\-noheading
|
||||
Do not print heading when listing the specified object type
|
||||
@@ -82,12 +84,13 @@ MLS/MCS Security Range (MLS/MCS Systems only) SELinux Range for SELinux login ma
|
||||
|
||||
.SH EXAMPLE
|
||||
.nf
|
||||
-.I remember to run restorecon after you set the file context
|
||||
-Add file-context for everything under /web
|
||||
+.I Remember to run restorecon after you set the file context
|
||||
+Add file-context httpd_sys_content_t for everything under /web
|
||||
# semanage fcontext \-a \-t httpd_sys_content_t "/web(/.*)?"
|
||||
# restorecon \-R \-v /web
|
||||
|
||||
Substitute /home1 with /home when setting file context
|
||||
+i.e. label everything under /home1 the same way /home is labeled
|
||||
# semanage fcontext \-a \-e /home /home1
|
||||
# restorecon \-R \-v /home1
|
||||
|
||||
@@ -99,7 +102,9 @@ execute the following commands.
|
||||
|
||||
.SH "SEE ALSO"
|
||||
.BR selinux (8),
|
||||
-.BR semanage (8)
|
||||
+.BR semanage (8),
|
||||
+.BR restorecon (8),
|
||||
+.BR selabel_file (5)
|
||||
|
||||
.SH "AUTHOR"
|
||||
This man page was written by Daniel Walsh <dwalsh@redhat.com>
|
||||
diff --git a/python/semanage/semanage-ibendport.8 b/python/semanage/semanage-ibendport.8
|
||||
index 0a29eae18031..53fe4ee8512a 100644
|
||||
--- a/python/semanage/semanage-ibendport.8
|
||||
+++ b/python/semanage/semanage-ibendport.8
|
||||
@@ -5,12 +5,14 @@
|
||||
.B semanage ibendport [\-h] [\-n] [\-N] [\-S STORE] [ \-\-add \-t TYPE \-z IBDEV_NAME \-r RANGE port | \-\-delete \-z IBDEV_NAME port | \-\-deleteall | \-\-extract | \-\-list [\-C] | \-\-modify \-t TYPE \-z IBDEV_NAME \-r RANGE port ]
|
||||
|
||||
.SH "DESCRIPTION"
|
||||
-semanage is used to configure certain elements of SELinux policy without requiring modification to or recompilation from policy sources. semanage ibendport controls the ibendport number to ibendport type definitions.
|
||||
+semanage is used to configure certain elements of SELinux policy without requiring modification to or recompilation from policy sources.
|
||||
+.B semanage ibendport
|
||||
+controls the ibendport number to ibendport type definitions.
|
||||
|
||||
.SH "OPTIONS"
|
||||
.TP
|
||||
.I \-h, \-\-help
|
||||
-show this help message and exit
|
||||
+Show this help message and exit
|
||||
.TP
|
||||
.I \-n, \-\-noheading
|
||||
Do not print heading when listing the specified object type
|
||||
diff --git a/python/semanage/semanage-ibpkey.8 b/python/semanage/semanage-ibpkey.8
|
||||
index 51f455abaeab..6cc5e02fbcb6 100644
|
||||
--- a/python/semanage/semanage-ibpkey.8
|
||||
+++ b/python/semanage/semanage-ibpkey.8
|
||||
@@ -5,12 +5,14 @@
|
||||
.B semanage ibpkey [\-h] [\-n] [\-N] [\-S STORE] [ \-\-add \-t TYPE \-x SUBNET_PREFIX \-r RANGE ibpkey_name | ibpkey_range | \-\-delete \-x SUBNET_PREFIX ibpkey_name | ibpkey_range | \-\-deleteall | \-\-extract | \-\-list [\-C] | \-\-modify \-t TYPE \-x SUBNET_PREFIX \-r RANGE ibpkey_name | ibpkey_range ]
|
||||
|
||||
.SH "DESCRIPTION"
|
||||
-semanage is used to configure certain elements of SELinux policy without requiring modification to or recompilation from policy sources. semanage ibpkey controls the ibpkey number to ibpkey type definitions.
|
||||
+semanage is used to configure certain elements of SELinux policy without requiring modification to or recompilation from policy sources.
|
||||
+.B semanage ibpkey
|
||||
+controls the ibpkey number to ibpkey type definitions.
|
||||
|
||||
.SH "OPTIONS"
|
||||
.TP
|
||||
.I \-h, \-\-help
|
||||
-show this help message and exit
|
||||
+Show this help message and exit
|
||||
.TP
|
||||
.I \-n, \-\-noheading
|
||||
Do not print heading when listing the specified object type
|
||||
diff --git a/python/semanage/semanage-import.8 b/python/semanage/semanage-import.8
|
||||
index 4a9b3e765f34..041e9ab052fb 100644
|
||||
--- a/python/semanage/semanage-import.8
|
||||
+++ b/python/semanage/semanage-import.8
|
||||
@@ -7,7 +7,15 @@
|
||||
.SH "DESCRIPTION"
|
||||
semanage is used to configure certain elements of
|
||||
SELinux policy without requiring modification to or recompilation
|
||||
-from policy sources. semanage import and export can be used to extract the SELinux modifications from one machine and apply them to another. You can put a whole group of semanage commands within a file and apply them to a machine in a single transaction.
|
||||
+from policy sources.
|
||||
+.B semanage import
|
||||
+and
|
||||
+.B export
|
||||
+can be used to extract the SELinux modifications from one machine and apply them to another. Please note that this will remove all current semanage customizations on the second machine as the command list generated using
|
||||
+.B semanage export
|
||||
+start with
|
||||
+.I <command> -D
|
||||
+for all semanage sub-commands. You can put a whole group of semanage commands within a file and apply them to a machine in a single transaction.
|
||||
|
||||
.SH "OPTIONS"
|
||||
.TP
|
||||
diff --git a/python/semanage/semanage-interface.8 b/python/semanage/semanage-interface.8
|
||||
index d9d526dc7391..080db70b6ec2 100644
|
||||
--- a/python/semanage/semanage-interface.8
|
||||
+++ b/python/semanage/semanage-interface.8
|
||||
@@ -7,12 +7,14 @@
|
||||
.SH "DESCRIPTION"
|
||||
semanage is used to configure certain elements of
|
||||
SELinux policy without requiring modification to or recompilation
|
||||
-from policy sources. semanage interface controls the labels assigned to network interfaces.
|
||||
+from policy sources.
|
||||
+.B semanage interface
|
||||
+controls the labels assigned to network interfaces.
|
||||
|
||||
.SH "OPTIONS"
|
||||
.TP
|
||||
.I \-h, \-\-help
|
||||
-show this help message and exit
|
||||
+Show this help message and exit
|
||||
.TP
|
||||
.I \-n, \-\-noheading
|
||||
Do not print heading when listing the specified object type
|
||||
@@ -54,6 +56,8 @@ MLS/MCS Security Range (MLS/MCS Systems only) SELinux Range for SELinux login ma
|
||||
.nf
|
||||
list all interface definitions
|
||||
# semanage interface \-l
|
||||
+Assign type netif_t and MLS/MCS range s0:c0.c1023 to interface eth0
|
||||
+# semanage interface \-a \-t netif_t \-r s0:c0.c1023 eth0
|
||||
|
||||
.SH "SEE ALSO"
|
||||
.BR selinux (8),
|
||||
diff --git a/python/semanage/semanage-login.8 b/python/semanage/semanage-login.8
|
||||
index f451bdc65d53..9076a1edcedb 100644
|
||||
--- a/python/semanage/semanage-login.8
|
||||
+++ b/python/semanage/semanage-login.8
|
||||
@@ -7,12 +7,14 @@
|
||||
.SH "DESCRIPTION"
|
||||
semanage is used to configure certain elements of
|
||||
SELinux policy without requiring modification to or recompilation
|
||||
-from policy sources. semanage login controls the mapping between a Linux User and the SELinux User. It can be used to turn on confined users. For example you could define that a particular user or group of users will login to a system as the user_u user. Prefix the group name with a '%' sign to indicate a group name.
|
||||
+from policy sources.
|
||||
+.B semanage login
|
||||
+controls the mapping between a Linux User and the SELinux User. It can be used to turn on confined users. For example you could define that a particular user or group of users will login to a system as the user_u user. Prefix the group name with a '%' sign to indicate a group name.
|
||||
|
||||
.SH "OPTIONS"
|
||||
.TP
|
||||
.I \-h, \-\-help
|
||||
-show this help message and exit
|
||||
+Show this help message and exit
|
||||
.TP
|
||||
.I \-n, \-\-noheading
|
||||
Do not print heading when listing the specified object type
|
||||
@@ -52,11 +54,11 @@ MLS/MCS Security Range (MLS/MCS Systems only) SELinux Range for SELinux login ma
|
||||
|
||||
.SH EXAMPLE
|
||||
.nf
|
||||
-Modify the default user on the system to the guest_u user
|
||||
+Set the default SELinux user on the system to guest_u
|
||||
# semanage login \-m \-s guest_u __default__
|
||||
-Assign gijoe user on an MLS machine a range and to the staff_u user
|
||||
-# semanage login \-a \-s staff_u \-rSystemLow-Secret gijoe
|
||||
-Assign all users in the engineering group to the staff_u user
|
||||
+Map user gijoe to SELinux user staff_u and assign MLS range SystemLow\-Secret
|
||||
+# semanage login \-a \-s staff_u \-rSystemLow\-Secret gijoe
|
||||
+Map all users in the engineering group to SELinux user staff_u
|
||||
# semanage login \-a \-s staff_u %engineering
|
||||
|
||||
.SH "SEE ALSO"
|
||||
diff --git a/python/semanage/semanage-module.8 b/python/semanage/semanage-module.8
|
||||
index e00571672565..6913b0cd47d9 100644
|
||||
--- a/python/semanage/semanage-module.8
|
||||
+++ b/python/semanage/semanage-module.8
|
||||
@@ -5,12 +5,14 @@
|
||||
.B semanage module [\-h] [\-n] [\-N] [\-S STORE] (\-a | \-r | \-e | \-d | \-\-extract | \-\-list [\-C] | \-\-deleteall) [module_name]
|
||||
|
||||
.SH "DESCRIPTION"
|
||||
-semanage is used to configure certain elements of SELinux policy without requiring modification to or recompilation from policy sources. semanage module installs, removes, disables SELinux Policy modules.
|
||||
+semanage is used to configure certain elements of SELinux policy without requiring modification to or recompilation from policy sources.
|
||||
+.B semanage module
|
||||
+installs, removes, disables, or enables SELinux Policy modules.
|
||||
|
||||
.SH "OPTIONS"
|
||||
.TP
|
||||
.I \-h, \-\-help
|
||||
-show this help message and exit
|
||||
+Show this help message and exit
|
||||
.TP
|
||||
.I \-n, \-\-noheading
|
||||
Do not print heading when listing the specified object type
|
||||
@@ -22,11 +24,14 @@ Do not reload policy after commit
|
||||
Select an alternate SELinux Policy Store to manage
|
||||
.TP
|
||||
.I \-a, \-\-add
|
||||
-Install specified module
|
||||
+Install specified module. Accepts both binary policy files (.pp) and CIL source files
|
||||
.TP
|
||||
.I \-r, \-\-remove
|
||||
Remove specified module
|
||||
.TP
|
||||
+.I \-D, \-\-deleteall
|
||||
+Remove all local customizations related to modules
|
||||
+.TP
|
||||
.I \-d \-\-disable
|
||||
Disable specified module
|
||||
.TP
|
||||
@@ -48,8 +53,8 @@ List all modules
|
||||
# semanage module \-l
|
||||
Disable unconfined module
|
||||
# semanage module \-\-disable unconfined
|
||||
-Install custom apache policy module
|
||||
-# semanage module \-a myapache
|
||||
+Install custom apache policy module (same as #semodule -i myapache.pp)
|
||||
+# semanage module \-a myapache.pp
|
||||
|
||||
.SH "SEE ALSO"
|
||||
.BR selinux (8),
|
||||
diff --git a/python/semanage/semanage-node.8 b/python/semanage/semanage-node.8
|
||||
index a0098221c85b..c78d6c3eaf76 100644
|
||||
--- a/python/semanage/semanage-node.8
|
||||
+++ b/python/semanage/semanage-node.8
|
||||
@@ -7,12 +7,14 @@
|
||||
.SH "DESCRIPTION"
|
||||
semanage is used to configure certain elements of
|
||||
SELinux policy without requiring modification to or recompilation
|
||||
-from policy sources. semanage controls the ipaddress to node type definitions.
|
||||
+from policy sources.
|
||||
+.B semanage node
|
||||
+controls the IP address to node type definitions.
|
||||
|
||||
.SH "OPTIONS"
|
||||
.TP
|
||||
.I \-h, \-\-help
|
||||
-show this help message and exit
|
||||
+Show this help message and exit
|
||||
.TP
|
||||
.I \-n, \-\-noheading
|
||||
Do not print heading when listing the specified object type
|
||||
@@ -54,5 +56,13 @@ SELinux type for the object
|
||||
MLS/MCS Security Range (MLS/MCS Systems only) SELinux Range for SELinux login mapping defaults to the SELinux user record range. SELinux Range for SELinux user defaults to s0.
|
||||
.TP
|
||||
.I \-p PROTO, \-\-proto PROTO
|
||||
-
|
||||
Protocol for the specified port (tcp|udp) or internet protocol version for the specified node (ipv4|ipv6).
|
||||
+
|
||||
+.SH "EXAMPLE"
|
||||
+.nf
|
||||
+Apply type node_t to ipv4 node 127.0.0.2
|
||||
+# semanage node \-a \-t node_t \-p ipv4 \-M 255.255.255.255 127.0.0.2
|
||||
+
|
||||
+.SH "SEE ALSO"
|
||||
+.BR selinux (8),
|
||||
+.BR semanage (8)
|
||||
diff --git a/python/semanage/semanage-permissive.8 b/python/semanage/semanage-permissive.8
|
||||
index 5c3364fa54f8..0414a850082a 100644
|
||||
--- a/python/semanage/semanage-permissive.8
|
||||
+++ b/python/semanage/semanage-permissive.8
|
||||
@@ -5,12 +5,14 @@
|
||||
.B semanage permissive [\-h] [\-n] [\-N] [\-S STORE] (\-\-add TYPE | \-\-delete TYPE | \-\-deleteall | \-\-extract | \-\-list)
|
||||
|
||||
.SH "DESCRIPTION"
|
||||
-semanage is used to configure certain elements of SELinux policy without requiring modification to or recompilation from policy sources. semanage permissive adds or removes a SELinux Policy permissive module.
|
||||
+semanage is used to configure certain elements of SELinux policy without requiring modification to or recompilation from policy sources.
|
||||
+.B semanage permissive
|
||||
+adds or removes a SELinux Policy permissive module. Please note that this command can make any domain permissive, but can only remove the permissive property from domains where it was added by semanage permissive ("semanage permissive -d" can only be used on types listed as "Customized Permissive Types" by "semanage permissive -l").
|
||||
|
||||
.SH "OPTIONS"
|
||||
.TP
|
||||
.I \-h, \-\-help
|
||||
-show this help message and exit
|
||||
+Show this help message and exit
|
||||
.TP
|
||||
.I \-a, \-\-add
|
||||
Add a record of the specified object type
|
||||
@@ -38,7 +40,7 @@ Select an alternate SELinux Policy Store to manage
|
||||
|
||||
.SH EXAMPLE
|
||||
.nf
|
||||
-List all permissive modules
|
||||
+List all permissive domains ("Builtin Permissive Types" where set by the system policy, or a custom policy module)
|
||||
# semanage permissive \-l
|
||||
Make httpd_t (Web Server) a permissive domain
|
||||
# semanage permissive \-a httpd_t
|
||||
diff --git a/python/semanage/semanage-port.8 b/python/semanage/semanage-port.8
|
||||
index 12ec14c2cb33..c6048660ca21 100644
|
||||
--- a/python/semanage/semanage-port.8
|
||||
+++ b/python/semanage/semanage-port.8
|
||||
@@ -5,12 +5,14 @@
|
||||
.B semanage port [\-h] [\-n] [\-N] [\-S STORE] [ \-\-add \-t TYPE \-p PROTOCOL \-r RANGE port_name | port_range | \-\-delete \-p PROTOCOL port_name | port_range | \-\-deleteall | \-\-extract | \-\-list [\-C] | \-\-modify \-t TYPE \-p PROTOCOL \-r RANGE port_name | port_range ]
|
||||
|
||||
.SH "DESCRIPTION"
|
||||
-semanage is used to configure certain elements of SELinux policy without requiring modification to or recompilation from policy sources. semanage port controls the port number to port type definitions.
|
||||
+semanage is used to configure certain elements of SELinux policy without requiring modification to or recompilation from policy sources.
|
||||
+.B semanage port
|
||||
+controls the port number to port type definitions.
|
||||
|
||||
.SH "OPTIONS"
|
||||
.TP
|
||||
.I \-h, \-\-help
|
||||
-show this help message and exit
|
||||
+Show this help message and exit
|
||||
.TP
|
||||
.I \-n, \-\-noheading
|
||||
Do not print heading when listing the specified object type
|
||||
@@ -55,9 +57,9 @@ Protocol for the specified port (tcp|udp|dccp|sctp) or internet protocol version
|
||||
.nf
|
||||
List all port definitions
|
||||
# semanage port \-l
|
||||
-Allow Apache to listen on tcp port 81
|
||||
+Allow Apache to listen on tcp port 81 (i.e. assign tcp port 81 label http_port_t, which apache is allowed to listen on)
|
||||
# semanage port \-a \-t http_port_t \-p tcp 81
|
||||
-Allow sshd to listen on tcp port 8991
|
||||
+Allow sshd to listen on tcp port 8991 (i.e. assign tcp port 8991 label ssh_port_t, which sshd is allowed to listen on)
|
||||
# semanage port \-a \-t ssh_port_t \-p tcp 8991
|
||||
|
||||
.SH "SEE ALSO"
|
||||
diff --git a/python/semanage/semanage-user.8 b/python/semanage/semanage-user.8
|
||||
index 23fec698e042..50d50bea7af8 100644
|
||||
--- a/python/semanage/semanage-user.8
|
||||
+++ b/python/semanage/semanage-user.8
|
||||
@@ -7,12 +7,14 @@
|
||||
.SH "DESCRIPTION"
|
||||
semanage is used to configure certain elements of
|
||||
SELinux policy without requiring modification to or recompilation
|
||||
-from policy sources. semanage user controls the mapping between an SELinux User and the roles and MLS/MCS levels.
|
||||
+from policy sources.
|
||||
+.B semanage user
|
||||
+controls the mapping between an SELinux User and the roles and MLS/MCS levels.
|
||||
|
||||
.SH "OPTIONS"
|
||||
.TP
|
||||
.I \-h, \-\-help
|
||||
-show this help message and exit
|
||||
+Show this help message and exit
|
||||
.TP
|
||||
.I \-n, \-\-noheading
|
||||
Do not print heading when listing the specified object type
|
||||
@@ -59,7 +61,7 @@ List SELinux users
|
||||
# semanage user \-l
|
||||
Modify groups for staff_u user
|
||||
# semanage user \-m \-R "system_r unconfined_r staff_r" staff_u
|
||||
-Add level for TopSecret Users
|
||||
+Assign user topsecret_u role staff_r and range s0\-TopSecret
|
||||
# semanage user \-a \-R "staff_r" \-rs0\-TopSecret topsecret_u
|
||||
|
||||
.SH "SEE ALSO"
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
From 52da97653bd64bcc603ab7e0b5c08cb687b833ab Mon Sep 17 00:00:00 2001
|
||||
From: Vit Mojzis <vmojzis@redhat.com>
|
||||
Date: Thu, 4 May 2023 14:04:50 +0200
|
||||
Subject: [PATCH] python/audit2allow: Remove unused "debug" option
|
||||
Content-type: text/plain
|
||||
|
||||
The option is not referenced anywhere in the code and I couldn't figure
|
||||
out its purpose from the description.
|
||||
|
||||
Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
|
||||
---
|
||||
python/audit2allow/audit2allow | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/python/audit2allow/audit2allow b/python/audit2allow/audit2allow
|
||||
index eafeea88aa21..5587a2dbb006 100644
|
||||
--- a/python/audit2allow/audit2allow
|
||||
+++ b/python/audit2allow/audit2allow
|
||||
@@ -88,8 +88,6 @@ class AuditToPolicy:
|
||||
parser.add_option("--interface-info", dest="interface_info", help="file name of interface information")
|
||||
parser.add_option("-x", "--xperms", action="store_true", dest="xperms",
|
||||
default=False, help="generate extended permission rules")
|
||||
- parser.add_option("--debug", dest="debug", action="store_true", default=False,
|
||||
- help="leave generated modules for -M")
|
||||
parser.add_option("-w", "--why", dest="audit2why", action="store_true", default=(os.path.basename(sys.argv[0]) == "audit2why"),
|
||||
help="Translates SELinux audit messages into a description of why the access was denied")
|
||||
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@ -1,309 +0,0 @@
|
||||
From b580a630378623df1c87c5fab1ffd63a41b3501e Mon Sep 17 00:00:00 2001
|
||||
From: Vit Mojzis <vmojzis@redhat.com>
|
||||
Date: Thu, 1 Jun 2023 16:39:11 +0200
|
||||
Subject: [PATCH] policycoreutils: Add examples to man pages
|
||||
Content-type: text/plain
|
||||
|
||||
While at it, remove trailing whitespaces.
|
||||
|
||||
Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
|
||||
Acked-by: Petr Lautrbach <lautrbach@redhat.com>
|
||||
---
|
||||
policycoreutils/scripts/fixfiles.8 | 34 +++++++++++++--------
|
||||
policycoreutils/secon/secon.1 | 12 ++++++--
|
||||
policycoreutils/semodule/semodule.8 | 14 ++++-----
|
||||
policycoreutils/setfiles/restorecon.8 | 9 ++++++
|
||||
policycoreutils/setfiles/restorecon_xattr.8 | 7 +++++
|
||||
policycoreutils/setfiles/setfiles.8 | 9 ++++++
|
||||
policycoreutils/setsebool/setsebool.8 | 16 +++++++---
|
||||
7 files changed, 74 insertions(+), 27 deletions(-)
|
||||
|
||||
diff --git a/policycoreutils/scripts/fixfiles.8 b/policycoreutils/scripts/fixfiles.8
|
||||
index 9a317d9181e2..928b82004b1a 100644
|
||||
--- a/policycoreutils/scripts/fixfiles.8
|
||||
+++ b/policycoreutils/scripts/fixfiles.8
|
||||
@@ -14,7 +14,7 @@ fixfiles \- fix file SELinux security contexts.
|
||||
.B fixfiles
|
||||
.I [\-v] [\-F] [\-B | \-N time ] [\-T nthreads] { check | restore | verify }
|
||||
|
||||
-.B fixfiles
|
||||
+.B fixfiles
|
||||
.I [\-v] [\-F] [\-T nthreads] \-R rpmpackagename[,rpmpackagename...] { check | restore | verify }
|
||||
|
||||
.B fixfiles
|
||||
@@ -31,7 +31,7 @@ This manual page describes the
|
||||
script.
|
||||
.P
|
||||
This script is primarily used to correct the security context
|
||||
-database (extended attributes) on filesystems.
|
||||
+database (extended attributes) on filesystems.
|
||||
.P
|
||||
It can also be run at any time to relabel when adding support for
|
||||
new policy, or just check whether the file contexts are all
|
||||
@@ -41,29 +41,29 @@ option. You can use the \-R flag to use rpmpackages as an alternative.
|
||||
The file /etc/selinux/fixfiles_exclude_dirs can contain a list of directories
|
||||
excluded from relabeling.
|
||||
.P
|
||||
-.B fixfiles onboot
|
||||
+.B fixfiles onboot
|
||||
will setup the machine to relabel on the next reboot.
|
||||
|
||||
.SH "OPTIONS"
|
||||
-.TP
|
||||
+.TP
|
||||
.B \-B
|
||||
If specified with onboot, this fixfiles will record the current date in the /.autorelabel file, so that it can be used later to speed up labeling. If used with restore, the restore will only affect files that were modified today.
|
||||
.TP
|
||||
.B \-F
|
||||
Force reset of context to match file_context for customizable files
|
||||
|
||||
-.TP
|
||||
+.TP
|
||||
.B \-f
|
||||
Clear /tmp directory with out prompt for removal.
|
||||
|
||||
-.TP
|
||||
+.TP
|
||||
.B \-R rpmpackagename[,rpmpackagename...]
|
||||
Use the rpm database to discover all files within the specified packages and restore the file contexts.
|
||||
.TP
|
||||
.B \-C PREVIOUS_FILECONTEXT
|
||||
Run a diff on the PREVIOUS_FILECONTEXT file to the currently installed one, and restore the context of all affected files.
|
||||
|
||||
-.TP
|
||||
+.TP
|
||||
.B \-N time
|
||||
Only act on files created after the specified date. Date must be specified in
|
||||
"YYYY\-MM\-DD HH:MM" format. Date field will be passed to find \-\-newermt command.
|
||||
@@ -83,19 +83,28 @@ Use parallel relabeling, see
|
||||
|
||||
.SH "ARGUMENTS"
|
||||
One of:
|
||||
-.TP
|
||||
+.TP
|
||||
.B check | verify
|
||||
print any incorrect file context labels, showing old and new context, but do not change them.
|
||||
-.TP
|
||||
+.TP
|
||||
.B restore
|
||||
change any incorrect file context labels.
|
||||
-.TP
|
||||
+.TP
|
||||
.B relabel
|
||||
Prompt for removal of contents of /tmp directory and then change any incorrect file context labels to match the install file_contexts file.
|
||||
-.TP
|
||||
-.B [[dir/file] ... ]
|
||||
+.TP
|
||||
+.B [[dir/file] ... ]
|
||||
List of files or directories trees that you wish to check file context on.
|
||||
|
||||
+.SH EXAMPLE
|
||||
+.nf
|
||||
+Relabel the whole filesystem, except paths listed in /etc/selinux/fixfiles_exclude_dirs
|
||||
+# fixfiles relabel
|
||||
+Schedule the machine to relabel on the next boot and force relabeling of customizable types
|
||||
+# fixfiles -F onboot
|
||||
+Check labeling of all files from the samba package (while not changing any labels)
|
||||
+# fixfiles -R samba check
|
||||
+
|
||||
.SH "AUTHOR"
|
||||
This man page was written by Richard Hally <rhally@mindspring.com>.
|
||||
The script was written by Dan Walsh <dwalsh@redhat.com>
|
||||
@@ -103,4 +112,3 @@ The script was written by Dan Walsh <dwalsh@redhat.com>
|
||||
.SH "SEE ALSO"
|
||||
.BR setfiles (8),
|
||||
.BR restorecon (8)
|
||||
-
|
||||
diff --git a/policycoreutils/secon/secon.1 b/policycoreutils/secon/secon.1
|
||||
index 501b5cb8c410..c0e8b05a6b66 100644
|
||||
--- a/policycoreutils/secon/secon.1
|
||||
+++ b/policycoreutils/secon/secon.1
|
||||
@@ -107,16 +107,24 @@ then the context will be read from stdin.
|
||||
.br
|
||||
If there is no argument,
|
||||
.B secon
|
||||
-will try reading a context from stdin, if that is not a tty, otherwise
|
||||
+will try reading a context from stdin, if that is not a tty, otherwise
|
||||
.B secon
|
||||
will act as though \fB\-\-self\fR had been passed.
|
||||
.PP
|
||||
If none of \fB\-\-user\fR, \fB\-\-role\fR, \fB\-\-type\fR, \fB\-\-level\fR or
|
||||
\fB\-\-mls\-range\fR is passed.
|
||||
Then all of them will be output.
|
||||
+
|
||||
+.SH EXAMPLE
|
||||
+.nf
|
||||
+Show SElinux context of the init process
|
||||
+# secon --pid 1
|
||||
+Parse the type portion of given security context
|
||||
+# secon -t system_u:object_r:httpd_sys_rw_content_t:s0
|
||||
+
|
||||
.PP
|
||||
.SH SEE ALSO
|
||||
.BR chcon (1)
|
||||
.SH AUTHORS
|
||||
.nf
|
||||
-James Antill (james.antill@redhat.com)
|
||||
+James Antill (james.antill@redhat.com)
|
||||
diff --git a/policycoreutils/semodule/semodule.8 b/policycoreutils/semodule/semodule.8
|
||||
index c56e580f27b8..01757b005e4a 100644
|
||||
--- a/policycoreutils/semodule/semodule.8
|
||||
+++ b/policycoreutils/semodule/semodule.8
|
||||
@@ -1,5 +1,5 @@
|
||||
.TH SEMODULE "8" "Nov 2005" "Security Enhanced Linux" NSA
|
||||
-.SH NAME
|
||||
+.SH NAME
|
||||
semodule \- Manage SELinux policy modules.
|
||||
|
||||
.SH SYNOPSIS
|
||||
@@ -8,7 +8,7 @@ semodule \- Manage SELinux policy modules.
|
||||
.SH DESCRIPTION
|
||||
.PP
|
||||
semodule is the tool used to manage SELinux policy modules,
|
||||
-including installing, upgrading, listing and removing modules.
|
||||
+including installing, upgrading, listing and removing modules.
|
||||
semodule may also be used to force a rebuild of policy from the
|
||||
module store and/or to force a reload of policy without performing
|
||||
any other transaction. semodule acts on module packages created
|
||||
@@ -39,7 +39,7 @@ install/replace a module package
|
||||
.B \-u,\-\-upgrade=MODULE_PKG
|
||||
deprecated, alias for --install
|
||||
.TP
|
||||
-.B \-b,\-\-base=MODULE_PKG
|
||||
+.B \-b,\-\-base=MODULE_PKG
|
||||
deprecated, alias for --install
|
||||
.TP
|
||||
.B \-r,\-\-remove=MODULE_NAME
|
||||
@@ -77,7 +77,7 @@ name of the store to operate on
|
||||
.B \-n,\-\-noreload,\-N
|
||||
do not reload policy after commit
|
||||
.TP
|
||||
-.B \-h,\-\-help
|
||||
+.B \-h,\-\-help
|
||||
prints help message and quit
|
||||
.TP
|
||||
.B \-P,\-\-preserve_tunables
|
||||
@@ -92,7 +92,7 @@ Use an alternate path for the policy root
|
||||
.B \-S,\-\-store-path
|
||||
Use an alternate path for the policy store root
|
||||
.TP
|
||||
-.B \-v,\-\-verbose
|
||||
+.B \-v,\-\-verbose
|
||||
be verbose
|
||||
.TP
|
||||
.B \-c,\-\-cil
|
||||
@@ -131,8 +131,6 @@ $ semodule \-B
|
||||
$ semodule \-d alsa
|
||||
# Install a module at a specific priority.
|
||||
$ semodule \-X 100 \-i alsa.pp
|
||||
-# List all modules.
|
||||
-$ semodule \-\-list=full
|
||||
# Set an alternate path for the policy root
|
||||
$ semodule \-B \-p "/tmp"
|
||||
# Set an alternate path for the policy store root
|
||||
@@ -143,6 +141,8 @@ $ semodule \-X 400 \-\-hll \-E puppet \-\-cil \-E wireshark
|
||||
# Check whether a module in "localmodule.pp" file is same as installed module "localmodule"
|
||||
$ /usr/libexec/selinux/hll/pp localmodule.pp | sha256sum
|
||||
$ semodule -l -m | grep localmodule
|
||||
+# Translate binary module file into CIL (useful for debugging installation errors)
|
||||
+$ /usr/libexec/selinux/hll/pp alsa.pp > alsa.cil
|
||||
.fi
|
||||
|
||||
.SH SEE ALSO
|
||||
diff --git a/policycoreutils/setfiles/restorecon.8 b/policycoreutils/setfiles/restorecon.8
|
||||
index dbd55ce7c512..6160aced5922 100644
|
||||
--- a/policycoreutils/setfiles/restorecon.8
|
||||
+++ b/policycoreutils/setfiles/restorecon.8
|
||||
@@ -224,6 +224,15 @@ and provided the
|
||||
option is NOT set and recursive mode is set, files will be relabeled as
|
||||
required with the digests then being updated provided there are no errors.
|
||||
|
||||
+.SH EXAMPLE
|
||||
+.nf
|
||||
+Fix labeling of /var/www/ including all sub-directories and list all context changes
|
||||
+# restorecon -rv /var/www/
|
||||
+List mislabeled files in user home directory and what the correct label should be
|
||||
+# restorecon -nvr ~
|
||||
+Fix labeling of files listed in file_list file, ignoring any that do not exist
|
||||
+# restorecon -vif file_list
|
||||
+
|
||||
.SH "AUTHOR"
|
||||
This man page was written by Dan Walsh <dwalsh@redhat.com>.
|
||||
Some of the content of this man page was taken from the setfiles
|
||||
diff --git a/policycoreutils/setfiles/restorecon_xattr.8 b/policycoreutils/setfiles/restorecon_xattr.8
|
||||
index 4b1ce304d995..09bfd8c40ab4 100644
|
||||
--- a/policycoreutils/setfiles/restorecon_xattr.8
|
||||
+++ b/policycoreutils/setfiles/restorecon_xattr.8
|
||||
@@ -112,6 +112,13 @@ If the option is not specified, then the default file_contexts will be used.
|
||||
.br
|
||||
the pathname of the directory tree to be searched.
|
||||
|
||||
+.SH EXAMPLE
|
||||
+.nf
|
||||
+List all paths that where assigned a checksum by "restorecon/setfiles -D"
|
||||
+# restorecon_xattr -r /
|
||||
+Remove all non-matching checksums
|
||||
+# restorecon_xattr -rd /
|
||||
+
|
||||
.SH "SEE ALSO"
|
||||
.BR restorecon (8),
|
||||
.BR setfiles (8)
|
||||
diff --git a/policycoreutils/setfiles/setfiles.8 b/policycoreutils/setfiles/setfiles.8
|
||||
index 36fe6b369548..6071d9ba3d38 100644
|
||||
--- a/policycoreutils/setfiles/setfiles.8
|
||||
+++ b/policycoreutils/setfiles/setfiles.8
|
||||
@@ -289,6 +289,15 @@ and provided the
|
||||
option is NOT set, files will be relabeled as required with the digests then
|
||||
being updated provided there are no errors.
|
||||
|
||||
+.SH EXAMPLE
|
||||
+.nf
|
||||
+Fix labeling of /var/www/ including all sub-directories, using targeted policy file context definitions and list all context changes
|
||||
+# setfiles -v /etc/selinux/targeted/contexts/files/file_contexts /var/www/
|
||||
+List mislabeled files in user home directory and what the label should be based on targeted policy file context definitions
|
||||
+# setfiles -nv /etc/selinux/targeted/contexts/files/file_contexts ~
|
||||
+Fix labeling of files listed in file_list file, ignoring any that do not exist
|
||||
+# setfiles -vif file_list /etc/selinux/targeted/contexts/files/file_contexts
|
||||
+
|
||||
.SH "AUTHOR"
|
||||
This man page was written by Russell Coker <russell@coker.com.au>.
|
||||
The program was written by Stephen Smalley <sds@tycho.nsa.gov>
|
||||
diff --git a/policycoreutils/setsebool/setsebool.8 b/policycoreutils/setsebool/setsebool.8
|
||||
index 52936f5a0ffb..f54664fb5c2a 100644
|
||||
--- a/policycoreutils/setsebool/setsebool.8
|
||||
+++ b/policycoreutils/setsebool/setsebool.8
|
||||
@@ -7,13 +7,13 @@ setsebool \- set SELinux boolean value
|
||||
.I "[ \-PNV ] boolean value | bool1=val1 bool2=val2 ..."
|
||||
|
||||
.SH "DESCRIPTION"
|
||||
-.B setsebool
|
||||
-sets the current state of a particular SELinux boolean or a list of booleans
|
||||
-to a given value. The value may be 1 or true or on to enable the boolean, or 0 or false or off to disable it.
|
||||
+.B setsebool
|
||||
+sets the current state of a particular SELinux boolean or a list of booleans
|
||||
+to a given value. The value may be 1 or true or on to enable the boolean, or 0 or false or off to disable it.
|
||||
|
||||
Without the \-P option, only the current boolean value is
|
||||
-affected; the boot-time default settings
|
||||
-are not changed.
|
||||
+affected; the boot-time default settings
|
||||
+are not changed.
|
||||
|
||||
If the \-P option is given, all pending values are written to
|
||||
the policy file on disk. So they will be persistent across reboots.
|
||||
@@ -22,6 +22,12 @@ If the \-N option is given, the policy on disk is not reloaded into the kernel.
|
||||
|
||||
If the \-V option is given, verbose error messages will be printed from semanage libraries.
|
||||
|
||||
+.SH EXAMPLE
|
||||
+.nf
|
||||
+Enable container_use_devices boolean (will return to persistent value after reboot)
|
||||
+# setsebool container_use_devices 1
|
||||
+Persistently enable samba_create_home_dirs and samba_enable_home_dirs booleans
|
||||
+# setsebool -P samba_create_home_dirs=on samba_enable_home_dirs=on
|
||||
|
||||
.SH AUTHOR
|
||||
This manual page was written by Dan Walsh <dwalsh@redhat.com>.
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@ -1,391 +0,0 @@
|
||||
From 72420ec0eb2ca8cf4cc9099dcd495695eeab308b Mon Sep 17 00:00:00 2001
|
||||
From: Vit Mojzis <vmojzis@redhat.com>
|
||||
Date: Thu, 1 Jun 2023 16:39:12 +0200
|
||||
Subject: [PATCH] python/sepolicy: Improve man pages
|
||||
Content-type: text/plain
|
||||
|
||||
- Add missing options
|
||||
- Add examples
|
||||
- Emphasize keywords
|
||||
- Remove trailing whitespaces
|
||||
|
||||
Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
|
||||
Acked-by: Petr Lautrbach <lautrbach@redhat.com>
|
||||
---
|
||||
python/sepolicy/sepolicy-booleans.8 | 15 +++++++++---
|
||||
python/sepolicy/sepolicy-communicate.8 | 14 ++++++++---
|
||||
python/sepolicy/sepolicy-generate.8 | 34 ++++++++++++--------------
|
||||
python/sepolicy/sepolicy-gui.8 | 4 +--
|
||||
python/sepolicy/sepolicy-interface.8 | 18 +++++++++++---
|
||||
python/sepolicy/sepolicy-manpage.8 | 25 ++++++++++++++-----
|
||||
python/sepolicy/sepolicy-network.8 | 17 ++++++-------
|
||||
python/sepolicy/sepolicy-transition.8 | 19 +++++++++-----
|
||||
8 files changed, 96 insertions(+), 50 deletions(-)
|
||||
|
||||
diff --git a/python/sepolicy/sepolicy-booleans.8 b/python/sepolicy/sepolicy-booleans.8
|
||||
index f8d8b56d5d4d..7f4b18e75ac8 100644
|
||||
--- a/python/sepolicy/sepolicy-booleans.8
|
||||
+++ b/python/sepolicy/sepolicy-booleans.8
|
||||
@@ -8,12 +8,16 @@ sepolicy-booleans \- Query SELinux Policy to see description of booleans
|
||||
.B sepolicy booleans [\-h] [ \-a | \-b booleanname ... ]
|
||||
|
||||
.SH "DESCRIPTION"
|
||||
-sepolicy booleans will show all booleans and their descriptions, or you can
|
||||
-choose individual booleans to display
|
||||
+.B sepolicy booleans
|
||||
+will show all booleans and their descriptions, or you can
|
||||
+choose individual booleans to display.
|
||||
+Please make sure that selinux-policy-devel is present in your system since it contains boolean descriptions extracted from the policy source code. Otherwise
|
||||
+.B sepolicy booleans
|
||||
+will only show descriptions generated based on boolean names.
|
||||
|
||||
.SH "OPTIONS"
|
||||
.TP
|
||||
-.I \-h, \-\-help
|
||||
+.I \-h, \-\-help
|
||||
Display help message
|
||||
.TP
|
||||
.I \-a, \-\-all
|
||||
@@ -22,6 +26,11 @@ Display all boolean descriptions
|
||||
.I \-b, \-\-boolean
|
||||
boolean to get description
|
||||
|
||||
+.SH EXAMPLE
|
||||
+.nf
|
||||
+List descriptions of samba_create_home_dirs and samba_enable_home_dirs booleans
|
||||
+# sepolicy booleans -b samba_create_home_dirs samba_enable_home_dirs
|
||||
+
|
||||
.SH "AUTHOR"
|
||||
This man page was written by Daniel Walsh <dwalsh@redhat.com>
|
||||
|
||||
diff --git a/python/sepolicy/sepolicy-communicate.8 b/python/sepolicy/sepolicy-communicate.8
|
||||
index 050aa475eef1..5ecf6eff0f6b 100644
|
||||
--- a/python/sepolicy/sepolicy-communicate.8
|
||||
+++ b/python/sepolicy/sepolicy-communicate.8
|
||||
@@ -8,7 +8,9 @@ sepolicy-communicate \- Generate a report showing if two SELinux Policy Domains
|
||||
.B sepolicy communicate [\-h] \-s SOURCE \-t TARGET [\-c TCLASS] [\-S SOURCEACCESS] [\-T TARGETACCESS]
|
||||
|
||||
.SH "DESCRIPTION"
|
||||
-Use sepolicy communicate to examine SELinux Policy to if a source SELinux Domain can communicate with a target SELinux Domain.
|
||||
+Use
|
||||
+.B sepolicy communicate
|
||||
+to examine SELinux Policy and determine if a source SELinux Domain can communicate with a target SELinux Domain.
|
||||
The default command looks to see if there are any file types that the source domain can write, which the target domain can read.
|
||||
|
||||
.SH "OPTIONS"
|
||||
@@ -16,7 +18,7 @@ The default command looks to see if there are any file types that the source dom
|
||||
.I \-c, \-\-class
|
||||
Specify the SELinux class which the source domain will attempt to communicate with the target domain. (Default file)
|
||||
.TP
|
||||
-.I \-h, \-\-help
|
||||
+.I \-h, \-\-help
|
||||
Display help message
|
||||
.TP
|
||||
.I \-s, \-\-source
|
||||
@@ -31,9 +33,15 @@ Specify the target SELinux domain type.
|
||||
.I \-T, \-\-targetaccess
|
||||
Specify the list of accesses used by the target SELinux domain type to receive communications from the source domain. Default Open, Read.
|
||||
|
||||
+.SH EXAMPLE
|
||||
+.nf
|
||||
+List types that can be used to communicate between samba daemon and apache server
|
||||
+# sepolicy communicate -s httpd_t -t smbd_t
|
||||
+Consider a type to be accessible by the source domain when it can be opened and appended to (as opposed to opened and written to)
|
||||
+# sepolicy communicate -s httpd_t -t smbd_t -S open,append
|
||||
+
|
||||
.SH "AUTHOR"
|
||||
This man page was written by Daniel Walsh <dwalsh@redhat.com>
|
||||
|
||||
.SH "SEE ALSO"
|
||||
sepolicy(8), selinux(8)
|
||||
-
|
||||
diff --git a/python/sepolicy/sepolicy-generate.8 b/python/sepolicy/sepolicy-generate.8
|
||||
index 0c5f998f5412..72d0e8e41b6e 100644
|
||||
--- a/python/sepolicy/sepolicy-generate.8
|
||||
+++ b/python/sepolicy/sepolicy-generate.8
|
||||
@@ -57,32 +57,29 @@ path. \fBsepolicy generate\fP will use the rpm payload of the
|
||||
application along with \fBnm \-D APPLICATION\fP to help it generate
|
||||
types and policy rules for your policy files.
|
||||
|
||||
-.B Type Enforcing File NAME.te
|
||||
+.B NAME.te
|
||||
.br
|
||||
-This file can be used to define all the types rules for a particular domain.
|
||||
+This file can be used to define all the types enforcement rules for a particular domain.
|
||||
|
||||
.I Note:
|
||||
-Policy generated by \fBsepolicy generate\fP will automatically add a permissive DOMAIN to your te file. When you are satisfied that your policy works, you need to remove the permissive line from the te file to run your domain in enforcing mode.
|
||||
+Policy generated by \fBsepolicy generate\fP will automatically add a \fIpermissive DOMAIN\fP to your \fB.te\fP file. When you are satisfied that your policy works, you need to remove the permissive line from the \fB.te\fP file to run your domain in enforcing mode.
|
||||
|
||||
-.B Interface File NAME.if
|
||||
+.B NAME.if
|
||||
.br
|
||||
-This file defines the interfaces for the types generated in the te file, which can be used by other policy domains.
|
||||
+This file defines the interfaces for the types generated in the \fB.te\fP file, which can be used by other policy domains.
|
||||
|
||||
-.B File Context NAME.fc
|
||||
+.B NAME.fc
|
||||
.br
|
||||
-This file defines the default file context for the system, it takes the file types created in the te file and associates
|
||||
+This file defines the default file context for the system, it takes the file types created in the \fB.te\fP file and associates
|
||||
file paths to the types. Tools like restorecon and RPM will use these paths to put down labels.
|
||||
|
||||
-.B RPM Spec File NAME_selinux.spec
|
||||
+.B NAME_selinux.spec
|
||||
.br
|
||||
-This file is an RPM SPEC file that can be used to install the SELinux policy on to machines and setup the labeling. The spec file also installs the interface file and a man page describing the policy. You can use \fBsepolicy manpage \-d NAME\fP to generate the man page.
|
||||
+This file is an RPM SPEC file that can be used to install the SELinux policy on to machines and setup the labeling. The spec file also installs the interface file and a man page describing the policy. You can use \fBsepolicy manpage \-d NAME\fP to generate the man page.
|
||||
|
||||
-.B Shell File NAME.sh
|
||||
+.B NAME.sh
|
||||
.br
|
||||
-This is a helper shell script to compile, install and fix the labeling on your test system. It will also generate a man page based on the installed policy, and
|
||||
-compile and build an RPM suitable to be installed on other machines
|
||||
-
|
||||
-If a generate is possible, this tool will print out all generate paths from the source domain to the target domain
|
||||
+This is a helper shell script to compile, install and fix the labeling on your test system. It will also generate a man page based on the installed policy, and compile and build an RPM suitable to be installed on other machines.
|
||||
|
||||
.SH "OPTIONS"
|
||||
.TP
|
||||
@@ -97,10 +94,11 @@ Specify alternate name of policy. The policy will default to the executable or n
|
||||
.TP
|
||||
.I \-p, \-\-path
|
||||
Specify the directory to store the created policy files. (Default to current working directory )
|
||||
+.TP
|
||||
optional arguments:
|
||||
.TP
|
||||
.I \-r, \-\-role
|
||||
-Enter role(s) to which this admin user will transition.
|
||||
+Enter role(s) to which this admin user will transition
|
||||
.TP
|
||||
.I \-t, \-\-type
|
||||
Enter type(s) for which you will generate new definition and rule(s)
|
||||
@@ -109,12 +107,12 @@ Enter type(s) for which you will generate new definition and rule(s)
|
||||
SELinux user(s) which will transition to this domain
|
||||
.TP
|
||||
.I \-w, \-\-writepath
|
||||
-Path(s) which the confined processes need to write
|
||||
+Path(s) which the confined processes need to write to
|
||||
.TP
|
||||
.I \-a, \-\-admin
|
||||
Domain(s) which the confined admin will administrate
|
||||
.TP
|
||||
-.I \-\-admin_user
|
||||
+.I \-\-admin_user
|
||||
Generate Policy for Administrator Login User Role
|
||||
.TP
|
||||
.I \-\-application
|
||||
@@ -142,7 +140,7 @@ Generate Policy for Internet Services Daemon
|
||||
Generate Policy for Standard Init Daemon (Default)
|
||||
.TP
|
||||
.I \-\-newtype
|
||||
-Generate new policy for new types to add to an existing policy.
|
||||
+Generate new policy for new types to add to an existing policy
|
||||
.TP
|
||||
.I \-\-sandbox
|
||||
Generate Policy for Sandbox
|
||||
diff --git a/python/sepolicy/sepolicy-gui.8 b/python/sepolicy/sepolicy-gui.8
|
||||
index ed744cdb914e..65b69faba144 100644
|
||||
--- a/python/sepolicy/sepolicy-gui.8
|
||||
+++ b/python/sepolicy/sepolicy-gui.8
|
||||
@@ -11,7 +11,7 @@ Common options
|
||||
.br
|
||||
|
||||
.SH "DESCRIPTION"
|
||||
-Use \fBsepolicy gui\fP to run a the graphical user interface, which
|
||||
+Use \fBsepolicy gui\fP to run the graphical user interface, which
|
||||
allows you to explore how SELinux confines different process domains.
|
||||
|
||||
.SH "OPTIONS"
|
||||
@@ -20,7 +20,7 @@ allows you to explore how SELinux confines different process domains.
|
||||
Display help message
|
||||
.TP
|
||||
.I \-d, \-\-domain
|
||||
-Initialize gui to the selected domain.
|
||||
+Initialize gui to the selected domain
|
||||
|
||||
.SH "AUTHOR"
|
||||
This man page was written by Daniel Walsh <dwalsh@redhat.com>
|
||||
diff --git a/python/sepolicy/sepolicy-interface.8 b/python/sepolicy/sepolicy-interface.8
|
||||
index 3e74ea627a79..a70a930629ea 100644
|
||||
--- a/python/sepolicy/sepolicy-interface.8
|
||||
+++ b/python/sepolicy/sepolicy-interface.8
|
||||
@@ -5,10 +5,10 @@ sepolicy-interface \- Print interface information based on the installed SELinux
|
||||
.SH "SYNOPSIS"
|
||||
|
||||
.br
|
||||
-.B sepolicy interface [\-h] [\-c] [\-v] [\-a | \-u | \-l | \-i INTERFACE [INTERFACE ... ]]
|
||||
+.B sepolicy interface [\-h] [\-c] [\-v] [\-f FILE] [\-a | \-u | \-l | \-i INTERFACE [INTERFACE ... ]]
|
||||
|
||||
.SH "DESCRIPTION"
|
||||
-Use sepolicy interface to print interfaces information based on SELinux Policy.
|
||||
+Use \fBsepolicy interface\fP to print interface information based on SELinux Policy.
|
||||
|
||||
.SH "OPTIONS"
|
||||
.TP
|
||||
@@ -18,7 +18,7 @@ List all domains with admin interface
|
||||
.I \-c, \-\-compile
|
||||
Test compile of interfaces
|
||||
.TP
|
||||
-.I \-h, \-\-help
|
||||
+.I \-h, \-\-help
|
||||
Display help message
|
||||
.TP
|
||||
.I \-i, \-\-interface
|
||||
@@ -32,6 +32,18 @@ List all domains with SELinux user role interface
|
||||
.TP
|
||||
.I \-v, \-\-verbose
|
||||
Display extended information about the interface including parameters and description if available.
|
||||
+.TP
|
||||
+.I \-f, \-\-file
|
||||
+Interface file to be explored
|
||||
+
|
||||
+.SH EXAMPLE
|
||||
+.nf
|
||||
+Show description of given interface
|
||||
+# sepolicy interface -vi samba_rw_config
|
||||
+List interfaces in given interface file and show their description
|
||||
+# sepolicy interface -f my_policy.if -lv
|
||||
+Run compile test for all interfaces in given file
|
||||
+# sepolicy interface -f my_policy.if -lc
|
||||
|
||||
.SH "AUTHOR"
|
||||
This man page was written by Daniel Walsh <dwalsh@redhat.com>
|
||||
diff --git a/python/sepolicy/sepolicy-manpage.8 b/python/sepolicy/sepolicy-manpage.8
|
||||
index c05c94305633..4991f645ba38 100644
|
||||
--- a/python/sepolicy/sepolicy-manpage.8
|
||||
+++ b/python/sepolicy/sepolicy-manpage.8
|
||||
@@ -8,27 +8,40 @@ sepolicy-manpage \- Generate a man page based on the installed SELinux Policy
|
||||
.B sepolicy manpage [\-w] [\-h] [\-p PATH ] [\-r ROOTDIR ] [\-a | \-d ]
|
||||
|
||||
.SH "DESCRIPTION"
|
||||
-Use sepolicy manpage to generate manpages based on SELinux Policy.
|
||||
+Use \fBsepolicy manpage\fP to generate manpages based on SELinux Policy.
|
||||
|
||||
.SH "OPTIONS"
|
||||
.TP
|
||||
-.I \-a, \-\-all
|
||||
+.I \-a, \-\-all
|
||||
Generate Man Pages for All Domains
|
||||
.TP
|
||||
-.I \-d, \-\-domain
|
||||
+.I \-d, \-\-domain
|
||||
Generate a Man Page for the specified domain. (Supports multiple commands)
|
||||
.TP
|
||||
-.I \-h, \-\-help
|
||||
+.I \-h, \-\-help
|
||||
Display help message
|
||||
.TP
|
||||
+.I \-o, \-\-os
|
||||
+Specify the name of the OS to be used in the man page (only affects HTML man pages)
|
||||
+.TP
|
||||
.I \-p, \-\-path
|
||||
Specify the directory to store the created man pages. (Default to /tmp)
|
||||
.TP
|
||||
.I \-r, \-\-root
|
||||
-Specify alternate root directory to generate man pages from. (Default to /)
|
||||
+Specify alternative root directory to generate man pages from. (Default to /)
|
||||
+.TP
|
||||
+.I \-\-source_files
|
||||
+Use file_contexts and policy.xml files from the specified root directory (the alternative root needs to include both files)
|
||||
.TP
|
||||
.I \-w, \-\-web
|
||||
-Generate an additional HTML man pages for the specified domain(s).
|
||||
+Generate an additional HTML man pages for the specified domain(s)
|
||||
+
|
||||
+.SH EXAMPLE
|
||||
+.nf
|
||||
+Generate man pages for all available domains
|
||||
+# sepolicy manpage -a
|
||||
+Generate an HTML man page for domain alsa_t, setting the OS name to "My_distro"
|
||||
+# sepolicy manpage -o My_distro -d alsa_t -w
|
||||
|
||||
.SH "AUTHOR"
|
||||
This man page was written by Daniel Walsh <dwalsh@redhat.com>
|
||||
diff --git a/python/sepolicy/sepolicy-network.8 b/python/sepolicy/sepolicy-network.8
|
||||
index dcddec756774..6faf60ab7a44 100644
|
||||
--- a/python/sepolicy/sepolicy-network.8
|
||||
+++ b/python/sepolicy/sepolicy-network.8
|
||||
@@ -8,27 +8,27 @@ sepolicy-network \- Examine the SELinux Policy and generate a network report
|
||||
.B sepolicy network [\-h] (\-l | \-a application [application ...] | \-p PORT [PORT ...] | \-t TYPE [TYPE ...] | \-d DOMAIN [DOMAIN ...])
|
||||
|
||||
.SH "DESCRIPTION"
|
||||
-Use sepolicy network to examine SELinux Policy and generate network reports.
|
||||
+Use \fBsepolicy network\fP to examine SELinux Policy and generate network reports.
|
||||
|
||||
.SH "OPTIONS"
|
||||
.TP
|
||||
.I \-a, \-\-application
|
||||
-Generate a report listing the ports to which the specified init application is allowed to connect and or bind.
|
||||
+Generate a report listing the ports to which the specified init application is allowed to connect and or bind
|
||||
.TP
|
||||
-.I \-d, \-\-domain
|
||||
-Generate a report listing the ports to which the specified domain is allowed to connect and or bind.
|
||||
+.I \-d, \-\-domain
|
||||
+Generate a report listing the ports to which the specified domain is allowed to connect and or bind
|
||||
.TP
|
||||
-.I \-l, \-\-list
|
||||
+.I \-l, \-\-list
|
||||
List all Network Port Types defined in SELinux Policy
|
||||
.TP
|
||||
-.I \-h, \-\-help
|
||||
+.I \-h, \-\-help
|
||||
Display help message
|
||||
.TP
|
||||
.I \-t, \-\-type
|
||||
-Generate a report listing the port numbers associate with the specified SELinux port type.
|
||||
+Generate a report listing the port numbers associate with the specified SELinux port type
|
||||
.TP
|
||||
.I \-p, \-\-port
|
||||
-Generate a report listing the SELinux port types associate with the specified port number.
|
||||
+Generate a report listing the SELinux port types associate with the specified port number
|
||||
|
||||
.SH "EXAMPLES"
|
||||
|
||||
@@ -88,4 +88,3 @@ This man page was written by Daniel Walsh <dwalsh@redhat.com>
|
||||
|
||||
.SH "SEE ALSO"
|
||||
sepolicy(8), selinux(8), semanage(8)
|
||||
-
|
||||
diff --git a/python/sepolicy/sepolicy-transition.8 b/python/sepolicy/sepolicy-transition.8
|
||||
index 897f0c4c418e..9f9ff5a52165 100644
|
||||
--- a/python/sepolicy/sepolicy-transition.8
|
||||
+++ b/python/sepolicy/sepolicy-transition.8
|
||||
@@ -11,21 +11,28 @@ sepolicy-transition \- Examine the SELinux Policy and generate a process transit
|
||||
.B sepolicy transition [\-h] \-s SOURCE \-t TARGET
|
||||
|
||||
.SH "DESCRIPTION"
|
||||
-sepolicy transition will show all domains that a give SELinux source domain can transition to, including the entrypoint.
|
||||
+\fBsepolicy transition\fP will show all domains that a given SELinux source domain can transition to, including the entrypoint.
|
||||
|
||||
-If a target domain is given, sepolicy transition will examine policy for all transition paths from the source domain to the target domain, and will list the
|
||||
-paths. If a transition is possible, this tool will print out all transition paths from the source domain to the target domain
|
||||
+If a target domain is given, sepolicy transition will examine policy for all transition paths from the source domain to the target domain, and will list the
|
||||
+paths.
|
||||
|
||||
.SH "OPTIONS"
|
||||
.TP
|
||||
-.I \-h, \-\-help
|
||||
+.I \-h, \-\-help
|
||||
Display help message
|
||||
.TP
|
||||
.I \-s, \-\-source
|
||||
-Specify the source SELinux domain type.
|
||||
+Specify the source SELinux domain type
|
||||
.TP
|
||||
.I \-t, \-\-target
|
||||
-Specify the target SELinux domain type.
|
||||
+Specify the target SELinux domain type
|
||||
+
|
||||
+.SH EXAMPLE
|
||||
+.nf
|
||||
+List all domain transition paths from init_t to httpd_t
|
||||
+# sepolicy transition -s init_t -t httpd_t
|
||||
+List all transitions available from samba domain, including entry points and booleans controlling each transition
|
||||
+# sepolicy transition -s smbd_t
|
||||
|
||||
.SH "AUTHOR"
|
||||
This man page was written by Daniel Walsh <dwalsh@redhat.com>
|
||||
--
|
||||
2.41.0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,94 +0,0 @@
|
||||
From cf06052cc5fece8ec1ae655aecf941420385bf4d Mon Sep 17 00:00:00 2001
|
||||
From: Vit Mojzis <vmojzis@redhat.com>
|
||||
Date: Thu, 1 Jun 2023 18:34:30 +0200
|
||||
Subject: [PATCH] python/sepolicy: Fix template for confined user policy
|
||||
modules
|
||||
Content-type: text/plain
|
||||
|
||||
The following commit
|
||||
https://github.com/SELinuxProject/refpolicy/commit/330b0fc3331d3b836691464734c96f3da3044490
|
||||
changed the userdom_base_user_template, which now requires a role
|
||||
corresponding to the user being created to be defined outside of the
|
||||
template.
|
||||
Similar change was also done to fedora-selinux/selinux-policy
|
||||
https://github.com/fedora-selinux/selinux-policy/commit/e1e216b25df1bdb4eb7dbb8f73f32927ad6f3d1f
|
||||
|
||||
Although I believe the template should define the role (just as it
|
||||
defines the new user), that will require extensive changes to refpolicy.
|
||||
In the meantime the role needs to be defined separately.
|
||||
|
||||
Fixes:
|
||||
# sepolicy generate --term_user -n newuser
|
||||
Created the following files:
|
||||
/root/a/test/newuser.te # Type Enforcement file
|
||||
/root/a/test/newuser.if # Interface file
|
||||
/root/a/test/newuser.fc # File Contexts file
|
||||
/root/a/test/newuser_selinux.spec # Spec file
|
||||
/root/a/test/newuser.sh # Setup Script
|
||||
|
||||
# ./newuser.sh
|
||||
Building and Loading Policy
|
||||
+ make -f /usr/share/selinux/devel/Makefile newuser.pp
|
||||
Compiling targeted newuser module
|
||||
Creating targeted newuser.pp policy package
|
||||
rm tmp/newuser.mod tmp/newuser.mod.fc
|
||||
+ /usr/sbin/semodule -i newuser.pp
|
||||
Failed to resolve roleattributeset statement at /var/lib/selinux/targeted/tmp/modules/400/newuser/cil:8
|
||||
Failed to resolve AST
|
||||
/usr/sbin/semodule: Failed!
|
||||
|
||||
Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
|
||||
Acked-by: Petr Lautrbach <lautrbach@redhat.com>
|
||||
---
|
||||
python/sepolicy/sepolicy/templates/user.py | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/python/sepolicy/sepolicy/templates/user.py b/python/sepolicy/sepolicy/templates/user.py
|
||||
index 1ff9d2ce8e75..7081fbaec496 100644
|
||||
--- a/python/sepolicy/sepolicy/templates/user.py
|
||||
+++ b/python/sepolicy/sepolicy/templates/user.py
|
||||
@@ -28,6 +28,8 @@ policy_module(TEMPLATETYPE, 1.0.0)
|
||||
#
|
||||
# Declarations
|
||||
#
|
||||
+role TEMPLATETYPE_r;
|
||||
+
|
||||
userdom_unpriv_user_template(TEMPLATETYPE)
|
||||
"""
|
||||
|
||||
@@ -38,6 +40,8 @@ policy_module(TEMPLATETYPE, 1.0.0)
|
||||
#
|
||||
# Declarations
|
||||
#
|
||||
+role TEMPLATETYPE_r;
|
||||
+
|
||||
userdom_admin_user_template(TEMPLATETYPE)
|
||||
"""
|
||||
|
||||
@@ -48,6 +52,7 @@ policy_module(TEMPLATETYPE, 1.0.0)
|
||||
#
|
||||
# Declarations
|
||||
#
|
||||
+role TEMPLATETYPE_r;
|
||||
|
||||
userdom_restricted_user_template(TEMPLATETYPE)
|
||||
"""
|
||||
@@ -59,6 +64,7 @@ policy_module(TEMPLATETYPE, 1.0.0)
|
||||
#
|
||||
# Declarations
|
||||
#
|
||||
+role TEMPLATETYPE_r;
|
||||
|
||||
userdom_restricted_xwindows_user_template(TEMPLATETYPE)
|
||||
"""
|
||||
@@ -89,6 +95,7 @@ gen_tunable(TEMPLATETYPE_manage_user_files, false)
|
||||
#
|
||||
# Declarations
|
||||
#
|
||||
+role TEMPLATETYPE_r;
|
||||
|
||||
userdom_base_user_template(TEMPLATETYPE)
|
||||
"""
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@ -1,455 +0,0 @@
|
||||
From 9bef6943871822d82a3428dda13a871e1848acad Mon Sep 17 00:00:00 2001
|
||||
From: Petr Lautrbach <lautrbach@redhat.com>
|
||||
Date: Tue, 16 May 2023 15:45:05 +0200
|
||||
Subject: [PATCH] python: improve format strings for proper localization
|
||||
Content-type: text/plain
|
||||
|
||||
If a string contains more than one unnamed argument it's hard for
|
||||
translators to proper localize as they don't know which value is
|
||||
represented by a unnamed argument. It also blocks them to use a
|
||||
different order of arguments which would make better sense in other
|
||||
languages.
|
||||
|
||||
Fixes:
|
||||
|
||||
$ xgettext --default-domain=python -L Python --keyword=_ --keyword=N_ ../audit2allow/audit2allow ../chcat/chcat ../semanage/semanage ../semanage/seobject.py ../sepolgen/src/sepolgen/interfaces.py ../sepolicy/sepolicy/generate.py ../sepolicy/sepolicy/gui.py ../sepolicy/sepolicy/__init__.py ../sepolicy/sepolicy/interface.py ../sepolicy/sepolicy.py
|
||||
../chcat/chcat:220: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
|
||||
The translator cannot reorder the arguments.
|
||||
Please consider using a format string with named arguments,
|
||||
and a mapping instead of a tuple for the arguments.
|
||||
../semanage/seobject.py:1178: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
|
||||
The translator cannot reorder the arguments.
|
||||
Please consider using a format string with named arguments,
|
||||
and a mapping instead of a tuple for the arguments.
|
||||
...
|
||||
|
||||
Signed-off-by: Petr Lautrbach <lautrbach@redhat.com>
|
||||
---
|
||||
python/chcat/chcat | 6 +-
|
||||
python/semanage/seobject.py | 130 ++++++++++++++++++------------------
|
||||
2 files changed, 68 insertions(+), 68 deletions(-)
|
||||
|
||||
diff --git a/python/chcat/chcat b/python/chcat/chcat
|
||||
index 68718ec5f102..c4f592291821 100755
|
||||
--- a/python/chcat/chcat
|
||||
+++ b/python/chcat/chcat
|
||||
@@ -125,7 +125,7 @@ def chcat_add(orig, newcat, objects, login_ind):
|
||||
|
||||
if len(clist) > 1:
|
||||
if cat in clist[1:]:
|
||||
- print(_("%s is already in %s") % (f, orig))
|
||||
+ print(_("{target} is already in {category}").format(target=f, category=orig))
|
||||
continue
|
||||
clist.append(cat)
|
||||
cats = clist[1:]
|
||||
@@ -207,7 +207,7 @@ def chcat_remove(orig, newcat, objects, login_ind):
|
||||
|
||||
if len(clist) > 1:
|
||||
if cat not in clist[1:]:
|
||||
- print(_("%s is not in %s") % (f, orig))
|
||||
+ print(_("{target} is not in {category}").format(target=f, category=orig))
|
||||
continue
|
||||
clist.remove(cat)
|
||||
if len(clist) > 1:
|
||||
@@ -217,7 +217,7 @@ def chcat_remove(orig, newcat, objects, login_ind):
|
||||
else:
|
||||
cat = ""
|
||||
else:
|
||||
- print(_("%s is not in %s") % (f, orig))
|
||||
+ print(_("{target} is not in {category}").format(target=f, category=orig))
|
||||
continue
|
||||
|
||||
if len(cat) == 0:
|
||||
diff --git a/python/semanage/seobject.py b/python/semanage/seobject.py
|
||||
index d82da4942987..2b1eb44ce8a3 100644
|
||||
--- a/python/semanage/seobject.py
|
||||
+++ b/python/semanage/seobject.py
|
||||
@@ -843,7 +843,7 @@ class seluserRecords(semanageRecords):
|
||||
for r in roles:
|
||||
rc = semanage_user_add_role(self.sh, u, r)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not add role %s for %s") % (r, name))
|
||||
+ raise ValueError(_("Could not add role {role} for {name}").format(role=r, name=name))
|
||||
|
||||
if is_mls_enabled == 1:
|
||||
rc = semanage_user_set_mlsrange(self.sh, u, serange)
|
||||
@@ -855,7 +855,7 @@ class seluserRecords(semanageRecords):
|
||||
raise ValueError(_("Could not set MLS level for %s") % name)
|
||||
rc = semanage_user_set_prefix(self.sh, u, prefix)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not add prefix %s for %s") % (r, prefix))
|
||||
+ raise ValueError(_("Could not add prefix {prefix} for {role}").format(role=r, prefix=prefix))
|
||||
(rc, key) = semanage_user_key_extract(self.sh, u)
|
||||
if rc < 0:
|
||||
raise ValueError(_("Could not extract key for %s") % name)
|
||||
@@ -1088,7 +1088,7 @@ class portRecords(semanageRecords):
|
||||
|
||||
(rc, k) = semanage_port_key_create(self.sh, low, high, proto_d)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not create a key for %s/%s") % (proto, port))
|
||||
+ raise ValueError(_("Could not create a key for {proto}/{port}").format(proto=proto, port=port))
|
||||
return (k, proto_d, low, high)
|
||||
|
||||
def __add(self, port, proto, serange, type):
|
||||
@@ -1110,44 +1110,44 @@ class portRecords(semanageRecords):
|
||||
|
||||
(rc, exists) = semanage_port_exists(self.sh, k)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port))
|
||||
+ raise ValueError(_("Could not check if port {proto}/{port} is defined").format(proto=proto, port=port))
|
||||
if exists:
|
||||
- raise ValueError(_("Port %s/%s already defined") % (proto, port))
|
||||
+ raise ValueError(_("Port {proto}/{port} already defined").format(proto=proto, port=port))
|
||||
|
||||
(rc, p) = semanage_port_create(self.sh)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not create port for %s/%s") % (proto, port))
|
||||
+ raise ValueError(_("Could not create port for {proto}/{port}").format(proto=proto, port=port))
|
||||
|
||||
semanage_port_set_proto(p, proto_d)
|
||||
semanage_port_set_range(p, low, high)
|
||||
(rc, con) = semanage_context_create(self.sh)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not create context for %s/%s") % (proto, port))
|
||||
+ raise ValueError(_("Could not create context for {proto}/{port}").format(proto=proto, port=port))
|
||||
|
||||
rc = semanage_context_set_user(self.sh, con, "system_u")
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not set user in port context for %s/%s") % (proto, port))
|
||||
+ raise ValueError(_("Could not set user in port context for {proto}/{port}").format(proto=proto, port=port))
|
||||
|
||||
rc = semanage_context_set_role(self.sh, con, "object_r")
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not set role in port context for %s/%s") % (proto, port))
|
||||
+ raise ValueError(_("Could not set role in port context for {proto}/{port}").format(proto=proto, port=port))
|
||||
|
||||
rc = semanage_context_set_type(self.sh, con, type)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not set type in port context for %s/%s") % (proto, port))
|
||||
+ raise ValueError(_("Could not set type in port context for {proto}/{port}").format(proto=proto, port=port))
|
||||
|
||||
if (is_mls_enabled == 1) and (serange != ""):
|
||||
rc = semanage_context_set_mls(self.sh, con, serange)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not set mls fields in port context for %s/%s") % (proto, port))
|
||||
+ raise ValueError(_("Could not set mls fields in port context for {proto}/{port}").format(proto=proto, port=port))
|
||||
|
||||
rc = semanage_port_set_con(self.sh, p, con)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not set port context for %s/%s") % (proto, port))
|
||||
+ raise ValueError(_("Could not set port context for {proto}/{port}").format(proto=proto, port=port))
|
||||
|
||||
rc = semanage_port_modify_local(self.sh, k, p)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not add port %s/%s") % (proto, port))
|
||||
+ raise ValueError(_("Could not add port {proto}/{port}").format(proto=proto, port=port))
|
||||
|
||||
semanage_context_free(con)
|
||||
semanage_port_key_free(k)
|
||||
@@ -1175,13 +1175,13 @@ class portRecords(semanageRecords):
|
||||
|
||||
(rc, exists) = semanage_port_exists(self.sh, k)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port))
|
||||
+ raise ValueError(_("Could not check if port {proto}/{port} is defined").format(proto=proto, port=port))
|
||||
if not exists:
|
||||
- raise ValueError(_("Port %s/%s is not defined") % (proto, port))
|
||||
+ raise ValueError(_("Port {proto}/{port} is not defined").format(proto=proto, port=port))
|
||||
|
||||
(rc, p) = semanage_port_query(self.sh, k)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not query port %s/%s") % (proto, port))
|
||||
+ raise ValueError(_("Could not query port {proto}/{port}").format(proto=proto, port=port))
|
||||
|
||||
con = semanage_port_get_con(p)
|
||||
|
||||
@@ -1195,7 +1195,7 @@ class portRecords(semanageRecords):
|
||||
|
||||
rc = semanage_port_modify_local(self.sh, k, p)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not modify port %s/%s") % (proto, port))
|
||||
+ raise ValueError(_("Could not modify port {proto}/{port}").format(proto=proto, port=port))
|
||||
|
||||
semanage_port_key_free(k)
|
||||
semanage_port_free(p)
|
||||
@@ -1241,19 +1241,19 @@ class portRecords(semanageRecords):
|
||||
(k, proto_d, low, high) = self.__genkey(port, proto)
|
||||
(rc, exists) = semanage_port_exists(self.sh, k)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port))
|
||||
+ raise ValueError(_("Could not check if port {proto}/{port} is defined").format(proto=proto, port=port))
|
||||
if not exists:
|
||||
- raise ValueError(_("Port %s/%s is not defined") % (proto, port))
|
||||
+ raise ValueError(_("Port {proto}/{port} is not defined").format(proto=proto, port=port))
|
||||
|
||||
(rc, exists) = semanage_port_exists_local(self.sh, k)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port))
|
||||
+ raise ValueError(_("Could not check if port {proto}/{port} is defined").format(proto=proto, port=port))
|
||||
if not exists:
|
||||
- raise ValueError(_("Port %s/%s is defined in policy, cannot be deleted") % (proto, port))
|
||||
+ raise ValueError(_("Port {proto}/{port} is defined in policy, cannot be deleted").format(proto=proto, port=port))
|
||||
|
||||
rc = semanage_port_del_local(self.sh, k)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not delete port %s/%s") % (proto, port))
|
||||
+ raise ValueError(_("Could not delete port {proto}/{port}").format(proto=proto, port=port))
|
||||
|
||||
semanage_port_key_free(k)
|
||||
|
||||
@@ -1362,7 +1362,7 @@ class ibpkeyRecords(semanageRecords):
|
||||
|
||||
(rc, k) = semanage_ibpkey_key_create(self.sh, subnet_prefix, low, high)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not create a key for %s/%s") % (subnet_prefix, pkey))
|
||||
+ raise ValueError(_("Could not create a key for {subnet_prefix}/{pkey}").format(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
return (k, subnet_prefix, low, high)
|
||||
|
||||
def __add(self, pkey, subnet_prefix, serange, type):
|
||||
@@ -1384,44 +1384,44 @@ class ibpkeyRecords(semanageRecords):
|
||||
|
||||
(rc, exists) = semanage_ibpkey_exists(self.sh, k)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not check if ibpkey %s/%s is defined") % (subnet_prefix, pkey))
|
||||
+ raise ValueError(_("Could not check if ibpkey {subnet_prefix}/{pkey} is defined").formnat(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
if exists:
|
||||
- raise ValueError(_("ibpkey %s/%s already defined") % (subnet_prefix, pkey))
|
||||
+ raise ValueError(_("ibpkey {subnet_prefix}/{pkey} already defined").format(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
|
||||
(rc, p) = semanage_ibpkey_create(self.sh)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not create ibpkey for %s/%s") % (subnet_prefix, pkey))
|
||||
+ raise ValueError(_("Could not create ibpkey for {subnet_prefix}/{pkey}").format(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
|
||||
semanage_ibpkey_set_subnet_prefix(self.sh, p, subnet_prefix)
|
||||
semanage_ibpkey_set_range(p, low, high)
|
||||
(rc, con) = semanage_context_create(self.sh)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not create context for %s/%s") % (subnet_prefix, pkey))
|
||||
+ raise ValueError(_("Could not create context for {subnet_prefix}/{pkey}").format(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
|
||||
rc = semanage_context_set_user(self.sh, con, "system_u")
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not set user in ibpkey context for %s/%s") % (subnet_prefix, pkey))
|
||||
+ raise ValueError(_("Could not set user in ibpkey context for {subnet_prefix}/{pkey}").format(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
|
||||
rc = semanage_context_set_role(self.sh, con, "object_r")
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not set role in ibpkey context for %s/%s") % (subnet_prefix, pkey))
|
||||
+ raise ValueError(_("Could not set role in ibpkey context for {subnet_prefix}/{pkey}").format(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
|
||||
rc = semanage_context_set_type(self.sh, con, type)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not set type in ibpkey context for %s/%s") % (subnet_prefix, pkey))
|
||||
+ raise ValueError(_("Could not set type in ibpkey context for {subnet_prefix}/{pkey}").format(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
|
||||
if (is_mls_enabled == 1) and (serange != ""):
|
||||
rc = semanage_context_set_mls(self.sh, con, serange)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not set mls fields in ibpkey context for %s/%s") % (subnet_prefix, pkey))
|
||||
+ raise ValueError(_("Could not set mls fields in ibpkey context for {subnet_prefix}/{pkey}").format(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
|
||||
rc = semanage_ibpkey_set_con(self.sh, p, con)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not set ibpkey context for %s/%s") % (subnet_prefix, pkey))
|
||||
+ raise ValueError(_("Could not set ibpkey context for {subnet_prefix}/{pkey}").format(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
|
||||
rc = semanage_ibpkey_modify_local(self.sh, k, p)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not add ibpkey %s/%s") % (subnet_prefix, pkey))
|
||||
+ raise ValueError(_("Could not add ibpkey {subnet_prefix}/{pkey}").format(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
|
||||
semanage_context_free(con)
|
||||
semanage_ibpkey_key_free(k)
|
||||
@@ -1448,13 +1448,13 @@ class ibpkeyRecords(semanageRecords):
|
||||
|
||||
(rc, exists) = semanage_ibpkey_exists(self.sh, k)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not check if ibpkey %s/%s is defined") % (subnet_prefix, pkey))
|
||||
+ raise ValueError(_("Could not check if ibpkey {subnet_prefix}/{pkey} is defined").format(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
if not exists:
|
||||
- raise ValueError(_("ibpkey %s/%s is not defined") % (subnet_prefix, pkey))
|
||||
+ raise ValueError(_("ibpkey {subnet_prefix}/{pkey} is not defined").format(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
|
||||
(rc, p) = semanage_ibpkey_query(self.sh, k)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not query ibpkey %s/%s") % (subnet_prefix, pkey))
|
||||
+ raise ValueError(_("Could not query ibpkey {subnet_prefix}/{pkey}").format(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
|
||||
con = semanage_ibpkey_get_con(p)
|
||||
|
||||
@@ -1465,7 +1465,7 @@ class ibpkeyRecords(semanageRecords):
|
||||
|
||||
rc = semanage_ibpkey_modify_local(self.sh, k, p)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not modify ibpkey %s/%s") % (subnet_prefix, pkey))
|
||||
+ raise ValueError(_("Could not modify ibpkey {subnet_prefix}/{pkey}").format(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
|
||||
semanage_ibpkey_key_free(k)
|
||||
semanage_ibpkey_free(p)
|
||||
@@ -1502,19 +1502,19 @@ class ibpkeyRecords(semanageRecords):
|
||||
(k, subnet_prefix, low, high) = self.__genkey(pkey, subnet_prefix)
|
||||
(rc, exists) = semanage_ibpkey_exists(self.sh, k)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not check if ibpkey %s/%s is defined") % (subnet_prefix, pkey))
|
||||
+ raise ValueError(_("Could not check if ibpkey {subnet_prefix}/{pkey} is defined").format(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
if not exists:
|
||||
- raise ValueError(_("ibpkey %s/%s is not defined") % (subnet_prefix, pkey))
|
||||
+ raise ValueError(_("ibpkey {subnet_prefix}/{pkey} is not defined").format(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
|
||||
(rc, exists) = semanage_ibpkey_exists_local(self.sh, k)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not check if ibpkey %s/%s is defined") % (subnet_prefix, pkey))
|
||||
+ raise ValueError(_("Could not check if ibpkey {subnet_prefix}/{pkey} is defined").format(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
if not exists:
|
||||
- raise ValueError(_("ibpkey %s/%s is defined in policy, cannot be deleted") % (subnet_prefix, pkey))
|
||||
+ raise ValueError(_("ibpkey {subnet_prefix}/{pkey} is defined in policy, cannot be deleted").format(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
|
||||
rc = semanage_ibpkey_del_local(self.sh, k)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not delete ibpkey %s/%s") % (subnet_prefix, pkey))
|
||||
+ raise ValueError(_("Could not delete ibpkey {subnet_prefix}/{pkey}").format(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
|
||||
semanage_ibpkey_key_free(k)
|
||||
|
||||
@@ -1617,7 +1617,7 @@ class ibendportRecords(semanageRecords):
|
||||
|
||||
(rc, k) = semanage_ibendport_key_create(self.sh, ibdev_name, port)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not create a key for ibendport %s/%s") % (ibdev_name, ibendport))
|
||||
+ raise ValueError(_("Could not create a key for ibendport {ibdev_name}/{ibendport}").format(ibdev_name=ibdev_name, ibendport=ibendport))
|
||||
return (k, ibdev_name, port)
|
||||
|
||||
def __add(self, ibendport, ibdev_name, serange, type):
|
||||
@@ -1638,44 +1638,44 @@ class ibendportRecords(semanageRecords):
|
||||
|
||||
(rc, exists) = semanage_ibendport_exists(self.sh, k)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not check if ibendport %s/%s is defined") % (ibdev_name, port))
|
||||
+ raise ValueError(_("Could not check if ibendport {ibdev_name}/{port} is defined").format(ibdev_name=ibdev_name, port=port))
|
||||
if exists:
|
||||
- raise ValueError(_("ibendport %s/%s already defined") % (ibdev_name, port))
|
||||
+ raise ValueError(_("ibendport {ibdev_name}/{port} already defined").format(ibdev_name=ibdev_name, port=port))
|
||||
|
||||
(rc, p) = semanage_ibendport_create(self.sh)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not create ibendport for %s/%s") % (ibdev_name, port))
|
||||
+ raise ValueError(_("Could not create ibendport for {ibdev_name}/{port}").format(ibdev_name=ibdev_name, port=port))
|
||||
|
||||
semanage_ibendport_set_ibdev_name(self.sh, p, ibdev_name)
|
||||
semanage_ibendport_set_port(p, port)
|
||||
(rc, con) = semanage_context_create(self.sh)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not create context for %s/%s") % (ibdev_name, port))
|
||||
+ raise ValueError(_("Could not create context for {ibendport}/{port}").format(ibdev_name=ibdev_name, port=port))
|
||||
|
||||
rc = semanage_context_set_user(self.sh, con, "system_u")
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not set user in ibendport context for %s/%s") % (ibdev_name, port))
|
||||
+ raise ValueError(_("Could not set user in ibendport context for {ibdev_name}/{port}").format(ibdev_name=ibdev_name, port=port))
|
||||
|
||||
rc = semanage_context_set_role(self.sh, con, "object_r")
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not set role in ibendport context for %s/%s") % (ibdev_name, port))
|
||||
+ raise ValueError(_("Could not set role in ibendport context for {ibdev_name}/{port}").format(ibdev_name=ibdev_name, port=port))
|
||||
|
||||
rc = semanage_context_set_type(self.sh, con, type)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not set type in ibendport context for %s/%s") % (ibdev_name, port))
|
||||
+ raise ValueError(_("Could not set type in ibendport context for {ibdev_name}/{port}").format(ibdev_name=ibdev_name, port=port))
|
||||
|
||||
if (is_mls_enabled == 1) and (serange != ""):
|
||||
rc = semanage_context_set_mls(self.sh, con, serange)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not set mls fields in ibendport context for %s/%s") % (ibdev_name, port))
|
||||
+ raise ValueError(_("Could not set mls fields in ibendport context for {ibdev_name}/{port}").format(ibdev_name=ibdev_name, port=port))
|
||||
|
||||
rc = semanage_ibendport_set_con(self.sh, p, con)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not set ibendport context for %s/%s") % (ibdev_name, port))
|
||||
+ raise ValueError(_("Could not set ibendport context for {ibdev_name}/{port}").format(ibdev_name=ibdev_name, port=port))
|
||||
|
||||
rc = semanage_ibendport_modify_local(self.sh, k, p)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not add ibendport %s/%s") % (ibdev_name, port))
|
||||
+ raise ValueError(_("Could not add ibendport {ibdev_name}/{port}").format(ibdev_name=ibdev_name, port=port))
|
||||
|
||||
semanage_context_free(con)
|
||||
semanage_ibendport_key_free(k)
|
||||
@@ -1702,13 +1702,13 @@ class ibendportRecords(semanageRecords):
|
||||
|
||||
(rc, exists) = semanage_ibendport_exists(self.sh, k)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not check if ibendport %s/%s is defined") % (ibdev_name, ibendport))
|
||||
+ raise ValueError(_("Could not check if ibendport {ibdev_name}/{ibendport} is defined").format(ibdev_name=ibdev_name, ibendport=ibendport))
|
||||
if not exists:
|
||||
- raise ValueError(_("ibendport %s/%s is not defined") % (ibdev_name, ibendport))
|
||||
+ raise ValueError(_("ibendport {ibdev_name}/{ibendport} is not defined").format(ibdev_name=ibdev_name, ibendport=ibendport))
|
||||
|
||||
(rc, p) = semanage_ibendport_query(self.sh, k)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not query ibendport %s/%s") % (ibdev_name, ibendport))
|
||||
+ raise ValueError(_("Could not query ibendport {ibdev_name}/{ibendport}").format(ibdev_name=ibdev_name, ibendport=ibendport))
|
||||
|
||||
con = semanage_ibendport_get_con(p)
|
||||
|
||||
@@ -1719,7 +1719,7 @@ class ibendportRecords(semanageRecords):
|
||||
|
||||
rc = semanage_ibendport_modify_local(self.sh, k, p)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not modify ibendport %s/%s") % (ibdev_name, ibendport))
|
||||
+ raise ValueError(_("Could not modify ibendport {ibdev_name}/{ibendport}").format(ibdev_name=ibdev_name, ibendport=ibendport))
|
||||
|
||||
semanage_ibendport_key_free(k)
|
||||
semanage_ibendport_free(p)
|
||||
@@ -1741,11 +1741,11 @@ class ibendportRecords(semanageRecords):
|
||||
port = semanage_ibendport_get_port(ibendport)
|
||||
(k, ibdev_name, port) = self.__genkey(str(port), ibdev_name)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not create a key for %s/%d") % (ibdevname, port))
|
||||
+ raise ValueError(_("Could not create a key for {ibdev_name}/{port}").format(ibdev_name=ibdev_name, port=port))
|
||||
|
||||
rc = semanage_ibendport_del_local(self.sh, k)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not delete the ibendport %s/%d") % (ibdev_name, port))
|
||||
+ raise ValueError(_("Could not delete the ibendport {ibdev_name}/{port}").format(ibdev_name=ibdev_name, port=port))
|
||||
semanage_ibendport_key_free(k)
|
||||
|
||||
self.commit()
|
||||
@@ -1754,19 +1754,19 @@ class ibendportRecords(semanageRecords):
|
||||
(k, ibdev_name, port) = self.__genkey(ibendport, ibdev_name)
|
||||
(rc, exists) = semanage_ibendport_exists(self.sh, k)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not check if ibendport %s/%s is defined") % (ibdev_name, ibendport))
|
||||
+ raise ValueError(_("Could not check if ibendport {ibdev_name}/{ibendport} is defined").format(ibdev_name=ibdev_name, ibendport=ibendport))
|
||||
if not exists:
|
||||
- raise ValueError(_("ibendport %s/%s is not defined") % (ibdev_name, ibendport))
|
||||
+ raise ValueError(_("ibendport {ibdev_name}/{ibendport} is not defined").format(ibdev_name=ibdev_name, ibendport=ibendport))
|
||||
|
||||
(rc, exists) = semanage_ibendport_exists_local(self.sh, k)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not check if ibendport %s/%s is defined") % (ibdev_name, ibendport))
|
||||
+ raise ValueError(_("Could not check if ibendport {ibdev_name}/{ibendport} is defined").format(ibdev_name=ibdev_name, ibendport=ibendport))
|
||||
if not exists:
|
||||
- raise ValueError(_("ibendport %s/%s is defined in policy, cannot be deleted") % (ibdev_name, ibendport))
|
||||
+ raise ValueError(_("ibendport {ibdev_name}/{ibendport} is defined in policy, cannot be deleted").format(ibdev_name=ibdev_name, ibendport=ibendport))
|
||||
|
||||
rc = semanage_ibendport_del_local(self.sh, k)
|
||||
if rc < 0:
|
||||
- raise ValueError(_("Could not delete ibendport %s/%s") % (ibdev_name, ibendport))
|
||||
+ raise ValueError(_("Could not delete ibendport {ibdev_name}/{ibendport}").format(ibdev_name=ibdev_name, ibendport=ibendport))
|
||||
|
||||
semanage_ibendport_key_free(k)
|
||||
|
||||
@@ -2765,7 +2765,7 @@ class booleanRecords(semanageRecords):
|
||||
try:
|
||||
boolname, val = b.split("=")
|
||||
except ValueError:
|
||||
- raise ValueError(_("Bad format %s: Record %s" % (name, b)))
|
||||
+ raise ValueError(_("Bad format {filename}: Record {record}").format(filename=name, record=b))
|
||||
self.__mod(boolname.strip(), val.strip())
|
||||
fd.close()
|
||||
else:
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@ -0,0 +1,396 @@
|
||||
From 78e4c9f2c2e97d23a67254647339d3c75bb7986d Mon Sep 17 00:00:00 2001
|
||||
From: Vit Mojzis <vmojzis@redhat.com>
|
||||
Date: Wed, 14 Feb 2024 13:08:40 +0100
|
||||
Subject: [PATCH] python/semanage: Allow modifying records on "add"
|
||||
Content-type: text/plain
|
||||
|
||||
When trying to add a record with a key that already exists, modify
|
||||
the existing record instead.
|
||||
|
||||
Also, fix "semanage -m -e" (add_equal was called instead of
|
||||
modify_equal), which meant that existing local equivalency couldn't be
|
||||
modified (though a user could remove it and add a modified
|
||||
equivalency).
|
||||
|
||||
Fixes:
|
||||
https://github.com/SELinuxProject/selinux/issues/412
|
||||
When a port or login definition present in the policy is modified
|
||||
using "semanage port -m", "semanage export" exports the command as
|
||||
"port -a" instead of "port -m". This results in "semanage import"
|
||||
failing (port already defined). The same is true for port, user,
|
||||
login, ibpkey, ibendport, node, interface and fcontext.
|
||||
|
||||
Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
|
||||
---
|
||||
python/semanage/semanage | 2 +-
|
||||
python/semanage/seobject.py | 208 +++++++++++++++++++++++++-----------
|
||||
2 files changed, 147 insertions(+), 63 deletions(-)
|
||||
|
||||
diff --git a/python/semanage/semanage b/python/semanage/semanage
|
||||
index 4fdb490f7df4..b269b9fca65b 100644
|
||||
--- a/python/semanage/semanage
|
||||
+++ b/python/semanage/semanage
|
||||
@@ -322,7 +322,7 @@ def handleFcontext(args):
|
||||
OBJECT.add(args.file_spec, args.type, args.ftype, args.range, args.seuser)
|
||||
if args.action == "modify":
|
||||
if args.equal:
|
||||
- OBJECT.add_equal(args.file_spec, args.equal)
|
||||
+ OBJECT.modify_equal(args.file_spec, args.equal)
|
||||
else:
|
||||
OBJECT.modify(args.file_spec, args.type, args.ftype, args.range, args.seuser)
|
||||
if args.action == "delete":
|
||||
diff --git a/python/semanage/seobject.py b/python/semanage/seobject.py
|
||||
index cc944ae202c9..12133b53fe91 100644
|
||||
--- a/python/semanage/seobject.py
|
||||
+++ b/python/semanage/seobject.py
|
||||
@@ -557,11 +557,6 @@ class loginRecords(semanageRecords):
|
||||
if rc < 0:
|
||||
raise ValueError(_("Could not create a key for %s") % name)
|
||||
|
||||
- (rc, exists) = semanage_seuser_exists(self.sh, k)
|
||||
- if rc < 0:
|
||||
- raise ValueError(_("Could not check if login mapping for %s is defined") % name)
|
||||
- if exists:
|
||||
- raise ValueError(_("Login mapping for %s is already defined") % name)
|
||||
if name[0] == '%':
|
||||
try:
|
||||
grp.getgrnam(name[1:])
|
||||
@@ -600,11 +595,29 @@ class loginRecords(semanageRecords):
|
||||
def add(self, name, sename, serange):
|
||||
try:
|
||||
self.begin()
|
||||
- self.__add(name, sename, serange)
|
||||
+ # Add a new mapping, or modify an existing one
|
||||
+ if self.__exists(name):
|
||||
+ print(_("Login mapping for %s is already defined, modifying instead") % name)
|
||||
+ self.__modify(name, sename, serange)
|
||||
+ else:
|
||||
+ self.__add(name, sename, serange)
|
||||
self.commit()
|
||||
except ValueError as error:
|
||||
raise error
|
||||
|
||||
+ # check if login mapping for given user exists
|
||||
+ def __exists(self, name):
|
||||
+ (rc, k) = semanage_seuser_key_create(self.sh, name)
|
||||
+ if rc < 0:
|
||||
+ raise ValueError(_("Could not create a key for %s") % name)
|
||||
+
|
||||
+ (rc, exists) = semanage_seuser_exists(self.sh, k)
|
||||
+ if rc < 0:
|
||||
+ raise ValueError(_("Could not check if login mapping for %s is defined") % name)
|
||||
+ semanage_seuser_key_free(k)
|
||||
+
|
||||
+ return exists
|
||||
+
|
||||
def __modify(self, name, sename="", serange=""):
|
||||
rec, self.oldsename, self.oldserange = selinux.getseuserbyname(name)
|
||||
if sename == "" and serange == "":
|
||||
@@ -821,12 +834,6 @@ class seluserRecords(semanageRecords):
|
||||
if rc < 0:
|
||||
raise ValueError(_("Could not create a key for %s") % name)
|
||||
|
||||
- (rc, exists) = semanage_user_exists(self.sh, k)
|
||||
- if rc < 0:
|
||||
- raise ValueError(_("Could not check if SELinux user %s is defined") % name)
|
||||
- if exists:
|
||||
- raise ValueError(_("SELinux user %s is already defined") % name)
|
||||
-
|
||||
(rc, u) = semanage_user_create(self.sh)
|
||||
if rc < 0:
|
||||
raise ValueError(_("Could not create SELinux user for %s") % name)
|
||||
@@ -866,12 +873,28 @@ class seluserRecords(semanageRecords):
|
||||
def add(self, name, roles, selevel, serange, prefix):
|
||||
try:
|
||||
self.begin()
|
||||
- self.__add(name, roles, selevel, serange, prefix)
|
||||
+ if self.__exists(name):
|
||||
+ print(_("SELinux user %s is already defined, modifying instead") % name)
|
||||
+ self.__modify(name, roles, selevel, serange, prefix)
|
||||
+ else:
|
||||
+ self.__add(name, roles, selevel, serange, prefix)
|
||||
self.commit()
|
||||
except ValueError as error:
|
||||
self.mylog.commit(0)
|
||||
raise error
|
||||
|
||||
+ def __exists(self, name):
|
||||
+ (rc, k) = semanage_user_key_create(self.sh, name)
|
||||
+ if rc < 0:
|
||||
+ raise ValueError(_("Could not create a key for %s") % name)
|
||||
+
|
||||
+ (rc, exists) = semanage_user_exists(self.sh, k)
|
||||
+ if rc < 0:
|
||||
+ raise ValueError(_("Could not check if SELinux user %s is defined") % name)
|
||||
+ semanage_user_key_free(k)
|
||||
+
|
||||
+ return exists
|
||||
+
|
||||
def __modify(self, name, roles=[], selevel="", serange="", prefix=""):
|
||||
oldserole = ""
|
||||
oldserange = ""
|
||||
@@ -1103,12 +1126,6 @@ class portRecords(semanageRecords):
|
||||
|
||||
(k, proto_d, low, high) = self.__genkey(port, proto)
|
||||
|
||||
- (rc, exists) = semanage_port_exists(self.sh, k)
|
||||
- if rc < 0:
|
||||
- raise ValueError(_("Could not check if port {proto}/{port} is defined").format(proto=proto, port=port))
|
||||
- if exists:
|
||||
- raise ValueError(_("Port {proto}/{port} already defined").format(proto=proto, port=port))
|
||||
-
|
||||
(rc, p) = semanage_port_create(self.sh)
|
||||
if rc < 0:
|
||||
raise ValueError(_("Could not create port for {proto}/{port}").format(proto=proto, port=port))
|
||||
@@ -1152,9 +1169,23 @@ class portRecords(semanageRecords):
|
||||
|
||||
def add(self, port, proto, serange, type):
|
||||
self.begin()
|
||||
- self.__add(port, proto, serange, type)
|
||||
+ if self.__exists(port, proto):
|
||||
+ print(_("Port {proto}/{port} already defined, modifying instead").format(proto=proto, port=port))
|
||||
+ self.__modify(port, proto, serange, type)
|
||||
+ else:
|
||||
+ self.__add(port, proto, serange, type)
|
||||
self.commit()
|
||||
|
||||
+ def __exists(self, port, proto):
|
||||
+ (k, proto_d, low, high) = self.__genkey(port, proto)
|
||||
+
|
||||
+ (rc, exists) = semanage_port_exists(self.sh, k)
|
||||
+ if rc < 0:
|
||||
+ raise ValueError(_("Could not check if port {proto}/{port} is defined").format(proto=proto, port=port))
|
||||
+ semanage_port_key_free(k)
|
||||
+
|
||||
+ return exists
|
||||
+
|
||||
def __modify(self, port, proto, serange, setype):
|
||||
if serange == "" and setype == "":
|
||||
if is_mls_enabled == 1:
|
||||
@@ -1377,12 +1408,6 @@ class ibpkeyRecords(semanageRecords):
|
||||
|
||||
(k, subnet_prefix, low, high) = self.__genkey(pkey, subnet_prefix)
|
||||
|
||||
- (rc, exists) = semanage_ibpkey_exists(self.sh, k)
|
||||
- if rc < 0:
|
||||
- raise ValueError(_("Could not check if ibpkey {subnet_prefix}/{pkey} is defined").formnat(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
- if exists:
|
||||
- raise ValueError(_("ibpkey {subnet_prefix}/{pkey} already defined").format(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
-
|
||||
(rc, p) = semanage_ibpkey_create(self.sh)
|
||||
if rc < 0:
|
||||
raise ValueError(_("Could not create ibpkey for {subnet_prefix}/{pkey}").format(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
@@ -1424,9 +1449,23 @@ class ibpkeyRecords(semanageRecords):
|
||||
|
||||
def add(self, pkey, subnet_prefix, serange, type):
|
||||
self.begin()
|
||||
- self.__add(pkey, subnet_prefix, serange, type)
|
||||
+ if self.__exists(pkey, subnet_prefix):
|
||||
+ print(_("ibpkey {subnet_prefix}/{pkey} already defined, modifying instead").format(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
+ self.__modify(pkey, subnet_prefix, serange, type)
|
||||
+ else:
|
||||
+ self.__add(pkey, subnet_prefix, serange, type)
|
||||
self.commit()
|
||||
|
||||
+ def __exists(self, pkey, subnet_prefix):
|
||||
+ (k, subnet_prefix, low, high) = self.__genkey(pkey, subnet_prefix)
|
||||
+
|
||||
+ (rc, exists) = semanage_ibpkey_exists(self.sh, k)
|
||||
+ if rc < 0:
|
||||
+ raise ValueError(_("Could not check if ibpkey {subnet_prefix}/{pkey} is defined").formnat(subnet_prefix=subnet_prefix, pkey=pkey))
|
||||
+ semanage_ibpkey_key_free(k)
|
||||
+
|
||||
+ return exists
|
||||
+
|
||||
def __modify(self, pkey, subnet_prefix, serange, setype):
|
||||
if serange == "" and setype == "":
|
||||
if is_mls_enabled == 1:
|
||||
@@ -1631,12 +1670,6 @@ class ibendportRecords(semanageRecords):
|
||||
raise ValueError(_("Type %s is invalid, must be an ibendport type") % type)
|
||||
(k, ibendport, port) = self.__genkey(ibendport, ibdev_name)
|
||||
|
||||
- (rc, exists) = semanage_ibendport_exists(self.sh, k)
|
||||
- if rc < 0:
|
||||
- raise ValueError(_("Could not check if ibendport {ibdev_name}/{port} is defined").format(ibdev_name=ibdev_name, port=port))
|
||||
- if exists:
|
||||
- raise ValueError(_("ibendport {ibdev_name}/{port} already defined").format(ibdev_name=ibdev_name, port=port))
|
||||
-
|
||||
(rc, p) = semanage_ibendport_create(self.sh)
|
||||
if rc < 0:
|
||||
raise ValueError(_("Could not create ibendport for {ibdev_name}/{port}").format(ibdev_name=ibdev_name, port=port))
|
||||
@@ -1678,9 +1711,23 @@ class ibendportRecords(semanageRecords):
|
||||
|
||||
def add(self, ibendport, ibdev_name, serange, type):
|
||||
self.begin()
|
||||
- self.__add(ibendport, ibdev_name, serange, type)
|
||||
+ if self.__exists(ibendport, ibdev_name):
|
||||
+ print(_("ibendport {ibdev_name}/{port} already defined, modifying instead").format(ibdev_name=ibdev_name, port=port))
|
||||
+ self.__modify(ibendport, ibdev_name, serange, type)
|
||||
+ else:
|
||||
+ self.__add(ibendport, ibdev_name, serange, type)
|
||||
self.commit()
|
||||
|
||||
+ def __exists(self, ibendport, ibdev_name):
|
||||
+ (k, ibendport, port) = self.__genkey(ibendport, ibdev_name)
|
||||
+
|
||||
+ (rc, exists) = semanage_ibendport_exists(self.sh, k)
|
||||
+ if rc < 0:
|
||||
+ raise ValueError(_("Could not check if ibendport {ibdev_name}/{port} is defined").format(ibdev_name=ibdev_name, port=port))
|
||||
+ semanage_ibendport_key_free(k)
|
||||
+
|
||||
+ return exists
|
||||
+
|
||||
def __modify(self, ibendport, ibdev_name, serange, setype):
|
||||
if serange == "" and setype == "":
|
||||
if is_mls_enabled == 1:
|
||||
@@ -1902,12 +1949,6 @@ class nodeRecords(semanageRecords):
|
||||
if rc < 0:
|
||||
raise ValueError(_("Could not create key for %s") % addr)
|
||||
|
||||
- (rc, exists) = semanage_node_exists(self.sh, k)
|
||||
- if rc < 0:
|
||||
- raise ValueError(_("Could not check if addr %s is defined") % addr)
|
||||
- if exists:
|
||||
- raise ValueError(_("Addr %s already defined") % addr)
|
||||
-
|
||||
(rc, node) = semanage_node_create(self.sh)
|
||||
if rc < 0:
|
||||
raise ValueError(_("Could not create addr for %s") % addr)
|
||||
@@ -1955,9 +1996,27 @@ class nodeRecords(semanageRecords):
|
||||
|
||||
def add(self, addr, mask, proto, serange, ctype):
|
||||
self.begin()
|
||||
- self.__add(addr, mask, proto, serange, ctype)
|
||||
+ if self.__exists(addr, mask, proto):
|
||||
+ print(_("Addr %s already defined, modifying instead") % addr)
|
||||
+ self.__modify(addr, mask, proto, serange, ctype)
|
||||
+ else:
|
||||
+ self.__add(addr, mask, proto, serange, ctype)
|
||||
self.commit()
|
||||
|
||||
+ def __exists(self, addr, mask, proto):
|
||||
+ addr, mask, proto, audit_proto = self.validate(addr, mask, proto)
|
||||
+
|
||||
+ (rc, k) = semanage_node_key_create(self.sh, addr, mask, proto)
|
||||
+ if rc < 0:
|
||||
+ raise ValueError(_("Could not create key for %s") % addr)
|
||||
+
|
||||
+ (rc, exists) = semanage_node_exists(self.sh, k)
|
||||
+ if rc < 0:
|
||||
+ raise ValueError(_("Could not check if addr %s is defined") % addr)
|
||||
+ semanage_node_key_free(k)
|
||||
+
|
||||
+ return exists
|
||||
+
|
||||
def __modify(self, addr, mask, proto, serange, setype):
|
||||
addr, mask, proto, audit_proto = self.validate(addr, mask, proto)
|
||||
|
||||
@@ -2111,12 +2170,6 @@ class interfaceRecords(semanageRecords):
|
||||
if rc < 0:
|
||||
raise ValueError(_("Could not create key for %s") % interface)
|
||||
|
||||
- (rc, exists) = semanage_iface_exists(self.sh, k)
|
||||
- if rc < 0:
|
||||
- raise ValueError(_("Could not check if interface %s is defined") % interface)
|
||||
- if exists:
|
||||
- raise ValueError(_("Interface %s already defined") % interface)
|
||||
-
|
||||
(rc, iface) = semanage_iface_create(self.sh)
|
||||
if rc < 0:
|
||||
raise ValueError(_("Could not create interface for %s") % interface)
|
||||
@@ -2163,9 +2216,25 @@ class interfaceRecords(semanageRecords):
|
||||
|
||||
def add(self, interface, serange, ctype):
|
||||
self.begin()
|
||||
- self.__add(interface, serange, ctype)
|
||||
+ if self.__exists(interface):
|
||||
+ print(_("Interface %s already defined, modifying instead") % interface)
|
||||
+ self.__modify(interface, serange, ctype)
|
||||
+ else:
|
||||
+ self.__add(interface, serange, ctype)
|
||||
self.commit()
|
||||
|
||||
+ def __exists(self, interface):
|
||||
+ (rc, k) = semanage_iface_key_create(self.sh, interface)
|
||||
+ if rc < 0:
|
||||
+ raise ValueError(_("Could not create key for %s") % interface)
|
||||
+
|
||||
+ (rc, exists) = semanage_iface_exists(self.sh, k)
|
||||
+ if rc < 0:
|
||||
+ raise ValueError(_("Could not check if interface %s is defined") % interface)
|
||||
+ semanage_iface_key_free(k)
|
||||
+
|
||||
+ return exists
|
||||
+
|
||||
def __modify(self, interface, serange, setype):
|
||||
if serange == "" and setype == "":
|
||||
raise ValueError(_("Requires setype or serange"))
|
||||
@@ -2353,7 +2422,13 @@ class fcontextRecords(semanageRecords):
|
||||
raise ValueError(_("Substitute %s is not valid. Substitute is not allowed to end with '/'") % substitute)
|
||||
|
||||
if target in self.equiv.keys():
|
||||
- raise ValueError(_("Equivalence class for %s already exists") % target)
|
||||
+ print(_("Equivalence class for %s already exists, modifying instead") % target)
|
||||
+ self.equiv[target] = substitute
|
||||
+ self.equal_ind = True
|
||||
+ self.mylog.log_change("resrc=fcontext op=modify-equal %s %s" % (audit.audit_encode_nv_string("sglob", target, 0), audit.audit_encode_nv_string("tglob", substitute, 0)))
|
||||
+ self.commit()
|
||||
+ return
|
||||
+
|
||||
self.validate(target)
|
||||
|
||||
for fdict in (self.equiv, self.equiv_dist):
|
||||
@@ -2429,18 +2504,6 @@ class fcontextRecords(semanageRecords):
|
||||
if rc < 0:
|
||||
raise ValueError(_("Could not create key for %s") % target)
|
||||
|
||||
- (rc, exists) = semanage_fcontext_exists(self.sh, k)
|
||||
- if rc < 0:
|
||||
- raise ValueError(_("Could not check if file context for %s is defined") % target)
|
||||
-
|
||||
- if not exists:
|
||||
- (rc, exists) = semanage_fcontext_exists_local(self.sh, k)
|
||||
- if rc < 0:
|
||||
- raise ValueError(_("Could not check if file context for %s is defined") % target)
|
||||
-
|
||||
- if exists:
|
||||
- raise ValueError(_("File context for %s already defined") % target)
|
||||
-
|
||||
(rc, fcontext) = semanage_fcontext_create(self.sh)
|
||||
if rc < 0:
|
||||
raise ValueError(_("Could not create file context for %s") % target)
|
||||
@@ -2479,9 +2542,30 @@ class fcontextRecords(semanageRecords):
|
||||
|
||||
def add(self, target, type, ftype="", serange="", seuser="system_u"):
|
||||
self.begin()
|
||||
- self.__add(target, type, ftype, serange, seuser)
|
||||
+ if self.__exists(target, ftype):
|
||||
+ print(_("File context for %s already defined, modifying instead") % target)
|
||||
+ self.__modify(target, type, ftype, serange, seuser)
|
||||
+ else:
|
||||
+ self.__add(target, type, ftype, serange, seuser)
|
||||
self.commit()
|
||||
|
||||
+ def __exists(self, target, ftype):
|
||||
+ (rc, k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
|
||||
+ if rc < 0:
|
||||
+ raise ValueError(_("Could not create key for %s") % target)
|
||||
+
|
||||
+ (rc, exists) = semanage_fcontext_exists(self.sh, k)
|
||||
+ if rc < 0:
|
||||
+ raise ValueError(_("Could not check if file context for %s is defined") % target)
|
||||
+
|
||||
+ if not exists:
|
||||
+ (rc, exists) = semanage_fcontext_exists_local(self.sh, k)
|
||||
+ if rc < 0:
|
||||
+ raise ValueError(_("Could not check if file context for %s is defined") % target)
|
||||
+ semanage_fcontext_key_free(k)
|
||||
+
|
||||
+ return exists
|
||||
+
|
||||
def __modify(self, target, setype, ftype, serange, seuser):
|
||||
if serange == "" and setype == "" and seuser == "":
|
||||
raise ValueError(_("Requires setype, serange or seuser"))
|
||||
--
|
||||
2.43.2
|
||||
|
||||
@ -1,148 +0,0 @@
|
||||
From 9001fe7d0d4007b5dac28422f46a9a605efefc0a Mon Sep 17 00:00:00 2001
|
||||
From: Petr Lautrbach <lautrbach@redhat.com>
|
||||
Date: Wed, 17 May 2023 12:18:54 +0200
|
||||
Subject: [PATCH] python: Drop hard formating from localized strings
|
||||
Content-type: text/plain
|
||||
|
||||
It confuses translators and new lines are dropped by parser module anyway.
|
||||
|
||||
Signed-off-by: Petr Lautrbach <lautrbach@redhat.com>
|
||||
---
|
||||
python/audit2allow/audit2allow | 14 ++++++--
|
||||
python/semanage/semanage | 60 +++++++++++++---------------------
|
||||
2 files changed, 34 insertions(+), 40 deletions(-)
|
||||
|
||||
diff --git a/python/audit2allow/audit2allow b/python/audit2allow/audit2allow
|
||||
index 5587a2dbb006..35b0b151ac86 100644
|
||||
--- a/python/audit2allow/audit2allow
|
||||
+++ b/python/audit2allow/audit2allow
|
||||
@@ -234,9 +234,17 @@ class AuditToPolicy:
|
||||
print(e)
|
||||
sys.exit(1)
|
||||
|
||||
- sys.stdout.write(_("******************** IMPORTANT ***********************\n"))
|
||||
- sys.stdout.write((_("To make this policy package active, execute:" +
|
||||
- "\n\nsemodule -i %s\n\n") % packagename))
|
||||
+ sys.stdout.write(
|
||||
+"""******************** {important} ***********************
|
||||
+{text}
|
||||
+
|
||||
+semodule -i {packagename}
|
||||
+
|
||||
+""".format(
|
||||
+ important=_("IMPORTANT"),
|
||||
+ text=_("To make this policy package active, execute:"),
|
||||
+ packagename=packagename
|
||||
+))
|
||||
|
||||
def __output_audit2why(self):
|
||||
import selinux
|
||||
diff --git a/python/semanage/semanage b/python/semanage/semanage
|
||||
index e0bd98a95c77..4fdb490f7df4 100644
|
||||
--- a/python/semanage/semanage
|
||||
+++ b/python/semanage/semanage
|
||||
@@ -238,30 +238,22 @@ def parser_add_level(parser, name):
|
||||
|
||||
|
||||
def parser_add_range(parser, name):
|
||||
- parser.add_argument('-r', '--range', default='',
|
||||
- help=_('''
|
||||
-MLS/MCS Security Range (MLS/MCS Systems only)
|
||||
-SELinux Range for SELinux login mapping
|
||||
-defaults to the SELinux user record range.
|
||||
-SELinux Range for SELinux user defaults to s0.
|
||||
-'''))
|
||||
+ parser.add_argument('-r', '--range', default='', help=_(
|
||||
+ "MLS/MCS Security Range (MLS/MCS Systems only) SELinux Range for SELinux login mapping defaults to the SELinux user record range. \
|
||||
+SELinux Range for SELinux user defaults to s0."
|
||||
+ ))
|
||||
|
||||
|
||||
def parser_add_proto(parser, name):
|
||||
- parser.add_argument('-p', '--proto', help=_('''
|
||||
- Protocol for the specified port (tcp|udp|dccp|sctp) or internet protocol
|
||||
- version for the specified node (ipv4|ipv6).
|
||||
-'''))
|
||||
+ parser.add_argument('-p', '--proto', help=_(
|
||||
+ "Protocol for the specified port (tcp|udp|dccp|sctp) or internet protocol version for the specified node (ipv4|ipv6)."
|
||||
+ ))
|
||||
|
||||
def parser_add_subnet_prefix(parser, name):
|
||||
- parser.add_argument('-x', '--subnet_prefix', help=_('''
|
||||
- Subnet prefix for the specified infiniband ibpkey.
|
||||
-'''))
|
||||
+ parser.add_argument('-x', '--subnet_prefix', help=_('Subnet prefix for the specified infiniband ibpkey.'))
|
||||
|
||||
def parser_add_ibdev_name(parser, name):
|
||||
- parser.add_argument('-z', '--ibdev_name', help=_('''
|
||||
- Name for the specified infiniband end port.
|
||||
-'''))
|
||||
+ parser.add_argument('-z', '--ibdev_name', help=_("Name for the specified infiniband end port."))
|
||||
|
||||
def parser_add_modify(parser, name):
|
||||
parser.add_argument('-m', '--modify', dest='action', action='store_const', const='modify', help=_("Modify a record of the %s object type") % name)
|
||||
@@ -348,15 +340,6 @@ def handleFcontext(args):
|
||||
|
||||
|
||||
def setupFcontextParser(subparsers):
|
||||
- ftype_help = '''
|
||||
-File Type. This is used with fcontext. Requires a file type
|
||||
-as shown in the mode field by ls, e.g. use d to match only
|
||||
-directories or f to match only regular files. The following
|
||||
-file type options can be passed:
|
||||
-f (regular file),d (directory),c (character device),
|
||||
-b (block device),s (socket),l (symbolic link),p (named pipe)
|
||||
-If you do not specify a file type, the file type will default to "all files".
|
||||
-'''
|
||||
generate_usage = generate_custom_usage(usage_fcontext, usage_fcontext_dict)
|
||||
fcontextParser = subparsers.add_parser('fcontext', usage=generate_usage, help=_("Manage file context mapping definitions"))
|
||||
parser_add_locallist(fcontextParser, "fcontext")
|
||||
@@ -372,11 +355,16 @@ If you do not specify a file type, the file type will default to "all files".
|
||||
parser_add_extract(fcontext_action, "fcontext")
|
||||
parser_add_deleteall(fcontext_action, "fcontext")
|
||||
|
||||
- fcontextParser.add_argument('-e', '--equal', help=_('''Substitute target path with sourcepath when generating default
|
||||
- label. This is used with fcontext. Requires source and target
|
||||
- path arguments. The context labeling for the target subtree is
|
||||
- made equivalent to that defined for the source.'''))
|
||||
- fcontextParser.add_argument('-f', '--ftype', default="", choices=["a", "f", "d", "c", "b", "s", "l", "p"], help=_(ftype_help))
|
||||
+ fcontextParser.add_argument('-e', '--equal', help=_(
|
||||
+ 'Substitute target path with sourcepath when generating default label. This is used with fcontext. Requires source and target \
|
||||
+path arguments. The context labeling for the target subtree is made equivalent to that defined for the source.'
|
||||
+ ))
|
||||
+ fcontextParser.add_argument('-f', '--ftype', default="", choices=["a", "f", "d", "c", "b", "s", "l", "p"], help=_(
|
||||
+ 'File Type. This is used with fcontext. Requires a file type as shown in the mode field by ls, e.g. use d to match only \
|
||||
+directories or f to match only regular files. The following file type options can be passed: f (regular file), d (directory), \
|
||||
+c (character device), b (block device), s (socket), l (symbolic link), p (named pipe). \
|
||||
+If you do not specify a file type, the file type will default to "all files".'
|
||||
+ ))
|
||||
parser_add_seuser(fcontextParser, "fcontext")
|
||||
parser_add_type(fcontextParser, "fcontext")
|
||||
parser_add_range(fcontextParser, "fcontext")
|
||||
@@ -426,9 +414,7 @@ def setupUserParser(subparsers):
|
||||
parser_add_range(userParser, "user")
|
||||
userParser.add_argument('-R', '--roles', default=[],
|
||||
action=CheckRole,
|
||||
- help=_('''
|
||||
-SELinux Roles. You must enclose multiple roles within quotes, separate by spaces. Or specify -R multiple times.
|
||||
-'''))
|
||||
+ help=_("SELinux Roles. You must enclose multiple roles within quotes, separate by spaces. Or specify -R multiple times."))
|
||||
userParser.add_argument('-P', '--prefix', default="user", help=argparse.SUPPRESS)
|
||||
userParser.add_argument('selinux_name', nargs='?', default=None, help=_('selinux_name'))
|
||||
userParser.set_defaults(func=handleUser)
|
||||
@@ -901,9 +887,9 @@ def setupImportParser(subparsers):
|
||||
def createCommandParser():
|
||||
commandParser = seParser(prog='semanage',
|
||||
formatter_class=argparse.ArgumentDefaultsHelpFormatter,
|
||||
- description='''semanage is used to configure certain elements
|
||||
- of SELinux policy with-out requiring modification
|
||||
- to or recompilation from policy source.''')
|
||||
+ description=_(
|
||||
+ "semanage is used to configure certain elements of SELinux policy with-out requiring modification or recompilation from policy source."
|
||||
+ ))
|
||||
|
||||
#To add a new subcommand define the parser for it in a function above and call it here.
|
||||
subparsers = commandParser.add_subparsers(dest='subcommand')
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@ -0,0 +1,64 @@
|
||||
From 616db16b5729a9473cf27edc32a03f38eca417e7 Mon Sep 17 00:00:00 2001
|
||||
From: Vit Mojzis <vmojzis@redhat.com>
|
||||
Date: Wed, 7 Feb 2024 15:46:23 +0100
|
||||
Subject: [PATCH] python/semanage: Do not sort local fcontext definitions
|
||||
Content-type: text/plain
|
||||
|
||||
Entries in file_contexts.local are processed from the most recent one to
|
||||
the oldest, with first match being used. Therefore it is important to
|
||||
preserve their order when listing (semanage fcontext -lC) and exporting
|
||||
(semanage export).
|
||||
|
||||
Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
|
||||
---
|
||||
gui/fcontextPage.py | 6 +++++-
|
||||
python/semanage/seobject.py | 9 +++++++--
|
||||
2 files changed, 12 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/gui/fcontextPage.py b/gui/fcontextPage.py
|
||||
index 767664f26ec8..c88df580400f 100644
|
||||
--- a/gui/fcontextPage.py
|
||||
+++ b/gui/fcontextPage.py
|
||||
@@ -133,7 +133,11 @@ class fcontextPage(semanagePage):
|
||||
self.fcontext = seobject.fcontextRecords()
|
||||
self.store.clear()
|
||||
fcon_dict = self.fcontext.get_all(self.local)
|
||||
- for k in sorted(fcon_dict.keys()):
|
||||
+ if self.local:
|
||||
+ fkeys = fcon_dict.keys()
|
||||
+ else:
|
||||
+ fkeys = sorted(fcon_dict.keys())
|
||||
+ for k in fkeys:
|
||||
if not self.match(fcon_dict, k, filter):
|
||||
continue
|
||||
iter = self.store.append()
|
||||
diff --git a/python/semanage/seobject.py b/python/semanage/seobject.py
|
||||
index dfb15b1d77e4..25ec43154848 100644
|
||||
--- a/python/semanage/seobject.py
|
||||
+++ b/python/semanage/seobject.py
|
||||
@@ -2735,7 +2735,7 @@ class fcontextRecords(semanageRecords):
|
||||
def customized(self):
|
||||
l = []
|
||||
fcon_dict = self.get_all(True)
|
||||
- for k in sorted(fcon_dict.keys()):
|
||||
+ for k in fcon_dict.keys():
|
||||
if fcon_dict[k]:
|
||||
if fcon_dict[k][3]:
|
||||
l.append("-a -f %s -t %s -r '%s' '%s'" % (file_type_str_to_option[k[1]], fcon_dict[k][2], fcon_dict[k][3], k[0]))
|
||||
@@ -2752,7 +2752,12 @@ class fcontextRecords(semanageRecords):
|
||||
if len(fcon_dict) != 0:
|
||||
if heading:
|
||||
print("%-50s %-18s %s\n" % (_("SELinux fcontext"), _("type"), _("Context")))
|
||||
- for k in sorted(fcon_dict.keys()):
|
||||
+ # do not sort local customizations since they are evaluated based on the order they where added in
|
||||
+ if locallist:
|
||||
+ fkeys = fcon_dict.keys()
|
||||
+ else:
|
||||
+ fkeys = sorted(fcon_dict.keys())
|
||||
+ for k in fkeys:
|
||||
if fcon_dict[k]:
|
||||
if is_mls_enabled:
|
||||
print("%-50s %-18s %s:%s:%s:%s " % (k[0], k[1], fcon_dict[k][0], fcon_dict[k][1], fcon_dict[k][2], translate(fcon_dict[k][3], False)))
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
From 0387db55278c10e04a7a507d2e1a6d028d5de0bf Mon Sep 17 00:00:00 2001
|
||||
From: Petr Lautrbach <lautrbach@redhat.com>
|
||||
Date: Wed, 17 May 2023 13:09:58 +0200
|
||||
Subject: [PATCH] semanage: Drop unnecessary import from seobject
|
||||
Content-type: text/plain
|
||||
|
||||
sepolgen.module is not used for permissive domains
|
||||
|
||||
Signed-off-by: Petr Lautrbach <lautrbach@redhat.com>
|
||||
---
|
||||
python/semanage/seobject.py | 5 -----
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/python/semanage/seobject.py b/python/semanage/seobject.py
|
||||
index 2b1eb44ce8a3..361205d11c10 100644
|
||||
--- a/python/semanage/seobject.py
|
||||
+++ b/python/semanage/seobject.py
|
||||
@@ -504,11 +504,6 @@ class permissiveRecords(semanageRecords):
|
||||
print(t)
|
||||
|
||||
def add(self, type):
|
||||
- try:
|
||||
- import sepolgen.module as module
|
||||
- except ImportError:
|
||||
- raise ValueError(_("The sepolgen python module is required to setup permissive domains.\nIn some distributions it is included in the policycoreutils-devel package.\n# yum install policycoreutils-devel\nOr similar for your distro."))
|
||||
-
|
||||
name = "permissive_%s" % type
|
||||
modtxt = "(typepermissive %s)" % type
|
||||
|
||||
--
|
||||
2.41.0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue