On 12-12-19 06:44 PM, Seth Arnold wrote:
> On Wed, Dec 19, 2012 at 06:30:01PM -0500, Simon Deziel wrote:
>> === modified file 'profiles/apparmor.d/abstractions/bash'
>> --- profiles/apparmor.d/abstractions/bash    2012-08-06 11:56:31 +0000
>> +++ profiles/apparmor.d/abstractions/bash    2012-12-19 22:57:02 +0000
>> @@ -10,10 +10,10 @@
>>  
>>    # user-specific bash files
>>    @{HOMEDIRS}                      r,
>> -  @{HOME}/.bashrc                  r,
>> -  @{HOME}/.profile                 r,
>> -  @{HOME}/.bash_profile            r,
>> -  @{HOME}/.bash_history            rw,
>> +  owner @{HOME}/.bashrc            r,
>> +  owner @{HOME}/.profile           r,
>> +  owner @{HOME}/.bash_profile      r,
>> +  owner @{HOME}/.bash_history      rw,
> 
> These are the only ones that looks potentially problematic to me -- sudo
> may or may not scrub the environment when it executes shells or programs
> that may execute shells, and something this tight may prevent proper
> initialization or prevent the history feature from working. This might
> be desirable at many, or even most, sites, but it does feel like the
> change most likely to break something somewhere.

You are right, I missed the "sudo -E" case.

> But I do like the rest of the patch.

Good, here is v2 without the changes to abstractions/bash. I appreciate
your review, thanks!

Simon

=== modified file 'profiles/apparmor.d/abstractions/X'
--- profiles/apparmor.d/abstractions/X	2012-04-25 18:36:51 +0000
+++ profiles/apparmor.d/abstractions/X	2012-12-19 23:00:34 +0000
@@ -13,10 +13,10 @@
 
 
   # .ICEauthority files required for X authentication, per user
-  @{HOME}/.ICEauthority r,
+  owner @{HOME}/.ICEauthority r,
 
   # .Xauthority files required for X connections, per user
-  @{HOME}/.Xauthority           r,
+  owner @{HOME}/.Xauthority r,
   owner /{,var/}run/gdm{,3}/*/database r,
   owner /{,var/}run/lightdm/authority/[0-9]* r,
 

=== modified file 'profiles/apparmor.d/abstractions/audio'
--- profiles/apparmor.d/abstractions/audio	2011-08-04 23:52:45 +0000
+++ profiles/apparmor.d/abstractions/audio	2012-12-19 23:00:49 +0000
@@ -40,12 +40,12 @@
 /usr/share/alsa/** r,
 /usr/share/sounds/** r,
 
-@{HOME}/.esd_auth  r,
-@{HOME}/.asoundrc  r,
+owner @{HOME}/.esd_auth r,
+owner @{HOME}/.asoundrc r,
 /etc/esound/esd.conf r,
 
 # libcanberra
-@{HOME}/.cache/event-sound-cache.* rwk,
+owner @{HOME}/.cache/event-sound-cache.* rwk,
 
 # pulse
 /etc/pulse/ r,

=== modified file 'profiles/apparmor.d/abstractions/fonts'
--- profiles/apparmor.d/abstractions/fonts	2012-08-14 18:40:58 +0000
+++ profiles/apparmor.d/abstractions/fonts	2012-12-19 22:54:28 +0000
@@ -33,14 +33,14 @@
   /usr/share/texmf/{,*/}fonts/**        r,
   /var/lib/ghostscript/**               r,
 
-  @{HOME}/.fonts.conf                   r,
-  @{HOME}/.fonts/                       r,
-  @{HOME}/.fonts/**                     r,
-  @{HOME}/.fonts.cache-2               mr,
-  @{HOME}/.{,cache/}fontconfig/         r,
-  @{HOME}/.{,cache/}fontconfig/**     mrl,
-  @{HOME}/.fonts.conf.d/                r,
-  @{HOME}/.fonts.conf.d/**              r,
+  owner @{HOME}/.fonts.conf             r,
+  owner @{HOME}/.fonts/                 r,
+  owner @{HOME}/.fonts/**               r,
+  owner @{HOME}/.fonts.cache-2          mr,
+  owner @{HOME}/.{,cache/}fontconfig/   r,
+  owner @{HOME}/.{,cache/}fontconfig/** mrl,
+  owner @{HOME}/.fonts.conf.d/          r,
+  owner @{HOME}/.fonts.conf.d/**        r,
 
   /usr/local/share/fonts/               r,
   /usr/local/share/fonts/**             r,

=== modified file 'profiles/apparmor.d/abstractions/gnome'
--- profiles/apparmor.d/abstractions/gnome	2012-08-14 19:31:58 +0000
+++ profiles/apparmor.d/abstractions/gnome	2012-12-19 22:56:12 +0000
@@ -38,24 +38,24 @@
   /usr/lib/@{multiarch}/gdk-pixbuf-*/** mr,
 
   # per-user gtk configuration
