Add fcontext for sshd pidfile and directory used for privsep
PATCH 1/2 Add fcontext for sshd pidfile and directory used for privsep
From: Laurent Bigonville <[email protected]>
Also allow sshd_t domain to chroot(2) in this directory as explained in the README.privsep file in the openssh tarball.
Thanks to Russell Coker for this patch
--- policy/modules/services/ssh.fc | 2 ++ policy/modules/services/ssh.if | 1 + 2 files changed, 3 insertions(+)
policy/modules/services/ssh.fc +2 -0
@@ -13,4 +13,6 @@ HOME_DIR/\.ssh(/.*)? gen_context(system_u:object_r:ssh_home_t,s0) /usr/sbin/sshd -- gen_context(system_u:object_r:sshd_exec_t,s0) +/var/run/sshd(/.*)? gen_context(system_u:object_r:sshd_var_run_t,s0) /var/run/sshd\.init\.pid -- gen_context(system_u:object_r:sshd_var_run_t,s0) +/var/run/sshd\.pid -- gen_context(system_u:object_r:sshd_var_run_t,s0)
policy/modules/services/ssh.if +1 -0
@@ -196,6 +196,7 @@ template(`ssh_server_template', ` manage_files_pattern($1_t, $1_tmpfs_t, $1_tmpfs_t) fs_tmpfs_filetrans($1_t, $1_tmpfs_t, file) + allow $1_t $1_var_run_t:dir search_dir_perms; allow $1_t $1_var_run_t:file manage_file_perms; files_pid_filetrans($1_t, $1_var_run_t, file)
Signature · 1 line
1.9.rc1
PATCH 1/2 Add fcontext for sshd pidfile and directory used for privsep
Le Wed, 5 Feb 2014 22:23:31 +0100,
Laurent Bigonville <[email protected]> a ?crit :
[...]
diff --git
policy/modules/services/ssh.if template(`ssh_server_template', ` · line 201
Quoted 10 lines
a/policy/modules/services/ssh.if b/policy/modules/services/ssh.if index fe0c682..48eb1c8 100644 --- a/policy/modules/services/ssh.if +++ b/policy/modules/services/ssh.if @@ -196,6 +196,7 @@ template(
ssh_server_template',manage_files_pattern($1_t, $1_tmpfs_t, $1_tmpfs_t)fs_tmpfs_filetrans($1_t, $1_tmpfs_t, file)policy/modules/services/ssh.if +1
-0+ allow $1_t $1_var_run_t:dir search_dir_perms; allow $1_t $1_var_run_t:file manage_file_perms; files_pid_filetrans($1_t, $1_var_run_t, file)
Or maybe this should be conditional for debian only?
PATCH 1/2 Add fcontext for sshd pidfile and directory used for privsep
Quoted 12 lines · Laurent Bigonville
Le Wed, 5 Feb 2014 22:23:31 +0100,
Laurent Bigonville <[email protected]> a ?crit :[...]
diff --git
Quoted 6 lines
a/policy/modules/services/ssh.if b/policy/modules/services/ssh.if index fe0c682..48eb1c8 100644 --- a/policy/modules/services/ssh.if +++ b/policy/modules/services/ssh.if @@ -196,6 +196,7 @@ template(
ssh_server_template',manage_files_pattern($1_t, $1_tmpfs_t, $1_tmpfs_t)fs_tmpfs_filetrans($1_t, $1_tmpfs_t, file)
Quoted 6 lines
policy/modules/services/ssh.if template(`ssh_server_template', ` · line 201
Quoted 4 lines
policy/modules/services/ssh.if +1
-0+ allow $1_t $1_var_run_t:dir search_dir_perms; allow $1_t $1_var_run_t:file manage_file_perms; files_pid_filetrans($1_t, $1_var_run_t, file)Or maybe this should be conditional for debian only?
No, its fine. Actually I was thinking that perhaps the init_daemon_run_dir() should become unconditional instead, since we have the fc entries.
Signature · 3 lines
Chris PeBenito Tresys Technology, LLC www.tresys.com | oss.tresys.com
PATCH 2/2 Move the ifdef at the end of the declaration block
In reply to Laurent BigonvilleFrom: Laurent Bigonville <[email protected]>
--- policy/modules/services/ssh.te | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
policy/modules/services/ssh.te +4 -4
@@ -33,10 +33,6 @@ corecmd_executable_file(sshd_exec_t) ssh_server_template(sshd) init_daemon_domain(sshd_t, sshd_exec_t) -ifdef(`distro_debian',` - init_daemon_run_dir(sshd_var_run_t, "sshd") -') - type sshd_key_t; files_type(sshd_key_t)
@@ -81,6 +77,10 @@ userdom_user_home_content(ssh_home_t) type sshd_keytab_t; files_type(sshd_keytab_t) +ifdef(`distro_debian',` + init_daemon_run_dir(sshd_var_run_t, "sshd") +') + ############################## # # SSH client local policy
Signature · 1 line
1.9.rc1
PATCH 2/2 Move the ifdef at the end of the declaration block
Quoted 22 lines · Laurent Bigonville
From: Laurent Bigonville <[email protected]>
--- policy/modules/services/ssh.te | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)policy/modules/services/ssh.te +0
-4@@ -33,10 +33,6 @@ corecmd_executable_file(sshd_exec_t) ssh_server_template(sshd) init_daemon_domain(sshd_t, sshd_exec_t) -ifdef(`distro_debian',` - init_daemon_run_dir(sshd_var_run_t, "sshd") -') - type sshd_key_t; files_type(sshd_key_t)
policy/modules/services/ssh.te userdom_user_home_content(ssh_home_t) · line 83
Quoted 7 lines
policy/modules/services/ssh.te +4
-0@@ -81,6 +77,10 @@ userdom_user_home_content(ssh_home_t) type sshd_keytab_t; files_type(sshd_keytab_t) +ifdef(`distro_debian',` + init_daemon_run_dir(sshd_var_run_t, "sshd") +') +
Merged.
Signature · 3 lines
Chris PeBenito Tresys Technology, LLC www.tresys.com | oss.tresys.com
PATCH 1/2 Add fcontext for sshd pidfile and directory used for privsep
In reply to Laurent BigonvilleQuoted 27 lines · Laurent Bigonville
From: Laurent Bigonville <[email protected]>
Also allow
sshd_tdomain to chroot(2) in this directory as explained in the README.privsep file in the openssh tarball.Thanks to Russell Coker for this patch
--- policy/modules/services/ssh.fc | 2 ++ policy/modules/services/ssh.if | 1 + 2 files changed, 3 insertions(+)policy/modules/services/ssh.fc +2
-0@@ -13,4 +13,6 @@ HOME_DIR/\.ssh(/.*)? gen_context(system_u:object_r:ssh_home_t,s0) /usr/sbin/sshd -- gen_context(system_u:object_r:sshd_exec_t,s0) +/var/run/sshd(/.*)? gen_context(system_u:object_r:sshd_var_run_t,s0) /var/run/sshd\.init\.pid -- gen_context(system_u:object_r:sshd_var_run_t,s0) +/var/run/sshd\.pid -- gen_context(system_u:object_r:sshd_var_run_t,s0)policy/modules/services/ssh.if +0
-0
policy/modules/services/ssh.if template(`ssh_server_template', ` · line 201
Quoted 6 lines
policy/modules/services/ssh.if +1
-0@@ -196,6 +196,7 @@ template(`ssh_server_template', ` manage_files_pattern($1_t, $1_tmpfs_t, $1_tmpfs_t) fs_tmpfs_filetrans($1_t, $1_tmpfs_t, file) + allow $1_t $1_var_run_t:dir search_dir_perms; allow $1_t $1_var_run_t:file manage_file_perms; files_pid_filetrans($1_t, $1_var_run_t, file)
Merged.
Signature · 3 lines
Chris PeBenito Tresys Technology, LLC www.tresys.com | oss.tresys.com