Robert Watson 52267f7411 Merge OpenBSM 1.1 alpha 2 from the OpenBSM vendor branch to head, both
contrib/openbsm (svn merge) and sys/{bsm,security/audit} (manual merge).

- Add OpenBSM contrib tree to include paths for audit(8) and auditd(8).
- Merge support for new tokens, fixes to existing token generation to
  audit_bsm_token.c.
- Synchronize bsm includes and definitions.

OpenBSM history for imported revisions below for reference.

MFC after:      1 month
Sponsored by:   Apple Inc.
Obtained from:  TrustedBSD Project

--

OpenBSM 1.1 alpha 2

- Include files in OpenBSM are now broken out into two parts: library builds
  required solely for user space, and system includes, which may also be
  required for use in the kernels of systems integrating OpenBSM.  Submitted
  by Stacey Son.
- Configure option --with-native-includes allows forcing the use of native
  include for system includes, rather than the versions bundled with OpenBSM.
  This is intended specifically for platforms that ship OpenBSM, have adapted
  versions of the system includes in a kernel source tree, and will use the
  OpenBSM build infrastructure with an unmodified OpenBSM distribution,
  allowing the customized system includes to be used with the OpenBSM build.
  Submitted by Stacey Son.
- Various strcpy()'s/strcat()'s have been changed to strlcpy()'s/strlcat()'s
  or asprintf().  Added compat/strlcpy.h for Linux.
- Remove compatibility defines for old Darwin token constant names; now only
  BSM token names are provided and used.
- Add support for extended header tokens, which contain space for information
  on the host generating the record.
- Add support for setting extended host information in the kernel, which is
  used for setting host information in extended header tokens.  The
  audit_control file now supports a "host" parameter which can be used by
  auditd to set the information; if not present, the kernel parameters won't
  be set and auditd uses unextended headers for records that it generates.

OpenBSM 1.1 alpha 1

- Add option to auditreduce(1) which allows users to invert sense of
  matching, such that BSM records that do not match, are selected.
- Fix bug in audit_write() where we commit an incomplete record in the
  event there is an error writing the subject token.  This was submitted
  by Diego Giagio.
- Build support for Mac OS X 10.5.1 submitted by Eric Hall.
- Fix a bug which resulted in host XML attributes not being arguments so
  that const strings can be passed as arguments to tokens.  This patch was
  submitted by Xin LI.
- Modify the -m option so users can select more then one audit event.
- For Mac OS X, added Mach IPC support for audit trigger messages.
- Fixed a bug in getacna() which resulted in a locking problem on Mac OS X.
- Added LOG_PERROR flag to openlog when -d option is used with auditd.
- AUE events added for Mac OS X Leopard system calls.
2008-12-02 23:26:43 +00:00

273 lines
6.6 KiB
C

