* [PATCH] scripts/selinux: modernize mdp
@ 2019-02-20 12:33 Dominick Grift
2019-02-20 14:09 ` Dominick Grift
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Dominick Grift @ 2019-02-20 12:33 UTC (permalink / raw)
To: selinux; +Cc: Dominick Grift
The MDP example no longer works on modern systems.
Add support for devtmpfs. This is required by login programs to relabel terminals.
Compile the policy with deny_unknown allow status to anticipate user space object managers in core components such as systemd.
Add default seusers mapping and failsafe context for the SELinux PAM module.
Signed-off-by: Dominick Grift <dominick.grift@defensec.nl>
---
scripts/selinux/install_policy.sh | 6 +++++-
scripts/selinux/mdp/mdp.c | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/scripts/selinux/install_policy.sh b/scripts/selinux/install_policy.sh
index 0b86c47baf7d..334fcf8903d5 100755
--- a/scripts/selinux/install_policy.sh
+++ b/scripts/selinux/install_policy.sh
@@ -20,14 +20,18 @@ CP=`which checkpolicy`
VERS=`$CP -V | awk '{print $1}'`
./mdp policy.conf file_contexts
-$CP -o policy.$VERS policy.conf
+$CP -U allow -o policy.$VERS policy.conf
mkdir -p /etc/selinux/dummy/policy
mkdir -p /etc/selinux/dummy/contexts/files
+echo "__default__:user_u" > /etc/selinux/dummy/seusers
+echo "base_r:base_t" > /etc/selinux/dummy/contexts/failsafe_context
+
cp file_contexts /etc/selinux/dummy/contexts/files
cp dbus_contexts /etc/selinux/dummy/contexts
cp policy.$VERS /etc/selinux/dummy/policy
+
FC_FILE=/etc/selinux/dummy/contexts/files/file_contexts
if [ ! -d /etc/selinux ]; then
diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c
index 073fe7537f6c..cf06d5694cbc 100644
--- a/scripts/selinux/mdp/mdp.c
+++ b/scripts/selinux/mdp/mdp.c
@@ -131,6 +131,7 @@ int main(int argc, char *argv[])
fprintf(fout, "fs_use_trans mqueue user_u:base_r:base_t;\n");
fprintf(fout, "fs_use_trans devpts user_u:base_r:base_t;\n");
+ fprintf(fout, "fs_use_trans devtmpfs user_u:base_r:base_t;\n");
fprintf(fout, "fs_use_trans hugetlbfs user_u:base_r:base_t;\n");
fprintf(fout, "fs_use_trans tmpfs user_u:base_r:base_t;\n");
fprintf(fout, "fs_use_trans shm user_u:base_r:base_t;\n");
--
2.21.0.rc1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH] scripts/selinux: modernize mdp
2019-02-20 12:33 [PATCH] scripts/selinux: modernize mdp Dominick Grift
@ 2019-02-20 14:09 ` Dominick Grift
2019-02-20 14:47 ` Dominick Grift
2019-02-20 15:19 ` [PATCH v2] " Dominick Grift
2019-02-20 15:34 ` [PATCH v3] " Dominick Grift
2 siblings, 1 reply; 11+ messages in thread
From: Dominick Grift @ 2019-02-20 14:09 UTC (permalink / raw)
To: selinux
On Wed, Feb 20, 2019 at 01:33:54PM +0100, Dominick Grift wrote:
> The MDP example no longer works on modern systems.
>
> Add support for devtmpfs. This is required by login programs to relabel terminals.
> Compile the policy with deny_unknown allow status to anticipate user space object managers in core components such as systemd.
> Add default seusers mapping and failsafe context for the SELinux PAM module.
There are a couple more possible improvements that i have identified:
Fail gracefully if checkpolicy does not exist
Run setfiles with -F. There *might* be one scenario where this might be a good idea. Where the filesystem is labeled with invalid contexts but where SELinux is disabled.
In that case setfiles will reset, but only types (I suppose)
>
> Signed-off-by: Dominick Grift <dominick.grift@defensec.nl>
> ---
> scripts/selinux/install_policy.sh | 6 +++++-
> scripts/selinux/mdp/mdp.c | 1 +
> 2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/selinux/install_policy.sh b/scripts/selinux/install_policy.sh
> index 0b86c47baf7d..334fcf8903d5 100755
> --- a/scripts/selinux/install_policy.sh
> +++ b/scripts/selinux/install_policy.sh
> @@ -20,14 +20,18 @@ CP=`which checkpolicy`
> VERS=`$CP -V | awk '{print $1}'`
>
> ./mdp policy.conf file_contexts
> -$CP -o policy.$VERS policy.conf
> +$CP -U allow -o policy.$VERS policy.conf
>
> mkdir -p /etc/selinux/dummy/policy
> mkdir -p /etc/selinux/dummy/contexts/files
>
> +echo "__default__:user_u" > /etc/selinux/dummy/seusers
> +echo "base_r:base_t" > /etc/selinux/dummy/contexts/failsafe_context
> +
> cp file_contexts /etc/selinux/dummy/contexts/files
> cp dbus_contexts /etc/selinux/dummy/contexts
> cp policy.$VERS /etc/selinux/dummy/policy
> +
> FC_FILE=/etc/selinux/dummy/contexts/files/file_contexts
>
> if [ ! -d /etc/selinux ]; then
> diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c
> index 073fe7537f6c..cf06d5694cbc 100644
> --- a/scripts/selinux/mdp/mdp.c
> +++ b/scripts/selinux/mdp/mdp.c
> @@ -131,6 +131,7 @@ int main(int argc, char *argv[])
>
> fprintf(fout, "fs_use_trans mqueue user_u:base_r:base_t;\n");
> fprintf(fout, "fs_use_trans devpts user_u:base_r:base_t;\n");
> + fprintf(fout, "fs_use_trans devtmpfs user_u:base_r:base_t;\n");
> fprintf(fout, "fs_use_trans hugetlbfs user_u:base_r:base_t;\n");
> fprintf(fout, "fs_use_trans tmpfs user_u:base_r:base_t;\n");
> fprintf(fout, "fs_use_trans shm user_u:base_r:base_t;\n");
> --
> 2.21.0.rc1
>
--
Key fingerprint = 5F4D 3CDB D3F8 3652 FBD8 02D5 3B6C 5F1D 2C7B 6B02
https://sks-keyservers.net/pks/lookup?op=get&search=0x3B6C5F1D2C7B6B02
Dominick Grift
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] scripts/selinux: modernize mdp
2019-02-20 14:09 ` Dominick Grift
@ 2019-02-20 14:47 ` Dominick Grift
2019-02-20 19:21 ` Stephen Smalley
0 siblings, 1 reply; 11+ messages in thread
From: Dominick Grift @ 2019-02-20 14:47 UTC (permalink / raw)
To: selinux
On Wed, Feb 20, 2019 at 03:09:22PM +0100, Dominick Grift wrote:
> On Wed, Feb 20, 2019 at 01:33:54PM +0100, Dominick Grift wrote:
> > The MDP example no longer works on modern systems.
> >
> > Add support for devtmpfs. This is required by login programs to relabel terminals.
> > Compile the policy with deny_unknown allow status to anticipate user space object managers in core components such as systemd.
> > Add default seusers mapping and failsafe context for the SELinux PAM module.
>
> There are a couple more possible improvements that i have identified:
>
> Fail gracefully if checkpolicy does not exist
> Run setfiles with -F. There *might* be one scenario where this might be a good idea. Where the filesystem is labeled with invalid contexts but where SELinux is disabled.
> In that case setfiles will reset, but only types (I suppose)
This also does not make sense to me:
if [ -f /sbin/setfiles ]; then
SF="/usr/setfiles"
I think "-f /usr/setfiles" was meant here? I suppose `which setfiles` only searches "PATH", and so it wouldnt find /usr/setfiles.
But then, who uses /usr/setfiles?
>
> >
> > Signed-off-by: Dominick Grift <dominick.grift@defensec.nl>
> > ---
> > scripts/selinux/install_policy.sh | 6 +++++-
> > scripts/selinux/mdp/mdp.c | 1 +
> > 2 files changed, 6 insertions(+), 1 deletion(-)
> >
> > diff --git a/scripts/selinux/install_policy.sh b/scripts/selinux/install_policy.sh
> > index 0b86c47baf7d..334fcf8903d5 100755
> > --- a/scripts/selinux/install_policy.sh
> > +++ b/scripts/selinux/install_policy.sh
> > @@ -20,14 +20,18 @@ CP=`which checkpolicy`
> > VERS=`$CP -V | awk '{print $1}'`
> >
> > ./mdp policy.conf file_contexts
> > -$CP -o policy.$VERS policy.conf
> > +$CP -U allow -o policy.$VERS policy.conf
> >
> > mkdir -p /etc/selinux/dummy/policy
> > mkdir -p /etc/selinux/dummy/contexts/files
> >
> > +echo "__default__:user_u" > /etc/selinux/dummy/seusers
> > +echo "base_r:base_t" > /etc/selinux/dummy/contexts/failsafe_context
> > +
> > cp file_contexts /etc/selinux/dummy/contexts/files
> > cp dbus_contexts /etc/selinux/dummy/contexts
> > cp policy.$VERS /etc/selinux/dummy/policy
> > +
> > FC_FILE=/etc/selinux/dummy/contexts/files/file_contexts
> >
> > if [ ! -d /etc/selinux ]; then
> > diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c
> > index 073fe7537f6c..cf06d5694cbc 100644
> > --- a/scripts/selinux/mdp/mdp.c
> > +++ b/scripts/selinux/mdp/mdp.c
> > @@ -131,6 +131,7 @@ int main(int argc, char *argv[])
> >
> > fprintf(fout, "fs_use_trans mqueue user_u:base_r:base_t;\n");
> > fprintf(fout, "fs_use_trans devpts user_u:base_r:base_t;\n");
> > + fprintf(fout, "fs_use_trans devtmpfs user_u:base_r:base_t;\n");
> > fprintf(fout, "fs_use_trans hugetlbfs user_u:base_r:base_t;\n");
> > fprintf(fout, "fs_use_trans tmpfs user_u:base_r:base_t;\n");
> > fprintf(fout, "fs_use_trans shm user_u:base_r:base_t;\n");
> > --
> > 2.21.0.rc1
> >
>
> --
> Key fingerprint = 5F4D 3CDB D3F8 3652 FBD8 02D5 3B6C 5F1D 2C7B 6B02
> https://sks-keyservers.net/pks/lookup?op=get&search=0x3B6C5F1D2C7B6B02
> Dominick Grift
--
Key fingerprint = 5F4D 3CDB D3F8 3652 FBD8 02D5 3B6C 5F1D 2C7B 6B02
https://sks-keyservers.net/pks/lookup?op=get&search=0x3B6C5F1D2C7B6B02
Dominick Grift
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2] scripts/selinux: modernize mdp
2019-02-20 12:33 [PATCH] scripts/selinux: modernize mdp Dominick Grift
2019-02-20 14:09 ` Dominick Grift
@ 2019-02-20 15:19 ` Dominick Grift
2019-02-20 15:34 ` [PATCH v3] " Dominick Grift
2 siblings, 0 replies; 11+ messages in thread
From: Dominick Grift @ 2019-02-20 15:19 UTC (permalink / raw)
To: selinux; +Cc: Dominick Grift
The MDP example no longer works on modern systems.
Add support for devtmpfs. This is required by login programs to relabel terminals.
Compile the policy with deny_unknown allow status to anticipate user space object managers in core components such as systemd.
Add default seusers mapping and failsafe context for the SELinux PAM module.
V2:
Fix existing file test for setfiles.
Add a file test for checkpolicy similar to the test for setfiles for consistency.
Execute setfiles with -F to ensure that customizables are relabeled as well in scenarios where filesystems are labeled but where SELinux is disabled.
Signed-off-by: Dominick Grift <dominick.grift@defensec.nl>
---
scripts/selinux/install_policy.sh | 21 ++++++++++++++++-----
scripts/selinux/mdp/mdp.c | 1 +
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/scripts/selinux/install_policy.sh b/scripts/selinux/install_policy.sh
index 0b86c47baf7d..c993178e6ee7 100755
--- a/scripts/selinux/install_policy.sh
+++ b/scripts/selinux/install_policy.sh
@@ -6,7 +6,7 @@ if [ `id -u` -ne 0 ]; then
fi
SF=`which setfiles`
if [ $? -eq 1 ]; then
- if [ -f /sbin/setfiles ]; then
+ if [ -f /usr/setfiles ]; then
SF="/usr/setfiles"
else
echo "no selinux tools installed: setfiles"
@@ -17,14 +17,25 @@ fi
cd mdp
CP=`which checkpolicy`
+if [ $? -eq 1 ]; then
+ if [ -f /usr/checkpolicy ]; then
+ SF="/usr/checkpolicy"
+ else
+ echo "no selinux tools installed: checkpolicy"
+ exit 1
+ fi
+fi
VERS=`$CP -V | awk '{print $1}'`
./mdp policy.conf file_contexts
-$CP -o policy.$VERS policy.conf
+$CP -U allow -o policy.$VERS policy.conf
mkdir -p /etc/selinux/dummy/policy
mkdir -p /etc/selinux/dummy/contexts/files
+echo "__default__:user_u" > /etc/selinux/dummy/seusers
+echo "base_r:base_t" > /etc/selinux/dummy/contexts/failsafe_context
+
cp file_contexts /etc/selinux/dummy/contexts/files
cp dbus_contexts /etc/selinux/dummy/contexts
cp policy.$VERS /etc/selinux/dummy/policy
@@ -55,15 +66,15 @@ else
fi
cd /etc/selinux/dummy/contexts/files
-$SF file_contexts /
+$SF -F file_contexts /
mounts=`cat /proc/$$/mounts | egrep "ext2|ext3|xfs|jfs|ext4|ext4dev|gfs2" | awk '{ print $2 '}`
-$SF file_contexts $mounts
+$SF -F file_contexts $mounts
dodev=`cat /proc/$$/mounts | grep "/dev "`
if [ "eq$dodev" != "eq" ]; then
mount --move /dev /mnt
- $SF file_contexts /dev
+ $SF -F file_contexts /dev
mount --move /mnt /dev
fi
diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c
index 073fe7537f6c..cf06d5694cbc 100644
--- a/scripts/selinux/mdp/mdp.c
+++ b/scripts/selinux/mdp/mdp.c
@@ -131,6 +131,7 @@ int main(int argc, char *argv[])
fprintf(fout, "fs_use_trans mqueue user_u:base_r:base_t;\n");
fprintf(fout, "fs_use_trans devpts user_u:base_r:base_t;\n");
+ fprintf(fout, "fs_use_trans devtmpfs user_u:base_r:base_t;\n");
fprintf(fout, "fs_use_trans hugetlbfs user_u:base_r:base_t;\n");
fprintf(fout, "fs_use_trans tmpfs user_u:base_r:base_t;\n");
fprintf(fout, "fs_use_trans shm user_u:base_r:base_t;\n");
--
2.21.0.rc1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v3] scripts/selinux: modernize mdp
2019-02-20 12:33 [PATCH] scripts/selinux: modernize mdp Dominick Grift
2019-02-20 14:09 ` Dominick Grift
2019-02-20 15:19 ` [PATCH v2] " Dominick Grift
@ 2019-02-20 15:34 ` Dominick Grift
2019-02-20 19:34 ` Stephen Smalley
2 siblings, 1 reply; 11+ messages in thread
From: Dominick Grift @ 2019-02-20 15:34 UTC (permalink / raw)
To: selinux; +Cc: Dominick Grift
The MDP example no longer works on modern systems.
Add support for devtmpfs. This is required by login programs to relabel terminals.
Compile the policy with deny_unknown allow status to anticipate user space object managers in core components such as systemd.
Add default seusers mapping and failsafe context for the SELinux PAM module.
V2:
Fix existing file test for setfiles.
Add a file test for checkpolicy similar to the test for setfiles for consistency.
Execute setfiles with -F to ensure that customizables are relabeled as well in scenarios where filesystems are labeled but where SELinux is disabled.
V3: Fixes file test that was introduced in V2.
Signed-off-by: Dominick Grift <dominick.grift@defensec.nl>
---
scripts/selinux/install_policy.sh | 21 ++++++++++++++++-----
scripts/selinux/mdp/mdp.c | 1 +
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/scripts/selinux/install_policy.sh b/scripts/selinux/install_policy.sh
index 0b86c47baf7d..e32f333f14cc 100755
--- a/scripts/selinux/install_policy.sh
+++ b/scripts/selinux/install_policy.sh
@@ -6,7 +6,7 @@ if [ `id -u` -ne 0 ]; then
fi
SF=`which setfiles`
if [ $? -eq 1 ]; then
- if [ -f /sbin/setfiles ]; then
+ if [ -f /usr/setfiles ]; then
SF="/usr/setfiles"
else
echo "no selinux tools installed: setfiles"
@@ -17,14 +17,25 @@ fi
cd mdp
CP=`which checkpolicy`
+if [ $? -eq 1 ]; then
+ if [ -f /usr/checkpolicy ]; then
+ CP="/usr/checkpolicy"
+ else
+ echo "no selinux tools installed: checkpolicy"
+ exit 1
+ fi
+fi
VERS=`$CP -V | awk '{print $1}'`
./mdp policy.conf file_contexts
-$CP -o policy.$VERS policy.conf
+$CP -U allow -o policy.$VERS policy.conf
mkdir -p /etc/selinux/dummy/policy
mkdir -p /etc/selinux/dummy/contexts/files
+echo "__default__:user_u" > /etc/selinux/dummy/seusers
+echo "base_r:base_t" > /etc/selinux/dummy/contexts/failsafe_context
+
cp file_contexts /etc/selinux/dummy/contexts/files
cp dbus_contexts /etc/selinux/dummy/contexts
cp policy.$VERS /etc/selinux/dummy/policy
@@ -55,15 +66,15 @@ else
fi
cd /etc/selinux/dummy/contexts/files
-$SF file_contexts /
+$SF -F file_contexts /
mounts=`cat /proc/$$/mounts | egrep "ext2|ext3|xfs|jfs|ext4|ext4dev|gfs2" | awk '{ print $2 '}`
-$SF file_contexts $mounts
+$SF -F file_contexts $mounts
dodev=`cat /proc/$$/mounts | grep "/dev "`
if [ "eq$dodev" != "eq" ]; then
mount --move /dev /mnt
- $SF file_contexts /dev
+ $SF -F file_contexts /dev
mount --move /mnt /dev
fi
diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c
index 073fe7537f6c..cf06d5694cbc 100644
--- a/scripts/selinux/mdp/mdp.c
+++ b/scripts/selinux/mdp/mdp.c
@@ -131,6 +131,7 @@ int main(int argc, char *argv[])
fprintf(fout, "fs_use_trans mqueue user_u:base_r:base_t;\n");
fprintf(fout, "fs_use_trans devpts user_u:base_r:base_t;\n");
+ fprintf(fout, "fs_use_trans devtmpfs user_u:base_r:base_t;\n");
fprintf(fout, "fs_use_trans hugetlbfs user_u:base_r:base_t;\n");
fprintf(fout, "fs_use_trans tmpfs user_u:base_r:base_t;\n");
fprintf(fout, "fs_use_trans shm user_u:base_r:base_t;\n");
--
2.21.0.rc1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH] scripts/selinux: modernize mdp
2019-02-20 14:47 ` Dominick Grift
@ 2019-02-20 19:21 ` Stephen Smalley
2019-02-20 19:25 ` Stephen Smalley
0 siblings, 1 reply; 11+ messages in thread
From: Stephen Smalley @ 2019-02-20 19:21 UTC (permalink / raw)
To: Dominick Grift; +Cc: selinux
On Wed, Feb 20, 2019 at 9:48 AM Dominick Grift
<dominick.grift@defensec.nl> wrote:
>
> On Wed, Feb 20, 2019 at 03:09:22PM +0100, Dominick Grift wrote:
> > On Wed, Feb 20, 2019 at 01:33:54PM +0100, Dominick Grift wrote:
> > > The MDP example no longer works on modern systems.
> > >
> > > Add support for devtmpfs. This is required by login programs to relabel terminals.
> > > Compile the policy with deny_unknown allow status to anticipate user space object managers in core components such as systemd.
> > > Add default seusers mapping and failsafe context for the SELinux PAM module.
> >
> > There are a couple more possible improvements that i have identified:
> >
> > Fail gracefully if checkpolicy does not exist
> > Run setfiles with -F. There *might* be one scenario where this might be a good idea. Where the filesystem is labeled with invalid contexts but where SELinux is disabled.
> > In that case setfiles will reset, but only types (I suppose)
>
> This also does not make sense to me:
>
> if [ -f /sbin/setfiles ]; then
> SF="/usr/setfiles"
>
> I think "-f /usr/setfiles" was meant here? I suppose `which setfiles` only searches "PATH", and so it wouldnt find /usr/setfiles.
> But then, who uses /usr/setfiles?
No one AFAIK. So I agree that this does not make sense. Might have
been a broken attempt to support either /sbin/setfiles or
/usr/sbin/setfiles as the install location of setfiles, since that did
change at some point.
>
> >
> > >
> > > Signed-off-by: Dominick Grift <dominick.grift@defensec.nl>
> > > ---
> > > scripts/selinux/install_policy.sh | 6 +++++-
> > > scripts/selinux/mdp/mdp.c | 1 +
> > > 2 files changed, 6 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/scripts/selinux/install_policy.sh b/scripts/selinux/install_policy.sh
> > > index 0b86c47baf7d..334fcf8903d5 100755
> > > --- a/scripts/selinux/install_policy.sh
> > > +++ b/scripts/selinux/install_policy.sh
> > > @@ -20,14 +20,18 @@ CP=`which checkpolicy`
> > > VERS=`$CP -V | awk '{print $1}'`
> > >
> > > ./mdp policy.conf file_contexts
> > > -$CP -o policy.$VERS policy.conf
> > > +$CP -U allow -o policy.$VERS policy.conf
> > >
> > > mkdir -p /etc/selinux/dummy/policy
> > > mkdir -p /etc/selinux/dummy/contexts/files
> > >
> > > +echo "__default__:user_u" > /etc/selinux/dummy/seusers
> > > +echo "base_r:base_t" > /etc/selinux/dummy/contexts/failsafe_context
> > > +
> > > cp file_contexts /etc/selinux/dummy/contexts/files
> > > cp dbus_contexts /etc/selinux/dummy/contexts
> > > cp policy.$VERS /etc/selinux/dummy/policy
> > > +
> > > FC_FILE=/etc/selinux/dummy/contexts/files/file_contexts
> > >
> > > if [ ! -d /etc/selinux ]; then
> > > diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c
> > > index 073fe7537f6c..cf06d5694cbc 100644
> > > --- a/scripts/selinux/mdp/mdp.c
> > > +++ b/scripts/selinux/mdp/mdp.c
> > > @@ -131,6 +131,7 @@ int main(int argc, char *argv[])
> > >
> > > fprintf(fout, "fs_use_trans mqueue user_u:base_r:base_t;\n");
> > > fprintf(fout, "fs_use_trans devpts user_u:base_r:base_t;\n");
> > > + fprintf(fout, "fs_use_trans devtmpfs user_u:base_r:base_t;\n");
> > > fprintf(fout, "fs_use_trans hugetlbfs user_u:base_r:base_t;\n");
> > > fprintf(fout, "fs_use_trans tmpfs user_u:base_r:base_t;\n");
> > > fprintf(fout, "fs_use_trans shm user_u:base_r:base_t;\n");
> > > --
> > > 2.21.0.rc1
> > >
> >
> > --
> > Key fingerprint = 5F4D 3CDB D3F8 3652 FBD8 02D5 3B6C 5F1D 2C7B 6B02
> > https://sks-keyservers.net/pks/lookup?op=get&search=0x3B6C5F1D2C7B6B02
> > Dominick Grift
>
> --
> Key fingerprint = 5F4D 3CDB D3F8 3652 FBD8 02D5 3B6C 5F1D 2C7B 6B02
> https://sks-keyservers.net/pks/lookup?op=get&search=0x3B6C5F1D2C7B6B02
> Dominick Grift
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] scripts/selinux: modernize mdp
2019-02-20 19:21 ` Stephen Smalley
@ 2019-02-20 19:25 ` Stephen Smalley
2019-02-20 19:35 ` Dominick Grift
0 siblings, 1 reply; 11+ messages in thread
From: Stephen Smalley @ 2019-02-20 19:25 UTC (permalink / raw)
To: Dominick Grift; +Cc: selinux
On Wed, Feb 20, 2019 at 2:21 PM Stephen Smalley
<stephen.smalley@gmail.com> wrote:
>
> On Wed, Feb 20, 2019 at 9:48 AM Dominick Grift
> <dominick.grift@defensec.nl> wrote:
> >
> > On Wed, Feb 20, 2019 at 03:09:22PM +0100, Dominick Grift wrote:
> > > On Wed, Feb 20, 2019 at 01:33:54PM +0100, Dominick Grift wrote:
> > > > The MDP example no longer works on modern systems.
> > > >
> > > > Add support for devtmpfs. This is required by login programs to relabel terminals.
> > > > Compile the policy with deny_unknown allow status to anticipate user space object managers in core components such as systemd.
> > > > Add default seusers mapping and failsafe context for the SELinux PAM module.
> > >
> > > There are a couple more possible improvements that i have identified:
> > >
> > > Fail gracefully if checkpolicy does not exist
> > > Run setfiles with -F. There *might* be one scenario where this might be a good idea. Where the filesystem is labeled with invalid contexts but where SELinux is disabled.
> > > In that case setfiles will reset, but only types (I suppose)
> >
> > This also does not make sense to me:
> >
> > if [ -f /sbin/setfiles ]; then
> > SF="/usr/setfiles"
> >
> > I think "-f /usr/setfiles" was meant here? I suppose `which setfiles` only searches "PATH", and so it wouldnt find /usr/setfiles.
> > But then, who uses /usr/setfiles?
>
> No one AFAIK. So I agree that this does not make sense. Might have
> been a broken attempt to support either /sbin/setfiles or
> /usr/sbin/setfiles as the install location of setfiles, since that did
> change at some point.
Or if as you say it was just an attempt to deal with a PATH that omits
/sbin, then maybe they should both be /sbin/setfiles.
>
> >
> > >
> > > >
> > > > Signed-off-by: Dominick Grift <dominick.grift@defensec.nl>
> > > > ---
> > > > scripts/selinux/install_policy.sh | 6 +++++-
> > > > scripts/selinux/mdp/mdp.c | 1 +
> > > > 2 files changed, 6 insertions(+), 1 deletion(-)
> > > >
> > > > diff --git a/scripts/selinux/install_policy.sh b/scripts/selinux/install_policy.sh
> > > > index 0b86c47baf7d..334fcf8903d5 100755
> > > > --- a/scripts/selinux/install_policy.sh
> > > > +++ b/scripts/selinux/install_policy.sh
> > > > @@ -20,14 +20,18 @@ CP=`which checkpolicy`
> > > > VERS=`$CP -V | awk '{print $1}'`
> > > >
> > > > ./mdp policy.conf file_contexts
> > > > -$CP -o policy.$VERS policy.conf
> > > > +$CP -U allow -o policy.$VERS policy.conf
> > > >
> > > > mkdir -p /etc/selinux/dummy/policy
> > > > mkdir -p /etc/selinux/dummy/contexts/files
> > > >
> > > > +echo "__default__:user_u" > /etc/selinux/dummy/seusers
> > > > +echo "base_r:base_t" > /etc/selinux/dummy/contexts/failsafe_context
> > > > +
> > > > cp file_contexts /etc/selinux/dummy/contexts/files
> > > > cp dbus_contexts /etc/selinux/dummy/contexts
> > > > cp policy.$VERS /etc/selinux/dummy/policy
> > > > +
> > > > FC_FILE=/etc/selinux/dummy/contexts/files/file_contexts
> > > >
> > > > if [ ! -d /etc/selinux ]; then
> > > > diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c
> > > > index 073fe7537f6c..cf06d5694cbc 100644
> > > > --- a/scripts/selinux/mdp/mdp.c
> > > > +++ b/scripts/selinux/mdp/mdp.c
> > > > @@ -131,6 +131,7 @@ int main(int argc, char *argv[])
> > > >
> > > > fprintf(fout, "fs_use_trans mqueue user_u:base_r:base_t;\n");
> > > > fprintf(fout, "fs_use_trans devpts user_u:base_r:base_t;\n");
> > > > + fprintf(fout, "fs_use_trans devtmpfs user_u:base_r:base_t;\n");
> > > > fprintf(fout, "fs_use_trans hugetlbfs user_u:base_r:base_t;\n");
> > > > fprintf(fout, "fs_use_trans tmpfs user_u:base_r:base_t;\n");
> > > > fprintf(fout, "fs_use_trans shm user_u:base_r:base_t;\n");
> > > > --
> > > > 2.21.0.rc1
> > > >
> > >
> > > --
> > > Key fingerprint = 5F4D 3CDB D3F8 3652 FBD8 02D5 3B6C 5F1D 2C7B 6B02
> > > https://sks-keyservers.net/pks/lookup?op=get&search=0x3B6C5F1D2C7B6B02
> > > Dominick Grift
> >
> > --
> > Key fingerprint = 5F4D 3CDB D3F8 3652 FBD8 02D5 3B6C 5F1D 2C7B 6B02
> > https://sks-keyservers.net/pks/lookup?op=get&search=0x3B6C5F1D2C7B6B02
> > Dominick Grift
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v3] scripts/selinux: modernize mdp
2019-02-20 15:34 ` [PATCH v3] " Dominick Grift
@ 2019-02-20 19:34 ` Stephen Smalley
2019-02-20 19:36 ` Dominick Grift
2019-02-20 20:25 ` Dominick Grift
0 siblings, 2 replies; 11+ messages in thread
From: Stephen Smalley @ 2019-02-20 19:34 UTC (permalink / raw)
To: Dominick Grift; +Cc: selinux
On Wed, Feb 20, 2019 at 10:34 AM Dominick Grift
<dominick.grift@defensec.nl> wrote:
>
> The MDP example no longer works on modern systems.
>
> Add support for devtmpfs. This is required by login programs to relabel terminals.
> Compile the policy with deny_unknown allow status to anticipate user space object managers in core components such as systemd.
> Add default seusers mapping and failsafe context for the SELinux PAM module.
>
> V2:
> Fix existing file test for setfiles.
> Add a file test for checkpolicy similar to the test for setfiles for consistency.
> Execute setfiles with -F to ensure that customizables are relabeled as well in scenarios where filesystems are labeled but where SELinux is disabled.
>
> V3: Fixes file test that was introduced in V2.
>
> Signed-off-by: Dominick Grift <dominick.grift@defensec.nl>
> ---
> scripts/selinux/install_policy.sh | 21 ++++++++++++++++-----
> scripts/selinux/mdp/mdp.c | 1 +
> 2 files changed, 17 insertions(+), 5 deletions(-)
>
> diff --git a/scripts/selinux/install_policy.sh b/scripts/selinux/install_policy.sh
> index 0b86c47baf7d..e32f333f14cc 100755
> --- a/scripts/selinux/install_policy.sh
> +++ b/scripts/selinux/install_policy.sh
> @@ -6,7 +6,7 @@ if [ `id -u` -ne 0 ]; then
> fi
> SF=`which setfiles`
> if [ $? -eq 1 ]; then
> - if [ -f /sbin/setfiles ]; then
> + if [ -f /usr/setfiles ]; then
> SF="/usr/setfiles"
I don't believe we've ever installed setfiles anywhere other than
/sbin/setfile or /usr/sbin/setfiles so no other locations should be
used. Maybe just drop the inner if statement entirely.
> else
> echo "no selinux tools installed: setfiles"
> @@ -17,14 +17,25 @@ fi
> cd mdp
>
> CP=`which checkpolicy`
> +if [ $? -eq 1 ]; then
> + if [ -f /usr/checkpolicy ]; then
> + CP="/usr/checkpolicy"
Similarly for /usr/bin/checkpolicy or /bin/checkpolicy.
> + else
> + echo "no selinux tools installed: checkpolicy"
> + exit 1
> + fi
> +fi
> VERS=`$CP -V | awk '{print $1}'`
>
> ./mdp policy.conf file_contexts
> -$CP -o policy.$VERS policy.conf
> +$CP -U allow -o policy.$VERS policy.conf
>
> mkdir -p /etc/selinux/dummy/policy
> mkdir -p /etc/selinux/dummy/contexts/files
>
> +echo "__default__:user_u" > /etc/selinux/dummy/seusers
> +echo "base_r:base_t" > /etc/selinux/dummy/contexts/failsafe_context
> +
> cp file_contexts /etc/selinux/dummy/contexts/files
> cp dbus_contexts /etc/selinux/dummy/contexts
> cp policy.$VERS /etc/selinux/dummy/policy
> @@ -55,15 +66,15 @@ else
> fi
>
> cd /etc/selinux/dummy/contexts/files
> -$SF file_contexts /
> +$SF -F file_contexts /
>
> mounts=`cat /proc/$$/mounts | egrep "ext2|ext3|xfs|jfs|ext4|ext4dev|gfs2" | awk '{ print $2 '}`
> -$SF file_contexts $mounts
> +$SF -F file_contexts $mounts
>
>
> dodev=`cat /proc/$$/mounts | grep "/dev "`
> if [ "eq$dodev" != "eq" ]; then
> mount --move /dev /mnt
I recall seeing errors from mount when running this script about
invalid usage of mount --move?
> - $SF file_contexts /dev
> + $SF -F file_contexts /dev
> mount --move /mnt /dev
> fi
> diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c
> index 073fe7537f6c..cf06d5694cbc 100644
> --- a/scripts/selinux/mdp/mdp.c
> +++ b/scripts/selinux/mdp/mdp.c
> @@ -131,6 +131,7 @@ int main(int argc, char *argv[])
>
> fprintf(fout, "fs_use_trans mqueue user_u:base_r:base_t;\n");
> fprintf(fout, "fs_use_trans devpts user_u:base_r:base_t;\n");
> + fprintf(fout, "fs_use_trans devtmpfs user_u:base_r:base_t;\n");
This will conflict with my patch but probably your patch should be
applied first since it fixes current usage of mdp, and then mine can
be re-based and introduce the MLS support (which hopefully can now be
tested on Fedora). Ideally we'd add fs_use* and genfscon statements
for all filesystems supported by the kernel but that can come later.
> fprintf(fout, "fs_use_trans hugetlbfs user_u:base_r:base_t;\n");
> fprintf(fout, "fs_use_trans tmpfs user_u:base_r:base_t;\n");
> fprintf(fout, "fs_use_trans shm user_u:base_r:base_t;\n");
> --
> 2.21.0.rc1
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] scripts/selinux: modernize mdp
2019-02-20 19:25 ` Stephen Smalley
@ 2019-02-20 19:35 ` Dominick Grift
0 siblings, 0 replies; 11+ messages in thread
From: Dominick Grift @ 2019-02-20 19:35 UTC (permalink / raw)
To: Stephen Smalley; +Cc: selinux
On Wed, Feb 20, 2019 at 02:25:16PM -0500, Stephen Smalley wrote:
> On Wed, Feb 20, 2019 at 2:21 PM Stephen Smalley
> <stephen.smalley@gmail.com> wrote:
> >
> > On Wed, Feb 20, 2019 at 9:48 AM Dominick Grift
> > <dominick.grift@defensec.nl> wrote:
> > >
> > > On Wed, Feb 20, 2019 at 03:09:22PM +0100, Dominick Grift wrote:
> > > > On Wed, Feb 20, 2019 at 01:33:54PM +0100, Dominick Grift wrote:
> > > > > The MDP example no longer works on modern systems.
> > > > >
> > > > > Add support for devtmpfs. This is required by login programs to relabel terminals.
> > > > > Compile the policy with deny_unknown allow status to anticipate user space object managers in core components such as systemd.
> > > > > Add default seusers mapping and failsafe context for the SELinux PAM module.
> > > >
> > > > There are a couple more possible improvements that i have identified:
> > > >
> > > > Fail gracefully if checkpolicy does not exist
> > > > Run setfiles with -F. There *might* be one scenario where this might be a good idea. Where the filesystem is labeled with invalid contexts but where SELinux is disabled.
> > > > In that case setfiles will reset, but only types (I suppose)
> > >
> > > This also does not make sense to me:
> > >
> > > if [ -f /sbin/setfiles ]; then
> > > SF="/usr/setfiles"
> > >
> > > I think "-f /usr/setfiles" was meant here? I suppose `which setfiles` only searches "PATH", and so it wouldnt find /usr/setfiles.
> > > But then, who uses /usr/setfiles?
> >
> > No one AFAIK. So I agree that this does not make sense. Might have
> > been a broken attempt to support either /sbin/setfiles or
> > /usr/sbin/setfiles as the install location of setfiles, since that did
> > change at some point.
>
> Or if as you say it was just an attempt to deal with a PATH that omits
> /sbin, then maybe they should both be /sbin/setfiles.
We should probably remove those particular file tests altogether?
If which does not find it then you have a problem that I am not we want to support?
Not to mention that we just dont know the reason for this and what is right or what is wrong?
>
> >
> > >
> > > >
> > > > >
> > > > > Signed-off-by: Dominick Grift <dominick.grift@defensec.nl>
> > > > > ---
> > > > > scripts/selinux/install_policy.sh | 6 +++++-
> > > > > scripts/selinux/mdp/mdp.c | 1 +
> > > > > 2 files changed, 6 insertions(+), 1 deletion(-)
> > > > >
> > > > > diff --git a/scripts/selinux/install_policy.sh b/scripts/selinux/install_policy.sh
> > > > > index 0b86c47baf7d..334fcf8903d5 100755
> > > > > --- a/scripts/selinux/install_policy.sh
> > > > > +++ b/scripts/selinux/install_policy.sh
> > > > > @@ -20,14 +20,18 @@ CP=`which checkpolicy`
> > > > > VERS=`$CP -V | awk '{print $1}'`
> > > > >
> > > > > ./mdp policy.conf file_contexts
> > > > > -$CP -o policy.$VERS policy.conf
> > > > > +$CP -U allow -o policy.$VERS policy.conf
> > > > >
> > > > > mkdir -p /etc/selinux/dummy/policy
> > > > > mkdir -p /etc/selinux/dummy/contexts/files
> > > > >
> > > > > +echo "__default__:user_u" > /etc/selinux/dummy/seusers
> > > > > +echo "base_r:base_t" > /etc/selinux/dummy/contexts/failsafe_context
> > > > > +
> > > > > cp file_contexts /etc/selinux/dummy/contexts/files
> > > > > cp dbus_contexts /etc/selinux/dummy/contexts
> > > > > cp policy.$VERS /etc/selinux/dummy/policy
> > > > > +
> > > > > FC_FILE=/etc/selinux/dummy/contexts/files/file_contexts
> > > > >
> > > > > if [ ! -d /etc/selinux ]; then
> > > > > diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c
> > > > > index 073fe7537f6c..cf06d5694cbc 100644
> > > > > --- a/scripts/selinux/mdp/mdp.c
> > > > > +++ b/scripts/selinux/mdp/mdp.c
> > > > > @@ -131,6 +131,7 @@ int main(int argc, char *argv[])
> > > > >
> > > > > fprintf(fout, "fs_use_trans mqueue user_u:base_r:base_t;\n");
> > > > > fprintf(fout, "fs_use_trans devpts user_u:base_r:base_t;\n");
> > > > > + fprintf(fout, "fs_use_trans devtmpfs user_u:base_r:base_t;\n");
> > > > > fprintf(fout, "fs_use_trans hugetlbfs user_u:base_r:base_t;\n");
> > > > > fprintf(fout, "fs_use_trans tmpfs user_u:base_r:base_t;\n");
> > > > > fprintf(fout, "fs_use_trans shm user_u:base_r:base_t;\n");
> > > > > --
> > > > > 2.21.0.rc1
> > > > >
> > > >
> > > > --
> > > > Key fingerprint = 5F4D 3CDB D3F8 3652 FBD8 02D5 3B6C 5F1D 2C7B 6B02
> > > > https://sks-keyservers.net/pks/lookup?op=get&search=0x3B6C5F1D2C7B6B02
> > > > Dominick Grift
> > >
> > > --
> > > Key fingerprint = 5F4D 3CDB D3F8 3652 FBD8 02D5 3B6C 5F1D 2C7B 6B02
> > > https://sks-keyservers.net/pks/lookup?op=get&search=0x3B6C5F1D2C7B6B02
> > > Dominick Grift
--
Key fingerprint = 5F4D 3CDB D3F8 3652 FBD8 02D5 3B6C 5F1D 2C7B 6B02
https://sks-keyservers.net/pks/lookup?op=get&search=0x3B6C5F1D2C7B6B02
Dominick Grift
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v3] scripts/selinux: modernize mdp
2019-02-20 19:34 ` Stephen Smalley
@ 2019-02-20 19:36 ` Dominick Grift
2019-02-20 20:25 ` Dominick Grift
1 sibling, 0 replies; 11+ messages in thread
From: Dominick Grift @ 2019-02-20 19:36 UTC (permalink / raw)
To: Stephen Smalley; +Cc: selinux
On Wed, Feb 20, 2019 at 02:34:16PM -0500, Stephen Smalley wrote:
> On Wed, Feb 20, 2019 at 10:34 AM Dominick Grift
> <dominick.grift@defensec.nl> wrote:
> >
> > The MDP example no longer works on modern systems.
> >
> > Add support for devtmpfs. This is required by login programs to relabel terminals.
> > Compile the policy with deny_unknown allow status to anticipate user space object managers in core components such as systemd.
> > Add default seusers mapping and failsafe context for the SELinux PAM module.
> >
> > V2:
> > Fix existing file test for setfiles.
> > Add a file test for checkpolicy similar to the test for setfiles for consistency.
> > Execute setfiles with -F to ensure that customizables are relabeled as well in scenarios where filesystems are labeled but where SELinux is disabled.
> >
> > V3: Fixes file test that was introduced in V2.
> >
> > Signed-off-by: Dominick Grift <dominick.grift@defensec.nl>
> > ---
> > scripts/selinux/install_policy.sh | 21 ++++++++++++++++-----
> > scripts/selinux/mdp/mdp.c | 1 +
> > 2 files changed, 17 insertions(+), 5 deletions(-)
> >
> > diff --git a/scripts/selinux/install_policy.sh b/scripts/selinux/install_policy.sh
> > index 0b86c47baf7d..e32f333f14cc 100755
> > --- a/scripts/selinux/install_policy.sh
> > +++ b/scripts/selinux/install_policy.sh
> > @@ -6,7 +6,7 @@ if [ `id -u` -ne 0 ]; then
> > fi
> > SF=`which setfiles`
> > if [ $? -eq 1 ]; then
> > - if [ -f /sbin/setfiles ]; then
> > + if [ -f /usr/setfiles ]; then
> > SF="/usr/setfiles"
>
> I don't believe we've ever installed setfiles anywhere other than
> /sbin/setfile or /usr/sbin/setfiles so no other locations should be
> used. Maybe just drop the inner if statement entirely.
I agree
>
> > else
> > echo "no selinux tools installed: setfiles"
> > @@ -17,14 +17,25 @@ fi
> > cd mdp
> >
> > CP=`which checkpolicy`
> > +if [ $? -eq 1 ]; then
> > + if [ -f /usr/checkpolicy ]; then
> > + CP="/usr/checkpolicy"
>
> Similarly for /usr/bin/checkpolicy or /bin/checkpolicy.
>
> > + else
> > + echo "no selinux tools installed: checkpolicy"
> > + exit 1
> > + fi
> > +fi
> > VERS=`$CP -V | awk '{print $1}'`
> >
> > ./mdp policy.conf file_contexts
> > -$CP -o policy.$VERS policy.conf
> > +$CP -U allow -o policy.$VERS policy.conf
> >
> > mkdir -p /etc/selinux/dummy/policy
> > mkdir -p /etc/selinux/dummy/contexts/files
> >
> > +echo "__default__:user_u" > /etc/selinux/dummy/seusers
> > +echo "base_r:base_t" > /etc/selinux/dummy/contexts/failsafe_context
> > +
> > cp file_contexts /etc/selinux/dummy/contexts/files
> > cp dbus_contexts /etc/selinux/dummy/contexts
> > cp policy.$VERS /etc/selinux/dummy/policy
> > @@ -55,15 +66,15 @@ else
> > fi
> >
> > cd /etc/selinux/dummy/contexts/files
> > -$SF file_contexts /
> > +$SF -F file_contexts /
> >
> > mounts=`cat /proc/$$/mounts | egrep "ext2|ext3|xfs|jfs|ext4|ext4dev|gfs2" | awk '{ print $2 '}`
> > -$SF file_contexts $mounts
> > +$SF -F file_contexts $mounts
> >
> >
> > dodev=`cat /proc/$$/mounts | grep "/dev "`
> > if [ "eq$dodev" != "eq" ]; then
> > mount --move /dev /mnt
>
> I recall seeing errors from mount when running this script about
> invalid usage of mount --move?
>
> > - $SF file_contexts /dev
> > + $SF -F file_contexts /dev
> > mount --move /mnt /dev
> > fi
> > diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c
> > index 073fe7537f6c..cf06d5694cbc 100644
> > --- a/scripts/selinux/mdp/mdp.c
> > +++ b/scripts/selinux/mdp/mdp.c
> > @@ -131,6 +131,7 @@ int main(int argc, char *argv[])
> >
> > fprintf(fout, "fs_use_trans mqueue user_u:base_r:base_t;\n");
> > fprintf(fout, "fs_use_trans devpts user_u:base_r:base_t;\n");
> > + fprintf(fout, "fs_use_trans devtmpfs user_u:base_r:base_t;\n");
>
> This will conflict with my patch but probably your patch should be
> applied first since it fixes current usage of mdp, and then mine can
> be re-based and introduce the MLS support (which hopefully can now be
> tested on Fedora). Ideally we'd add fs_use* and genfscon statements
> for all filesystems supported by the kernel but that can come later.
>
> > fprintf(fout, "fs_use_trans hugetlbfs user_u:base_r:base_t;\n");
> > fprintf(fout, "fs_use_trans tmpfs user_u:base_r:base_t;\n");
> > fprintf(fout, "fs_use_trans shm user_u:base_r:base_t;\n");
> > --
> > 2.21.0.rc1
> >
--
Key fingerprint = 5F4D 3CDB D3F8 3652 FBD8 02D5 3B6C 5F1D 2C7B 6B02
https://sks-keyservers.net/pks/lookup?op=get&search=0x3B6C5F1D2C7B6B02
Dominick Grift
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v3] scripts/selinux: modernize mdp
2019-02-20 19:34 ` Stephen Smalley
2019-02-20 19:36 ` Dominick Grift
@ 2019-02-20 20:25 ` Dominick Grift
1 sibling, 0 replies; 11+ messages in thread
From: Dominick Grift @ 2019-02-20 20:25 UTC (permalink / raw)
To: Stephen Smalley; +Cc: selinux
On Wed, Feb 20, 2019 at 02:34:16PM -0500, Stephen Smalley wrote:
> On Wed, Feb 20, 2019 at 10:34 AM Dominick Grift
> <dominick.grift@defensec.nl> wrote:
> >
> > The MDP example no longer works on modern systems.
> >
> > Add support for devtmpfs. This is required by login programs to relabel terminals.
> > Compile the policy with deny_unknown allow status to anticipate user space object managers in core components such as systemd.
> > Add default seusers mapping and failsafe context for the SELinux PAM module.
> >
> > V2:
> > Fix existing file test for setfiles.
> > Add a file test for checkpolicy similar to the test for setfiles for consistency.
> > Execute setfiles with -F to ensure that customizables are relabeled as well in scenarios where filesystems are labeled but where SELinux is disabled.
> >
> > V3: Fixes file test that was introduced in V2.
> >
> > Signed-off-by: Dominick Grift <dominick.grift@defensec.nl>
> > ---
> > scripts/selinux/install_policy.sh | 21 ++++++++++++++++-----
> > scripts/selinux/mdp/mdp.c | 1 +
> > 2 files changed, 17 insertions(+), 5 deletions(-)
> >
> > diff --git a/scripts/selinux/install_policy.sh b/scripts/selinux/install_policy.sh
> > index 0b86c47baf7d..e32f333f14cc 100755
> > --- a/scripts/selinux/install_policy.sh
> > +++ b/scripts/selinux/install_policy.sh
> > @@ -6,7 +6,7 @@ if [ `id -u` -ne 0 ]; then
> > fi
> > SF=`which setfiles`
> > if [ $? -eq 1 ]; then
> > - if [ -f /sbin/setfiles ]; then
> > + if [ -f /usr/setfiles ]; then
> > SF="/usr/setfiles"
>
> I don't believe we've ever installed setfiles anywhere other than
> /sbin/setfile or /usr/sbin/setfiles so no other locations should be
> used. Maybe just drop the inner if statement entirely.
>
> > else
> > echo "no selinux tools installed: setfiles"
> > @@ -17,14 +17,25 @@ fi
> > cd mdp
> >
> > CP=`which checkpolicy`
> > +if [ $? -eq 1 ]; then
> > + if [ -f /usr/checkpolicy ]; then
> > + CP="/usr/checkpolicy"
>
> Similarly for /usr/bin/checkpolicy or /bin/checkpolicy.
>
> > + else
> > + echo "no selinux tools installed: checkpolicy"
> > + exit 1
> > + fi
> > +fi
> > VERS=`$CP -V | awk '{print $1}'`
> >
> > ./mdp policy.conf file_contexts
> > -$CP -o policy.$VERS policy.conf
> > +$CP -U allow -o policy.$VERS policy.conf
> >
> > mkdir -p /etc/selinux/dummy/policy
> > mkdir -p /etc/selinux/dummy/contexts/files
> >
> > +echo "__default__:user_u" > /etc/selinux/dummy/seusers
> > +echo "base_r:base_t" > /etc/selinux/dummy/contexts/failsafe_context
> > +
> > cp file_contexts /etc/selinux/dummy/contexts/files
> > cp dbus_contexts /etc/selinux/dummy/contexts
> > cp policy.$VERS /etc/selinux/dummy/policy
> > @@ -55,15 +66,15 @@ else
> > fi
> >
> > cd /etc/selinux/dummy/contexts/files
> > -$SF file_contexts /
> > +$SF -F file_contexts /
> >
> > mounts=`cat /proc/$$/mounts | egrep "ext2|ext3|xfs|jfs|ext4|ext4dev|gfs2" | awk '{ print $2 '}`
> > -$SF file_contexts $mounts
> > +$SF -F file_contexts $mounts
> >
> >
> > dodev=`cat /proc/$$/mounts | grep "/dev "`
> > if [ "eq$dodev" != "eq" ]; then
> > mount --move /dev /mnt
>
> I recall seeing errors from mount when running this script about
> invalid usage of mount --move?
Yes but we may want this for (backwards) compatibility? I suspect that this might work in some scenario's (just not ours)
>
> > - $SF file_contexts /dev
> > + $SF -F file_contexts /dev
> > mount --move /mnt /dev
> > fi
> > diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c
> > index 073fe7537f6c..cf06d5694cbc 100644
> > --- a/scripts/selinux/mdp/mdp.c
> > +++ b/scripts/selinux/mdp/mdp.c
> > @@ -131,6 +131,7 @@ int main(int argc, char *argv[])
> >
> > fprintf(fout, "fs_use_trans mqueue user_u:base_r:base_t;\n");
> > fprintf(fout, "fs_use_trans devpts user_u:base_r:base_t;\n");
> > + fprintf(fout, "fs_use_trans devtmpfs user_u:base_r:base_t;\n");
>
> This will conflict with my patch but probably your patch should be
> applied first since it fixes current usage of mdp, and then mine can
> be re-based and introduce the MLS support (which hopefully can now be
> tested on Fedora). Ideally we'd add fs_use* and genfscon statements
> for all filesystems supported by the kernel but that can come later.
Probably yes, but you can also just take my changes and add them to your patch.
BTW: we also might want to use object_r instead of base_r for object contexts for consistency?
>
> > fprintf(fout, "fs_use_trans hugetlbfs user_u:base_r:base_t;\n");
> > fprintf(fout, "fs_use_trans tmpfs user_u:base_r:base_t;\n");
> > fprintf(fout, "fs_use_trans shm user_u:base_r:base_t;\n");
> > --
> > 2.21.0.rc1
> >
--
Key fingerprint = 5F4D 3CDB D3F8 3652 FBD8 02D5 3B6C 5F1D 2C7B 6B02
https://sks-keyservers.net/pks/lookup?op=get&search=0x3B6C5F1D2C7B6B02
Dominick Grift
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-02-20 20:25 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-20 12:33 [PATCH] scripts/selinux: modernize mdp Dominick Grift
2019-02-20 14:09 ` Dominick Grift
2019-02-20 14:47 ` Dominick Grift
2019-02-20 19:21 ` Stephen Smalley
2019-02-20 19:25 ` Stephen Smalley
2019-02-20 19:35 ` Dominick Grift
2019-02-20 15:19 ` [PATCH v2] " Dominick Grift
2019-02-20 15:34 ` [PATCH v3] " Dominick Grift
2019-02-20 19:34 ` Stephen Smalley
2019-02-20 19:36 ` Dominick Grift
2019-02-20 20:25 ` Dominick Grift
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).