X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=policy%2Fmodules%2Fsystem%2Fuserdomain.if;h=db35b2e9b93284ed366bfa5068b010d7eadd63ea;hb=f5fe855dd86a1a5395d174f2e7e1c379595f618d;hp=10ddf7d6d9b633f8cb882ae83bcd792dd91be21e;hpb=e3128f3ca1c5497a082e824b15691f5e4730bbe9;p=people%2Fstevee%2Fselinux-policy.git
diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if
index 10ddf7d6..db35b2e9 100644
--- a/policy/modules/system/userdomain.if
+++ b/policy/modules/system/userdomain.if
@@ -47,7 +47,10 @@ template(`userdom_base_user_template',`
term_user_tty($1_t, user_tty_device_t)
term_dontaudit_getattr_generic_ptys($1_t)
- allow $1_usertype $1_usertype:process { ptrace signal_perms getsched setsched share getpgid setpgid getcap setcap getsession getattr };
+ allow $1_usertype $1_usertype:process { signal_perms getsched setsched share getpgid setpgid getcap setcap getsession getattr };
+ tunable_policy(`deny_ptrace',`',`
+ allow $1_usertype $1_usertype:process ptrace;
+ ')
allow $1_usertype $1_usertype:fd use;
allow $1_usertype $1_t:key { create view read write search link setattr };
@@ -146,12 +149,12 @@ template(`userdom_base_user_template',`
systemd_dbus_chat_logind($1_usertype)
- tunable_policy(`allow_execmem',`
+ tunable_policy(`deny_execmem',`', `
# Allow loading DSOs that require executable stack.
allow $1_t self:process execmem;
')
- tunable_policy(`allow_execmem && allow_execstack',`
+ tunable_policy(`allow_execstack',`
# Allow making the stack executable via mprotect.
allow $1_t self:process execstack;
')
@@ -281,6 +284,8 @@ interface(`userdom_manage_home_role',`
relabel_sock_files_pattern($2, { user_home_dir_t user_home_type }, user_home_type)
relabel_fifo_files_pattern($2, { user_home_dir_t user_home_type }, user_home_type)
filetrans_pattern($2, user_home_dir_t, user_home_t, { dir file lnk_file sock_file fifo_file })
+ userdom_filetrans_home_content($2)
+
files_list_home($2)
# cjp: this should probably be removed:
@@ -650,6 +655,8 @@ template(`userdom_common_user_template',`
auth_read_login_records($1_usertype)
auth_run_pam($1_t,$1_r)
auth_run_utempter($1_t,$1_r)
+ auth_filetrans_admin_home_content($1_t)
+ auth_filetrans_home_content($1_t)
init_read_utmp($1_usertype)
@@ -671,13 +678,6 @@ template(`userdom_common_user_template',`
term_getattr_all_ttys($1_t)
')
- optional_policy(`
- alsa_read_rw_config($1_usertype)
- alsa_manage_home_files($1_t)
- alsa_relabel_home_files($1_t)
- alsa_filetrans_named_content($1_t)
- ')
-
optional_policy(`
# Allow graphical boot to check battery lifespan
apm_stream_connect($1_usertype)
@@ -687,10 +687,6 @@ template(`userdom_common_user_template',`
canna_stream_connect($1_usertype)
')
- optional_policy(`
- chrome_role($1_r, $1_usertype)
- ')
-
optional_policy(`
colord_read_lib_files($1_usertype)
')
@@ -723,11 +719,6 @@ template(`userdom_common_user_template',`
devicekit_dbus_chat_disk($1_usertype)
')
- optional_policy(`
- evolution_dbus_chat($1_usertype)
- evolution_alarm_dbus_chat($1_usertype)
- ')
-
optional_policy(`
gnome_dbus_chat_gconfdefault($1_usertype)
')
@@ -788,10 +779,6 @@ template(`userdom_common_user_template',`
mta_filetrans_home_content($1_usertype)
')
- optional_policy(`
- nsplugin_role($1_r, $1_usertype)
- ')
-
optional_policy(`
tunable_policy(`allow_user_mysql_connect',`
mysql_stream_connect($1_t)
@@ -848,7 +835,6 @@ template(`userdom_common_user_template',`
optional_policy(`
slrnpull_search_spool($1_usertype)
')
-
')
#######################################
@@ -907,7 +893,7 @@ template(`userdom_login_user_template', `
allow $1_t self:capability { setgid chown fowner };
dontaudit $1_t self:capability { sys_nice fsetid };
- allow $1_t self:process ~{ setcurrent setexec setrlimit execmem execstack execheap };
+ allow $1_t self:process ~{ ptrace setcurrent setexec setrlimit execmem execstack execheap };
dontaudit $1_t self:process setrlimit;
dontaudit $1_t self:netlink_route_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown nlmsg_read nlmsg_write };
@@ -1107,8 +1093,6 @@ template(`userdom_restricted_xwindows_user_template',`
optional_policy(`
gnome_read_usr_config($1_usertype)
gnome_role_gkeyringd($1, $1_r, $1_usertype)
- # cjp: telepathy F15 bugs
- telepathy_role($1_r, $1_t, $1)
')
optional_policy(`
@@ -1142,10 +1126,6 @@ template(`userdom_restricted_xwindows_user_template',`
')
')
- optional_policy(`
- openoffice_role_template($1, $1_r, $1_usertype)
- ')
-
optional_policy(`
policykit_role($1_r, $1_usertype)
')
@@ -1264,10 +1244,6 @@ template(`userdom_unpriv_user_template', `
cron_role($1_r, $1_t)
')
- optional_policy(`
- games_rw_data($1_usertype)
- ')
-
optional_policy(`
gpg_role($1_r, $1_usertype)
')
@@ -1280,18 +1256,6 @@ template(`userdom_unpriv_user_template', `
gpm_stream_connect($1_usertype)
')
- optional_policy(`
- execmem_role_template($1, $1_r, $1_t)
- ')
-
- optional_policy(`
- java_role_template($1, $1_r, $1_t)
- ')
-
- optional_policy(`
- mono_role_template($1, $1_r, $1_t)
- ')
-
optional_policy(`
mount_run_fusermount($1_t, $1_r)
mount_read_pid_files($1_t)
@@ -1376,7 +1340,10 @@ template(`userdom_admin_user_template',`
# $1_t local policy
#
- allow $1_t self:capability ~{ sys_module audit_control audit_write };
+ allow $1_t self:capability ~{ sys_ptrace sys_module audit_control audit_write };
+ tunable_policy(`deny_ptrace',`',`
+ allow $1_t self:capability sys_ptrace;
+ ')
allow $1_t self:capability2 syslog;
allow $1_t self:process { setexec setfscreate };
allow $1_t self:netlink_audit_socket nlmsg_readpriv;
@@ -3007,6 +2974,25 @@ interface(`userdom_tmp_filetrans_user_tmp',`
files_tmp_filetrans($1, user_tmp_t, $2)
')
+#######################################
+##
+## Getattr user tmpfs files.
+##
+##
+##
+## Domain allowed access.
+##
+##
+#
+interface(`userdom_getattr_user_tmpfs_files',`
+ gen_require(`
+ type user_tmpfs_t;
+ ')
+
+ getattr_files_pattern($1, user_tmpfs_t, user_tmpfs_t)
+ fs_search_tmpfs($1)
+')
+
########################################
##
## Read user tmpfs files.
@@ -3049,6 +3035,42 @@ interface(`userdom_rw_user_tmpfs_files',`
fs_search_tmpfs($1)
')
+########################################
+##
+## Read/Write inherited user tmpfs files.
+##
+##
+##
+## Domain allowed access.
+##
+##
+#
+interface(`userdom_rw_inherited_user_tmpfs_files',`
+ gen_require(`
+ type user_tmpfs_t;
+ ')
+
+ allow $1 user_tmpfs_t:file rw_inherited_file_perms;
+')
+
+########################################
+##
+## Execute user tmpfs files.
+##
+##
+##
+## Domain allowed access.
+##
+##
+#
+interface(`userdom_execute_user_tmpfs_files',`
+ gen_require(`
+ type user_tmpfs_t;
+ ')
+
+ allow $1 user_tmpfs_t:file execute;
+')
+
########################################
##
## Get the attributes of a user domain tty.
@@ -3258,8 +3280,8 @@ interface(`userdom_dontaudit_use_user_terminals',`
type user_tty_device_t, user_devpts_t;
')
- dontaudit $1 user_tty_device_t:chr_file rw_term_perms;
- dontaudit $1 user_devpts_t:chr_file rw_term_perms;
+ dontaudit $1 user_tty_device_t:chr_file rw_inherited_term_perms;
+ dontaudit $1 user_devpts_t:chr_file rw_inherited_term_perms;
')
@@ -3685,7 +3707,7 @@ interface(`userdom_dontaudit_use_user_ttys',`
type user_tty_device_t;
')
- dontaudit $1 user_tty_device_t:chr_file rw_file_perms;
+ dontaudit $1 user_tty_device_t:chr_file rw_inherited_file_perms;
')
########################################
@@ -3817,6 +3839,24 @@ interface(`userdom_sigchld_all_users',`
allow $1 userdomain:process sigchld;
')
+########################################
+##
+## Read keys for all user domains.
+##
+##
+##
+## Domain allowed access.
+##
+##
+#
+interface(`userdom_read_all_users_keys',`
+ gen_require(`
+ attribute userdomain;
+ ')
+
+ allow $1 userdomain:key read;
+')
+
########################################
##
## Create keys for all user domains.
@@ -3906,6 +3946,38 @@ template(`userdom_unpriv_usertype',`
ubac_constrained($2)
')
+#######################################
+##
+## Define this type as a Allow apps to set rlimits on userdomain
+##
+##
+##
+## Domain allowed access.
+##
+##
+##
+##
+## The prefix of the user domain (e.g., user
+## is the prefix for user_t).
+##
+##
+##
+##
+## Domain allowed access.
+##
+##
+#
+template(`userdom_unpriv_type',`
+ gen_require(`
+ attribute unpriv_userdomain, userdomain;
+ ')
+ typeattribute $2 unpriv_userdomain;
+ typeattribute $2 userdomain;
+
+ auth_use_nsswitch($2)
+ ubac_constrained($2)
+')
+
########################################
##
## Connect to users over an unix stream socket.
@@ -3940,7 +4012,9 @@ interface(`userdom_ptrace_all_users',`
attribute userdomain;
')
- allow $1 userdomain:process ptrace;
+ tunable_policy(`deny_ptrace',`',`
+ allow $1 userdomain:process ptrace;
+ ')
')
########################################
@@ -4109,6 +4183,25 @@ interface(`userdom_read_admin_home_files',`
read_files_pattern($1, admin_home_t, admin_home_t)
')
+########################################
+##
+## Delete admin home files.
+##
+##
+##
+## Domain allowed access.
+##
+##
+##
+#
+interface(`userdom_delete_admin_home_files',`
+ gen_require(`
+ type admin_home_t;
+ ')
+
+ allow $1 admin_home_t:file delete_file_perms;
+')
+
########################################
##
## Execute admin home files.
@@ -4576,6 +4669,29 @@ interface(`userdom_read_home_certs',`
read_lnk_files_pattern($1, home_cert_t, home_cert_t)
')
+########################################
+##
+## Manage system SSL certificates in the users homedir.
+##
+##
+##
+## Domain allowed access.
+##
+##
+#
+interface(`userdom_manage_home_certs',`
+ gen_require(`
+ type home_cert_t;
+ ')
+
+ allow $1 home_cert_t:dir list_dir_perms;
+ manage_files_pattern($1, home_cert_t, home_cert_t)
+ manage_lnk_files_pattern($1, home_cert_t, home_cert_t)
+
+ userdom_user_home_dir_filetrans($1, home_cert_t, dir, ".cert")
+ userdom_user_home_dir_filetrans($1, home_cert_t, dir, ".pki")
+')
+
#######################################
##
## Dontaudit Write system SSL certificates in the users homedir.
@@ -4706,6 +4822,24 @@ interface(`userdom_dontaudit_setattr_user_tmp',`
dontaudit $1 user_tmp_t:dir setattr;
')
+########################################
+##
+## Read all inherited users files in /tmp
+##
+##
+##
+## Domain allowed access.
+##
+##
+#
+interface(`userdom_read_inherited_user_tmp_files',`
+ gen_require(`
+ type user_tmp_t;
+ ')
+
+ allow $1 user_tmp_t:file read_inherited_file_perms;
+')
+
########################################
##
## Write all inherited users files in /tmp
@@ -4926,3 +5060,69 @@ interface(`userdom_rw_unpriv_user_semaphores',`
allow $1 unpriv_userdomain:sem rw_sem_perms;
')
+
+########################################
+##
+## Transition to userdom named content
+##
+##
+##
+## Domain allowed access.
+##
+##
+#
+interface(`userdom_filetrans_home_content',`
+ gen_require(`
+ type home_bin_t, home_cert_t;
+ type audio_home_t;
+ ')
+
+ userdom_user_home_dir_filetrans($1, home_bin_t, dir, "bin")
+ userdom_user_home_dir_filetrans($1, audio_home_t, dir, "Audio")
+ userdom_user_home_dir_filetrans($1, audio_home_t, dir, "Music")
+ userdom_user_home_dir_filetrans($1, home_cert_t, dir, ".cert")
+ userdom_user_home_dir_filetrans($1, home_cert_t, dir, ".pki")
+ userdom_user_home_dir_filetrans($1, home_cert_t, dir, "certificates")
+ gnome_config_filetrans($1, home_cert_t, dir, "certificates")
+
+ #optional_policy(`
+ # gnome_admin_home_gconf_filetrans($1, home_bin_t, dir, "bin")
+ #')
+')
+
+########################################
+##
+## Make the specified type able to read content in user home dirs
+##
+##
+##
+## Domain allowed access.
+##
+##
+#
+interface(`userdom_home_reader',`
+ gen_require(`
+ attribute userdom_home_reader_type;
+ ')
+
+ typeattribute $1 userdom_home_reader_type;
+')
+
+
+########################################
+##
+## Make the specified type able to manage content in user home dirs
+##
+##
+##
+## Domain allowed access.
+##
+##
+#
+interface(`userdom_home_manager',`
+ gen_require(`
+ attribute userdom_home_manager_type;
+ ')
+
+ typeattribute $1 userdom_home_manager_type;
+')