Skip to contentSkip to conversation

Changes to the miscfiles policy module

PATCH New dominick.grift at gmail.com 2 participants 4 messages Oct 14, 2012 – Oct 31, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Changes to the miscfiles policy module

From: Dominick Grift <[email protected]>

If you use the miscfiles policy module then you depend on the mandv policy module

Change various miscfiles man interfaces to include relevant mandb interface calls

policy/modules/system/miscfiles.fc +0 -1
index 9116567..016974b 100644
@@ -77,7 +77,6 @@
 
 /var/cache/fontconfig(/.*)?	gen_context(system_u:object_r:fonts_cache_t,s0)
 /var/cache/fonts(/.*)?		gen_context(system_u:object_r:tetex_data_t,s0)
-/var/cache/man(/.*)?		gen_context(system_u:object_r:man_t,s0)
 
 /var/named/chroot/etc/pki(/.*)? gen_context(system_u:object_r:cert_t,s0)
 
policy/modules/system/miscfiles.if +8 -0
index 926ba65..0a504f0 100644
@@ -491,6 +491,8 @@
 
 	allow $1 man_t:dir search_dir_perms;
 	files_search_usr($1)
+
+	mandb_search_cache($1)
 ')
 
 ########################################
@@ -531,6 +533,8 @@
 	allow $1 man_t:dir list_dir_perms;
 	read_files_pattern($1, man_t, man_t)
 	read_lnk_files_pattern($1, man_t, man_t)
+
+	mandb_read_cache_content($1)
 ')
 
 ########################################
@@ -557,6 +561,8 @@
 	delete_dirs_pattern($1, man_t, man_t)
 	delete_files_pattern($1, man_t, man_t)
 	delete_lnk_files_pattern($1, man_t, man_t)
+
+	mandb_delete_cache_content($1)
 ')
 
 ########################################
@@ -578,6 +584,8 @@
 	manage_dirs_pattern($1, man_t, man_t)
 	manage_files_pattern($1, man_t, man_t)
 	read_lnk_files_pattern($1, man_t, man_t)
+
+	mandb_manage_cache_content($1)
 ')
 
 ########################################
#1 lore raw

PATCH 1/1 Changes to the miscfiles policy module

I changed this so that miscfiles policy module depends on it.

I think this should take away your previous concerns.

Can this be merged now?

Quoted 61 lines · dominick.grift at gmail.com

From: Dominick Grift <[email protected]>

If you use the miscfiles policy module then you depend on the mandv policy module

Change various miscfiles man interfaces to include relevant mandb interface calls

policy/modules/system/miscfiles.fc +0 -1
index 9116567..016974b 100644
@@ -77,7 +77,6 @@
 
 /var/cache/fontconfig(/.*)?	gen_context(system_u:object_r:fonts_cache_t,s0)
 /var/cache/fonts(/.*)?		gen_context(system_u:object_r:tetex_data_t,s0)
-/var/cache/man(/.*)?		gen_context(system_u:object_r:man_t,s0)
 
 /var/named/chroot/etc/pki(/.*)? gen_context(system_u:object_r:cert_t,s0)
 
policy/modules/system/miscfiles.if +8 -0
index 926ba65..0a504f0 100644
@@ -491,6 +491,8 @@
 
 	allow $1 man_t:dir search_dir_perms;
 	files_search_usr($1)
+
+	mandb_search_cache($1)
 ')
 
 ########################################
@@ -531,6 +533,8 @@
 	allow $1 man_t:dir list_dir_perms;
 	read_files_pattern($1, man_t, man_t)
 	read_lnk_files_pattern($1, man_t, man_t)
+
+	mandb_read_cache_content($1)
 ')
 
 ########################################
@@ -557,6 +561,8 @@
 	delete_dirs_pattern($1, man_t, man_t)
 	delete_files_pattern($1, man_t, man_t)
 	delete_lnk_files_pattern($1, man_t, man_t)
+
+	mandb_delete_cache_content($1)
 ')
 
 ########################################
@@ -578,6 +584,8 @@
 	manage_dirs_pattern($1, man_t, man_t)
 	manage_files_pattern($1, man_t, man_t)
 	read_lnk_files_pattern($1, man_t, man_t)
+
+	mandb_manage_cache_content($1)
 ')
 
 ########################################
#2 lore raw

PATCH 1/1 Changes to the miscfiles policy module

Quoted 5 lines · Dominick Grift

I changed this so that miscfiles policy module depends on it.

I think this should take away your previous concerns.

Can this be merged now?

This is actually the reverse of what I was saying. Miscfiles shouldn't be unconditionally depending on a higher layer module. I think the only solution is to have the cache type be in miscfiles so the files will be labeled right, even if mandb isn't installed.

Quoted 69 lines · dominick.grift at gmail.com
Quoted 53 lines

From: Dominick Grift <[email protected]>

If you use the miscfiles policy module then you depend on the mandv policy module

Change various miscfiles man interfaces to include relevant mandb interface calls

