libsemanage: maintain disable dontaudit state between handle commits
PATCH v7 2/2 libsemanage: maintain disable dontaudit state between handle commits
Currently any changes made to the policy which require committing a handle cause dontaudit rules to be re-enabled. This is confusing, and frustrating for users who want to edit policy with dontaudit rules turned off. This patch allows semanage to remember the last state of the dontaudit rules and apply them as default whenever a handle is connected. Additionally other functions may check for the file semanage creates to determine if dontaudit rules are turned on. This knowledge can be useful for tools like SETroubleshoot which may want to change their behavior depending on the state of the dontaudit rules. In the event that a the file cannot be created a call to commit will fail.
--- libsemanage/include/semanage/handle.h | 3 +++ libsemanage/src/direct_api.c | 32 +++++++++++++++++++++++++++++++- libsemanage/src/handle.c | 9 ++++++++- libsemanage/src/libsemanage.map | 2 +- libsemanage/src/semanage_store.c | 1 + libsemanage/src/semanage_store.h | 1 + 6 files changed, 45 insertions(+), 3 deletions(-)
libsemanage/include/semanage/handle.h +3 -0
@@ -69,6 +69,9 @@ void semanage_set_rebuild(semanage_handl* 1 for yes, 0 for no (default) */ void semanage_set_create_store (semanage_handle_t * handle,int create_store); +/*Get whether or not to dontaudits will be disabled upon commit */ +int semanage_get_disable_dontaudit (semanage_handle_t * handle); +/* Set whether or not to disable dontaudits upon commit */ void semanage_set_disable_dontaudit (semanage_handle_t * handle,int disable_dontaudit);
libsemanage/src/direct_api.c +31 -1
@@ -20,6 +20,7 @@*/ #include <sepol/module.h> +#include <sepol/handle.h> #include <selinux/selinux.h> #include <assert.h>
@@ -111,6 +112,7 @@ int semanage_direct_is_managed(semanage_int semanage_direct_connect (semanage_handle_t * sh) {char polpath[PATH_MAX ]; +const char *path;snprintf (polpath,PATH_MAX ,"%s%s" ,selinux_path (), sh->conf->store_path);
@@ -223,6 +225,13 @@ int semanage_direct_connect(semanage_hanif (bool_activedb_dbase_init (sh,semanage_bool_dbase_active (sh)) <0 ) goto err; +/* set the disable dontaudit value */ + path =semanage_fname (SEMANAGE_DISABLE_DONTAUDIT ); +if (access (path,F_OK ) ==0 ) +sepol_set_disable_dontaudit (sh->sepolh,1 ); +else +sepol_set_disable_dontaudit (sh->sepolh,0 ); +return STATUS_SUCCESS ; err:
@@ -645,7 +654,7 @@ static int semanage_direct_commit(semanachar **mod_filenames =NULL ;char *sorted_fc_buffer =NULL , *sorted_nc_buffer =NULL ;size_t sorted_fc_buffer_len =0 , sorted_nc_buffer_len =0 ; -const char *linked_filename =NULL , *ofilename =NULL ; +const char *linked_filename =NULL , *ofilename =NULL , *path;sepol_module_package_t *base =NULL ;int retval =-1 , num_modfiles =0 , i;sepol_policydb_t *out =NULL ;
@@ -669,6 +678,27 @@ static int semanage_direct_commit(semanadbase_config_t *pfcontexts =semanage_fcontext_dbase_policy (sh);dbase_config_t *seusers =semanage_seuser_dbase_local (sh); +/* Immediently create the disable_dontaudit flag */ + path =semanage_fname (SEMANAGE_DISABLE_DONTAUDIT ); +if (sepol_get_disable_dontaudit (sh->sepolh) ==1 ) { +FILE *touch; + touch =fopen (path,"w" ); +if (touch !=NULL ) { +if (fclose (touch) !=0 ) { +ERR (sh,"Error attempting to create disable_dontaudit flag." ); + goto cleanup; + } + }else { +ERR (sh,"Error attempting to create disable_dontaudit flag." ); + goto cleanup; + } + }else { +if (remove (path) ==-1 && errno !=ENOENT ) { +ERR (sh,"Error removing the disable_dontaudit flag." ); + goto cleanup; + } + } +/* Before we do anything else, flush the join to its component parts. * This *does not* flush to disk automatically */ if (users->dtable->is_modified (users->dbase)) {
libsemanage/src/handle.c +8 -1
@@ -110,6 +110,13 @@ void semanage_set_create_store(semanage_return ; } +int semanage_get_disable_dontaudit (semanage_handle_t * sh) +{ +assert (sh !=NULL ); + +return sepol_get_disable_dontaudit (sh->sepolh); +} +void semanage_set_disable_dontaudit (semanage_handle_t * sh,int disable_dontaudit) {assert (sh !=NULL );
@@ -264,7 +271,7 @@ int semanage_commit(semanage_handle_t *assert (sh !=NULL && sh->funcs !=NULL && sh->funcs->commit !=NULL );if (!sh->is_in_transaction) {ERR (sh, -"Will not commit because caller does not have a tranaction lock yet." ); +"Will not commit because caller does not have a transaction lock yet." );return -1 ; } retval = sh->funcs->commit (sh);
libsemanage/src/libsemanage.map +1 -1
@@ -15,7 +15,7 @@ LIBSEMANAGE_1.0 { semanage_iface_*; semanage_port_*; semanage_context_*; semanage_node_*; semanage_fcontext_*; semanage_access_check; semanage_set_create_store; - semanage_is_connected; semanage_set_disable_dontaudit; + semanage_is_connected; semanage_get_disable_dontaudit; semanage_set_disable_dontaudit; semanage_mls_enabled; local: *; };
libsemanage/src/semanage_store.c +1 -0
@@ -114,6 +114,7 @@ static const char *semanage_sandbox_path"/users_extra" ,"/netfilter_contexts" ,"/file_contexts.homedirs" , + "/disable_dontaudit", };/* A node used in a linked list of file contexts; used for sorting.
libsemanage/src/semanage_store.h +1 -0
@@ -58,6 +58,7 @@ enum semanage_sandbox_defs {SEMANAGE_USERS_EXTRA ,SEMANAGE_NC ,SEMANAGE_FC_HOMEDIRS , +SEMANAGE_DISABLE_DONTAUDIT , SEMANAGE_STORE_NUM_PATHS };
libsemanage/include/semanage/handle.h +3 -0
@@ -69,6 +69,9 @@ void semanage_set_rebuild(semanage_handl* 1 for yes, 0 for no (default) */ void semanage_set_create_store (semanage_handle_t * handle,int create_store); +/*Get whether or not to dontaudits will be disabled upon commit */ +int semanage_get_disable_dontaudit (semanage_handle_t * handle); +/* Set whether or not to disable dontaudits upon commit */ void semanage_set_disable_dontaudit (semanage_handle_t * handle,int disable_dontaudit);
libsemanage/src/direct_api.c +31 -1
@@ -20,6 +20,7 @@*/ #include <sepol/module.h> +#include <sepol/handle.h> #include <selinux/selinux.h> #include <assert.h>
@@ -111,6 +112,7 @@ int semanage_direct_is_managed(semanage_int semanage_direct_connect (semanage_handle_t * sh) {char polpath[PATH_MAX ]; +const char *path;snprintf (polpath,PATH_MAX ,"%s%s" ,selinux_path (), sh->conf->store_path);
@@ -223,6 +225,13 @@ int semanage_direct_connect(semanage_hanif (bool_activedb_dbase_init (sh,semanage_bool_dbase_active (sh)) <0 ) goto err; +/* set the disable dontaudit value */ + path =semanage_fname (SEMANAGE_DISABLE_DONTAUDIT ); +if (access (path,F_OK ) ==0 ) +sepol_set_disable_dontaudit (sh->sepolh,1 ); +else +sepol_set_disable_dontaudit (sh->sepolh,0 ); +return STATUS_SUCCESS ; err:
@@ -645,7 +654,7 @@ static int semanage_direct_commit(semanachar **mod_filenames =NULL ;char *sorted_fc_buffer =NULL , *sorted_nc_buffer =NULL ;size_t sorted_fc_buffer_len =0 , sorted_nc_buffer_len =0 ; -const char *linked_filename =NULL , *ofilename =NULL ; +const char *linked_filename =NULL , *ofilename =NULL , *path;sepol_module_package_t *base =NULL ;int retval =-1 , num_modfiles =0 , i;sepol_policydb_t *out =NULL ;
@@ -669,6 +678,27 @@ static int semanage_direct_commit(semanadbase_config_t *pfcontexts =semanage_fcontext_dbase_policy (sh);dbase_config_t *seusers =semanage_seuser_dbase_local (sh); +/* Immediently create the disable_dontaudit flag */ + path =semanage_fname (SEMANAGE_DISABLE_DONTAUDIT ); +if (sepol_get_disable_dontaudit (sh->sepolh) ==1 ) { +FILE *touch; + touch =fopen (path,"w" ); +if (touch !=NULL ) { +if (fclose (touch) !=0 ) { +ERR (sh,"Error attempting to create disable_dontaudit flag." ); + goto cleanup; + } + }else { +ERR (sh,"Error attempting to create disable_dontaudit flag." ); + goto cleanup; + } + }else { +if (remove (path) ==-1 && errno !=ENOENT ) { +ERR (sh,"Error removing the disable_dontaudit flag." ); + goto cleanup; + } + } +/* Before we do anything else, flush the join to its component parts. * This *does not* flush to disk automatically */ if (users->dtable->is_modified (users->dbase)) {
libsemanage/src/handle.c +8 -1
@@ -110,6 +110,13 @@ void semanage_set_create_store(semanage_return ; } +int semanage_get_disable_dontaudit (semanage_handle_t * sh) +{ +assert (sh !=NULL ); + +return sepol_get_disable_dontaudit (sh->sepolh); +} +void semanage_set_disable_dontaudit (semanage_handle_t * sh,int disable_dontaudit) {assert (sh !=NULL );
@@ -264,7 +271,7 @@ int semanage_commit(semanage_handle_t *assert (sh !=NULL && sh->funcs !=NULL && sh->funcs->commit !=NULL );if (!sh->is_in_transaction) {ERR (sh, -"Will not commit because caller does not have a tranaction lock yet." ); +"Will not commit because caller does not have a transaction lock yet." );return -1 ; } retval = sh->funcs->commit (sh);
libsemanage/src/libsemanage.map +1 -1
@@ -15,7 +15,7 @@ LIBSEMANAGE_1.0 { semanage_iface_*; semanage_port_*; semanage_context_*; semanage_node_*; semanage_fcontext_*; semanage_access_check; semanage_set_create_store; - semanage_is_connected; semanage_set_disable_dontaudit; + semanage_is_connected; semanage_get_disable_dontaudit; semanage_set_disable_dontaudit; semanage_mls_enabled; local: *; };
libsemanage/src/semanage_store.c +1 -0
@@ -114,6 +114,7 @@ static const char *semanage_sandbox_path"/users_extra" ,"/netfilter_contexts" ,"/file_contexts.homedirs" , + "/disable_dontaudit", };/* A node used in a linked list of file contexts; used for sorting.
libsemanage/src/semanage_store.h +1 -0
@@ -58,6 +58,7 @@ enum semanage_sandbox_defs {SEMANAGE_USERS_EXTRA ,SEMANAGE_NC ,SEMANAGE_FC_HOMEDIRS , +SEMANAGE_DISABLE_DONTAUDIT , SEMANAGE_STORE_NUM_PATHS };
Quoted 3 lines · Christopher Pardy
Currently any changes made to the policy which require committing a handle cause dontaudit rules to be re-enabled. This is confusing, and frustrating for users who want to edit policy with dontaudit rules turned off. This patch allows semanage to remember the last state of the dontaudit rules and apply them as default whenever a handle is connected. Additionally other functions may check for the file semanage creates to determine if dontaudit rules are turned on. This knowledge can be useful for tools like SETroubleshoot which may want to change their behavior depending on the state of the dontaudit rules. In the event that a the file cannot be created a call to commit will fail.
Signed-off-by Christopher Pardy <[email protected]>
I'll fix up the duplicate diff (you have a spelling correction that was already committed) and clean up a couple of minor things when I commit it along with the libsepol and semodule patches.
Quoted 154 lines
--- libsemanage/include/semanage/handle.h | 3 +++ libsemanage/src/direct_api.c | 32 +++++++++++++++++++++++++++++++- libsemanage/src/handle.c | 9 ++++++++- libsemanage/src/libsemanage.map | 2 +- libsemanage/src/semanage_store.c | 1 + libsemanage/src/semanage_store.h | 1 + 6 files changed, 45 insertions(+), 3 deletions(-)diff -urpN
selinux.orig2/libsemanage/include/semanage/handle.hselinux.orig3/libsemanage/include/semanage/handle.hlibsemanage/include/semanage/handle.h +3
-0@@ -69,6 +69,9 @@ void semanage_set_rebuild(semanage_handl* 1 for yes, 0 for no (default) */ void semanage_set_create_store (semanage_handle_t * handle,int create_store); +/*Get whether or not to dontaudits will be disabled upon commit */ +int semanage_get_disable_dontaudit (semanage_handle_t * handle); +/* Set whether or not to disable dontaudits upon commit */ void semanage_set_disable_dontaudit (semanage_handle_t * handle,int disable_dontaudit);diff -urpN
selinux.orig2/libsemanage/src/direct_api.cselinux.orig3/libsemanage/src/direct_api.clibsemanage/src/direct_api.c +31
-1@@ -20,6 +20,7 @@*/ #include <sepol/module.h> +#include <sepol/handle.h> #include <selinux/selinux.h> #include <assert.h> @@ -111,6 +112,7 @@ int semanage_direct_is_managed(semanage_int semanage_direct_connect (semanage_handle_t * sh) {char polpath[PATH_MAX ]; +const char *path;snprintf (polpath,PATH_MAX ,"%s%s" ,selinux_path (), sh->conf->store_path);@@ -223,6 +225,13 @@ int semanage_direct_connect(semanage_hanif (bool_activedb_dbase_init (sh,semanage_bool_dbase_active (sh)) <0 ) goto err; +/* set the disable dontaudit value */ + path =semanage_fname (SEMANAGE_DISABLE_DONTAUDIT ); +if (access (path,F_OK ) ==0 ) +sepol_set_disable_dontaudit (sh->sepolh,1 ); +else +sepol_set_disable_dontaudit (sh->sepolh,0 ); +return STATUS_SUCCESS ; err:@@ -645,7 +654,7 @@ static int semanage_direct_commit(semanachar **mod_filenames =NULL ;char *sorted_fc_buffer =NULL , *sorted_nc_buffer =NULL ;size_t sorted_fc_buffer_len =0 , sorted_nc_buffer_len =0 ; -const char *linked_filename =NULL , *ofilename =NULL ; +const char *linked_filename =NULL , *ofilename =NULL , *path;sepol_module_package_t *base =NULL ;int retval =-1 , num_modfiles =0 , i;sepol_policydb_t *out =NULL ;@@ -669,6 +678,27 @@ static int semanage_direct_commit(semanadbase_config_t *pfcontexts =semanage_fcontext_dbase_policy (sh);dbase_config_t *seusers =semanage_seuser_dbase_local (sh); +/* Immediently create the disable_dontaudit flag */ + path =semanage_fname (SEMANAGE_DISABLE_DONTAUDIT ); +if (sepol_get_disable_dontaudit (sh->sepolh) ==1 ) { +FILE *touch; + touch =fopen (path,"w" ); +if (touch !=NULL ) { +if (fclose (touch) !=0 ) { +ERR (sh,"Error attempting to create disable_dontaudit flag." ); + goto cleanup; + } + }else { +ERR (sh,"Error attempting to create disable_dontaudit flag." ); + goto cleanup; + } + }else { +if (remove (path) ==-1 && errno !=ENOENT ) { +ERR (sh,"Error removing the disable_dontaudit flag." ); + goto cleanup; + } + } +/* Before we do anything else, flush the join to its component parts. * This *does not* flush to disk automatically */ if (users->dtable->is_modified (users->dbase)) {diff -urpN
selinux.orig2/libsemanage/src/handle.cselinux.orig3/libsemanage/src/handle.clibsemanage/src/handle.c +8
-1@@ -110,6 +110,13 @@ void semanage_set_create_store(semanage_return ; } +int semanage_get_disable_dontaudit (semanage_handle_t * sh) +{ +assert (sh !=NULL ); + +return sepol_get_disable_dontaudit (sh->sepolh); +} +void semanage_set_disable_dontaudit (semanage_handle_t * sh,int disable_dontaudit) {assert (sh !=NULL );@@ -264,7 +271,7 @@ int semanage_commit(semanage_handle_t *assert (sh !=NULL && sh->funcs !=NULL && sh->funcs->commit !=NULL );if (!sh->is_in_transaction) {ERR (sh, -"Will not commit because caller does not have a tranaction lock yet." ); +"Will not commit because caller does not have a transaction lock yet." );return -1 ; } retval = sh->funcs->commit (sh);diff -urpN selinux.orig2/libsemanage/src/libsemanage.map selinux.orig3/libsemanage/src/libsemanage.map
libsemanage/src/libsemanage.map +1
-1@@ -15,7 +15,7 @@ LIBSEMANAGE_1.0 { semanage_iface_*; semanage_port_*; semanage_context_*; semanage_node_*; semanage_fcontext_*; semanage_access_check; semanage_set_create_store; - semanage_is_connected; semanage_set_disable_dontaudit; + semanage_is_connected; semanage_get_disable_dontaudit; semanage_set_disable_dontaudit; semanage_mls_enabled; local: *; };diff -urpN
selinux.orig2/libsemanage/src/semanage_store.cselinux.orig3/libsemanage/src/semanage_store.clibsemanage/src/semanage_store.c +1
-0@@ -114,6 +114,7 @@ static const char *semanage_sandbox_path"/users_extra" ,"/netfilter_contexts" ,"/file_contexts.homedirs" , + "/disable_dontaudit", };/* A node used in a linked list of file contexts; used for sorting. diff -urpN
selinux.orig2/libsemanage/src/semanage_store.hselinux.orig3/libsemanage/src/semanage_store.hlibsemanage/src/semanage_store.h +1
-0@@ -58,6 +58,7 @@ enum semanage_sandbox_defs {SEMANAGE_USERS_EXTRA ,SEMANAGE_NC ,SEMANAGE_FC_HOMEDIRS , +SEMANAGE_DISABLE_DONTAUDIT , SEMANAGE_STORE_NUM_PATHS };
Signature · 8 lines
Stephen Smalley National Security Agency -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
Quoted 10 lines · Stephen Smalley
Quoted 3 lines · Christopher Pardy
Currently any changes made to the policy which require committing a handle cause dontaudit rules to be re-enabled. This is confusing, and frustrating for users who want to edit policy with dontaudit rules turned off. This patch allows semanage to remember the last state of the dontaudit rules and apply them as default whenever a handle is connected. Additionally other functions may check for the file semanage creates to determine if dontaudit rules are turned on. This knowledge can be useful for tools like SETroubleshoot which may want to change their behavior depending on the state of the dontaudit rules. In the event that a the file cannot be created a call to commit will fail.
Signed-off-by Christopher Pardy <[email protected]>Acked-by Stephen Smalley <[email protected]>I'll fix up the duplicate diff (you have a spelling correction that was already committed) and clean up a couple of minor things when I commit it along with the libsepol and semodule patches.
Oops. I made a mistake - semanage_fname() is only the file suffix. I'll switch it to use semanage_path(SEMANAGE_TMP, SEMANAGE_DISABLE_DONTAUDIT).
Signature · 8 lines
Stephen Smalley National Security Agency -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
Quoted 8 lines · Stephen Smalley
Quoted 7 lines · Stephen Smalley
Quoted 3 lines · Christopher Pardy
Currently any changes made to the policy which require committing a handle cause dontaudit rules to be re-enabled. This is confusing, and frustrating for users who want to edit policy with dontaudit rules turned off. This patch allows semanage to remember the last state of the dontaudit rules and apply them as default whenever a handle is connected. Additionally other functions may check for the file semanage creates to determine if dontaudit rules are turned on. This knowledge can be useful for tools like SETroubleshoot which may want to change their behavior depending on the state of the dontaudit rules. In the event that a the file cannot be created a call to commit will fail.
Signed-off-by Christopher Pardy <[email protected]>Acked-by Stephen Smalley <[email protected]>
Quoted 7 lines
Quoted 3 lines
I'll fix up the duplicate diff (you have a spelling correction that was already committed) and clean up a couple of minor things when I commit it along with the libsepol and semodule patches.
Oops. I made a mistake -
semanage_fname()is only the file suffix. I'll switch it to usesemanage_path(SEMANAGE_TMP, SEMANAGE_DISABLE_DONTAUDIT).
Final version of the patch.
libsemanage/include/semanage/handle.h +3 -0
@@ -69,6 +69,9 @@ void semanage_set_rebuild(semanage_handle_t * handle, int do_rebuild);* 1 for yes, 0 for no (default) */ void semanage_set_create_store (semanage_handle_t * handle,int create_store); +/*Get whether or not dontaudits will be disabled upon commit */ +int semanage_get_disable_dontaudit (semanage_handle_t * handle); +/* Set whether or not to disable dontaudits upon commit */ void semanage_set_disable_dontaudit (semanage_handle_t * handle,int disable_dontaudit);
libsemanage/src/direct_api.c +31 -1
@@ -20,6 +20,7 @@*/ #include <sepol/module.h> +#include <sepol/handle.h> #include <selinux/selinux.h> #include <assert.h>
@@ -111,6 +112,7 @@ int semanage_direct_is_managed(semanage_handle_t * sh)int semanage_direct_connect (semanage_handle_t * sh) {char polpath[PATH_MAX ]; +const char *path;snprintf (polpath,PATH_MAX ,"%s%s" ,selinux_path (), sh->conf->store_path);
@@ -223,6 +225,13 @@ int semanage_direct_connect(semanage_handle_t * sh)if (bool_activedb_dbase_init (sh,semanage_bool_dbase_active (sh)) <0 ) goto err; +/* set the disable dontaudit value */ + path =semanage_path (SEMANAGE_ACTIVE ,SEMANAGE_DISABLE_DONTAUDIT ); +if (access (path,F_OK ) ==0 ) +sepol_set_disable_dontaudit (sh->sepolh,1 ); +else +sepol_set_disable_dontaudit (sh->sepolh,0 ); +return STATUS_SUCCESS ; err:
@@ -645,7 +654,7 @@ static int semanage_direct_commit(semanage_handle_t * sh)char **mod_filenames =NULL ;char *sorted_fc_buffer =NULL , *sorted_nc_buffer =NULL ;size_t sorted_fc_buffer_len =0 , sorted_nc_buffer_len =0 ; -const char *linked_filename =NULL , *ofilename =NULL ; +const char *linked_filename =NULL , *ofilename =NULL , *path;sepol_module_package_t *base =NULL ;int retval =-1 , num_modfiles =0 , i;sepol_policydb_t *out =NULL ;
@@ -669,6 +678,27 @@ static int semanage_direct_commit(semanage_handle_t * sh)dbase_config_t *pfcontexts =semanage_fcontext_dbase_policy (sh);dbase_config_t *seusers =semanage_seuser_dbase_local (sh); +/* Create or remove the disable_dontaudit flag file. */ + path =semanage_path (SEMANAGE_TMP ,SEMANAGE_DISABLE_DONTAUDIT ); +if (sepol_get_disable_dontaudit (sh->sepolh) ==1 ) { +FILE *touch; + touch =fopen (path,"w" ); +if (touch !=NULL ) { +if (fclose (touch) !=0 ) { +ERR (sh,"Error attempting to create disable_dontaudit flag." ); + goto cleanup; + } + }else { +ERR (sh,"Error attempting to create disable_dontaudit flag." ); + goto cleanup; + } + }else { +if (remove (path) ==-1 && errno !=ENOENT ) { +ERR (sh,"Error removing the disable_dontaudit flag." ); + goto cleanup; + } + } +/* Before we do anything else, flush the join to its component parts. * This *does not* flush to disk automatically */ if (users->dtable->is_modified (users->dbase)) {
libsemanage/src/handle.c +7 -0
@@ -110,6 +110,13 @@ void semanage_set_create_store(semanage_handle_t * sh, int create_store)return ; } +int semanage_get_disable_dontaudit (semanage_handle_t * sh) +{ +assert (sh !=NULL ); + +return sepol_get_disable_dontaudit (sh->sepolh); +} +void semanage_set_disable_dontaudit (semanage_handle_t * sh,int disable_dontaudit) {assert (sh !=NULL );
libsemanage/src/libsemanage.map +1 -1
@@ -15,7 +15,7 @@ LIBSEMANAGE_1.0 { semanage_iface_*; semanage_port_*; semanage_context_*; semanage_node_*; semanage_fcontext_*; semanage_access_check; semanage_set_create_store; - semanage_is_connected; semanage_set_disable_dontaudit; + semanage_is_connected; semanage_get_disable_dontaudit; semanage_set_disable_dontaudit; semanage_mls_enabled; local: *; };
libsemanage/src/semanage_store.c +1 -0
@@ -114,6 +114,7 @@ static const char *semanage_sandbox_paths[SEMANAGE_STORE_NUM_PATHS] = {"/users_extra" ,"/netfilter_contexts" ,"/file_contexts.homedirs" , + "/disable_dontaudit", };/* A node used in a linked list of file contexts; used for sorting.
libsemanage/src/semanage_store.h +1 -0
@@ -58,6 +58,7 @@ enum semanage_sandbox_defs {SEMANAGE_USERS_EXTRA ,SEMANAGE_NC ,SEMANAGE_FC_HOMEDIRS , +SEMANAGE_DISABLE_DONTAUDIT , SEMANAGE_STORE_NUM_PATHS };
Signature · 8 lines
Stephen Smalley National Security Agency -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
Joshua Brindle
Acked-byQuoted 18 lines
From: Stephen Smalley [mailto:[email protected]]
Quoted 3 lines · Stephen Smalley
Quoted 2 lines · Stephen Smalley
Quoted 1 line · Christopher Pardy
Currently any changes made to the policy which require
committing a handle cause dontaudit rules to be re-enabled. This is confusing, and frustrating for users who want to edit policy with dontaudit rules turned off. This patch allows semanage to remember the last state of the dontaudit rules and apply them as default whenever a handle is connected. Additionally other functions may check for the file semanage creates to determine if dontaudit rules are turned on. This knowledge can be useful for tools like SETroubleshoot which may want to change their behavior depending on the state of the dontaudit rules. In the event that a the file cannot be created a call to commit will fail.
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 14 lines
Quoted 5 lines
Quoted 5 lines
Quoted 1 line
Signed-off-by Christopher Pardy <[email protected]>Acked-by Stephen Smalley <[email protected]>I'll fix up the duplicate diff (you have a spelling
correction that
Quoted 1 line
Quoted 1 line
was already committed) and clean up a couple of minor
things when I
Quoted 5 lines
Quoted 1 line
commit it along with the libsepol and semodule patches.
Oops. I made a mistake -
semanage_fname()is only the file suffix. I'll switch it to usesemanage_path(SEMANAGE_TMP, SEMANAGE_DISABLE_DONTAUDIT).
Quoted 162 lines
Final version of the patch.
libsemanage/include/semanage/handle.h +3
-0@@ -69,6 +69,9 @@ void semanage_set_rebuild(semanage_handle_t* handle, int do_rebuild); * 1 for yes, 0 for no (default) */ void semanage_set_create_store (semanage_handle_t * handle,int create_store); +/*Get whether or not dontaudits will be disabled upon commit */ int +semanage_get_disable_dontaudit (semanage_handle_t * handle); +/* Set whether or not to disable dontaudits upon commit */ void
semanage_set_disable_dontaudit(semanage_handle_t * handle, int disable_dontaudit);(quoted diff) +0
-0
b/libsemanage/src/direct_api.cindex cfc1fed..56f7b05 100644libsemanage/src/direct_api.c +1
-0@@ -20,6 +20,7 @@*/ #include <sepol/module.h> +#include <sepol/handle.h> #include <selinux/selinux.h> #include <assert.h> @@ -111,6 +112,7 @@ int
semanage_direct_is_managed(semanage_handle_t * sh)intsemanage_direct_connect(semanage_handle_t * sh){libsemanage/src/direct_api.c +8
-0char polpath[PATH_MAX ]; +const char *path;snprintf (polpath,PATH_MAX ,"%s%s" ,selinux_path (), sh->conf->store_path);@@ -223,6 +225,13 @@ int semanage_direct_connect(semanage_handle_t * sh)if (bool_activedb_dbase_init (sh,semanage_bool_dbase_active (sh)) <0 ) goto err; +/* set the disable dontaudit value */ + path =semanage_path (SEMANAGE_ACTIVE ,SEMANAGE_DISABLE_DONTAUDIT ); +if (access (path,F_OK ) ==0 ) +sepol_set_disable_dontaudit (sh->sepolh,1 ); +else +sepol_set_disable_dontaudit (sh->sepolh,0 ); +libsemanage/src/direct_api.c +1
-1return STATUS_SUCCESS ; err:@@ -645,7 +654,7 @@ static intsemanage_direct_commit (semanage_handle_t * sh) char **mod_filenames = NULL;char *sorted_fc_buffer =NULL , *sorted_nc_buffer =NULL ;size_t sorted_fc_buffer_len =0 , sorted_nc_buffer_len =0 ; -const char *linked_filename =NULL , *ofilename =NULL ; +const char *linked_filename =NULL , *ofilename =NULL , *path;sepol_module_package_t *base =NULL ;int retval =-1 , num_modfiles =0 , i;libsemanage/src/direct_api.c +17
-0sepol_policydb_t *out =NULL ;@@ -669,6 +678,27 @@ static int semanage_direct_commit(semanage_handle_t * sh)dbase_config_t *pfcontexts =semanage_fcontext_dbase_policy (sh);dbase_config_t *seusers =semanage_seuser_dbase_local (sh); +/* Create or remove the disable_dontaudit flag file. */ + path =semanage_path (SEMANAGE_TMP ,SEMANAGE_DISABLE_DONTAUDIT ); +if (sepol_get_disable_dontaudit (sh->sepolh) ==1 ) { +FILE *touch; + touch =fopen (path,"w" ); +if (touch !=NULL ) { +if (fclose (touch) !=0 ) { + ERR(sh, "Error attempting to create disable_dontaudit flag."); + goto cleanup; + } + }else { + ERR(sh, "Error attempting to create disable_dontaudit flag."); + goto cleanup; + } + }else { +if (remove (path) ==-1 && errno !=ENOENT ) { + ERR(sh, "Error removing the
disable_dontauditflag.");libsemanage/src/direct_api.c +4
-0+ goto cleanup; + } + } +/* Before we do anything else, flush the join to its component parts.
libsemanage/src/direct_api.c +0
-1* This *does not* flush to disk automatically */ if (users->dtable->is_modified (users->dbase)) { diff --git a/libsemanage/src/handle.c b/libsemanage/src/handle.cindex d677d3d..0605402 100644
libsemanage/src/handle.c +6
-0@@ -110,6 +110,13 @@ void semanage_set_create_store(semanage_handle_t * sh, int create_store) return; } +int semanage_get_disable_dontaudit (semanage_handle_t * sh) { +assert (sh !=NULL ); + +return sepol_get_disable_dontaudit (sh->sepolh); +} +void semanage_set_disable_dontaudit (semanage_handle_t * sh,int disable_dontaudit) {assert (sh !=NULL );(quoted diff) +0
-0b/libsemanage/src/libsemanage.map index b091344..4c2996e 100644
libsemanage/src/libsemanage.map +2
-1@@ -15,7 +15,7 @@ LIBSEMANAGE_1.0 { semanage_iface_*; semanage_port_*; semanage_context_*; semanage_node_*; semanage_fcontext_*; semanage_access_check; semanage_set_create_store; - semanage_is_connected; semanage_set_disable_dontaudit; + semanage_is_connected; semanage_get_disable_dontaudit; +semanage_set_disable_dontaudit; semanage_mls_enabled; local: *; };libsemanage/src/semanage_store.c +1
-0@@ -114,6 +114,7 @@ static const char *semanage_sandbox_paths[SEMANAGE_STORE_NUM_PATHS] = {"/users_extra" ,"/netfilter_contexts" ,"/file_contexts.homedirs" , + "/disable_dontaudit", };/* A node used in a linked list of file contexts; used for sorting.
libsemanage/src/semanage_store.h +1
-1@@ -58,6 +58,7 @@ enum semanage_sandbox_defs {SEMANAGE_USERS_EXTRA ,SEMANAGE_NC ,SEMANAGE_FC_HOMEDIRS , +SEMANAGE_DISABLE_DONTAUDIT , SEMANAGE_STORE_NUM_PATHS }; --
Quoted 4 lines
Stephen Smalley
National Security Agency
--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
Quoted 13 lines · Stephen Smalley
Quoted 12 lines · Stephen Smalley
Quoted 10 lines · Stephen Smalley
Quoted 3 lines · Christopher Pardy
Currently any changes made to the policy which require committing a handle cause dontaudit rules to be re-enabled. This is confusing, and frustrating for users who want to edit policy with dontaudit rules turned off. This patch allows semanage to remember the last state of the dontaudit rules and apply them as default whenever a handle is connected. Additionally other functions may check for the file semanage creates to determine if dontaudit rules are turned on. This knowledge can be useful for tools like SETroubleshoot which may want to change their behavior depending on the state of the dontaudit rules. In the event that a the file cannot be created a call to commit will fail.
Signed-off-by Christopher Pardy <[email protected]>Acked-by Stephen Smalley <[email protected]>I'll fix up the duplicate diff (you have a spelling correction that was already committed) and clean up a couple of minor things when I commit it along with the libsepol and semodule patches.
Quoted 5 lines
Quoted 3 lines
Oops. I made a mistake -
semanage_fname()is only the file suffix. I'll switch it to usesemanage_path(SEMANAGE_TMP, SEMANAGE_DISABLE_DONTAUDIT).Final version of the patch.
Merged in libsepol 2.0.37, libsemanage 2.0.33, and policycoreutils 2.0.67.
Signature · 8 lines
Stephen Smalley National Security Agency -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.