/*-
* Copyright (c) 2004 Apple Inc.
* Copyright (c) 2006 Robert N. M. Watson
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
* its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
* $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#14 $
*/
#include <config/config.h>
#include <bsm/libbsm.h>
#include <string.h>
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#ifndef HAVE_STRLCPY
#include <compat/strlcpy.h>
#endif
/*
* Parse the contents of the audit_class file to return struct au_class_ent
* entries.
*/
static FILE *fp = NULL;
static char linestr[AU_LINE_MAX];
static const char *classdelim = ":";
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
/*
* Parse a single line from the audit_class file passed in str to the struct
* au_class_ent elements; store the result in c.
*/
static struct au_class_ent *
classfromstr(char *str, struct au_class_ent *c)
{
char *classname, *classdesc, *classflag;
char *last;
/* Each line contains flag:name:desc. */
classflag = strtok_r(str, classdelim, &last);
classname = strtok_r(NULL, classdelim, &last);
classdesc = strtok_r(NULL, classdelim, &last);
if ((classflag == NULL) || (classname == NULL) || (classdesc == NULL))
return (NULL);
/*
* Check for very large classnames.
*/
if (strlen(classname) >= AU_CLASS_NAME_MAX)
return (NULL);
strlcpy(c->ac_name, classname, AU_CLASS_NAME_MAX);
/*
* Check for very large class description.
*/
if (strlen(classdesc) >= AU_CLASS_DESC_MAX)
return (NULL);
strlcpy(c->ac_desc, classdesc, AU_CLASS_DESC_MAX);
c->ac_class = strtoul(classflag, (char **) NULL, 0);
return (c);
}
/*
* Return the next au_class_ent structure from the file setauclass should be
* called before invoking this function for the first time.
*
* Must be called with mutex held.
*/
static struct au_class_ent *
getauclassent_r_locked(struct au_class_ent *c)
{
char *tokptr, *nl;
if ((fp == NULL) && ((fp = fopen(AUDIT_CLASS_FILE, "r")) == NULL))
return (NULL);
/*
* Read until next non-comment line is found, or EOF.
*/
while (1) {
if (fgets(linestr, AU_LINE_MAX, fp) == NULL)
return (NULL);
/* Skip comments. */
if (linestr[0] == '#')
continue;
/* Remove trailing new line character. */
if ((nl = strrchr(linestr, '\n')) != NULL)
*nl = '\0';
/* Parse tokptr to au_class_ent components. */
tokptr = linestr;
if (classfromstr(tokptr, c) == NULL)
return (NULL);
break;
}
return (c);
}
struct au_class_ent *
getauclassent_r(struct au_class_ent *c)
{
struct au_class_ent *cp;
pthread_mutex_lock(&mutex);
cp = getauclassent_r_locked(c);
pthread_mutex_unlock(&mutex);
return (cp);
}
struct au_class_ent *
getauclassent(void)
{
static char class_ent_name[AU_CLASS_NAME_MAX];
static char class_ent_desc[AU_CLASS_DESC_MAX];
static struct au_class_ent c, *cp;
bzero(&c, sizeof(c));
bzero(class_ent_name, sizeof(class_ent_name));
bzero(class_ent_desc, sizeof(class_ent_desc));
c.ac_name = class_ent_name;
c.ac_desc = class_ent_desc;
pthread_mutex_lock(&mutex);
cp = getauclassent_r_locked(&c);
pthread_mutex_unlock(&mutex);
return (cp);
}
/*
* Rewind to the beginning of the enumeration.
*
* Must be called with mutex held.
*/
static void
setauclass_locked(void)
{
if (fp != NULL)
fseek(fp, 0, SEEK_SET);
}
void
setauclass(void)
{
pthread_mutex_lock(&mutex);
setauclass_locked();
pthread_mutex_unlock(&mutex);
}
/*
* Return the next au_class_entry having the given class name.
*/
struct au_class_ent *
getauclassnam_r(struct au_class_ent *c, const char *name)
{
struct au_class_ent *cp;
if (name == NULL)
return (NULL);
pthread_mutex_lock(&mutex);
setauclass_locked();
while ((cp = getauclassent_r_locked(c)) != NULL) {
if (strcmp(name, cp->ac_name) == 0) {
pthread_mutex_unlock(&mutex);
return (cp);
}
}
pthread_mutex_unlock(&mutex);
return (NULL);
}
struct au_class_ent *
getauclassnam(const char *name)
{
static char class_ent_name[AU_CLASS_NAME_MAX];
static char class_ent_desc[AU_CLASS_DESC_MAX];
static struct au_class_ent c;
bzero(&c, sizeof(c));
bzero(class_ent_name, sizeof(class_ent_name));
bzero(class_ent_desc, sizeof(class_ent_desc));
c.ac_name = class_ent_name;
c.ac_desc = class_ent_desc;
return (getauclassnam_r(&c, name));
}
/*
* Return the next au_class_entry having the given class number.
*
* OpenBSM extension.
*/
struct au_class_ent *
getauclassnum_r(struct au_class_ent *c, au_class_t class_number)
{
struct au_class_ent *cp;
pthread_mutex_lock(&mutex);
setauclass_locked();
while ((cp = getauclassent_r_locked(c)) != NULL) {
if (class_number == cp->ac_class)
return (cp);
}
pthread_mutex_unlock(&mutex);
return (NULL);
}
struct au_class_ent *
getauclassnum(au_class_t class_number)
{
static char class_ent_name[AU_CLASS_NAME_MAX];
static char class_ent_desc[AU_CLASS_DESC_MAX];
static struct au_class_ent c;
bzero(&c, sizeof(c));
bzero(class_ent_name, sizeof(class_ent_name));
bzero(class_ent_desc, sizeof(class_ent_desc));
c.ac_name = class_ent_name;
c.ac_desc = class_ent_desc;
return (getauclassnum_r(&c, class_number));
}
/*
* audit_class processing is complete; close any open files.
*/
void
endauclass(void)
{
pthread_mutex_lock(&mutex);
if (fp != NULL) {
fclose(fp);
fp = NULL;
}
pthread_mutex_unlock(&mutex);
}