* [PATCH v3] 98integrity: Use /etc/ima as dir for IMA policy and config file
@ 2016-11-30 16:18 Stefan Berger
[not found] ` <1480522734-975-1-git-send-email-stefanb-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
[not found] ` <OFAB3B0DDA.C5BDF803-ON0025807B.00603714-8525807B.0060434C@notes.na.collabserv.com>
0 siblings, 2 replies; 3+ messages in thread
From: Stefan Berger @ 2016-11-30 16:18 UTC (permalink / raw)
To: initramfs, harald; +Cc: linux-ima-user, systemd-devel, Stefan Berger
From: Stefan Berger <stefanb@us.ibm.com>
To sync with systemd, use the filepath /etc/ima/ima-policy as
the default file location for the IMA policy. At the same time we
move the ima config file location to /etc/ima/ima. Adapt the
documentation to the new path. Maintain backwards compatibility
by still reading the old files in case the new ones do not exist.
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
modules.d/98integrity/README | 8 ++++----
modules.d/98integrity/ima-keys-load.sh | 7 ++++++-
modules.d/98integrity/ima-policy-load.sh | 20 +++++++++++++++++---
3 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/modules.d/98integrity/README b/modules.d/98integrity/README
index 64de0ae..c8ccee5 100644
--- a/modules.d/98integrity/README
+++ b/modules.d/98integrity/README
@@ -33,10 +33,10 @@ line.
# Save the policy in a file.
-# Create the configuration file '/etc/sysconfig/ima' to override the path name of
+# Create the configuration file '/etc/ima/ima' to override the path name of
# the IMA custom policy.
-------------- '/etc/sysconfig/ima' (with the default value) -------------
-IMAPOLICY="/etc/sysconfig/ima-policy"
+------------- '/etc/ima/ima' (with the default value) -------------
+IMAPOLICY="/etc/ima/ima-policy"
-------------------------------------------------------------------------
@@ -64,5 +64,5 @@ IMAPOLICY="/etc/sysconfig/ima-policy"
# 98integrity/ima-keys-load.sh script loads the signed certificates stored
# in the $IMAKEYSDIR onto the trusted IMA keyring. The default $IMAKEYSDIR
-# directory is /etc/keys/ima, but can be specified in the /etc/sysconfig/ima
+# directory is /etc/keys/ima, but can be specified in the /etc/ima/ima
# policy.
diff --git a/modules.d/98integrity/ima-keys-load.sh b/modules.d/98integrity/ima-keys-load.sh
index 659b722..922af1e 100755
--- a/modules.d/98integrity/ima-keys-load.sh
+++ b/modules.d/98integrity/ima-keys-load.sh
@@ -2,7 +2,10 @@
SECURITYFSDIR="/sys/kernel/security"
IMASECDIR="${SECURITYFSDIR}/ima"
-IMACONFIG="${NEWROOT}/etc/sysconfig/ima"
+IMACONFIG="${NEWROOT}/etc/ima/ima"
+
+# for backwards compatibility
+IMACONFIG_OLD="${NEWROOT}/etc/sysconfig/ima"
load_x509_keys()
{
@@ -11,6 +14,8 @@ load_x509_keys()
# override the default configuration
if [ -f "${IMACONFIG}" ]; then
. ${IMACONFIG}
+ elif [ -f "${IMACONFIG_OLD}" ]; then
+ . ${IMACONFIG_OLD}
fi
if [ -z "${IMAKEYDIR}" ]; then
diff --git a/modules.d/98integrity/ima-policy-load.sh b/modules.d/98integrity/ima-policy-load.sh
index 85cd3b9..a92b1bb 100755
--- a/modules.d/98integrity/ima-policy-load.sh
+++ b/modules.d/98integrity/ima-policy-load.sh
@@ -5,10 +5,19 @@
# Copyright (C) 2011 Politecnico di Torino, Italy
# TORSEC group -- http://security.polito.it
# Roberto Sassu <roberto.sassu@polito.it>
+#
+# Copyright (C) 2016 IBM Corporation
+#
+# Stefan Berger <stefanb@linux.vnet.ibm.com>
+#
IMASECDIR="${SECURITYFSDIR}/ima"
-IMACONFIG="${NEWROOT}/etc/sysconfig/ima"
-IMAPOLICY="/etc/sysconfig/ima-policy"
+IMACONFIG="${NEWROOT}/etc/ima/ima"
+IMAPOLICY="/etc/ima/ima-policy"
+
+# for backwards compatibility
+IMACONFIG_OLD="${NEWROOT}/etc/sysconfig/ima"
+IMAPOLICY_OLD="/etc/sysconfig/ima-policy"
load_ima_policy()
{
@@ -21,11 +30,16 @@ load_ima_policy()
fi
# override the default configuration
- [ -f "${IMACONFIG}" ] && \
+ if [ -f "${IMACONFIG}" ]; then
. ${IMACONFIG}
+ elif [ -f "${IMACONFIG_OLD}" ]; then
+ . ${IMACONFIG_OLD}
+ fi
# set the IMA policy path name
IMAPOLICYPATH="${NEWROOT}${IMAPOLICY}"
+ [ ! -f "${IMAPOLICYPATH}" ] && \
+ IMAPOLICYPATH="${NEWROOT}${IMAPOLICY_OLD}"
# check the existence of the IMA policy file
[ -f "${IMAPOLICYPATH}" ] && {
--
2.8.3
_______________________________________________
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/systemd-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3] 98integrity: Use /etc/ima as dir for IMA policy and config file
[not found] ` <1480522734-975-1-git-send-email-stefanb-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
@ 2016-11-30 17:03 ` Dracut GitHub Import Bot
0 siblings, 0 replies; 3+ messages in thread
From: Dracut GitHub Import Bot @ 2016-11-30 17:03 UTC (permalink / raw)
To: initramfs-u79uwXL29TY76Z2rM5mHXA
Patchset imported to github.
Pull request:
<https://github.com/dracutdevs/dracut/compare/master...dracut-mailing-devs:1480522734-975-1-git-send-email-stefanb%40linux.vnet.ibm.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3] 98integrity: Use /etc/ima as dir for IMA policy and config file
[not found] ` <OFAB3B0DDA.C5BDF803-ON0025807B.00603714-8525807B.0060434C@notes.na.collabserv.com>
@ 2016-11-30 17:54 ` Stefan Berger
0 siblings, 0 replies; 3+ messages in thread
From: Stefan Berger @ 2016-11-30 17:54 UTC (permalink / raw)
To: Stefan Berger; +Cc: linux-ima-user, initramfs, systemd-devel, harald
[-- Attachment #1.1: Type: text/plain, Size: 4350 bytes --]
Harald,
please do not apply this patch.
Stefan
>
> >
> > From: Stefan Berger <stefanb@us.ibm.com>
> >
> > To sync with systemd, use the filepath /etc/ima/ima-policy as
> > the default file location for the IMA policy. At the same time we
> > move the ima config file location to /etc/ima/ima. Adapt the
> > documentation to the new path. Maintain backwards compatibility
> > by still reading the old files in case the new ones do not exist.
> >
> > Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
> > ---
> > modules.d/98integrity/README | 8 ++++----
> > modules.d/98integrity/ima-keys-load.sh | 7 ++++++-
> > modules.d/98integrity/ima-policy-load.sh | 20 +++++++++++++++++---
> > 3 files changed, 27 insertions(+), 8 deletions(-)
> >
> > diff --git a/modules.d/98integrity/README b/modules.d/98integrity/README
> > index 64de0ae..c8ccee5 100644
> > --- a/modules.d/98integrity/README
> > +++ b/modules.d/98integrity/README
> > @@ -33,10 +33,10 @@ line.
> >
> > # Save the policy in a file.
> >
> > -# Create the configuration file '/etc/sysconfig/ima' to override
> > the path name of
> > +# Create the configuration file '/etc/ima/ima' to override the path
> name of
> > # the IMA custom policy.
> > -------------- '/etc/sysconfig/ima' (with the default value)
> -------------
> > -IMAPOLICY="/etc/sysconfig/ima-policy"
> > +------------- '/etc/ima/ima' (with the default value) -------------
> > +IMAPOLICY="/etc/ima/ima-policy"
> >
> -------------------------------------------------------------------------
> >
> >
> > @@ -64,5 +64,5 @@ IMAPOLICY="/etc/sysconfig/ima-policy"
> >
> > # 98integrity/ima-keys-load.sh script loads the signed certificates
> stored
> > # in the $IMAKEYSDIR onto the trusted IMA keyring. The default
> $IMAKEYSDIR
> > -# directory is /etc/keys/ima, but can be specified in the
> /etc/sysconfig/ima
> > +# directory is /etc/keys/ima, but can be specified in the /etc/ima/ima
> > # policy.
> > diff --git a/modules.d/98integrity/ima-keys-load.sh b/modules.d/
> > 98integrity/ima-keys-load.sh
> > index 659b722..922af1e 100755
> > --- a/modules.d/98integrity/ima-keys-load.sh
> > +++ b/modules.d/98integrity/ima-keys-load.sh
> > @@ -2,7 +2,10 @@
> >
> > SECURITYFSDIR="/sys/kernel/security"
> > IMASECDIR="${SECURITYFSDIR}/ima"
> > -IMACONFIG="${NEWROOT}/etc/sysconfig/ima"
> > +IMACONFIG="${NEWROOT}/etc/ima/ima"
> > +
> > +# for backwards compatibility
> > +IMACONFIG_OLD="${NEWROOT}/etc/sysconfig/ima"
> >
> > load_x509_keys()
> > {
> > @@ -11,6 +14,8 @@ load_x509_keys()
> > # override the default configuration
> > if [ -f "${IMACONFIG}" ]; then
> > . ${IMACONFIG}
> > + elif [ -f "${IMACONFIG_OLD}" ]; then
> > + . ${IMACONFIG_OLD}
> > fi
> >
> > if [ -z "${IMAKEYDIR}" ]; then
> > diff --git a/modules.d/98integrity/ima-policy-load.sh b/modules.d/
> > 98integrity/ima-policy-load.sh
> > index 85cd3b9..a92b1bb 100755
> > --- a/modules.d/98integrity/ima-policy-load.sh
> > +++ b/modules.d/98integrity/ima-policy-load.sh
> > @@ -5,10 +5,19 @@
> > # Copyright (C) 2011 Politecnico di Torino, Italy
> > # TORSEC group -- http://security.polito.it
> <http://security.polito.it/>
> > # Roberto Sassu <roberto.sassu@polito.it>
> > +#
> > +# Copyright (C) 2016 IBM Corporation
> > +#
> > +# Stefan Berger <stefanb@linux.vnet.ibm.com>
> > +#
> >
> > IMASECDIR="${SECURITYFSDIR}/ima"
> > -IMACONFIG="${NEWROOT}/etc/sysconfig/ima"
> > -IMAPOLICY="/etc/sysconfig/ima-policy"
> > +IMACONFIG="${NEWROOT}/etc/ima/ima"
> > +IMAPOLICY="/etc/ima/ima-policy"
> > +
> > +# for backwards compatibility
> > +IMACONFIG_OLD="${NEWROOT}/etc/sysconfig/ima"
> > +IMAPOLICY_OLD="/etc/sysconfig/ima-policy"
> >
> > load_ima_policy()
> > {
> > @@ -21,11 +30,16 @@ load_ima_policy()
> > fi
> >
> > # override the default configuration
> > - [ -f "${IMACONFIG}" ] && \
> > + if [ -f "${IMACONFIG}" ]; then
> > . ${IMACONFIG}
> > + elif [ -f "${IMACONFIG_OLD}" ]; then
> > + . ${IMACONFIG_OLD}
> > + fi
> >
> > # set the IMA policy path name
> > IMAPOLICYPATH="${NEWROOT}${IMAPOLICY}"
> > + [ ! -f "${IMAPOLICYPATH}" ] && \
> > + IMAPOLICYPATH="${NEWROOT}${IMAPOLICY_OLD}"
> >
> > # check the existence of the IMA policy file
> > [ -f "${IMAPOLICYPATH}" ] && {
> > --
> > 2.8.3
> >
>
[-- Attachment #1.2: Type: text/html, Size: 7472 bytes --]
[-- Attachment #2: Type: text/plain, Size: 172 bytes --]
_______________________________________________
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/systemd-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-11-30 17:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-30 16:18 [PATCH v3] 98integrity: Use /etc/ima as dir for IMA policy and config file Stefan Berger
[not found] ` <1480522734-975-1-git-send-email-stefanb-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
2016-11-30 17:03 ` Dracut GitHub Import Bot
[not found] ` <OFAB3B0DDA.C5BDF803-ON0025807B.00603714-8525807B.0060434C@notes.na.collabserv.com>
2016-11-30 17:54 ` Stefan Berger
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.