Changeset 2756

Timestamp:

07/09/08 13:11:38 (5 months ago)

Author:

cpebenito

Message:

rbacsep: fixes for modular building

Files:

• branches/rbacsep/policy/modules/apps/cdrecord.te (modified) (1 diff)
• branches/rbacsep/policy/modules/apps/evolution.if (modified) (1 diff)
• branches/rbacsep/policy/modules/apps/screen.if (modified) (1 diff)
• branches/rbacsep/policy/modules/services/cron.if (modified) (5 diffs)
• branches/rbacsep/policy/modules/services/cron.te (modified) (3 diffs)
• branches/rbacsep/policy/modules/services/dbus.if (modified) (1 diff)
• branches/rbacsep/policy/modules/services/ssh.if (modified) (1 diff)
• branches/rbacsep/policy/modules/services/xserver.if (modified) (4 diffs)
• branches/rbacsep/policy/modules/services/xserver.te (modified) (1 diff)
• branches/rbacsep/policy/modules/system/unconfined.te (modified) (1 diff)
• branches/rbacsep/policy/modules/system/userdomain.if (modified) (4 diffs)
• branches/rbacsep/policy/modules/system/userdomain.te (modified) (2 diffs)

branches/rbacsep/policy/modules/apps/cdrecord.te

@@ -17 +17 @@
-
-type cdrecord_t;
+type cdrecord_exec_t;
-application_domain(cdrecord_t, cdrecord_exec_t)
-
-type cdrecord_exec_t;
-application_executable_file(cdrecord_exec_t)
-
-########################################

branches/rbacsep/policy/modules/apps/evolution.if

@@ -24 +24 @@
-                type evolution_alarm_tmpfs_t, evolution_alarm_orbit_tmp_t;
-                type evolution_exchange_t, evolution_exchange_exec_t;
-$1_
+
-                type evolution_exchange_orbit_tmp_t;
-                type evolution_server_t, evolution_server_exec_t;

branches/rbacsep/policy/modules/apps/screen.if

