* policy changes to userdomain.if
@ 2007-02-20 16:31 Daniel J Walsh
2007-02-23 19:46 ` Christopher J. PeBenito
0 siblings, 1 reply; 2+ messages in thread
From: Daniel J Walsh @ 2007-02-20 16:31 UTC (permalink / raw)
To: Christopher J. PeBenito, SE Linux
[-- Attachment #1: Type: text/plain, Size: 85 bytes --]
Remove ifdef strict_policy, We want to support user roles within
targeted policy
[-- Attachment #2: nsaserefpolicy_policy_modules_system_userdomain.if --]
[-- Type: text/plain, Size: 5318 bytes --]
--- nsaserefpolicy/policy/modules/system/userdomain.if 2007-02-19 11:32:53.000000000 -0500
+++ serefpolicy-2.5.4/policy/modules/system/userdomain.if 2007-02-19 16:41:57.000000000 -0500
@@ -1368,11 +1373,7 @@
## <rolecap/>
#
template(`userdom_role_change_generic_user',`
- ifdef(`strict_policy',`
- userdom_role_change_template($1,user)
- ',`
- refpolicywarn(`$0($*) has no effect in targeted policy.')
- ')
+ userdom_role_change_template($1,user)
')
########################################
@@ -1713,13 +1714,11 @@
## </param>
#
template(`userdom_setattr_user_ptys',`
- ifdef(`strict_policy',`
- gen_require(`
- type $1_devpts_t;
- ')
-
- allow $2 $1_devpts_t:chr_file setattr;
+ gen_require(`
+ type $1_devpts_t;
')
+
+ allow $2 $1_devpts_t:chr_file setattr;
')
########################################
@@ -1748,13 +1747,11 @@
## </param>
#
template(`userdom_create_user_pty',`
- ifdef(`strict_policy',`
- gen_require(`
- type $1_devpts_t;
- ')
-
- term_create_pty($2,$1_devpts_t)
+ gen_require(`
+ type $1_devpts_t;
')
+
+ term_create_pty($2,$1_devpts_t)
')
########################################
@@ -3639,13 +3636,12 @@
template(`userdom_setattr_user_ttys',`
ifdef(`targeted_policy',`
term_setattr_unallocated_ttys($2)
- ',`
- gen_require(`
- type $1_tty_device_t;
- ')
-
- allow $2 $1_tty_device_t:chr_file setattr;
')
+ gen_require(`
+ type $1_tty_device_t;
+ ')
+
+ allow $2 $1_tty_device_t:chr_file setattr;
')
########################################
@@ -3676,13 +3672,12 @@
template(`userdom_use_user_ttys',`
ifdef(`targeted_policy',`
term_use_unallocated_ttys($2)
- ',`
- gen_require(`
- type $1_tty_device_t;
- ')
-
- allow $2 $1_tty_device_t:chr_file rw_term_perms;
')
+ gen_require(`
+ type $1_tty_device_t;
+ ')
+
+ allow $2 $1_tty_device_t:chr_file rw_term_perms;
')
########################################
@@ -3711,18 +3706,13 @@
## </param>
#
template(`userdom_use_user_terminals',`
- ifdef(`targeted_policy',`
- term_use_unallocated_ttys($2)
- term_use_generic_ptys($2)
- ',`
- gen_require(`
- type $1_tty_device_t, $1_devpts_t;
- ')
-
- allow $2 $1_tty_device_t:chr_file rw_term_perms;
- allow $2 $1_devpts_t:chr_file rw_term_perms;
- term_list_ptys($2)
+ gen_require(`
+ type $1_tty_device_t, $1_devpts_t;
')
+
+ allow $2 $1_tty_device_t:chr_file rw_term_perms;
+ allow $2 $1_devpts_t:chr_file rw_term_perms;
+ term_list_ptys($2)
')
########################################
@@ -5386,14 +5376,13 @@
interface(`userdom_use_unpriv_users_ptys',`
ifdef(`targeted_policy',`
term_use_generic_ptys($1)
- ',`
- gen_require(`
- attribute user_ptynode;
- ')
-
- term_search_ptys($1)
- allow $1 user_ptynode:chr_file rw_file_perms;
')
+ gen_require(`
+ attribute user_ptynode;
+ ')
+
+ term_search_ptys($1)
+ allow $1 user_ptynode:chr_file rw_file_perms;
')
########################################
@@ -5410,13 +5399,13 @@
interface(`userdom_dontaudit_use_unpriv_users_ptys',`
ifdef(`targeted_policy',`
term_dontaudit_use_generic_ptys($1)
- ',`
- gen_require(`
- attribute user_ptynode;
- ')
+ ')
- dontaudit $1 user_ptynode:chr_file rw_file_perms;
+ gen_require(`
+ attribute user_ptynode;
')
+
+ dontaudit $1 user_ptynode:chr_file rw_file_perms;
')
########################################
@@ -5469,13 +5458,12 @@
interface(`userdom_list_unpriv_users_tmp',`
ifdef(`targeted_policy',`
files_list_tmp($1)
- ',`
- gen_require(`
- attribute user_tmpfile;
- ')
-
- allow $1 user_tmpfile:dir list_dir_perms;
')
+ gen_require(`
+ attribute user_tmpfile;
+ ')
+
+ allow $1 user_tmpfile:dir list_dir_perms;
')
########################################
@@ -5491,13 +5479,12 @@
interface(`userdom_read_unpriv_users_tmp_files',`
ifdef(`targeted_policy',`
files_read_generic_tmp_files($1)
- ',`
- gen_require(`
- attribute user_tmpfile;
- ')
-
- allow $1 user_tmpfile:file { read getattr };
')
+ gen_require(`
+ attribute user_tmpfile;
+ ')
+
+ allow $1 user_tmpfile:file { read getattr };
')
########################################
@@ -5513,13 +5500,12 @@
interface(`userdom_read_unpriv_users_tmp_symlinks',`
ifdef(`targeted_policy',`
files_read_generic_tmp_symlinks($1)
- ',`
- gen_require(`
- attribute user_tmpfile;
- ')
-
- allow $1 user_tmpfile:lnk_file { getattr read };
')
+ gen_require(`
+ attribute user_tmpfile;
+ ')
+
+ allow $1 user_tmpfile:lnk_file { getattr read };
')
########################################
@@ -5553,13 +5539,12 @@
interface(`userdom_use_unpriv_users_ttys',`
ifdef(`targeted_policy',`
term_use_unallocated_ttys($1)
- ',`
- gen_require(`
- attribute user_ttynode;
- ')
-
- allow $1 user_ttynode:chr_file rw_term_perms;
')
+ gen_require(`
+ attribute user_ttynode;
+ ')
+
+ allow $1 user_ttynode:chr_file rw_term_perms;
')
########################################
@@ -5576,13 +5561,12 @@
interface(`userdom_dontaudit_use_unpriv_users_ttys',`
ifdef(`targeted_policy',`
term_dontaudit_use_unallocated_ttys($1)
- ',`
- gen_require(`
- attribute user_ttynode;
- ')
-
- dontaudit $1 user_ttynode:chr_file rw_file_perms;
')
+ gen_require(`
+ attribute user_ttynode;
+ ')
+
+ dontaudit $1 user_ttynode:chr_file rw_file_perms;
')
########################################
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: policy changes to userdomain.if
2007-02-20 16:31 policy changes to userdomain.if Daniel J Walsh
@ 2007-02-23 19:46 ` Christopher J. PeBenito
0 siblings, 0 replies; 2+ messages in thread
From: Christopher J. PeBenito @ 2007-02-23 19:46 UTC (permalink / raw)
To: Daniel J Walsh; +Cc: SE Linux
On Tue, 2007-02-20 at 11:31 -0500, Daniel J Walsh wrote:
> Remove ifdef strict_policy, We want to support user roles within
> targeted policy
I'm holding off on this. When we allow user roles, we're going to have
to do it in one large change, since not only do you have to do this
change, but theres other changes, like home directories and terminals
for the unconfined role. I plan to start a branch in refpolicy svn for
this soon.
>
> plain text document attachment
> (nsaserefpolicy_policy_modules_system_userdomain.if)
> --- nsaserefpolicy/policy/modules/system/userdomain.if 2007-02-19 11:32:53.000000000 -0500
> +++ serefpolicy-2.5.4/policy/modules/system/userdomain.if 2007-02-19 16:41:57.000000000 -0500
> @@ -1368,11 +1373,7 @@
> ## <rolecap/>
> #
> template(`userdom_role_change_generic_user',`
> - ifdef(`strict_policy',`
> - userdom_role_change_template($1,user)
> - ',`
> - refpolicywarn(`$0($*) has no effect in targeted policy.')
> - ')
> + userdom_role_change_template($1,user)
> ')
>
> ########################################
> @@ -1713,13 +1714,11 @@
> ## </param>
> #
> template(`userdom_setattr_user_ptys',`
> - ifdef(`strict_policy',`
> - gen_require(`
> - type $1_devpts_t;
> - ')
> -
> - allow $2 $1_devpts_t:chr_file setattr;
> + gen_require(`
> + type $1_devpts_t;
> ')
> +
> + allow $2 $1_devpts_t:chr_file setattr;
> ')
>
> ########################################
> @@ -1748,13 +1747,11 @@
> ## </param>
> #
> template(`userdom_create_user_pty',`
> - ifdef(`strict_policy',`
> - gen_require(`
> - type $1_devpts_t;
> - ')
> -
> - term_create_pty($2,$1_devpts_t)
> + gen_require(`
> + type $1_devpts_t;
> ')
> +
> + term_create_pty($2,$1_devpts_t)
> ')
>
> ########################################
> @@ -3639,13 +3636,12 @@
> template(`userdom_setattr_user_ttys',`
> ifdef(`targeted_policy',`
> term_setattr_unallocated_ttys($2)
> - ',`
> - gen_require(`
> - type $1_tty_device_t;
> - ')
> -
> - allow $2 $1_tty_device_t:chr_file setattr;
> ')
> + gen_require(`
> + type $1_tty_device_t;
> + ')
> +
> + allow $2 $1_tty_device_t:chr_file setattr;
> ')
>
> ########################################
> @@ -3676,13 +3672,12 @@
> template(`userdom_use_user_ttys',`
> ifdef(`targeted_policy',`
> term_use_unallocated_ttys($2)
> - ',`
> - gen_require(`
> - type $1_tty_device_t;
> - ')
> -
> - allow $2 $1_tty_device_t:chr_file rw_term_perms;
> ')
> + gen_require(`
> + type $1_tty_device_t;
> + ')
> +
> + allow $2 $1_tty_device_t:chr_file rw_term_perms;
> ')
>
> ########################################
> @@ -3711,18 +3706,13 @@
> ## </param>
> #
> template(`userdom_use_user_terminals',`
> - ifdef(`targeted_policy',`
> - term_use_unallocated_ttys($2)
> - term_use_generic_ptys($2)
> - ',`
> - gen_require(`
> - type $1_tty_device_t, $1_devpts_t;
> - ')
> -
> - allow $2 $1_tty_device_t:chr_file rw_term_perms;
> - allow $2 $1_devpts_t:chr_file rw_term_perms;
> - term_list_ptys($2)
> + gen_require(`
> + type $1_tty_device_t, $1_devpts_t;
> ')
> +
> + allow $2 $1_tty_device_t:chr_file rw_term_perms;
> + allow $2 $1_devpts_t:chr_file rw_term_perms;
> + term_list_ptys($2)
> ')
>
> ########################################
> @@ -5386,14 +5376,13 @@
> interface(`userdom_use_unpriv_users_ptys',`
> ifdef(`targeted_policy',`
> term_use_generic_ptys($1)
> - ',`
> - gen_require(`
> - attribute user_ptynode;
> - ')
> -
> - term_search_ptys($1)
> - allow $1 user_ptynode:chr_file rw_file_perms;
> ')
> + gen_require(`
> + attribute user_ptynode;
> + ')
> +
> + term_search_ptys($1)
> + allow $1 user_ptynode:chr_file rw_file_perms;
> ')
>
> ########################################
> @@ -5410,13 +5399,13 @@
> interface(`userdom_dontaudit_use_unpriv_users_ptys',`
> ifdef(`targeted_policy',`
> term_dontaudit_use_generic_ptys($1)
> - ',`
> - gen_require(`
> - attribute user_ptynode;
> - ')
> + ')
>
> - dontaudit $1 user_ptynode:chr_file rw_file_perms;
> + gen_require(`
> + attribute user_ptynode;
> ')
> +
> + dontaudit $1 user_ptynode:chr_file rw_file_perms;
> ')
>
> ########################################
> @@ -5469,13 +5458,12 @@
> interface(`userdom_list_unpriv_users_tmp',`
> ifdef(`targeted_policy',`
> files_list_tmp($1)
> - ',`
> - gen_require(`
> - attribute user_tmpfile;
> - ')
> -
> - allow $1 user_tmpfile:dir list_dir_perms;
> ')
> + gen_require(`
> + attribute user_tmpfile;
> + ')
> +
> + allow $1 user_tmpfile:dir list_dir_perms;
> ')
>
> ########################################
> @@ -5491,13 +5479,12 @@
> interface(`userdom_read_unpriv_users_tmp_files',`
> ifdef(`targeted_policy',`
> files_read_generic_tmp_files($1)
> - ',`
> - gen_require(`
> - attribute user_tmpfile;
> - ')
> -
> - allow $1 user_tmpfile:file { read getattr };
> ')
> + gen_require(`
> + attribute user_tmpfile;
> + ')
> +
> + allow $1 user_tmpfile:file { read getattr };
> ')
>
> ########################################
> @@ -5513,13 +5500,12 @@
> interface(`userdom_read_unpriv_users_tmp_symlinks',`
> ifdef(`targeted_policy',`
> files_read_generic_tmp_symlinks($1)
> - ',`
> - gen_require(`
> - attribute user_tmpfile;
> - ')
> -
> - allow $1 user_tmpfile:lnk_file { getattr read };
> ')
> + gen_require(`
> + attribute user_tmpfile;
> + ')
> +
> + allow $1 user_tmpfile:lnk_file { getattr read };
> ')
>
> ########################################
> @@ -5553,13 +5539,12 @@
> interface(`userdom_use_unpriv_users_ttys',`
> ifdef(`targeted_policy',`
> term_use_unallocated_ttys($1)
> - ',`
> - gen_require(`
> - attribute user_ttynode;
> - ')
> -
> - allow $1 user_ttynode:chr_file rw_term_perms;
> ')
> + gen_require(`
> + attribute user_ttynode;
> + ')
> +
> + allow $1 user_ttynode:chr_file rw_term_perms;
> ')
>
> ########################################
> @@ -5576,13 +5561,12 @@
> interface(`userdom_dontaudit_use_unpriv_users_ttys',`
> ifdef(`targeted_policy',`
> term_dontaudit_use_unallocated_ttys($1)
> - ',`
> - gen_require(`
> - attribute user_ttynode;
> - ')
> -
> - dontaudit $1 user_ttynode:chr_file rw_file_perms;
> ')
> + gen_require(`
> + attribute user_ttynode;
> + ')
> +
> + dontaudit $1 user_ttynode:chr_file rw_file_perms;
> ')
>
> ########################################
--
Chris PeBenito
Tresys Technology, LLC
(410) 290-1411 x150
--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-02-23 19:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-02-20 16:31 policy changes to userdomain.if Daniel J Walsh
2007-02-23 19:46 ` Christopher J. PeBenito
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.