Changeset 2640

Timestamp:

03/17/08 11:59:29 (8 months ago)

Author:

pebenito

Message:

xselinux: some renaming to be more consistent with naming of fallback types. work through some denials from testing.

Files:

• branches/xselinux/config/appconfig-mcs/x_contexts (modified) (4 diffs)
• branches/xselinux/config/appconfig-mls/x_contexts (modified) (4 diffs)
• branches/xselinux/config/appconfig-standard/x_contexts (modified) (4 diffs)
• branches/xselinux/policy/modules/services/xserver.if (modified) (7 diffs)
• branches/xselinux/policy/modules/services/xserver.te (modified) (2 diffs)

branches/xselinux/config/appconfig-mcs/x_contexts

@@ -49 +49 @@
-
-# Default fallback type
-default_
+
-
-
@@ -112 +112 @@
-
-# Default fallback type
-unknown_
+
-
-
@@ -130 +130 @@
-
-# Default fallback type
-default_
+
-
-
@@ -191 +191 @@
-
-# Default fallback type
-default_
+

branches/xselinux/config/appconfig-mls/x_contexts

@@ -49 +49 @@
-
-# Default fallback type
-default_
+
-
-
@@ -112 +112 @@
-
-# Default fallback type
-unknown_
+
-
-
@@ -130 +130 @@
-
-# Default fallback type
-default_
+
-
-
@@ -191 +191 @@
-
-# Default fallback type
-default_
+

branches/xselinux/config/appconfig-standard/x_contexts

@@ -49 +49 @@
-
-# Default fallback type
-default_
+
-
-
@@ -112 +112 @@
-
-# Default fallback type
-unknown_
+
-
-
@@ -130 +130 @@
-
-# Default fallback type
-default_
+
-
-
@@ -191 +191 @@
-
-# Default fallback type
-default_
+

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

@@ -189 +189 @@
-                selinux_compute_create_context($1_xserver_t)
-
+                # read x_contexts
+                seutil_read_default_contexts($1_xserver_t)
+
-                logging_send_audit_msgs($1_xserver_t)
-        ',`
@@ -474 +477 @@
-        allow $1_xserver_t { x_rootwindow_t $1_x_domain }:x_drawable send;
-
+        # manage: xhost X11:ChangeHosts
+        # freeze: metacity X11:GrabKey
+        allow $2 $1_xserver_t:x_device { manage freeze };
+
+        # gnome-settings-daemon XKEYBOARD:SetControls
+        allow $2 $1_xserver_t:x_server manage;
+
+        allow $2 x_rootcolormap_t:x_colormap { install uninstall };
+
+        # read: gnome-settings-daemon RANDR:GetScreenSizeRange
+        # write: gnome-settings-daemon RANDR:SelectInput
+        # setattr: gnome-settings-daemon X11:GrabKey
+        # manage: metacity X11:ChangeWindowAttributes
+        allow $2 x_rootwindow_t:x_drawable { read write manage setattr };
+
+        # setattr: metacity X11:InstallColormap
+        allow $2 x_rootscreen_t:x_screen { saver_setattr saver_getattr setattr };
+
+        # xrdb X11:ChangeProperty prop=RESOURCE_MANAGER
+        allow $2 info_xproperty_t:x_property { create write };
+
-        mls_xwin_read_to_clearance($1_xserver_t)
-
@@ -653 +677 @@
-        gen_require(`
-                type x_rootwindow_t, x_rootcolormap_t, std_xext_t, shmem_xext_t;
-default_
+
-                type input_xevent_t, focus_xevent_t, property_xevent_t, manage_xevent_t;
-default_
-default_
+
+
-
-                attribute x_server_domain, x_domain;
@@ -689 +713 @@
-
-        # Types for properties
-
+xproperty_t alias $2_
-
-        # Types for events
@@ -734 +758 @@
-        # X Properties
-        # can read and write client properties
-default_
-default_xproperty_t:x_property $2_default
+
+xproperty_t:x_property $2
-        # can read and write cut buffers
-        allow $3 clipboard_xproperty_t:x_property { create read write };
@@ -768 +792 @@
-        type_transition $3 focus_xevent_t:x_event $2_focus_xevent_t;
-        type_transition $3 manage_xevent_t:x_event $2_manage_xevent_t;
-        type_transition $3 default_xevent_t:x_event $2_default_xevent_t;
-        type_transition $3 client_xevent_t:x_event $2_client_xevent_t;
+        type_transition $3 xevent_t:x_event $2_default_xevent_t;
-        # can receive certain root window events
-        allow $3 focus_xevent_t:x_event receive;
@@ -785 +809 @@
-        allow $3 clipboard_xselection_t:x_selection { getattr setattr read };
-        # can query all other selections
-default_
+
-
-        # Other X Objects

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

@@ -50 +50 @@
-type clipboard_xselection_t, xselection_type;
-type debug_xext_t, xextension_type;
-type default_xevent_t, xevent_type;
-type default_xproperty_t, xproperty_type;
-type default_xselection_t, xselection_type;
-type disallowed_xext_t, xextension_type;
-type focus_xevent_t, xevent_type;
@@ -71 +68 @@
-type video_xext_t, xextension_type;
-type unknown_xevent_t, xevent_type;
-type unknown_xext_t, xextension_type;
-type x_rootcolormap_t;
-type x_rootscreen_t;
-type x_rootwindow_t;
+type xevent_t alias default_xevent_t, xevent_type;
+type xext_t alias unknown_xext_t, xextension_type;
+type xproperty_t alias default_xproperty_t, xproperty_type;
+type xselection_t alias default_xselection_t, xselection_type;
-
-type xauth_exec_t;