Remove module for gitosis.

[people/stevee/selinux-policy.git] / policy / modules / services / ssh.te

diff --git a/policy/modules/services/ssh.te b/policy/modules/services/ssh.te
index 49309147424d4c2802b8f651f49a5e7398d76af9..aadaa2cb0b2f164ef873a1f80fae6aed00dfe53c 100644 (file)
--- a/policy/modules/services/ssh.te
+++ b/policy/modules/services/ssh.te
@@ -34,17 +34,13 @@ gen_tunable(sshd_forward_ports, false)
 ## </desc>
 gen_tunable(ssh_chroot_rw_homedirs, false)
 
-attribute ssh_dyntrasition_domain;
+attribute ssh_dyntransition_domain;
 attribute ssh_server;
 attribute ssh_agent_type;
 
 ssh_dyntransition_domain_template(chroot_user_t)
 ssh_dyntransition_domain_template(sshd_sandbox_t)
 
-type chroot_user_t;
-domain_type(chroot_user_t)
-role system_r types chroot_user_t;
-
 type ssh_keygen_t;
 type ssh_keygen_exec_t;
 init_system_domain(ssh_keygen_t, ssh_keygen_exec_t)
@@ -109,6 +105,7 @@ allow ssh_t self:capability { setuid setgid dac_override dac_read_search };
 allow ssh_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
 allow ssh_t self:fd use;
 allow ssh_t self:fifo_file rw_fifo_file_perms;
+allow ssh_t self:key read;
 allow ssh_t self:unix_dgram_socket { create_socket_perms sendto };
 allow ssh_t self:unix_stream_socket { create_stream_socket_perms connectto };
 allow ssh_t self:shm create_shm_perms;
@@ -130,6 +127,7 @@ fs_tmpfs_filetrans(ssh_t, ssh_tmpfs_t, { dir file lnk_file sock_file fifo_file }
 manage_dirs_pattern(ssh_t, ssh_home_t, ssh_home_t)
 manage_sock_files_pattern(ssh_t, ssh_home_t, ssh_home_t)
 userdom_user_home_dir_filetrans(ssh_t, ssh_home_t, { dir sock_file })
+userdom_read_all_users_keys(ssh_t)
 userdom_stream_connect(ssh_t)
 userdom_search_admin_dir(sshd_t)
 userdom_admin_home_dir_filetrans(ssh_t, ssh_home_t, { dir sock_file })
@@ -202,26 +200,12 @@ userdom_read_user_tmp_files(ssh_t)
 userdom_write_user_tmp_files(ssh_t)
 userdom_read_user_home_content_symlinks(ssh_t)
 userdom_read_home_certs(ssh_t)
+userdom_home_manager(ssh_t)
 
 tunable_policy(`allow_ssh_keysign',`
        domtrans_pattern(ssh_t, ssh_keysign_exec_t, ssh_keysign_t)
 ')
 
-tunable_policy(`use_fusefs_home_dirs',`
-       fs_manage_fusefs_dirs(ssh_t)
-       fs_manage_fusefs_files(ssh_t)
-')
-
-tunable_policy(`use_nfs_home_dirs',`
-       fs_manage_nfs_dirs(ssh_t)
-       fs_manage_nfs_files(ssh_t)
-')
-
-tunable_policy(`use_samba_home_dirs',`
-       fs_manage_cifs_dirs(ssh_t)
-       fs_manage_cifs_files(ssh_t)
-')
-
 # for port forwarding
 tunable_policy(`user_tcp_server',`
        corenet_tcp_bind_ssh_port(ssh_t)
@@ -318,10 +302,6 @@ optional_policy(`
        ftp_dyntrans_anon_sftpd(sshd_t)
 ')
 
-optional_policy(`
-       gitosis_manage_lib_files(sshd_t)
-')
-
 optional_policy(`
        inetd_tcp_service_domain(sshd_t, sshd_exec_t)
 ')
@@ -491,15 +471,18 @@ tunable_policy(`ssh_chroot_rw_homedirs && use_samba_home_dirs',`
     fs_manage_cifs_symlinks(chroot_user_t)
 ')
 
+tunable_policy(`ssh_chroot_rw_homedirs && use_fusefs_home_dirs',`
+    fs_manage_fusefs_dirs(chroot_user_t)
+    fs_manage_fusefs_files(chroot_user_t)
+    fs_manage_fusefs_symlinks(chroot_user_t)
+')
+
 tunable_policy(`use_samba_home_dirs',`
     fs_read_cifs_files(chroot_user_t)
     fs_read_cifs_symlinks(chroot_user_t)
 ')
 
-tunable_policy(`use_nfs_home_dirs',`
-    fs_read_nfs_files(chroot_user_t)
-    fs_read_nfs_symlinks(chroot_user_t)
-')
+userdom_home_manager(chroot_user_t)
 
 optional_policy(`
     ssh_rw_dgram_sockets(chroot_user_t)