From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 39889139083 for ; Sat, 25 Feb 2017 15:00:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24764E0D3E; Sat, 25 Feb 2017 14:59:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D1BBCE0D3E for ; Sat, 25 Feb 2017 14:59:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E5022341026 for ; Sat, 25 Feb 2017 14:59:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3AA495439 for ; Sat, 25 Feb 2017 14:59:39 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1488034253.8e14efe4abf1297f7c8c341d7690802f82d798a2.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:next commit in: policy/modules/contrib/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/contrib/samba.fc policy/modules/contrib/samba.te X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 8e14efe4abf1297f7c8c341d7690802f82d798a2 X-VCS-Branch: next Date: Sat, 25 Feb 2017 14:59:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7d3ce8db-86b8-466a-8d51-cc3998f9b805 X-Archives-Hash: fabad3e2d95efa67ab41f0bba5f62a0f Message-ID: <20170225145939.iOrgZwS4PXNbPEMnVTTWn0uVVV4yxOV25c9OqeCZ1uQ@z> commit: 8e14efe4abf1297f7c8c341d7690802f82d798a2 Author: Russell Coker coker com au> AuthorDate: Tue Feb 21 08:29:50 2017 +0000 Commit: Jason Zaman gentoo org> CommitDate: Sat Feb 25 14:50:53 2017 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=8e14efe4 patch for samba I merged the types nmbd_var_run_t and smbd_var_run_t because nmbd_t and smbd_t interacted with each other so much there was no benefit in separating them. Also added a tunable for reading /etc/shadow because on one of my systems I couldn't get samba working without it. Maybe I misconfigured samba, but others will do the same and we need to give users the choice. Description: samba patches Author: Russell Coker coker.com.au> Last-Update: 2017-02-21 policy/modules/contrib/samba.fc | 30 +++++++++--------- policy/modules/contrib/samba.te | 69 ++++++++++++++++++++++++----------------- 2 files changed, 55 insertions(+), 44 deletions(-) diff --git a/policy/modules/contrib/samba.fc b/policy/modules/contrib/samba.fc index d227fd82..753a009c 100644 --- a/policy/modules/contrib/samba.fc +++ b/policy/modules/contrib/samba.fc @@ -31,21 +31,21 @@ /var/nmbd(/.*)? gen_context(system_u:object_r:samba_var_t,s0) -/run/nmbd(/.*)? gen_context(system_u:object_r:nmbd_var_run_t,s0) -/run/samba/nmbd(/.*)? gen_context(system_u:object_r:nmbd_var_run_t,s0) - -/run/samba(/.*)? gen_context(system_u:object_r:smbd_var_run_t,s0) -/run/samba/brlock\.tdb -- gen_context(system_u:object_r:smbd_var_run_t,s0) -/run/samba/connections\.tdb -- gen_context(system_u:object_r:smbd_var_run_t,s0) -/run/samba/gencache\.tdb -- gen_context(system_u:object_r:smbd_var_run_t,s0) -/run/samba/locking\.tdb -- gen_context(system_u:object_r:smbd_var_run_t,s0) -/run/samba/messages\.tdb -- gen_context(system_u:object_r:nmbd_var_run_t,s0) -/run/samba/namelist\.debug -- gen_context(system_u:object_r:nmbd_var_run_t,s0) -/run/samba/nmbd\.pid -- gen_context(system_u:object_r:nmbd_var_run_t,s0) -/run/samba/sessionid\.tdb -- gen_context(system_u:object_r:smbd_var_run_t,s0) -/run/samba/share_info\.tdb -- gen_context(system_u:object_r:smbd_var_run_t,s0) -/run/samba/smbd\.pid -- gen_context(system_u:object_r:smbd_var_run_t,s0) -/run/samba/unexpected\.tdb -- gen_context(system_u:object_r:nmbd_var_run_t,s0) +/run/nmbd(/.*)? gen_context(system_u:object_r:samba_var_run_t,s0) +/run/samba/nmbd(/.*)? gen_context(system_u:object_r:samba_var_run_t,s0) + +/run/samba(/.*)? gen_context(system_u:object_r:samba_var_run_t,s0) +/run/samba/brlock\.tdb -- gen_context(system_u:object_r:samba_var_run_t,s0) +/run/samba/connections\.tdb -- gen_context(system_u:object_r:samba_var_run_t,s0) +/run/samba/gencache\.tdb -- gen_context(system_u:object_r:samba_var_run_t,s0) +/run/samba/locking\.tdb -- gen_context(system_u:object_r:samba_var_run_t,s0) +/run/samba/messages\.tdb -- gen_context(system_u:object_r:samba_var_run_t,s0) +/run/samba/namelist\.debug -- gen_context(system_u:object_r:samba_var_run_t,s0) +/run/samba/nmbd\.pid -- gen_context(system_u:object_r:samba_var_run_t,s0) +/run/samba/sessionid\.tdb -- gen_context(system_u:object_r:samba_var_run_t,s0) +/run/samba/share_info\.tdb -- gen_context(system_u:object_r:samba_var_run_t,s0) +/run/samba/smbd\.pid -- gen_context(system_u:object_r:samba_var_run_t,s0) +/run/samba/unexpected\.tdb -- gen_context(system_u:object_r:samba_var_run_t,s0) /run/winbindd(/.*)? gen_context(system_u:object_r:winbind_var_run_t,s0) /run/samba/winbindd(/.*)? gen_context(system_u:object_r:winbind_var_run_t,s0) diff --git a/policy/modules/contrib/samba.te b/policy/modules/contrib/samba.te index e7dae973..6f314b0c 100644 --- a/policy/modules/contrib/samba.te +++ b/policy/modules/contrib/samba.te @@ -6,6 +6,14 @@ policy_module(samba, 1.20.0) # ## +##

