Merge lp:~clint-fewbar/charm-tools/apparmor into lp:~charmers/charm-tools/trunk

[Clint Byrum]

Adding an apparmor helper to charm-helpers

[Juan L. Negron (negronjl)]

Looks good.

Approved.

-Juan

review: Approve

[Juan L. Negron (negronjl)]

Looks good.

Approved.

-Juan

review: Approve

=== added file 'helpers/sh/apparmor.sh'
--- helpers/sh/apparmor.sh	1970-01-01 00:00:00 +0000
+++ helpers/sh/apparmor.sh	2012-01-12 09:29:23 +0000
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+##
+# Copyright 2011 Canonical, Ltd. All Rights Reserved
+#
+# This file is part of Charm Helpers.
+#
+# Charm Helpers is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Charm Helpers is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Charm Helpers.  If not, see <http://www.gnu.org/licenses/>.
+##
+
+ch_apparmor_load() {
+    local ddir=${CH_APPARMOR_DESTDIR:-""}
+    [ -n "$CHARM_DIR" ] || return 1
+    [ -d "$CHARM_DIR" ] || return 1
+    [ -d "$CHARM_DIR/apparmor/profiles.d" ] || return 0
+    cp -f $CHARM_DIR/apparmor/profiles.d/* $ddir/etc/apparmor/profiles.d || return 1
+    service apparmor reload || return 0
+    return 0
+}

=== added file 'tests/helpers/test_apparmor.sh'
--- tests/helpers/test_apparmor.sh	1970-01-01 00:00:00 +0000
+++ tests/helpers/test_apparmor.sh	2012-01-12 09:29:23 +0000
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+if [ -z "$test_home" ] ; then
+    test_home=`dirname $0`
+    test_home=`readlink -f $test_home`
+fi
+
+[ "$LIB_SOURCED" = "1" ] || . $test_home/lib.sh
+
+set -ue
+
+mock_service() {
+    echo $* >> $SERVICE_LOG
+}
+alias service=mock_service
+
+. $HELPERS_HOME/apparmor.sh
+
+CHARM_DIR=""
+SERVICE_LOG=""
+CH_APPARMOR_DESTDIR=""
+
+cleanup_apparmor() {
+    if [ -n "$CHARM_DIR" ] && [ -d "$CHARM_DIR" ] ; then
+        rm -rf $CHARM_DIR
+    fi
+    if [ -n "$CH_APPARMOR_DESTDIR" ] && [ -d "$CH_APPARMOR_DESTDIR" ] ; then
+        rm -rf $CH_APPARMOR_DESTDIR
+    fi
+    if [ -n "$SERVICE_LOG" ] && [ -f "$SERVICE_LOG" ] ; then
+        rm -rf $SERVICE_LOG
+    fi
+}
+
+trap cleanup_apparmor EXIT
+
+CHARM_DIR=`mktemp -d /tmp/ch_charm_dir.XXXXXX`
+CH_APPARMOR_DESTDIR=`mktemp -d /tmp/ch_apparmor_root.XXXXXX`
+SERVICE_LOG=`mktemp /tmp/service_log.XXXXXX`
+
+mkdir -p $CHARM_DIR/apparmor/profiles.d
+mkdir -p $CH_APPARMOR_DESTDIR/etc/apparmor/profiles.d
+cat > $CHARM_DIR/apparmor/profiles.d/usr.bin.foo <<EOF
+/usr/lib/telepathy/telepathy-* {
+    #include <abstractions/base>
+}
+EOF
+
+start_test ch_apparmor_load...
+ch_apparmor_load
+[ -f $CH_APPARMOR_DESTDIR/etc/apparmor/profiles.d/usr.bin.foo ]
+cmp $CH_APPARMOR_DESTDIR/etc/apparmor/profiles.d/usr.bin.foo $CHARM_DIR/apparmor/profiles.d/usr.bin.foo
+grep -q "apparmor reload" $SERVICE_LOG
+cp /dev/null $SERVICE_LOG
+echo PASS
+
+trap - EXIT
+cleanup_apparmor