apparmor:master

Last commit made on 2021-01-22
Get this branch:
git clone -b master https://git.launchpad.net/apparmor

Branch merges

Branch information

Name:
master
Repository:
lp:apparmor

Recent commits

cb65ab9... by John Johansen <email address hidden> on 2021-01-22

Merge fix setting proc_attr_base

There is currently a case in which proc_attr_base won't get set when asprintf is able to generate the path, but the file doesn't exist, it will exit proc_attr_base_init_once() without proc_attr_base having been set as the fall-through if/else logic will get bypassed when asprintf is successful.

Without this fix, various commands like aa-status will not properly display which processes have an apparmor profile enforced because it proc_attr_base will always be NULL and therefore the proc attr path won't be able to be generated.

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/701
Acked-by: John Johansen <email address hidden>

cc113f4... by Aaron U'Ren <email address hidden> on 2021-01-20

fix setting proc_attr_base

There is currently a case in which proc_attr_base won't get set when
asprintf is able to generate the path, but the file doesn't exist, it
will exit proc_attr_base_init_once() without proc_attr_base having been
set as the fall-through if/else logic will get bypassed when asprintf is
successful.

d86b7ac... by John Johansen <email address hidden> on 2021-01-10

Merge Enable minitools tests

To get them running in the CI,

* call them with `--configdir ./`
* skip testing `aa-unconfined` if securityfs is not available

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/696
Acked-by: John Johansen <email address hidden>

7e02f25... by John Johansen <email address hidden> on 2021-01-10

Merge add re_match_include_parse() test with invalid rule name

... to increase test coverity of regex.py to 100%.

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/695
Acked-by: John Johansen <email address hidden>

cc28eba... by John Johansen <email address hidden> on 2021-01-10

Merge Add missing test for ProfileList add_alias()

... to ensure that it errors out if a wrong parameter type is given.

This also increases the test coverage of ProfileList to 100%.

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/694
Acked-by: John Johansen <email address hidden>

ca344a3... by John Johansen <email address hidden> on 2021-01-10

Merge Add and use BooleanRule and BooleanRuleset classes to handle boolean variable definitions

Add the BooleanRule and BooleanRuleset classes, add handling of boolean variable definitions in ProfileList and adjust `parse_profile_data()` to use BooleanRule. As usual, add tests for the added code.

See the individual commits for the details.

Note that this MR is also a bugfix - the previous code in (3.0 and master) saved boolean variables at a wrong place, and they were silently lost when writing the profile.
MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/693
Acked-by: John Johansen <email address hidden>

d7ce5f0... by John Johansen <email address hidden> on 2021-01-10

Merge branch 'cboltz-comment-fix' into 'master'

Fix comment in split_name() tests

See merge request apparmor/apparmor!692

2e6bdc0... by Christian Boltz on 2020-12-25

skip testing aa-unconfined if securityfs is not available

8d422ff... by Christian Boltz on 2020-12-25

Test minitools with --configdir ./

70bbc32... by Christian Boltz on 2020-12-25

Enable minitools tests in 'make check`

... by renaming them to test-*.py