diff --git a/refpolicy/policy/modules/kernel/filesystem.if b/refpolicy/policy/modules/kernel/filesystem.if
index e3e5442..6ab8773 100644
--- a/refpolicy/policy/modules/kernel/filesystem.if
+++ b/refpolicy/policy/modules/kernel/filesystem.if
@@ -1707,6 +1707,26 @@ interface(`fs_getattr_all_fs',`
')
########################################
+##
+##
+## Do not audit attempts to get the attributes
+## all filesystems.
+##
+##
+## The type of the domain to not audit.
+##
+##
+#
+interface(`fs_dontaudit_getattr_all_fs',`
+ gen_require(`
+ attribute fs_type;
+ class filesystem getattr;
+ ')
+
+ dontaudit $1 fs_type:filesystem getattr;
+')
+
+########################################
##
##
## Get the quotas of all filesystems.
diff --git a/refpolicy/policy/modules/services/ssh.if b/refpolicy/policy/modules/services/ssh.if
index 132fc81..a55373e 100644
--- a/refpolicy/policy/modules/services/ssh.if
+++ b/refpolicy/policy/modules/services/ssh.if
@@ -1,18 +1,70 @@
template(`ssh_per_userdomain_template',`
- # Derived domain based on the calling user domain and the program.
- type $1_ssh_t; #, privlog, nscd_client_domain;
- domain_type($1_ssh_t)
+ ##############################
+ #
+ # Declarations
+ #
type $1_home_ssh_t; #, $1_file_type;
files_file_type($1_home_ssh_t)
role $1_r types $1_ssh_t;
+ type $1_ssh_t; #, nscd_client_domain;
+ domain_type($1_ssh_t)
+
+ type $1_ssh_agent_t;
+ domain_type($1_ssh_agent_t)
+ role $1_r types $1_ssh_agent_t;
+
+ ##############################
+ #
+ # $1_ssh_t local policy
+ #
+ allow $1_ssh_t self:capability { setuid setgid dac_override dac_read_search };
+ allow $1_ssh_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem dyntransition };
+ allow $1_ssh_t self:fd use;
+ allow $1_ssh_t self:fifo_file { read getattr lock ioctl write append };
+ allow $1_ssh_t self:unix_dgram_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown };
+ allow $1_ssh_t self:unix_stream_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown listen accept };
+ allow $1_ssh_t self:unix_dgram_socket sendto;
+ allow $1_ssh_t self:unix_stream_socket connectto;
+ allow $1_ssh_t self:shm { associate getattr setattr create destroy read write lock unix_read unix_write };
+ allow $1_ssh_t self:sem { associate getattr setattr create destroy read write unix_read unix_write };
+ allow $1_ssh_t self:msgq { associate getattr setattr create destroy read write enqueue unix_read unix_write };
+ allow $1_ssh_t self:msg { send receive };
+
# Transition from the user domain to the derived domain.
domain_auto_trans($1_t, ssh_exec_t, $1_ssh_t)
+ # Read the ssh key file.
+ allow $1_ssh_t sshd_key_t:file r_file_perms;
+
+ kernel_read_kernel_sysctl($1_ssh_t)
+
+ dev_read_urand($1_ssh_t)
+
+ fs_getattr_all_fs($1_ssh_t)
+
+ # run helper programs - needed eg for x11-ssh-askpass
+ corecmd_exec_shell($1_ssh_t)
+ corecmd_exec_bin($1_ssh_t)
+
+ domain_use_wide_inherit_fd($1_ssh_t)
+
+ files_list_home($1_ssh_t)
+ files_read_usr_files($1_ssh_t)
+ files_read_etc_runtime_files($1_ssh_t)
+ files_read_generic_etc_files($1_ssh_t)
+
libs_use_ld_so($1_ssh_t)
libs_use_shared_libs($1_ssh_t)
+ logging_send_syslog_msg($1_ssh_t)
+ logging_read_generic_logs($1_ssh_t)
+
+ miscfiles_read_localization($1_ssh_t)
+
+ seutil_read_config($1_ssh_t)
+
tunable_policy(`use_nfs_home_dirs',`
fs_manage_nfs_dirs($1_ssh_t)
fs_manage_nfs_files($1_ssh_t)
@@ -23,20 +75,24 @@ template(`ssh_per_userdomain_template',`
fs_manage_cifs_files($1_ssh_t)
')
- ifdef(`TODO',`
- # Grant permissions within the domain.
- general_domain_access($1_ssh_t)
- allow $1_ssh_t autofs_t:dir { search getattr };
+ # for port forwarding
+ tunable_policy(`user_tcp_server',`
+ corenet_tcp_bind_ssh_port($1_ssh_t)
+ ')
- # Use descriptors created by sshd
- allow $1_ssh_t privfd:fd use;
+ ifdef(`TODO',`
+ allow $1_ssh_t unpriv_userdomain:fd use;
+ can_ypbind($1_ssh_t)
- read_locale($1_ssh_t)
+ allow $1_ssh_t autofs_t:dir { search getattr };
- # Get attributes of file systems.
- allow $1_ssh_t fs_type:filesystem getattr;
+ allow $1 sbin_t:dir r_dir_perms;
+ allow $1 sbin_t:notdevfile_class_set r_file_perms;
- base_file_read_access($1_ssh_t)
+ if (read_default_t) {
+ allow $1 default_t:dir r_dir_perms;
+ allow $1 default_t:notdevfile_class_set r_file_perms;
+ }
# Read /var.
allow $1_ssh_t var_t:dir r_dir_perms;
@@ -45,23 +101,6 @@ template(`ssh_per_userdomain_template',`
# Read /var/run, /var/log.
allow $1_ssh_t var_run_t:dir r_dir_perms;
allow $1_ssh_t var_run_t:{ file lnk_file } r_file_perms;
- allow $1_ssh_t var_log_t:dir r_dir_perms;
- allow $1_ssh_t var_log_t:{ file lnk_file } r_file_perms;
-
- # Read /etc.
- allow $1_ssh_t etc_t:dir r_dir_perms;
- allow $1_ssh_t etc_t:notdevfile_class_set r_file_perms;
- allow $1_ssh_t etc_runtime_t:{ file lnk_file } r_file_perms;
-
- # Read /dev directories and any symbolic links.
- allow $1_ssh_t device_t:dir r_dir_perms;
- allow $1_ssh_t device_t:lnk_file r_file_perms;
-
- # Read /dev/urandom.
- allow $1_ssh_t urandom_device_t:chr_file r_file_perms;
-
- # Read and write /dev/null.
- allow $1_ssh_t { null_device_t zero_device_t }:chr_file rw_file_perms;
# Grant permissions needed to create TCP and UDP sockets and
# to access the network.
@@ -70,20 +109,6 @@ template(`ssh_per_userdomain_template',`
can_ypbind($1_ssh_t)
can_kerberos($1_ssh_t)
- # for port forwarding
- if (user_tcp_server) {
- allow $1_ssh_t port_t:tcp_socket name_bind;
- }
-
- # Use capabilities.
- allow $1_ssh_t self:capability { setuid setgid dac_override dac_read_search };
-
- # run helper programs - needed eg for x11-ssh-askpass
- can_exec($1_ssh_t, { shell_exec_t bin_t })
-
- # Read the ssh key file.
- allow $1_ssh_t sshd_key_t:file r_file_perms;
-
# Access the ssh temporary files.
file_type_auto_trans($1_ssh_t, tmp_t, sshd_tmp_t)
allow $1_ssh_t $1_tmp_t:dir r_dir_perms;
@@ -109,7 +134,9 @@ template(`ssh_per_userdomain_template',`
ifdef(`gnome-pty-helper.te', `allow $1_ssh_t $1_gph_t:fd use;')
# Write to the user domain tty.
- access_terminal($1_ssh_t, $1)
+ allow $1_ssh_t $1_tty_device_t:chr_file { read write getattr ioctl };
+ allow $1_ssh_t devpts_t:dir { read search getattr };
+ allow $1_ssh_t $1_devpts_t:chr_file { read write getattr ioctl };
# Allow the user shell to signal the ssh program.
allow $1_t $1_ssh_t:process signal;
@@ -129,10 +156,6 @@ template(`ssh_per_userdomain_template',`
')
')dnl end if xserver
- ifdef(`ssh-agent.te', `
- ssh_agent_domain($1)
- ')dnl end if ssh_agent.te
-
#allow ssh to access keys stored on removable media
# Should we have a boolean around this?
allow $1_ssh_t mnt_t:dir search;
@@ -149,6 +172,106 @@ template(`ssh_per_userdomain_template',`
allow $1_ssh_t xdm_t:fd use;
')dnl end if xdm.te
') dnl endif TODO
+
+ ##############################
+ #
+ # $1_ssh_agent_t local policy
+ #
+ allow $1_ssh_agent_t self:process setrlimit;
+ allow $1_ssh_agent_t self:capability setgid;
+
+ allow $1_ssh_agent_t { $1_ssh_agent_t $1_t }:process signull;
+
+ allow $1_ssh_t $1_ssh_agent_t:unix_stream_socket connectto;
+
+ domain_auto_trans($1_t, ssh_agent_exec_t, $1_ssh_agent_t)
+
+ kernel_read_kernel_sysctl($1_ssh_agent_t)
+
+ dev_read_urand($1_ssh_agent_t)
+ dev_read_rand($1_ssh_agent_t)
+
+ domain_use_wide_inherit_fd($1_ssh_agent_t)
+
+ files_read_generic_etc_files($1_ssh_agent_t)
+ files_read_etc_runtime_files($1_ssh_agent_t)
+
+ libs_read_lib($1_ssh_agent_t)
+ libs_use_ld_so($1_ssh_agent_t)
+ libs_use_shared_libs($1_ssh_agent_t)
+
+ logging_send_syslog_msg($1_ssh_agent_t)
+
+ miscfiles_read_localization($1_ssh_agent_t)
+
+ if (use_nfs_home_dirs) {
+ fs_manage_nfs_files($1_ssh_agent_t)
+ }
+
+ if (use_samba_home_dirs) {
+ fs_manage_cifs_files($1_ssh_agent_t)
+ }
+
+ ifdef(`TODO',`
+
+ # Write to the user domain tty.
+ access_terminal($1_ssh_agent_t, $1)
+
+ # Allow the user shell to signal the ssh program.
+ allow $1_t $1_ssh_agent_t:process signal;
+ # allow ps to show ssh
+ can_ps($1_t, $1_ssh_agent_t)
+
+ can_ypbind($1_ssh_agent_t)
+ allow $1_ssh_agent_t autofs_t:dir { search getattr };
+
+ allow $1_ssh_agent_t proc_t:dir search;
+ dontaudit $1_ssh_agent_t proc_t:{ lnk_file file } { getattr read };
+ dontaudit $1_ssh_agent_t selinux_config_t:dir search;
+
+ # Access the ssh temporary files. Should we have an own type here
+ # to which only ssh, ssh-agent and ssh-add have access?
+ allow $1_ssh_agent_t $1_tmp_t:dir r_dir_perms;
+ file_type_auto_trans($1_ssh_agent_t, tmp_t, $1_tmp_t)
+
+ # for ssh-add
+ can_unix_connect($1_t, $1_ssh_agent_t)
+
+ # transition back to normal privs upon exec
+ domain_auto_trans($1_ssh_agent_t, { bin_t shell_exec_t $1_home_t }, $1_t)
+ allow $1_ssh_agent_t bin_t:dir search;
+ allow $1_ssh_agent_t bin_t:lnk_file read;
+ if (use_nfs_home_dirs) {
+ domain_auto_trans($1_ssh_agent_t, nfs_t, $1_t)
+ }
+ if (use_samba_home_dirs) {
+ domain_auto_trans($1_ssh_agent_t, cifs_t, $1_t)
+ }
+
+ allow $1_ssh_agent_t { home_root_t $1_home_dir_t }:dir search;
+
+ allow $1_ssh_t $1_tmp_t:sock_file write;
+ allow $1_ssh_t $1_t:unix_stream_socket connectto;
+
+ ifdef(`xdm.te', `
+ allow $1_ssh_agent_t xdm_t:fd use;
+ allow $1_ssh_agent_t xdm_t:fifo_file { read write };
+
+ # kdm: sigchld
+ allow $1_ssh_agent_t xdm_t:process sigchld;
+ ')
+
+ #
+ # Allow command to ssh-agent > ~/.ssh_agent
+ #
+ allow $1_ssh_agent_t $1_home_t:file rw_file_perms;
+ allow $1_ssh_agent_t $1_tmp_t:file rw_file_perms;
+
+ # Allow the ssh program to communicate with ssh-agent.
+ allow $1_ssh_t $1_tmp_t:sock_file write;
+ allow $1_ssh_t $1_t:unix_stream_socket connectto;
+ allow $1_ssh_t sshd_t:unix_stream_socket connectto;
+ ') dnl endif TODO
')
########################################
@@ -199,6 +322,8 @@ template(`sshd_program_domain', `
dev_read_urand($1_t)
+ fs_dontaudit_getattr_all_fs($1_t)
+
selinux_get_fs_mount($1_t)
selinux_validate_context($1_t)
selinux_compute_access_vector($1_t)
@@ -233,6 +358,8 @@ template(`sshd_program_domain', `
sysnet_read_config($1_t)
+ userdom_search_all_users_home($1_t)
+
tunable_policy(`use_nfs_home_dirs',`
fs_read_nfs_files($1_t)
')
@@ -241,10 +368,11 @@ template(`sshd_program_domain', `
fs_read_cifs_files($1_t)
')
- ifdef(`TODO',`
+ optional_policy(`mount.te', `
+ mount_send_nfs_client_request($1_t)
+ ')
- # do not allow statfs()
- dontaudit $1_t fs_type:filesystem getattr;
+ ifdef(`TODO',`
allow $1_t bin_t:dir search;
allow $1_t bin_t:lnk_file read;
@@ -255,11 +383,7 @@ template(`sshd_program_domain', `
# Read /var.
allow $1_t var_t:dir getattr;
- ifdef(`mount.te', `
- allow $1_t mount_t:udp_socket rw_socket_perms;
- ')
-
- allow $1_t { home_root_t home_dir_type }:dir { search getattr };
+ allow $1_t { home_root_t home_dir_type }:dir getattr;
allow $1_t autofs_t:dir { search getattr };
dontaudit sshd_t userpty_type:chr_file relabelfrom;
@@ -268,7 +392,8 @@ template(`sshd_program_domain', `
if (run_ssh_inetd) {
allow $1_t self:process signal;
allow $1_t inetd_t:tcp_socket rw_socket_perms;
- allow $1_t var_run_t:dir { getattr search };
+ allow $1_t var_run_t:dir getattr;
+ files_search_pids($1_t)
} else {
corenet_tcp_bind_ssh_port($1_t)
init_use_fd($1_t)
@@ -283,3 +408,12 @@ template(`sshd_program_domain', `
')
') dnl end TODO
')
+
+interface(`ssh_dontaudit_read_server_keys',`
+ gen_require(`
+ type sshd_key_t;
+ class file { getattr read };
+ ')
+
+ dontaudit $1 sshd_key_t:file { getattr read };
+')
diff --git a/refpolicy/policy/modules/services/ssh.te b/refpolicy/policy/modules/services/ssh.te
index 2a0290d..2c6e0de 100644
--- a/refpolicy/policy/modules/services/ssh.te
+++ b/refpolicy/policy/modules/services/ssh.te
@@ -25,10 +25,13 @@ type ssh_keygen_exec_t;
init_daemon_domain(ssh_keygen_t,ssh_keygen_exec_t)
role system_r types ssh_keygen_t;
-# ssh server executable
+sshd_program_domain(sshd)
+
type sshd_exec_t;
files_file_type(sshd_exec_t)
+sshd_program_domain(sshd_extern)
+
type sshd_key_t;
files_file_type(sshd_key_t)
@@ -42,7 +45,8 @@ files_tmp_file(sshd_tmp_t)
# sshd_t is the domain for the sshd program.
#
-sshd_program_domain(sshd)
+# so a tunnel can point to another ssh tunnel
+allow sshd_t self:tcp_socket { acceptfrom connectto recvfrom };
allow sshd_t sshd_tmp_t:dir create_dir_perms;
allow sshd_t sshd_tmp_t:file create_file_perms;
@@ -56,12 +60,27 @@ auth_exec_pam(sshd_t)
seutil_read_config(sshd_t)
+# Allow checking users mail at login
+mta_getattr_spool(sshd_t)
+
+optional_policy(`inetd.te',`
+ tunable_policy(`run_ssh_inetd',`
+ inetd_service_domain(sshd_t,sshd_exec_t)
+ ',`
+ init_daemon_domain(sshd_t,sshd_exec_t)
+ ')
+',`
+ # These rules should match the else block
+ # of the run_ssh_inetd tunable directly above
+ init_daemon_domain(sshd_t,sshd_exec_t)
+')
+
ifdef(`TODO',`
-if (ssh_sysadm_login) {
+tunable_policy(`ssh_sysadm_login',`
userdom_spec_domtrans_all_users(sshd_t)
userdom_signal_all_users(sshd_t)
- ifdef(`xauth.te',`
+ optional_policy(`xauth.te',`
domain_trans(sshd_t, xauth_exec_t, userdomain)
')
# Relabel and access ptys created by sshd
@@ -72,11 +91,11 @@ if (ssh_sysadm_login) {
# inheriting stream sockets is needed for "ssh host command" as no pty
# is allocated
allow userdomain sshd_t:unix_stream_socket rw_stream_socket_perms;
-} else {
+',`
userdom_spec_domtrans_unpriv_users(sshd_t)
userdom_signal_unpriv_users(sshd_t)
- ifdef(`xauth.te',`
+ optional_policy(`xauth.te',`
domain_trans(sshd_t, xauth_exec_t, unpriv_userdomain)
')
# Relabel and access ptys created by sshd
@@ -87,15 +106,16 @@ if (ssh_sysadm_login) {
# inheriting stream sockets is needed for "ssh host command" as no pty
# is allocated
allow userdomain sshd_t:unix_stream_socket rw_stream_socket_perms;
-}
+')
+
+# this goes to inetd
+tunable_policy(`run_ssh_inetd',`
+ corenet_tcp_bind_ssh_port(inetd_t)
+')
# for when the network connection breaks after running newrole -r sysadm_r
dontaudit sshd_t sysadm_devpts_t:chr_file setattr;
-# Allow checking users mail at login
-allow sshd_t { var_spool_t mail_spool_t }:dir search;
-allow sshd_t mail_spool_t:lnk_file read;
-allow sshd_t mail_spool_t:file getattr;
') dnl endif TODO
#################################
@@ -104,9 +124,8 @@ allow sshd_t mail_spool_t:file getattr;
#
# sshd_extern_t is the domain for ssh from outside our network
#
-ifdef(`TODO',`
-sshd_program_domain(sshd_extern)
+ifdef(`TODO',`
domain_trans(sshd_extern_t, shell_exec_t, user_mini_domain)
# Signal the user domains.
allow sshd_extern_t user_mini_domain:process signal;
@@ -126,21 +145,15 @@ allow sshd_extern_t user_mini_domain:chr_file { relabelto read write getattr ioc
allow user_mini_domain sshd_extern_t:unix_stream_socket rw_stream_socket_perms;
optional_policy(`inetd.te',`
- if (run_ssh_inetd) {
- allow inetd_t ssh_port_t:tcp_socket name_bind;
- domain_auto_trans(inetd_t, sshd_exec_t, sshd_t)
+ tunable_policy(`run_ssh_inetd',`
domain_trans(inetd_t, sshd_exec_t, sshd_extern_t)
- } else {
- domain_auto_trans(initrc_t, sshd_exec_t, sshd_t)
+ ',`
domain_trans(initrc_t, sshd_exec_t, sshd_extern_t)
- dontaudit initrc_t sshd_key_t:file { getattr read };
- }
+ ')
',`
# These rules should match the else block
- # of the run_ssh_inetd conditional directly above
- domain_auto_trans(initrc_t, sshd_exec_t, sshd_t)
+ # of the run_ssh_inetd tunable directly above
domain_trans(initrc_t, sshd_exec_t, sshd_extern_t)
- dontaudit initrc_t sshd_key_t:file { getattr read };
')
ifdef(`direct_sysadm_daemon', `
@@ -150,7 +163,6 @@ role_transition sysadm_r sshd_exec_t system_r;
')
# so a tunnel can point to another ssh tunnel...
-allow sshd_t self:tcp_socket { acceptfrom connectto recvfrom };
allow sshd_t kernel_t:tcp_socket recvfrom;
allow sshd_t kernel_t:tcp_socket recvfrom;
diff --git a/refpolicy/policy/modules/system/init.te b/refpolicy/policy/modules/system/init.te
index 1ee33b6..b941ec8 100644
--- a/refpolicy/policy/modules/system/init.te
+++ b/refpolicy/policy/modules/system/init.te
@@ -368,6 +368,16 @@ optional_policy(`rpm.te',`
rpm_manage_db(initrc_t)
') dnl end rpm.te
+optional_policy(`ssh.te',`
+ optional_policy(`inetd.te',`
+ tunable_policy(`run_ssh_inetd',`',`
+ ssh_dontaudit_read_server_keys(initrc_t)
+ ')
+ ',`
+ ssh_dontaudit_read_server_keys(initrc_t)
+ ')
+')
+
ifdef(`TODO',`
# Mount and unmount file systems.