~talkless/apparmor/fix_user_download

~talkless/apparmor/fix_user_download_nonlatin » Changes from revision 3666

From Revision 3655 to 3636

Rev	Summary	Authors	Tags	Date
3655	Ignore test failures about duplicated conditionals in dbus r... Ignore test failures about duplicated conditionals in dbus rules Since r3634, the tools allow any order of dbus conditionals. Quoting the r3634 patch description: This patch eases the restriction on the ordering at the expense of the utils no longer being able to detect and reject a single attribute that is repeated multiple times. In that situation, only the last occurrence of the attribute will be honored by the utils. It seems nobody tested with all test profiles generated ;-) so we have to add some exceptions to the "does not raise an exception" list now. Acked-by <timeout> for trunk and 2.11	Christian Boltz		7 years ago
3654	profiles: abstractions/base - Allow sysconf(_SC_NPROCESSORS_... profiles: abstractions/base - Allow sysconf(_SC_NPROCESSORS_CONF) Merge Simon McVittie's patch to allow querying the number of configured processors in the base abstraction. Acked-by: Steve Beattie <steve@nxnw.org>	Steve Beattie		7 years ago
3653	Update Version to dev version number 2.11.90 Update Version to dev version number 2.11.90	John Johansen		7 years ago
3652	aa-notify currently calls notify-send with urgency of 'criti... aa-notify currently calls notify-send with urgency of 'critical'. In gnome-shell critical urgency notifications result in a notification that must be explictly clicked to dismiss (ie, they don't time out) and gnome-shell does not honor -- expire-time with (at least) critical urgency. In other popular DEs critical urgency notifications time out. This patch updates the urgency to 'normal' to obtain intended behavior across DEs. Signed-off-by: Jamie Strandboge <jamie@canonical.com> Acked-by: Tyler Hicks <tyhicks@canonical.com> Acked-by: Christian Boltz <apparmor@cboltz.de>	Jamie Strandboge	apparmor_2.11_branchpoint, apparmor_2.12_branchpoint	7 years ago
3651	update dovecot-lda profile update dovecot-lda profile dovecot-lda needs - the attach_disconnected flags - read access to /usr/share/dovecot/protocols.d/ - rw for /run/dovecot/auth-userdb References: https://bugs.launchpad.net/bugs/1650827 Acked-by: Steve Beattie <steve@nxnw.org> for 2.9, 2.10 and trunk.	Christian Boltz		7 years ago
3650	tests: readdir - test both getdents() and getdents64() if av... tests: readdir - test both getdents() and getdents64() if available In commit 3649, Colin King fixed the readdir test build issue where aarch64 only supports getdetns64(), not getdents(). Realistically, however, we want to ensure mediation occurs on both syscalls where they exist. This patch changes the test to attempt performing both versions of getdents(). Because we want to catch the situation where the result of getdents differs from getdents64, we now pass in the expected result. Also add a test to verify that having write access does not grant the ability to read a directory's contents. Bug: https://bugs.launchpad.net/bugs/1674245 Signed-off-by: Steve Beattie <steve@nxnw.org> Acked-by: Seth Arnold <seth.arnold@canonical.com> Acked-by: Tyler Hicks <tyhicks@canonical.com>	Steve Beattie		7 years ago
3649	tests: where necessary use getdents64 to fix arm64 build fai... tests: where necessary use getdents64 to fix arm64 build failure https://launchpad.net/bugs/1674245 arm64 build of the tests breaks because getdents is not available. Where available, use gendents64 as the preferred choice. Fixes: cc -g -O0 -Wall -Wstrict-prototypes readdir.c -lapparmor -o readdir readdir.c: In function ‘main’: readdir.c:45:14: error: ‘SYS_getdents’ undeclared (first use in this function) if (syscall(SYS_getdents, fd, &dir, sizeof(struct dirent)) == -1){ ^~~~~~~~~~~~ readdir.c:45:14: note: each undeclared identifier is reported only once for each function it appears in <builtin>: recipe for target 'readdir' failed make: *** [readdir] Error 1 Signed-off-by: Tyler Hicks <tyhicks@canonical.com>	Colin King		7 years ago
3648	utils: Add aa-remove-unknown utility to unload unknown profi... utils: Add aa-remove-unknown utility to unload unknown profiles https://launchpad.net/bugs/1668892 This patch creates a new utility, with the code previously used in the init script 'restart' action, that removes unknown profiles which are not found in /etc/apparmor.d/. The functionality was removed from the common init script code in the fix for CVE-2017-6507. The new utility prints a message containing the name of each unknown profile before the profiles are removed. It also supports a dry run mode so that an administrator can check which profiles will be removed before unloading any unknown profiles. If you backport this utility with the fix for CVE-2017-6507 to an apparmor 2.10 release and your backported aa-remove-unknown utility is sourcing the upstream rc.apparmor.functions file, you'll want to include the following bug fix to prevent the aa-remove-unknown utility from removing child profiles that it shouldn't remove: r3440 - Fix: parser: incorrect output of child profile names Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Acked-by: Seth Arnold <seth.arnold@canonical.com> Acked-by: John Johansen <john.johansen@canonical.com>	Tyler Hicks		7 years ago
3647	parser: Preserve unknown profiles when restarting apparmor i... parser: Preserve unknown profiles when restarting apparmor init/job/unit CVE-2017-6507 https://launchpad.net/bugs/1668892 The common AppArmor 'restart' code used by some init scripts, upstart jobs, and/or systemd units contained functionality that is no longer appropriate to retain. Any profiles not found /etc/apparmor.d/ were assumed to be obsolete and were unloaded. That behavior became problematic now that there's a growing number of projects that maintain their own internal set of AppArmor profiles outside of /etc/apparmor.d/. It resulted in the AppArmor 'restart' code leaving some important processes running unconfined. A couple examples are profiles managed by LXD and Docker. Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Acked-by: Seth Arnold <seth.arnold@canonical.com> Acked-by: John Johansen <john.johansen@canonical.com>	Tyler Hicks		7 years ago
3646	parser: Fix delete after new[] -- patch from Oleg Strikov parser: Fix delete after new[] -- patch from Oleg Strikov <oleg.strikov@gmail.com>	Seth Arnold		7 years ago
3645	profiles: Update nvidia abstraction for newer nvidia drivers profiles: Update nvidia abstraction for newer nvidia drivers Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Acked-by: Jamie Strandboge <jamie@ubuntu.com>	Tyler Hicks		7 years ago
3644	Fix regressions caused by init_aa() Fix regressions caused by init_aa() With the init_aa() patch series commited, minitools_test.py showed several test failures - which effectively means the -d option of aa-complain, aa-cleanprof etc. was broken. These failures were caused by - calling init_aa() too late in tools.py - _after_ setting the profiledir, which then got overwritten by init_aa() - calling init_aa() twice (because apparmor.aa gets imported in two modules used by aa-cleanprof), which overwrote the manually set values on the second run This patch fixes the call order in tools.py and adds a check to init_aa() so that it only runs once and ignores additional calls. Acked-by: Tyler Hicks <tyhicks@canonical.com> Acked-by: Seth Arnold <seth.arnold@canonical.com>	Christian Boltz		7 years ago
3643	test-parser-simple-tests.py: No longer skip testing generate... test-parser-simple-tests.py: No longer skip testing generated_perms_leading profiles FileRule understands leading permissions, so the reason to skip those (generated) test profiles in test-parser-simple-tests.py is gone. However, the gen-xtrans.pl script generates profiles with a not-so-valid mix of uppercase and lowercase, for example "Pux" and "Cux". The parser accepts this, but the tools complain about such rules. Therefore add the affected profiles to the exception list. In total, this means we now test 319 of the 380 generated_perms_leading test profiles. The patch also moves some lines around to get the \-escaped profiles out of the mixed uppercase/lowercase exec rule section. Acked-by: Seth Arnold <seth.arnold@canonical.com>	Christian Boltz		7 years ago
3642	utils: Fix apparmor.easyprof import in test-aa-easyprof.py utils: Fix apparmor.easyprof import in test-aa-easyprof.py The test-aa-easyprof.py script was attempting to do its own special setup to import the in-tree easyprof module. However, this proved to be very flaky and resulted in the test periodically failing due to an AttributeError the first time easyprof.parse_args() was called. This patch removes the flakiness by trusting that PYTHONPATH is set up appropriately before the test script is ran. PYTHONPATH is already initialized appropriately by utils/test/Makefile according to the USE_SYSTEM make variable. Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Acked-by: Seth Arnold <seth.arnold@canonical.com> Acked-by: Christian Boltz <apparmor@cboltz.de>	Tyler Hicks		7 years ago
3641	utils: Set parser executable path according to USE_SYSTEM ma... utils: Set parser executable path according to USE_SYSTEM make variable if USE_SYSTEM is not set, the utils make check target will instruct test-aa-easyprof.py to provide the path of the in-tree parser executable to aa-easyprof. If USE_SYSTEM is set, the default parser path (/sbin/apparmor_parser or the result of `which apparmor_parser`) is used. The test-aa-easyprof.py script receives the parser path by checking the __AA_PARSER environment variable. This environment variable is strictly used by the test script and not any user-facing code so two leading underscores were used. Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Acked-by: Christian Boltz <apparmor@cboltz.de> Acked-by: Seth Arnold <seth.arnold@canonical.com>	Tyler Hicks		7 years ago
3640	utils: Add option to aa-easyprof to specify the apparmor_par... utils: Add option to aa-easyprof to specify the apparmor_parser path When testing against a clean system without the apparmor_parser binary installed, the test-aa-easyprof.py script ends up skipping profile verification because it can't find the parser binary. This even causes a test failure due to the test_genpolicy_invalid_template_policy test. Adding a --parser option to aa-easyprof is the first step in addressing this problem. Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Acked-by: Christian Boltz <apparmor@cboltz.de> Acked-by: Seth Arnold <seth.arnold@canonical.com>	Tyler Hicks		7 years ago
3639	utils: Set parser base path according to USE_SYSTEM make var... utils: Set parser base path according to USE_SYSTEM make variable If USE_SYSTEM is not set, the utils make check target will instruct test-aa-easyprof.py to provide the path of the in-tree profiles/apparmor.d directory to aa-easyprof as the parser base directory. If USE_SYSTEM is set, the default base directory (/etc/apparmor.d) is used. The test-aa-easyprof.py script receives the base path by checking the __AA_BASEDIR environment variable. This environment variable is strictly used by the test script and not any user-facing code so two leading underscores were used. Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Acked-by: Christian Boltz <apparmor@cboltz.de> Acked-by: Seth Arnold <seth.arnold@canonical.com>	Tyler Hicks		7 years ago
3638	utils: Accept parser base and include options in aa-easyprof utils: Accept parser base and include options in aa-easyprof https://launchpad.net/bugs/1521031 aa-easyprof accepts a list of abstractions to include and, by default, execs apparmor_parser to verify the generated profile including any abstractions. However, aa-easyprof didn't provide the same flexibility as apparmor_parser when it came to where in the filesystem the abstraction files could exist. The parser supports --base (defaulting to /etc/apparmor.d) and --Include (defaulting to unset) options to specify the search paths for abstraction files. This patch adds the same options to aa-easyprof to aide in two different situations: 1) Some Ubuntu packages use aa-easyprof to generate AppArmor profiles at build time. Something that has been previously needed is a way for those packages to ship their own abstractions file(s) that are #included in the easyprof-generated profile. That's not been possible since the abstraction file(s) have not yet been installed during the package build. 2) The test-aa-easyprof.py script contains some tests that specify abstractions that should be #included. Without the ability to specify a different --base or --Include directory, the abstractions were required to be present in /etc/apparmor.d/abstractions/ or the tests would fail. This prevents the Python utils from being able to strictly test against in-tree code/profiles/etc. I don't like the names of the command line options --base and --Include. They're not particularly descriptive and the capital 'I' is not user friendly. However, I decided to preserve the name of the options from apparmor_parser. Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Acked-by: Christian Boltz <apparmor@cboltz.de> Acked-by: Seth Arnold <seth.arnold@canonical.com>	Tyler Hicks		7 years ago
3637	utils: Require apparmor.aa users to call init_aa() utils: Require apparmor.aa users to call init_aa() Introduce an apparmor.aa.init_aa() method and move the initialization code of the apparmor.aa module into it. Note that this change will break any external users of apparmor.aa because global variables that were previously initialized when importing apparmor.aa will not be initialized unless a call to the new apparmor.aa.init_aa() method is made. The main purpose of this change is to allow the utils tests to be able to set a non-default location for configuration files. Instead of hard-coding the location of logprof.conf and other utils related configuration files to /etc/apparmor/, this patch allows it to be configured by calling apparmor.aa.init_aa(confdir=PATH). This allows for the make check target to use the in-tree config file, profiles, and parser by default. A helper method, setup_aa(), is added to common_test.py that checks for an environment variable containing a non-default configuration directory path prior to calling apparmor.aa.init_aa(). All test scripts that use apparmor.aa are updated to call setup_aa(). Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Suggested-by: Christian Boltz <apparmor@cboltz.de> Acked-by: Seth Arnold <seth.arnold@canonical.com> Acked-by: Christian Boltz <apparmor@cboltz.de>	Tyler Hicks		7 years ago
3636	utils: Update the logprof.conf in the test dir to point to i... utils: Update the logprof.conf in the test dir to point to in-tree paths The utils tests should make use of the logprof.conf that resides in utils/test/ when testing against the in-tree parser and profiles. When testing against the system, it the utils tests should continue to use the system logprof.conf. This patch updates the parser and profiles paths to point to the in-tree paths. Another patch is needed to get aa.py to honor a non-hardcoded search path for logprof.conf and other configuration files. Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Acked-by: Christian Boltz <apparmor@cboltz.de> Acked-by: Seth Arnold <seth.arnold@canonical.com>	Tyler Hicks		7 years ago

Older »