-  @{HOME}/.gnome/Gnome            r,
-  @{HOME}/.gtk                    r,
-  @{HOME}/.gtkrc                  r,
-  @{HOME}/.gtkrc-2.0              r,
-  @{HOME}/.gtk-bookmarks          r,
-  @{HOME}/.themes/                r,
-  @{HOME}/.themes/**              r,
+  owner @{HOME}/.gnome/Gnome            r,
+  owner @{HOME}/.gtk                    r,
+  owner @{HOME}/.gtkrc                  r,
+  owner @{HOME}/.gtkrc-2.0              r,
+  owner @{HOME}/.gtk-bookmarks          r,
+  owner @{HOME}/.themes/                r,
+  owner @{HOME}/.themes/**              r,
 
   # for gtk file dialog
-  @{HOME}/.config/gtk-2.0/**                    r,
-  @{HOME}/.config/gtk-2.0/gtkfilechooser.ini*   rw,
+  owner @{HOME}/.config/gtk-2.0/**                  r,
+  owner @{HOME}/.config/gtk-2.0/gtkfilechooser.ini* rw,
 
   # from evolution-mail
-  @{HOME}/.gconfd/lock/*                        r,
-  @{HOME}/.gnome/application-info               r,
+  owner @{HOME}/.gconfd/lock/*                      r,
+  owner @{HOME}/.gnome/application-info             r,
 
   # per-user font business
-  @{HOME}/.fonts.cache-*          rwl,
+  owner @{HOME}/.fonts.cache-*    rwl,
 
   # icon caches
   /var/cache/**/icon-theme.cache  r,

=== modified file 'profiles/apparmor.d/abstractions/gnupg'
--- profiles/apparmor.d/abstractions/gnupg	2007-08-27 23:49:51 +0000
+++ profiles/apparmor.d/abstractions/gnupg	2012-12-19 22:55:06 +0000
@@ -2,9 +2,9 @@
 # gnupg sub-process running permissions
 
   # user configurations
-  @{HOME}/.gnupg/options r,
-  @{HOME}/.gnupg/pubring.gpg r,
-  @{HOME}/.gnupg/random_seed rw,
-  @{HOME}/.gnupg/secring.gpg r,
-  @{HOME}/.gnupg/so/*.x86_64 mr,
-  @{HOME}/.gnupg/trustdb.gpg rw,
+  owner @{HOME}/.gnupg/options     r,
+  owner @{HOME}/.gnupg/pubring.gpg r,
+  owner @{HOME}/.gnupg/random_seed rw,
+  owner @{HOME}/.gnupg/secring.gpg r,
+  owner @{HOME}/.gnupg/so/*.x86_64 mr,
+  owner @{HOME}/.gnupg/trustdb.gpg rw,

=== modified file 'profiles/apparmor.d/abstractions/kde'
--- profiles/apparmor.d/abstractions/kde	2012-01-19 14:20:28 +0000
+++ profiles/apparmor.d/abstractions/kde	2012-12-19 22:56:36 +0000
@@ -23,13 +23,13 @@
 /etc/kde3/* r,
 /etc/kde4rc r,
 
-@{HOME}/.DCOPserver_* r,
-@{HOME}/.ICEauthority r,
-@{HOME}/.fonts.* lrw,
-@{HOME}/.kde{,4}/share/config/kdeglobals rw,
-@{HOME}/.kde{,4}/share/config/*.lock rwl,
-@{HOME}/.qt/** rw,
-@{HOME}/.config/Trolltech.conf rwk,
+owner @{HOME}/.DCOPserver_* r,
+owner @{HOME}/.ICEauthority r,
+owner @{HOME}/.fonts.* lrw,
+owner @{HOME}/.kde{,4}/share/config/kdeglobals rw,
+owner @{HOME}/.kde{,4}/share/config/*.lock rwl,
+owner @{HOME}/.qt/** rw,
+owner @{HOME}/.config/Trolltech.conf rwk,
 
 /usr/share/icons/ r,
 /usr/share/icons/** r,

=== modified file 'profiles/apparmor.d/abstractions/ubuntu-browsers.d/user-files'
--- profiles/apparmor.d/abstractions/ubuntu-browsers.d/user-files	2012-01-19 14:20:28 +0000
+++ profiles/apparmor.d/abstractions/ubuntu-browsers.d/user-files	2012-12-19 23:21:58 +0000
@@ -5,7 +5,6 @@
   @{HOME}/ r,
   @{HOME}/** r,
   owner @{HOME}/** w,
-  owner @{HOME}/Desktop/** r,
 
   # Do not allow read and/or write to particularly sensitive/problematic files
   #include <abstractions/private-files>

-- 
AppArmor mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/apparmor

Reply via email to