Changeset 2728

Timestamp:

06/23/08 09:35:51 (2 months ago)

Author:

cpebenito

Message:

rbacsep: make xserver compilable.

Files:

• branches/rbacsep/policy/modules/services/xserver.if (modified) (8 diffs)
• branches/rbacsep/policy/modules/services/xserver.te (modified) (5 diffs)

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

@@ -2 +2 @@
-
-interface(`xserver_role',`
-        typeattribute $2 x_userdomain;
-
-        domtrans_pattern($2, xserver_exec_t, xserver_t)
@@ -50 +49 @@
-        allow $2 xauth_home_t:file { relabelfrom relabelto };
-
+        xserver_common_x_domain_template(user, $2)
-
-        ##############################
@@ -229 +229 @@
-template(`xserver_common_x_domain_template',`
-        gen_require(`
-
-
+
-                type input_xevent_t, focus_xevent_t, property_xevent_t, manage_xevent_t;
-                type xevent_t, client_xevent_t;
-                type clipboard_xselection_t, xselection_t;
-
-                attribute x_domain;
-                attribute xproperty_type;
-, xextension_type
+
-                attribute input_xevent_type;
-
-                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;
-        ')
-
-        ##############################
-        #
-        # Declarations
-        #
-
-        # Type attributes
-        typeattribute $2 x_domain;
-
-        # Types for properties
-        type $1_xproperty_t alias $1_default_xproperty_t, xproperty_type;
-
-        # Types for events
-        type $1_input_xevent_t, input_xevent_type, xevent_type;
-        type $1_property_xevent_t, xevent_type;
-        type $1_focus_xevent_t, xevent_type;
-        type $1_manage_xevent_t, xevent_type;
-        type $1_default_xevent_t, xevent_type;
-        type $1_client_xevent_t, xevent_type;
-
-        ##############################
@@ -281 +249 @@
-        #
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-        # X Properties
@@ -313 +256 @@
-        allow $2 $1_xproperty_t:x_property { create destroy read write append };
-        type_transition $2 xproperty_t:x_property $1_xproperty_t;
-        # can read and write cut buffers
-        allow $2 clipboard_xproperty_t:x_property { create read write append };
-        # can read info properties
-        allow $2 info_xproperty_t:x_property read;
-        # can change properties of root window
-        allow $2 rootwindow_t:x_drawable { list_property get_property set_property };
-        # can change properties of own windows
-        allow $2 self:x_drawable { list_property get_property set_property };
-
-        # X Windows
-
-
-
-
+
-        type_transition $2 rootwindow_t:x_drawable $2;
-
-        # X Colormaps
-        # can use the default colormap
-        allow $2 rootwindow_t:x_colormap { read use add_color };
-
-        # X Input
@@ -347 +275 @@
-        type_transition $2 client_xevent_t:x_event $1_client_xevent_t;
-        type_transition $2 xevent_t:x_event $1_default_xevent_t;
-        # can receive certain root window events
-        allow $2 focus_xevent_t:x_event receive;
-        allow $2 property_xevent_t:x_event receive;
-        allow $2 client_xevent_t:x_synthetic_event receive;
-        allow $2 manage_xevent_t:x_synthetic_event receive;
-        # can send ICCCM events to myself
-        allow $2 $1_manage_xevent_t:x_synthetic_event send;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-')
-
@@ -429 +325 @@
-                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;
@@ -460 +359 @@
-
-        # X object manager
+        xserver_object_types_template($1)
-        xserver_common_x_domain_template($1,$2)
-

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

@@ -68 +68 @@
-type unknown_xevent_t, xevent_type;
-
+xserver_object_types_template(user)
+
-type user_fonts_t;
-userdom_user_home_content(user_fonts_t)
@@ -131 +133 @@
-type xserver_t;
-type xserver_exec_t;
+xserver_object_types_template(xdm)
-xserver_common_x_domain_template(xdm,xdm_t)
-init_system_domain(xserver_t, xserver_exec_t)
@@ -146 +149 @@
-type xserver_log_t;
-logging_log_file(xserver_log_t)
-
-# basic object manager rules for user domains
-xserver_common_x_domain_template(user, x_userdomain)
-
-ifdef(`enable_mcs',`
@@ -695 +695 @@
-        # but typeattribute doesnt work in conditionals
-
-_server_domain
-ype
-_server_domain
+server_t
+
+server_t
-        allow xserver_t x_domain:x_gc *;
-ype
+
-        allow xserver_t xproperty_type:x_property *;
-        allow xserver_t xselection_type:x_selection *;
-        allow xserver_t x_domain:x_cursor *;
-        allow xserver_t { x_domain remote_xclient_t }:x_client *;
-_server_domain
+server_t
-        allow xserver_t xextension_type:x_extension *;
-_server_domain
+server_t
-        allow xserver_t xevent_type:{ x_event x_synthetic_event } *;
-')
@@ -790 +790 @@
-        rhgb_rw_shm(xserver_t)
-        rhgb_rw_tmpfs_files(xserver_t)
+')
+
+########################################
+#
+# Rules common to all X window domains
+#
+
+# Hacks
+# everyone can get the input focus of everyone else
+# this is a fundamental brokenness in the X protocol
+allow x_domain { x_domain xserver_t }:x_device getfocus;
+# everyone can grab the server
+# everyone does it, it is basically a free DOS attack
+allow x_domain xserver_t:x_server grab;
+# everyone can get the font path, etc.
+# this could leak out sensitive information
+allow x_domain xserver_t:x_server getattr;
+# everyone can do override-redirect windows.
+# this could be used to spoof labels
+allow x_domain self:x_drawable override;
+# everyone can receive management events on the root window
+# allows to know when new windows appear, among other things
+allow x_domain manage_xevent_t:x_event receive;
+
+# X Server
+# can read server-owned resources
+allow x_domain xserver_t:x_resource read;
+# can mess with own clients
+allow x_domain self:x_client { manage destroy };
+
+# X Protocol Extensions
+allow x_domain std_xext_t:x_extension { query use };
+allow x_domain shmem_xext_t:x_extension { query use };
+dontaudit x_domain xextension_type:x_extension { query use };
+
+# X Properties
+# can read and write cut buffers
+allow x_domain clipboard_xproperty_t:x_property { create read write append };
+# can read info properties
+allow x_domain info_xproperty_t:x_property read;
+# can change properties of root window
+allow x_domain rootwindow_t:x_drawable { list_property get_property set_property };
+# can change properties of own windows
+allow x_domain self:x_drawable { list_property get_property set_property };
+
+# X Windows
+# operations allowed on root windows
+allow x_domain rootwindow_t:x_drawable { getattr list_child add_child remove_child send receive };
+# operations allowed on my windows
+allow x_domain self:x_drawable { create destroy getattr setattr read write show hide list_child add_child remove_child manage send receive };
+
+# X Colormaps
+# can use the default colormap
+allow x_domain rootwindow_t:x_colormap { read use add_color };
+
+# X Input
+# can receive certain root window events
+allow x_domain focus_xevent_t:x_event receive;
+allow x_domain property_xevent_t:x_event receive;
+allow x_domain client_xevent_t:x_synthetic_event receive;
+allow x_domain manage_xevent_t:x_synthetic_event receive;
+# can send ICCCM events to the root window
+allow x_domain manage_xevent_t:x_synthetic_event send;
+allow x_domain client_xevent_t:x_synthetic_event send;
+# X Selections
+# can use the clipboard
+allow x_domain clipboard_xselection_t:x_selection { getattr setattr read };
+# can query all other selections
+allow x_domain xselection_t:x_selection { getattr read };
+
+# Other X Objects
+# can create and use cursors
+allow x_domain self:x_cursor *;
+# can create and use graphics contexts
+allow x_domain self:x_gc *;
+# can create and use colormaps
+allow x_domain self:x_colormap *;
+# can read and write own objects
+allow x_domain self:x_resource { read write };
+
+tunable_policy(`! xserver_object_manager',`
+        # should be xserver_unconfined(x_domain),
+        # but typeattribute doesnt work in conditionals
+
+        allow x_domain xserver_t:x_server *;
+        allow x_domain { x_domain rootwindow_t }:x_drawable *;
+        allow x_domain xserver_t:x_screen *;
+        allow x_domain x_domain:x_gc *;
+        allow x_domain { x_domain rootwindow_t }:x_colormap *;
+        allow x_domain xproperty_type:x_property *;
+        allow x_domain xselection_type:x_selection *;
+        allow x_domain x_domain:x_cursor *;
+        allow x_domain { x_domain remote_xclient_t }:x_client *;
+        allow x_domain { x_domain xserver_t }:x_device *;
+        allow x_domain xextension_type:x_extension *;
+        allow x_domain { x_domain xserver_t }:x_resource *;
+        allow x_domain xevent_type:{ x_event x_synthetic_event } *;
-')
-