@@ -24 +24 @@
-template(`screen_role_template',`
-        gen_require(`
-
+
+
-        ')
-

branches/rbacsep/policy/modules/services/cron.if

@@ -13 +13 @@
-#
-template(`cron_common_crontab_template',`
-        gen_require(`
-                type crontab_exec_t, user_cron_spool_t;
-                class dbus send_msg;
-        ')
-
-        ##############################
-        #
@@ -105 +100 @@
-#
-interface(`cron_role',`
+        gen_require(`
+                type cronjob_t, crontab_t, crontab_tmp_t, crontab_exec_t;
+        ')
-
-        role $1 types { cronjob_t crontab_t crontab_tmp_t };
@@ -147 +145 @@
-#
-interface(`cron_unconfined_role',`
+        gen_require(`
+                type unconfined_cronjob_t, crontab_t, crontab_tmp_t, crontab_exec_t;
+        ')
-
-        role $1 types { unconfined_cronjob_t crontab_t crontab_tmp_t };
@@ -167 +168 @@
-
-        optional_policy(`
-
-
-
+unconfined_
+
+unconfined_
-        ')              
-')
@@ -191 +192 @@
-        gen_require(`
-                type cronjob_t, crontab_exec_t, admin_crontab_t, admin_crontab_tmp_t;
+                class passwd crontab;
-        ')
-

branches/rbacsep/policy/modules/services/cron.te

@@ -43 +43 @@
-logging_log_file(cron_log_t)
-
+type cronjob_t;
+domain_type(cronjob_t)
+domain_cron_exemption_target(cronjob_t)
+corecmd_shell_entry_type(cronjob_t)
+
-type crond_t;
-type crond_exec_t;
@@ -80 +85 @@
-')
-
-
-
-
-
+
+
-
-# Type of user crontabs once moved to cron spool.
@@ -583 +586 @@
-
-optional_policy(`
-        type unconfined_cronjob_t;
-        unconfined_domain(unconfined_cronjob_t)
-')

branches/rbacsep/policy/modules/services/dbus.if

@@ -44 +44 @@
-
-                attribute session_bus_type;
-
+, dbusd_etc_t
-        ')
-

branches/rbacsep/policy/modules/services/ssh.if

@@ -311 +311 @@
-template(`ssh_role_template',`
-        gen_require(`
-
+server, ssh_
-
-                type ssh_t, ssh_exec_t, ssh_tmpfs_t, home_ssh_t;
-                type ssh_agent_exec_t, ssh_keysign_t, ssh_tmpfs_t;
+                type ssh_agent_tmp_t;
-        ')
-

branches/rbacsep/policy/modules/services/xserver.if

@@ -2 +2 @@
-
-interface(`xserver_role',`
+        gen_require(`
+                type xserver_t, xserver_exec_t, xserver_tmp_t, xserver_tmpfs_t;
+                type user_fonts_t, user_fonts_cache_t, user_fonts_config_t;
+                type iceauth_t, iceauth_exec_t, iceauth_home_t;
+                type xauth_t, xauth_exec_t, xauth_home_t;
+
+                type info_xproperty_t;
+
+                class x_drawable all_x_drawable_perms;
+                class x_screen all_x_screen_perms;
+                class x_gc all_x_gc_perms;
+                class x_font all_x_font_perms;
+                class x_colormap all_x_colormap_perms;
+                class x_property all_x_property_perms;
+                class x_selection all_x_selection_perms;
+                class x_cursor all_x_cursor_perms;
+                class x_client all_x_client_perms;
+                class x_device all_x_device_perms;
+                class x_server all_x_server_perms;
+                class x_extension all_x_extension_perms;
+                class x_resource all_x_resource_perms;
+                class x_event all_x_event_perms;
+                class x_synthetic_event all_x_synthetic_event_perms;
+        ')
-
-        domtrans_pattern($2, xserver_exec_t, xserver_t)
@@ -229 +253 @@
-template(`xserver_common_x_domain_template',`
-        gen_require(`
+                type $1_xproperty_t, $1_input_xevent_t, $1_property_xevent_t;
+                type $1_focus_xevent_t, $1_manage_xevent_t, $1_default_xevent_t;
+                type $1_client_xevent_t;
+
-                type rootwindow_t, xproperty_t;
-                type input_xevent_t, focus_xevent_t, property_xevent_t, manage_xevent_t;
@@ -280 +308 @@
-
-template(`xserver_object_types_template',`
+        gen_require(`
+                attribute xproperty_type, input_xevent_type, xevent_type;
+        ')
+
-        ##############################
-        #
@@ -325 +357 @@
-                type xauth_home_t, iceauth_home_t, xserver_t, xserver_tmpfs_t;
-        ')
-
-        # Type attributes
-        typeattribute $2 x_domain;
-
-        allow $2 self:shm create_shm_perms;

branches/rbacsep/policy/modules/services/xserver.te

@@ -1 +1 @@
-
-policy_module(xserver, 2.1.0)
+
+gen_require(`
+        class x_drawable all_x_drawable_perms;
+        class x_screen all_x_screen_perms;
+        class x_gc all_x_gc_perms;
+        class x_font all_x_font_perms;
+        class x_colormap all_x_colormap_perms;
+        class x_property all_x_property_perms;
+        class x_selection all_x_selection_perms;
+        class x_cursor all_x_cursor_perms;
+        class x_client all_x_client_perms;
+        class x_device all_x_device_perms;
+        class x_server all_x_server_perms;
+        class x_extension all_x_extension_perms;
+        class x_resource all_x_resource_perms;
+        class x_event all_x_event_perms;
+        class x_synthetic_event all_x_synthetic_event_perms;
+')
-
-########################################

branches/rbacsep/policy/modules/system/unconfined.te

@@ -11 +11 @@
-# have another method to add access to these types
-userdom_base_user_template(unconfined)
-template(unconfined
-template(unconfined
-template(unconfined
+role(unconfined_r, unconfined_t
+role(unconfined_r, unconfined_t
+role(unconfined_r, unconfined_t
-
-type unconfined_exec_t;

branches/rbacsep/policy/modules/system/userdomain.if

@@ -40 +40 @@
-        allow system_r $1_r;
-
+        # XXX cjp: temporary hack
+        ifelse(`$1',`user',`',`
+                typealias user_devpts_t alias $1_devpts_t;
+        ')
-        term_user_pty($1_t, user_devpts_t)
-        role $1_r types user_devpts_t;
-
+        # XXX cjp: temporary hack
+        ifelse(`$1',`user',`',`
+                typealias user_tty_device_t alias $1_tty_device_t;
+        ')
-        term_user_tty($1_t, user_tty_device_t)
-        role $1_r types user_tty_device_t;
@@ -846 +854 @@
-        # Local policy
-        #
-
-        # privileged home directory writers
-        manage_dirs_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t)
-        manage_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t)
-        manage_lnk_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t)
-        manage_sock_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t)
-        manage_fifo_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t)
-        filetrans_pattern(privhome,$1_home_dir_t,$1_home_t,{ dir file lnk_file sock_file fifo_file })
-
-        optional_policy(`
@@ -1059 +1059 @@
-template(`userdom_admin_user_template',`
-        gen_require(`
-admin_terminal, 
+
-                class passwd { passwd chfn chsh rootok };
-        ')
@@ -2564 +2564 @@
-interface(`userdom_manage_all_users_home_content_symlinks',`
-        gen_require(`
-attribute home_type
+type user_home_t, user_home_dir_t
-        ')
-

branches/rbacsep/policy/modules/system/userdomain.te

@@ -82 +82 @@
-files_mountpoint(user_home_t)
-
-
+; #
-dev_node(user_devpts_t)
-files_type(user_devpts_t)
@@ -95 +95 @@
-userdom_user_home_content(user_tmpfs_t)
-
-
+; #
-dev_node(user_tty_device_t)