1 |
commit: 9f71ba76490a062fa097c64028e719a803971b79 |
2 |
Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> |
3 |
AuthorDate: Sat Nov 22 18:20:55 2014 +0000 |
4 |
Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 22 18:20:55 2014 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=9f71ba76 |
7 |
|
8 |
Reshuffle to match upstream better (for comparisons) |
9 |
|
10 |
--- |
11 |
policy/modules/roles/sysadm.te | 136 ++++++++++++++++++++++------------------- |
12 |
1 file changed, 74 insertions(+), 62 deletions(-) |
13 |
|
14 |
diff --git a/policy/modules/roles/sysadm.te b/policy/modules/roles/sysadm.te |
15 |
index af9d2cf..7e497b0 100644 |
16 |
--- a/policy/modules/roles/sysadm.te |
17 |
+++ b/policy/modules/roles/sysadm.te |
18 |
@@ -52,9 +52,6 @@ ifdef(`direct_sysadm_daemon',` |
19 |
') |
20 |
|
21 |
ifdef(`distro_gentoo',` |
22 |
- # To support mirrorselect / netselect |
23 |
- allow sysadm_t self:rawip_socket create_socket_perms; |
24 |
- |
25 |
init_exec_rc(sysadm_t) |
26 |
') |
27 |
|
28 |
@@ -89,7 +86,6 @@ optional_policy(` |
29 |
') |
30 |
|
31 |
optional_policy(` |
32 |
- asterisk_admin(sysadm_t, sysadm_r) |
33 |
asterisk_stream_connect(sysadm_t) |
34 |
') |
35 |
|
36 |
@@ -106,7 +102,6 @@ optional_policy(` |
37 |
') |
38 |
|
39 |
optional_policy(` |
40 |
- bind_admin(sysadm_t, sysadm_r) |
41 |
bind_run_ndc(sysadm_t, sysadm_r) |
42 |
') |
43 |
|
44 |
@@ -157,10 +152,6 @@ optional_policy(` |
45 |
') |
46 |
|
47 |
optional_policy(` |
48 |
- dracut_run(sysadm_t, sysadm_r) |
49 |
-') |
50 |
- |
51 |
-optional_policy(` |
52 |
firstboot_run(sysadm_t, sysadm_r) |
53 |
') |
54 |
|
55 |
@@ -242,45 +233,25 @@ optional_policy(` |
56 |
') |
57 |
|
58 |
optional_policy(` |
59 |
- mutt_role(sysadm_r, sysadm_t) |
60 |
-') |
61 |
- |
62 |
-optional_policy(` |
63 |
mysql_stream_connect(sysadm_t) |
64 |
') |
65 |
|
66 |
optional_policy(` |
67 |
- networkmanager_run_wpa_cli(sysadm_t, sysadm_r) |
68 |
-') |
69 |
- |
70 |
-optional_policy(` |
71 |
netutils_run(sysadm_t, sysadm_r) |
72 |
netutils_run_ping(sysadm_t, sysadm_r) |
73 |
netutils_run_traceroute(sysadm_t, sysadm_r) |
74 |
') |
75 |
|
76 |
optional_policy(` |
77 |
- nginx_admin(sysadm_t, sysadm_r) |
78 |
-') |
79 |
- |
80 |
-optional_policy(` |
81 |
ntp_stub() |
82 |
corenet_udp_bind_ntp_port(sysadm_t) |
83 |
') |
84 |
|
85 |
optional_policy(` |
86 |
- ntp_admin(sysadm_t, sysadm_r) |
87 |
-') |
88 |
- |
89 |
-optional_policy(` |
90 |
oav_run_update(sysadm_t, sysadm_r) |
91 |
') |
92 |
|
93 |
optional_policy(` |
94 |
- openvpn_admin(sysadm_t, sysadm_r) |
95 |
-') |
96 |
- |
97 |
-optional_policy(` |
98 |
pcmcia_run_cardctl(sysadm_t, sysadm_r) |
99 |
') |
100 |
|
101 |
@@ -295,31 +266,10 @@ optional_policy(` |
102 |
') |
103 |
|
104 |
optional_policy(` |
105 |
- postfix_admin(sysadm_t, sysadm_r) |
106 |
-') |
107 |
- |
108 |
-optional_policy(` |
109 |
- postgresql_admin(sysadm_t, sysadm_r) |
110 |
- postgresql_exec(sysadm_t) |
111 |
-') |
112 |
- |
113 |
-optional_policy(` |
114 |
- puppet_admin(sysadm_t, sysadm_r) |
115 |
-') |
116 |
- |
117 |
-optional_policy(` |
118 |
pyzor_role(sysadm_r, sysadm_t) |
119 |
') |
120 |
|
121 |
optional_policy(` |
122 |
- qemu_read_state(sysadm_t) |
123 |
- qemu_signal(sysadm_t) |
124 |
- qemu_kill(sysadm_t) |
125 |
- qemu_setsched(sysadm_t) |
126 |
- qemu_run(sysadm_t, sysadm_r) |
127 |
-') |
128 |
- |
129 |
-optional_policy(` |
130 |
quota_run(sysadm_t, sysadm_r) |
131 |
') |
132 |
|
133 |
@@ -348,10 +298,6 @@ optional_policy(` |
134 |
') |
135 |
|
136 |
optional_policy(` |
137 |
- rtorrent_admin(sysadm_t, sysadm_r) |
138 |
-') |
139 |
- |
140 |
-optional_policy(` |
141 |
samba_run_net(sysadm_t, sysadm_r) |
142 |
samba_run_winbind_helper(sysadm_t, sysadm_r) |
143 |
') |
144 |
@@ -444,10 +390,6 @@ optional_policy(` |
145 |
') |
146 |
|
147 |
optional_policy(` |
148 |
- vde_role(sysadm_r, sysadm_t) |
149 |
-') |
150 |
- |
151 |
-optional_policy(` |
152 |
virt_stream_connect(sysadm_t) |
153 |
') |
154 |
|
155 |
@@ -517,10 +459,6 @@ ifndef(`distro_redhat',` |
156 |
') |
157 |
|
158 |
optional_policy(` |
159 |
- gorg_role(sysadm_r, sysadm_t) |
160 |
- ') |
161 |
- |
162 |
- optional_policy(` |
163 |
gpg_role(sysadm_r, sysadm_t) |
164 |
') |
165 |
|
166 |
@@ -534,10 +472,27 @@ ifndef(`distro_redhat',` |
167 |
') |
168 |
|
169 |
ifdef(`distro_gentoo',` |
170 |
+ ######################################### |
171 |
+ # |
172 |
+ # Local sysadm_t policy |
173 |
+ # |
174 |
+ |
175 |
+ # To support mirrorselect / netselect |
176 |
+ allow sysadm_t self:rawip_socket create_socket_perms; |
177 |
+ |
178 |
+ |
179 |
# powertop support |
180 |
dev_read_cpuid(sysadm_t) |
181 |
|
182 |
optional_policy(` |
183 |
+ asterisk_admin(sysadm_t, sysadm_r) |
184 |
+ ') |
185 |
+ |
186 |
+ optional_policy(` |
187 |
+ bind_admin(sysadm_t, sysadm_r) |
188 |
+ ') |
189 |
+ |
190 |
+ optional_policy(` |
191 |
dnsmasq_admin(sysadm_t, sysadm_r) |
192 |
') |
193 |
|
194 |
@@ -546,10 +501,59 @@ ifdef(`distro_gentoo',` |
195 |
') |
196 |
|
197 |
optional_policy(` |
198 |
+ dracut_run(sysadm_t, sysadm_r) |
199 |
+ ') |
200 |
+ |
201 |
+ optional_policy(` |
202 |
fail2ban_run_client(sysadm_t, sysadm_r) |
203 |
') |
204 |
|
205 |
optional_policy(` |
206 |
+ gorg_role(sysadm_r, sysadm_t) |
207 |
+ ') |
208 |
+ |
209 |
+ optional_policy(` |
210 |
+ mutt_role(sysadm_r, sysadm_t) |
211 |
+ ') |
212 |
+ |
213 |
+ optional_policy(` |
214 |
+ networkmanager_run_wpa_cli(sysadm_t, sysadm_r) |
215 |
+ ') |
216 |
+ |
217 |
+ optional_policy(` |
218 |
+ nginx_admin(sysadm_t, sysadm_r) |
219 |
+ ') |
220 |
+ |
221 |
+ optional_policy(` |
222 |
+ ntp_admin(sysadm_t, sysadm_r) |
223 |
+ ') |
224 |
+ |
225 |
+ optional_policy(` |
226 |
+ openvpn_admin(sysadm_t, sysadm_r) |
227 |
+ ') |
228 |
+ |
229 |
+ optional_policy(` |
230 |
+ postfix_admin(sysadm_t, sysadm_r) |
231 |
+ ') |
232 |
+ |
233 |
+ optional_policy(` |
234 |
+ postgresql_admin(sysadm_t, sysadm_r) |
235 |
+ postgresql_exec(sysadm_t) |
236 |
+ ') |
237 |
+ |
238 |
+ optional_policy(` |
239 |
+ puppet_admin(sysadm_t, sysadm_r) |
240 |
+ ') |
241 |
+ |
242 |
+ optional_policy(` |
243 |
+ qemu_read_state(sysadm_t) |
244 |
+ qemu_signal(sysadm_t) |
245 |
+ qemu_kill(sysadm_t) |
246 |
+ qemu_setsched(sysadm_t) |
247 |
+ qemu_run(sysadm_t, sysadm_r) |
248 |
+ ') |
249 |
+ |
250 |
+ optional_policy(` |
251 |
rpc_admin(sysadm_t, sysadm_r) |
252 |
') |
253 |
|
254 |
@@ -558,6 +562,10 @@ ifdef(`distro_gentoo',` |
255 |
') |
256 |
|
257 |
optional_policy(` |
258 |
+ rtorrent_admin(sysadm_t, sysadm_r) |
259 |
+ ') |
260 |
+ |
261 |
+ optional_policy(` |
262 |
salt_admin_master(sysadm_t, sysadm_r) |
263 |
salt_admin_minion(sysadm_t, sysadm_r) |
264 |
') |
265 |
@@ -570,4 +578,8 @@ ifdef(`distro_gentoo',` |
266 |
optional_policy(` |
267 |
shorewall_admin(sysadm_t, sysadm_r) |
268 |
') |
269 |
+ |
270 |
+ optional_policy(` |
271 |
+ vde_role(sysadm_r, sysadm_t) |
272 |
+ ') |
273 |
') |