AppArmor

Merge lp:~intrigeri/apparmor/apache2-attach_disconnected into lp:apparmor/2.12

  1. apache2-attach_disconnected
  2. Merge into master
Proposed by intrigeri
Status: Merged
Merged at revision: 3729
Proposed branch: lp:~intrigeri/apparmor/apache2-attach_disconnected
Merge into: lp:apparmor/2.12
Diff against target: 30 lines (+3/-3)
1 file modified
profiles/apparmor.d/usr.sbin.apache2 (+3/-3)
To merge this branch: bzr merge lp:~intrigeri/apparmor/apache2-attach_disconnected
Reviewer Review Type Date Requested Status
Steve Beattie Approve
Review via email: mp+331065@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Steve Beattie (sbeattie) wrote :

I don't particularly care for how we've had to sprinkle attach_disconnected around in profiles recently, but given that I would hope anyone actually developing profiles for apache with mod_apparmor would roll their own, so I think it's okay for the "mostly works out of the box" example profile nature of the included apache profile.

Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'profiles/apparmor.d/usr.sbin.apache2'
2--- profiles/apparmor.d/usr.sbin.apache2 2014-09-09 01:39:34 +0000
3+++ profiles/apparmor.d/usr.sbin.apache2 2017-09-20 14:46:35 +0000
4@@ -1,7 +1,7 @@
5 # Author: Marc Deslauriers <marc.deslauriers@ubuntu.com>
6
7 #include <tunables/global>
8-/usr/sbin/apache2 {
9+/usr/sbin/apache2 flags=(attach_disconnected) {
10
11 # This profile is completely permissive.
12 # It is designed to target specific applications using mod_apparmor,
13@@ -84,7 +84,7 @@
14 /** mrwlkix,
15
16
17- ^DEFAULT_URI {
18+ ^DEFAULT_URI flags=(attach_disconnected) {
19 #include <abstractions/base>
20 #include <abstractions/apache2-common>
21
22@@ -92,7 +92,7 @@
23 /** mrwlkix,
24 }
25
26- ^HANDLING_UNTRUSTED_INPUT {
27+ ^HANDLING_UNTRUSTED_INPUT flags=(attach_disconnected) {
28 #include <abstractions/apache2-common>
29
30 / rw,

Subscribers

People subscribed via source and target branches