policy/modules/system/miscfiles.fc +0 -1
index 9116567..016974b 100644
@@ -77,7 +77,6 @@
 
 /var/cache/fontconfig(/.*)?	gen_context(system_u:object_r:fonts_cache_t,s0)
 /var/cache/fonts(/.*)?		gen_context(system_u:object_r:tetex_data_t,s0)
-/var/cache/man(/.*)?		gen_context(system_u:object_r:man_t,s0)
 
 /var/named/chroot/etc/pki(/.*)? gen_context(system_u:object_r:cert_t,s0)
 
policy/modules/system/miscfiles.if +6 -0
index 926ba65..0a504f0 100644
@@ -491,6 +491,8 @@
 
 	allow $1 man_t:dir search_dir_perms;
 	files_search_usr($1)
+
+	mandb_search_cache($1)
 ')
 
 ########################################
@@ -531,6 +533,8 @@
 	allow $1 man_t:dir list_dir_perms;
 	read_files_pattern($1, man_t, man_t)
 	read_lnk_files_pattern($1, man_t, man_t)
+
+	mandb_read_cache_content($1)
 ')
 
 ########################################
@@ -557,6 +561,8 @@
 	delete_dirs_pattern($1, man_t, man_t)
 	delete_files_pattern($1, man_t, man_t)
 	delete_lnk_files_pattern($1, man_t, man_t)
+
+	mandb_delete_cache_content($1)
 ')
 
 ########################################

policy/modules/system/miscfiles.if line 591

Quoted 8 lines
policy/modules/system/miscfiles.if +2 -0
@@ -578,6 +584,8 @@
 	manage_dirs_pattern($1, man_t, man_t)
 	manage_files_pattern($1, man_t, man_t)
 	read_lnk_files_pattern($1, man_t, man_t)
+
+	mandb_manage_cache_content($1)
 ')
 
 ########################################

_______________________________________________
refpolicy mailing list
refpolicy at oss.tresys.com
http://oss.tresys.com/mailman/listinfo/refpolicy

Signature · 3 lines
Chris PeBenito
Tresys Technology, LLC
www.tresys.com | oss.tresys.com
#3 lore raw

PATCH 1/1 Changes to the miscfiles policy module

Quoted 8 lines · Christopher J. PeBenito
Quoted 5 lines · Dominick Grift

I changed this so that miscfiles policy module depends on it.

I think this should take away your previous concerns.

Can this be merged now?

This is actually the reverse of what I was saying. Miscfiles shouldn't be unconditionally depending on a higher layer module. I think the only solution is to have the cache type be in miscfiles so the files will be labeled right, even if mandb isn't installed.

But if mandb is not installed then the location that is labeled with the cache type is not installed either

But ok if that is really what you want then i guess i can work on that instead

Quoted 71 lines
Quoted 69 lines · dominick.grift at gmail.com
Quoted 53 lines

From: Dominick Grift <[email protected]>

If you use the miscfiles policy module then you depend on the mandv policy module

Change various miscfiles man interfaces to include relevant mandb interface calls

policy/modules/system/miscfiles.fc +0 -1
index 9116567..016974b 100644
@@ -77,7 +77,6 @@
 
 /var/cache/fontconfig(/.*)?	gen_context(system_u:object_r:fonts_cache_t,s0)
 /var/cache/fonts(/.*)?		gen_context(system_u:object_r:tetex_data_t,s0)
-/var/cache/man(/.*)?		gen_context(system_u:object_r:man_t,s0)
 
 /var/named/chroot/etc/pki(/.*)? gen_context(system_u:object_r:cert_t,s0)
 
policy/modules/system/miscfiles.if +6 -0
index 926ba65..0a504f0 100644
@@ -491,6 +491,8 @@
 
 	allow $1 man_t:dir search_dir_perms;
 	files_search_usr($1)
+
+	mandb_search_cache($1)
 ')
 
 ########################################
@@ -531,6 +533,8 @@
 	allow $1 man_t:dir list_dir_perms;
 	read_files_pattern($1, man_t, man_t)
 	read_lnk_files_pattern($1, man_t, man_t)
+
+	mandb_read_cache_content($1)
 ')
 
 ########################################
@@ -557,6 +561,8 @@
 	delete_dirs_pattern($1, man_t, man_t)
 	delete_files_pattern($1, man_t, man_t)
 	delete_lnk_files_pattern($1, man_t, man_t)
+
+	mandb_delete_cache_content($1)
 ')
 
 ########################################

policy/modules/system/miscfiles.if line 591

Quoted 8 lines
policy/modules/system/miscfiles.if +2 -0
@@ -578,6 +584,8 @@
 	manage_dirs_pattern($1, man_t, man_t)
 	manage_files_pattern($1, man_t, man_t)
 	read_lnk_files_pattern($1, man_t, man_t)
+
+	mandb_manage_cache_content($1)
 ')
 
 ########################################

_______________________________________________
refpolicy mailing list
refpolicy at oss.tresys.com
http://oss.tresys.com/mailman/listinfo/refpolicy