On 07/06/2009 11:17 AM, Daniel J Walsh wrote:
> On 07/06/2009 11:03 AM, Stephen Smalley wrote:
>> On Mon, 2009-07-06 at 10:54 -0400, Christopher Pardy wrote:
>>> Currently any changes made to the policy which require committing a handle cause dontaudit rules to be disabled. 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 created. 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.
>>>
>>> Signed-off-by: Christopher Pardy <cpardy@xxxxxxxxxx>
>>>
>>> ---
>>> libsemanage/include/semanage/handle.h | 3 +++
>>> libsemanage/src/handle.c | 33 +++++++++++++++++++++++++++++++--
>>> libsemanage/src/libsemanage.map | 2 +-
>>> libsemanage/src/semanage_store.c | 1 +
>>> libsemanage/src/semanage_store.h | 1 +
>>> 5 files changed, 37 insertions(+), 3 deletions(-)
>>>
>>>
>>> diff -urpN selinux.orig2/libsemanage/include/semanage/handle.h selinux/libsemanage/include/semanage/handle.h
>>> --- selinux.orig2/libsemanage/include/semanage/handle.h 2009-07-01 21:15:17.224235939 -0400
>>> +++ selinux/libsemanage/include/semanage/handle.h 2009-07-02 11:09:06.982262194 -0400
>>> @@ -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);
>> Still don't see the need for this function. The two patches I was
>> expecting were one to modify semanage_set_disable_dontaudit() to create
>> or remove the flag file, and one to update semodule to call
>> semanage_set_disable_dontaudit() in the build case. No libsepol
>> patches.
>>
> We would like to put an indicator in setroubleshoot to say DONTAUDIT Rules are currently disabled. This will cause a lot of AVC messages that ordinarily can be ignored. We have similar wording for checking whether or not the machine is in permissive mode.
>
> The original goal of this check was for system-config-selinux to check whether or not the machine was in in disable dontaudit mode, so we could set a button to enabled/disable dontaudit rules. We have decided to remove this button from the GUI, since setting this should be seldom be run.
>
>
Usage example for this function:
1.Program A creates handle x
2.Program A gets initial values form handle x and stores them
3.Program A passes handle x to Library B
4.Library B sets the values of handle x based on some logic
5.Library B returns a modified handle x to Program A
6.Program A repeats steps 3 - 5 with Libraries C - N
7.Program A gets new values in handle x and compares them to oldvalues to see if commit is needed.
Or:
User A tells SELINUX to turn off dontaudit rules, rather than rebuild policy right away selinux can check if dontaudit rules are already turned off by creating a handle and calling get_disable_dontaudit
Also libsepol patch will remain as it mimicks current behavior, is faster than accessing the file system, and more correct if the sepol handle was modified from another source.
>>> +
>>> /* 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/handle.c selinux/libsemanage/src/handle.c
>>> --- selinux.orig2/libsemanage/src/handle.c 2009-07-01 21:15:17.288238017 -0400
>>> +++ selinux/libsemanage/src/handle.c 2009-07-06 10:28:52.492201095 -0400
>>> @@ -23,12 +23,14 @@
>>>
>>> #include <selinux/selinux.h>
>>>
>>> +#include <unistd.h>
>>> #include <stdarg.h>
>>> #include <assert.h>
>>> #include <stdlib.h>
>>> #include <stdio.h>
>>> #include <string.h>
>>> #include <sys/time.h>
>>> +#include <limits.h>
>>>
>>> #include "direct_api.h"
>>> #include "handle.h"
>>> @@ -42,6 +44,7 @@ semanage_handle_t *semanage_handle_creat
>>> {
>>> semanage_handle_t *sh = NULL;
>>> const char *conf_name = NULL;
>>> + char path[PATH_MAX]
>> No semicolon.
>>
>>> /* Allocate handle */
>>> if ((sh = calloc(1, sizeof(semanage_handle_t))) == NULL)
>>> @@ -59,6 +62,14 @@ semanage_handle_t *semanage_handle_creat
>>> goto err;
>>> sepol_msg_set_callback(sh->sepolh, semanage_msg_relay_handler, sh);
>>>
>>> + /*set the disable dontaudit flag to system defaults*/
>>> + snprintf(path,PATH_MAX,"%s/disable_dontaudit",selinux_policy_root());
>>> +
>>> + if (access(path,F_OK) == 0)
>>> + semanage_set_disable_dontaudit(sh,1);
>>> + else
>>> + semanage_set_disable_dontaudit(sh,0);
>> No. Now we're back to a flag file outside the policy store that isn't
>> managed by libsemanage.
>>
>> Why do you need to do anything here at all? What happens if you just
>> drop your changes to semanage_handle_create() and only modify
>> semanage_set_disable_dontaudit() to create or remove the in-store flag
>> file?
The issue is that I need to know what the flag was set to on the last commit. for this I don't want to look at the sandbox where the inprogress files are stored I want to look at the file that gets written post commit. Also this functionality cannot be put into set_disable_dontaudit.
>>> +
>>> /* By default do not rebuild the policy on commit
>>> * If any changes are made, this flag is ignored */
>>> sh->do_rebuild = 0;
>>> @@ -110,11 +121,29 @@ 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)
>>> {
>>> + const char *path;
>>> +
>>> assert(sh != NULL);
>>> -
>>> +
>>> sepol_set_disable_dontaudit(sh->sepolh, disable_dontaudit);
>>> +
>>> + path = semanage_fname(SEMANAGE_DISABLE_DONTAUDIT);
>>> + if(disable_dontaudit == 1){
>> The entire if statement needs to be re-indented.
>>
>>> + FILE *touch;
>>> + touch = fopen(path,"w");
>>> + if (touch != NULL)
>>> + fclose(touch);
>>> + }else
>>> + remove(path);
>>> return;
>>> }
>
--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@xxxxxxxxxxxxx with
the words "unsubscribe selinux" without quotes as the message.
