52267f7411
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.
119 lines
4.0 KiB
C
119 lines
4.0 KiB
C
/*-
|
|
* Copyright (c) 2005 Apple Inc.
|
|
* Copyright (c) 2005 SPARTA, Inc.
|
|
* All rights reserved.
|
|
*
|
|
* This code was developed in part by Robert N. M. Watson, Senior Principal
|
|
* Scientist, SPARTA, Inc.
|
|
*
|
|
* 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/sys/bsm/audit_internal.h#2
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _AUDIT_INTERNAL_H
|
|
#define _AUDIT_INTERNAL_H
|
|
|
|
#if defined(__linux__) && !defined(__unused)
|
|
#define __unused
|
|
#endif
|
|
|
|
/*
|
|
* audit_internal.h contains private interfaces that are shared by user space
|
|
* and the kernel for the purposes of assembling audit records. Applications
|
|
* should not include this file or use the APIs found within, or it may be
|
|
* broken with future releases of OpenBSM, which may delete, modify, or
|
|
* otherwise break these interfaces or the assumptions they rely on.
|
|
*/
|
|
struct au_token {
|
|
u_char *t_data;
|
|
size_t len;
|
|
TAILQ_ENTRY(au_token) tokens;
|
|
};
|
|
|
|
struct au_record {
|
|
char used; /* Record currently in use? */
|
|
int desc; /* Descriptor for record. */
|
|
TAILQ_HEAD(, au_token) token_q; /* Queue of BSM tokens. */
|
|
u_char *data;
|
|
size_t len;
|
|
LIST_ENTRY(au_record) au_rec_q;
|
|
};
|
|
typedef struct au_record au_record_t;
|
|
|
|
|
|
/*
|
|
* We could determined the header and trailer sizes by defining appropriate
|
|
* structures. We hold off that approach until we have a consistent way of
|
|
* using structures for all tokens. This is not straightforward since these
|
|
* token structures may contain pointers of whose contents we do not know the
|
|
* size (e.g text tokens).
|
|
*/
|
|
#define AUDIT_HEADER_EX_SIZE(a) ((a)->ai_termid.at_type+18+sizeof(u_int32_t))
|
|
#define AUDIT_HEADER_SIZE 18
|
|
#define MAX_AUDIT_HEADER_SIZE (5*sizeof(u_int32_t)+18)
|
|
#define AUDIT_TRAILER_SIZE 7
|
|
|
|
/*
|
|
* BSM token streams store fields in big endian byte order, so as to be
|
|
* portable; when encoding and decoding, we must convert byte orders for
|
|
* typed values.
|
|
*/
|
|
#define ADD_U_CHAR(loc, val) \
|
|
do { \
|
|
*(loc) = (val); \
|
|
(loc) += sizeof(u_char); \
|
|
} while(0)
|
|
|
|
|
|
#define ADD_U_INT16(loc, val) \
|
|
do { \
|
|
be16enc((loc), (val)); \
|
|
(loc) += sizeof(u_int16_t); \
|
|
} while(0)
|
|
|
|
#define ADD_U_INT32(loc, val) \
|
|
do { \
|
|
be32enc((loc), (val)); \
|
|
(loc) += sizeof(u_int32_t); \
|
|
} while(0)
|
|
|
|
#define ADD_U_INT64(loc, val) \
|
|
do { \
|
|
be64enc((loc), (val)); \
|
|
(loc) += sizeof(u_int64_t); \
|
|
} while(0)
|
|
|
|
#define ADD_MEM(loc, data, size) \
|
|
do { \
|
|
memcpy((loc), (data), (size)); \
|
|
(loc) += size; \
|
|
} while(0)
|
|
|
|
#define ADD_STRING(loc, data, size) ADD_MEM(loc, data, size)
|
|
|
|
#endif /* !_AUDIT_INTERNAL_H_ */
|