AppArmor

lp://qastaging/~sbeattie/apparmor/apparmor-deprecated-cleanup

Created by Steve Beattie and last modified
Get this branch:
bzr branch lp://qastaging/~sbeattie/apparmor/apparmor-deprecated-cleanup
Only Steve Beattie can upload to this branch. If you are Steve Beattie please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Steve Beattie
Project:
AppArmor
Status:
Merged

Recent revisions

2443. By Steve Beattie

toplevel: drop exclusion of deprecated directory from tarball creation

After removing the tools that had lingered in the deprecated directory
for too long, don't exclude the deprecated/ subdirectory from tarball
creation, as SUSE needs access to the deprecated perl modules for YaST.
Add a make variable for adding back in exclusions if needed.

2442. By Steve Beattie

Remove the deprecated apparmor dbus client and the wxwidgets based
profile editor. They've been under the deprecated tree since Feb 2010,
and were placed there because they were already problematic to support.
No one has taken the mantle to resurrect support after 4 years, so
remove them from the tree entirely. (They will live on in the history,
if anyone does decide to resurrect them.)

2441. By Steve Beattie

utils: add simple capability regex tests

This patch adds some simple tests of the capability regex in
apparmor/aa.py.

Signed-off-by: Steve Beattie <email address hidden>
Acked-by: Tyler Hicks <email address hidden>

2440. By Tyler Hicks

utils: Basic support for bare capability rules

Bug: https://bugs.launchpad.net/bugs/1294819

This patch as minimal support for bare capability rules ("capability,").
It prevents aa.py from emitting a traceback when encountering such a
rule.

It only adds the ability to parse and write the bare rule. It doesn't
attempt to be clever when deleting duplicate rules, such as realizing
that "capability audit_control," can be deleted if "capability," is also
present.

Signed-off-by: Tyler Hicks <email address hidden>
Acked-by: Steve Beattie <email address hidden>
Acked-by: Christian Boltz <email address hidden>

2439. By Tyler Hicks

utils: Add very limited support for mount rules

Bug: https://bugs.launchpad.net/bugs/1294825

This patch is inspired by sbeattie's patch to add limited dbus rule
support. It adds does very dumb parsing of mount rules. Basically, it
stores mount, remount, and umount rules as raw strings wrapped in a
class.

Signed-off-by: Tyler Hicks <email address hidden>
Acked-by: Steve Beattie <email address hidden>
Acked-by: Christian Boltz <email address hidden>

2438. By Tyler Hicks

utils: Fix typo in write_dbus()

Signed-off-by: Tyler Hicks <email address hidden>
Acked-by: Steve Beattie <email address hidden>

2437. By Steve Beattie

regression swap test: 640 KiB not enough swap for everyone

On ppc64el platforms, the minimum swapfile size is 640KiB. Our swap
test aborts there because it creates a swapfile of size 512KiB. This
patch adjusts the size to 768KiB, to satisfy ppc64el and to try
to keep the size down for embedded and otherwise limited platforms
(e.g. phones).

Signed-off-by: Steve Beattie <email address hidden>
Acked-by: John Johansen <email address hidden>

2436. By Steve Beattie

regression sysctl: skip if sysctl not available

Some kernels have CONFIG_SYSCALL_SYSCTL disabled, which is something to
be encouraged. This patch separates out the two different kind of sysctl
tests (syscall based and /proc/sys based) into separate shell functions,
and then checks to see that the test environment supports each before
invoking each shell function, issuing a warning (but not failing the
tests) if not available.

Signed-off-by: Steve Beattie <email address hidden>
Acked-by: John Johansen <email address hidden>

2435. By Steve Beattie

Bump version to 2.8.96 in preparation for a potential additional beta
release before 2.9.0 final.

2434. By Steve Beattie

utils/easyprof: fix regression test when apparmor-easyprof is not installed

Bug: https://bugs.launchpad.net/bugs/1294848

This patch fixes the testsuite for aa-easyprof when the easyprof
utilities and configuration files are not installed in the system.
What was happening was that verify_manifest was calling parse_args()
without the synthetic arguments created by the test case and passing
the result to AppArmorEasyProfile(). Because parse_args() didn't
have the synthetic arguments, it would parse the actual command line
arguments passed to the testscript, which of course didn't specify the
alternate configuration file location. This would work when easyprof
had been installed in the system, because the fallback configuration
file in /etc/apparmor/easyprof.conf would exist and specify template
and policy group locations. Without that, though, the tests would abort
due to not knowing the location of the templates and policy groups.

This patch fixes the issue by passing the synthetic argument list
to verify_manifest, which uses that when calling parse_args(). A
debugging statement that states which conffile is being used when
AppArmorEasyProfile is being instantiated.

Signed-off-by: Steve Beattie <email address hidden>
Acked-by: Tyler Hicks <email address hidden>

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp://qastaging/apparmor/2.12
This branch contains Public information 
Everyone can see this information.

Subscribers