+## Determine whether smbd_t can +## read shadow files. +##

+## +gen_tunable(samba_read_shadow, false) + +## ##

## Determine whether samba can modify ## public files used for public file @@ -104,8 +112,9 @@ type nmbd_t; type nmbd_exec_t; init_daemon_domain(nmbd_t, nmbd_exec_t) -type nmbd_var_run_t; -files_pid_file(nmbd_var_run_t) +type samba_var_run_t; +typealias samba_var_run_t alias { nmbd_var_run_t smbd_var_run_t }; +files_pid_file(samba_var_run_t) type samba_etc_t; files_config_file(samba_etc_t) @@ -151,9 +160,6 @@ files_type(smbd_keytab_t) type smbd_tmp_t; files_tmp_file(smbd_tmp_t) -type smbd_var_run_t; -files_pid_file(smbd_var_run_t) - type smbmount_t; type smbmount_exec_t; application_domain(smbmount_t, smbmount_exec_t) @@ -305,16 +311,15 @@ manage_dirs_pattern(smbd_t, smbd_tmp_t, smbd_tmp_t) manage_files_pattern(smbd_t, smbd_tmp_t, smbd_tmp_t) files_tmp_filetrans(smbd_t, smbd_tmp_t, { file dir }) -manage_dirs_pattern(smbd_t, smbd_var_run_t, smbd_var_run_t) -manage_files_pattern(smbd_t, smbd_var_run_t, smbd_var_run_t) -manage_sock_files_pattern(smbd_t, smbd_var_run_t, smbd_var_run_t) -files_pid_filetrans(smbd_t, smbd_var_run_t, { dir file }) +manage_dirs_pattern(smbd_t, samba_var_run_t, samba_var_run_t) +manage_files_pattern(smbd_t, samba_var_run_t, samba_var_run_t) +manage_sock_files_pattern(smbd_t, samba_var_run_t, samba_var_run_t) +files_pid_filetrans(smbd_t, samba_var_run_t, { dir file }) allow smbd_t winbind_var_run_t:sock_file read_sock_file_perms; stream_connect_pattern(smbd_t, winbind_var_run_t, winbind_var_run_t, winbind_t) -allow smbd_t nmbd_var_run_t:file read_file_perms; -stream_connect_pattern(smbd_t, nmbd_var_run_t, nmbd_var_run_t, nmbd_t) +stream_connect_pattern(smbd_t, samba_var_run_t, samba_var_run_t, nmbd_t) kernel_getattr_core_if(smbd_t) kernel_getattr_message_if(smbd_t) @@ -377,6 +382,11 @@ auth_domtrans_upd_passwd(smbd_t) auth_manage_cache(smbd_t) auth_write_login_records(smbd_t) +auth_can_read_shadow_passwords(smbd_t) +tunable_policy(`samba_read_shadow',` + auth_tunable_read_shadow(smbd_t) +') + init_rw_utmp(smbd_t) logging_search_logs(smbd_t) @@ -519,11 +529,10 @@ allow nmbd_t self:tcp_socket { accept listen }; allow nmbd_t self:unix_dgram_socket sendto; allow nmbd_t self:unix_stream_socket { accept connectto listen }; -manage_dirs_pattern(nmbd_t, { smbd_var_run_t nmbd_var_run_t }, nmbd_var_run_t) -manage_files_pattern(nmbd_t, nmbd_var_run_t, nmbd_var_run_t) -manage_sock_files_pattern(nmbd_t, nmbd_var_run_t, nmbd_var_run_t) -files_pid_filetrans(nmbd_t, nmbd_var_run_t, { dir file sock_file }) -filetrans_pattern(nmbd_t, smbd_var_run_t, nmbd_var_run_t, dir) +manage_dirs_pattern(nmbd_t, samba_var_run_t, samba_var_run_t) +manage_files_pattern(nmbd_t, samba_var_run_t, samba_var_run_t) +manage_sock_files_pattern(nmbd_t, samba_var_run_t, samba_var_run_t) +files_pid_filetrans(nmbd_t, samba_var_run_t, { dir file sock_file }) read_files_pattern(nmbd_t, samba_etc_t, samba_etc_t) read_lnk_files_pattern(nmbd_t, samba_etc_t, samba_etc_t) @@ -542,7 +551,7 @@ files_var_filetrans(nmbd_t, samba_var_t, dir, "samba") allow nmbd_t { swat_t smbcontrol_t }:process signal; -allow nmbd_t smbd_var_run_t:dir rw_dir_perms; +allow nmbd_t samba_var_run_t:dir rw_dir_perms; kernel_getattr_core_if(nmbd_t) kernel_getattr_message_if(nmbd_t) @@ -567,6 +576,8 @@ corenet_sendrecv_smbd_client_packets(nmbd_t) corenet_tcp_connect_smbd_port(nmbd_t) corenet_tcp_sendrecv_smbd_port(nmbd_t) +corecmd_search_bin(nmbd_t) +dev_read_urand(nmbd_t) dev_read_sysfs(nmbd_t) dev_getattr_mtrr_dev(nmbd_t) @@ -618,7 +629,7 @@ allow smbcontrol_t self:unix_stream_socket create_stream_socket_perms; allow smbcontrol_t self:process { signal signull }; allow smbcontrol_t { winbind_t nmbd_t smbd_t }:process { signal signull }; -read_files_pattern(smbcontrol_t, { nmbd_var_run_t smbd_var_run_t }, { nmbd_var_run_t smbd_var_run_t }) +read_files_pattern(smbcontrol_t, samba_var_run_t, samba_var_run_t) manage_files_pattern(smbcontrol_t, samba_var_t, samba_var_t) @@ -733,8 +744,8 @@ allow swat_t self:unix_stream_socket connectto; allow swat_t { nmbd_t smbd_t }:process { signal signull }; -allow swat_t smbd_var_run_t:file read_file_perms; -allow swat_t smbd_var_run_t:file { lock delete_file_perms }; +allow swat_t samba_var_run_t:file read_file_perms; +allow swat_t samba_var_run_t:file { lock delete_file_perms }; rw_files_pattern(swat_t, samba_etc_t, samba_etc_t) read_lnk_files_pattern(swat_t, samba_etc_t, samba_etc_t) @@ -766,8 +777,8 @@ read_files_pattern(swat_t, winbind_var_run_t, winbind_var_run_t) allow swat_t winbind_var_run_t:dir { add_entry_dir_perms del_entry_dir_perms }; allow swat_t winbind_var_run_t:sock_file { create_sock_file_perms delete_sock_file_perms }; -read_files_pattern(swat_t, nmbd_var_run_t, nmbd_var_run_t) -stream_connect_pattern(swat_t, nmbd_var_run_t, nmbd_var_run_t, nmbd_t) +read_files_pattern(swat_t, samba_var_run_t, samba_var_run_t) +stream_connect_pattern(swat_t, samba_var_run_t, samba_var_run_t, nmbd_t) samba_domtrans_smbd(swat_t) samba_domtrans_nmbd(swat_t) @@ -852,8 +863,8 @@ allow winbind_t self:tcp_socket { accept listen }; allow winbind_t nmbd_t:process { signal signull }; -allow winbind_t nmbd_var_run_t:file read_file_perms; -stream_connect_pattern(winbind_t, nmbd_var_run_t, nmbd_var_run_t, nmbd_t) +allow winbind_t samba_var_run_t:file read_file_perms; +stream_connect_pattern(winbind_t, samba_var_run_t, samba_var_run_t, nmbd_t) allow winbind_t samba_etc_t:dir list_dir_perms; read_files_pattern(winbind_t, samba_etc_t, samba_etc_t) @@ -885,15 +896,15 @@ manage_files_pattern(winbind_t, winbind_tmp_t, winbind_tmp_t) manage_sock_files_pattern(winbind_t, winbind_tmp_t, winbind_tmp_t) files_tmp_filetrans(winbind_t, winbind_tmp_t, { file dir }) -manage_dirs_pattern(winbind_t, { smbd_var_run_t winbind_var_run_t }, winbind_var_run_t) +manage_dirs_pattern(winbind_t, { samba_var_run_t winbind_var_run_t }, winbind_var_run_t) manage_files_pattern(winbind_t, winbind_var_run_t, winbind_var_run_t) manage_sock_files_pattern(winbind_t, winbind_var_run_t, winbind_var_run_t) files_pid_filetrans(winbind_t, winbind_var_run_t, { sock_file file dir }) -filetrans_pattern(winbind_t, smbd_var_run_t, winbind_var_run_t, dir) +filetrans_pattern(winbind_t, samba_var_run_t, winbind_var_run_t, dir) -manage_dirs_pattern(winbind_t, smbd_var_run_t, smbd_var_run_t) -manage_files_pattern(winbind_t, smbd_var_run_t, smbd_var_run_t) -manage_sock_files_pattern(winbind_t, smbd_var_run_t, smbd_var_run_t) +manage_dirs_pattern(winbind_t, samba_var_run_t, samba_var_run_t) +manage_files_pattern(winbind_t, samba_var_run_t, samba_var_run_t) +manage_sock_files_pattern(winbind_t, samba_var_run_t, samba_var_run_t) kernel_read_network_state(winbind_t) kernel_read_kernel_sysctls(winbind_t)