Skip to content

Commit e1ff906

Browse files
stevegrubbstevegrubb
committed
Create the libauplugin library
This is the beginning of a new library intended to simplify writing and auditd plugin. For now, it contains just the audit_fgets family of functions.
1 parent 73f56e5 commit e1ff906

20 files changed

Lines changed: 155 additions & 40 deletions

‎Makefile.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
# Rickard E. (Rik) Faith <faith@redhat.com>
2323
#
2424

25-
SUBDIRS = common lib auparse audisp src/libev src tools bindings init.d \
26-
m4 docs rules
25+
SUBDIRS = common lib auplugin auparse audisp src/libev src tools \
26+
bindings init.d m4 docs rules
2727
EXTRA_DIST = ChangeLog AUTHORS NEWS README.md INSTALL \
2828
audit.spec COPYING COPYING.LIB \
2929
contrib/avc_snap contrib/plugin/Makefile \

‎audisp/plugins/af_unix/Makefile.am‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ CONFIG_CLEAN_FILES = *.rej *.orig
2525
CONF_FILES = af_unix.conf
2626
EXTRA_DIST = $(CONF_FILES) $(man_MANS)
2727

28-
AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/audisp
28+
AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/audisp -I${top_srcdir}/auplugin
2929
LIBS = ${top_builddir}/lib/libaudit.la
3030
prog_confdir = $(sysconfdir)/audit
3131
plugin_confdir=$(prog_confdir)/plugins.d
3232
plugin_conf = af_unix.conf
3333
sbin_PROGRAMS = audisp-af_unix
3434
man_MANS = audisp-af_unix.8
3535

36-
audisp_af_unix_DEPENDENCIES = ${top_builddir}/lib/libaudit.la
36+
audisp_af_unix_DEPENDENCIES = ${top_builddir}/lib/libaudit.la ${top_builddir}/auplugin/libauplugin.la
3737
audisp_af_unix_SOURCES = audisp-af_unix.c
3838
audisp_af_unix_CFLAGS = -fPIE -DPIE -g -D_GNU_SOURCE -Wundef ${WFLAGS}
3939
audisp_af_unix_LDFLAGS = -pie -Wl,-z,relro -Wl,-z,now
40-
audisp_af_unix_LDADD = $(CAPNG_LDADD) ${top_builddir}/lib/libaudit.la
40+
audisp_af_unix_LDADD = $(CAPNG_LDADD) ${top_builddir}/lib/libaudit.la ${top_builddir}/auplugin/libauplugin.la
4141

4242
install-data-hook:
4343
mkdir -p -m 0750 ${DESTDIR}${plugin_confdir}

‎audisp/plugins/af_unix/audisp-af_unix.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
#include <cap-ng.h>
4444
#endif
4545
#include "libaudit.h"
46+
#include "auplugin.h"
4647
#include "audispd-pconfig.h"
4748

4849
#define DEFAULT_PATH "/var/run/audispd_events"

‎audisp/plugins/ids/Makefile.am‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
CONFIG_CLEAN_FILES = *.loT *.rej *.orig
2424
EXTRA_DIST = audisp-ids.conf ids.conf TODO README.md
2525
SUBDIRS = rules
26-
AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/auparse -I${top_srcdir}/common
26+
AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/auparse -I${top_srcdir}/common -I${top_srcdir}/auplugin
2727
prog_confdir = $(sysconfdir)/audit
2828
prog_conf = ids.conf
2929
plugin_confdir=$(prog_confdir)/plugins.d
@@ -33,13 +33,13 @@ noinst_HEADERS = account.h avl.h ids_config.h gcc-attributes.h ids.h \
3333
model_bad_event.h model_behavior.h nvpair.h origin.h \
3434
reactions.h session.h timer-services.h
3535

36-
audisp_ids_DEPENDENCIES = ${top_builddir}/lib/libaudit.la ${top_builddir}/auparse/libauparse.la ${top_builddir}/common/libaucommon.la
36+
audisp_ids_DEPENDENCIES = ${top_builddir}/lib/libaudit.la ${top_builddir}/auparse/libauparse.la ${top_builddir}/common/libaucommon.la ${top_builddir}/auplugin/libauplugin.la
3737
audisp_ids_SOURCES = account.c avl.c ids.c ids_config.c model_bad_event.c \
3838
model_behavior.c nvpair.c origin.c reactions.c session.c \
3939
timer-services.c
4040
audisp_ids_CFLAGS = -D_GNU_SOURCE ${WFLAGS}
4141
audisp_ids_LDADD = ${top_builddir}/lib/libaudit.la \
42-
${top_builddir}/auparse/libauparse.la ${top_builddir}/common/libaucommon.la
42+
${top_builddir}/auparse/libauparse.la ${top_builddir}/common/libaucommon.la ${top_builddir}/auplugin/libauplugin.la
4343

4444
install-data-hook:
4545
mkdir -p -m 0750 ${DESTDIR}${plugin_confdir}

‎audisp/plugins/ids/ids.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#include <sys/timerfd.h>
3737
#include "auparse.h"
3838
#include "libaudit.h"
39+
#include "auplugin.h"
3940
#include "ids.h"
4041
#include "ids_config.h"
4142
#include "origin.h"

‎audisp/plugins/remote/Makefile.am‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
CONFIG_CLEAN_FILES = *.loT *.rej *.orig
2525
EXTRA_DIST = au-remote.conf audisp-remote.conf notes.txt $(man_MANS)
26-
AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/common
26+
AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/common -I${top_srcdir}/auplugin
2727
prog_confdir = $(sysconfdir)/audit
2828
prog_conf = audisp-remote.conf
2929
plugin_confdir=$(prog_confdir)/plugins.d
@@ -34,11 +34,11 @@ man_MANS = audisp-remote.8 audisp-remote.conf.5
3434
check_PROGRAMS = test-queue
3535
TESTS = $(check_PROGRAMS)
3636

37-
audisp_remote_DEPENDENCIES = ${top_builddir}/lib/libaudit.la ${top_builddir}/common/libaucommon.la
37+
audisp_remote_DEPENDENCIES = ${top_builddir}/lib/libaudit.la ${top_builddir}/common/libaucommon.la ${top_builddir}/auplugin/libauplugin.la
3838
audisp_remote_SOURCES = audisp-remote.c remote-config.c queue.c
3939
audisp_remote_CFLAGS = -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE -Wundef ${WFLAGS}
4040
audisp_remote_LDFLAGS = -pie -Wl,-z,relro -Wl,-z,now
41-
audisp_remote_LDADD = $(CAPNG_LDADD) $(gss_libs) ${top_builddir}/lib/libaudit.la ${top_builddir}/common/libaucommon.la
41+
audisp_remote_LDADD = $(CAPNG_LDADD) $(gss_libs) ${top_builddir}/lib/libaudit.la ${top_builddir}/common/libaucommon.la ${top_builddir}/auplugin/libauplugin.la
4242

4343
test_queue_SOURCES = queue.c test-queue.c
4444

‎audisp/plugins/remote/audisp-remote.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
#include <cap-ng.h>
5050
#endif
5151
#include "libaudit.h"
52+
#include "auplugin.h"
5253
#include "private.h"
5354
#include "remote-config.h"
5455
#include "queue.h"

‎audisp/plugins/syslog/Makefile.am‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@
2323

2424
CONFIG_CLEAN_FILES = *.loT *.rej *.orig
2525
EXTRA_DIST = syslog.conf $(man_MANS)
26-
AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/common -I${top_srcdir}/auparse
26+
AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/common -I${top_srcdir}/auparse -I${top_srcdir}/auplugin
2727
prog_confdir = $(sysconfdir)/audit
2828
plugin_confdir=$(prog_confdir)/plugins.d
2929
plugin_conf = syslog.conf
3030
sbin_PROGRAMS = audisp-syslog
3131
man_MANS = audisp-syslog.8
3232

33-
audisp_syslog_DEPENDENCIES = ${top_builddir}/lib/libaudit.la ${top_builddir}/auparse/libauparse.la
33+
audisp_syslog_DEPENDENCIES = ${top_builddir}/lib/libaudit.la ${top_builddir}/auparse/libauparse.la ${top_builddir}/auplugin/libauplugin.la
3434
audisp_syslog_SOURCES = audisp-syslog.c
3535
audisp_syslog_CFLAGS = -fPIE -DPIE -g -D_GNU_SOURCE -Wundef ${WFLAGS}
3636
audisp_syslog_LDFLAGS = -pie -Wl,-z,relro -Wl,-z,now
37-
audisp_syslog_LDADD = $(CAPNG_LDADD) ${top_builddir}/lib/libaudit.la ${top_builddir}/auparse/libauparse.la
37+
audisp_syslog_LDADD = $(CAPNG_LDADD) ${top_builddir}/lib/libaudit.la ${top_builddir}/auparse/libauparse.la ${top_builddir}/auplugin/libauplugin.la
3838

3939
install-data-hook:
4040
mkdir -p -m 0750 ${DESTDIR}${plugin_confdir}

‎audisp/plugins/syslog/audisp-syslog.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include <cap-ng.h>
3434
#endif
3535
#include "libaudit.h"
36+
#include "auplugin.h"
3637
#include "auparse.h"
3738

3839
/* Global Data */

‎audit.spec‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,18 +173,21 @@ fi
173173
%license COPYING.LIB
174174
%{_libdir}/libaudit.so.1*
175175
%{_libdir}/libauparse.*
176+
%{_libdir}/libauplugin.so.1*
176177
%config(noreplace) %attr(640,root,root) /etc/libaudit.conf
177178
%{_mandir}/man5/libaudit.conf.5.gz
178179

179180
%files libs-devel
180181
%doc contrib/plugin
181182
%{_libdir}/libaudit.so
182183
%{_libdir}/libauparse.so
184+
%{_libdir}/libauplugin.so
183185
%{_includedir}/libaudit.h
184186
%{_includedir}/audit_logging.h
185187
%{_includedir}/audit-records.h
186188
%{_includedir}/auparse.h
187189
%{_includedir}/auparse-defs.h
190+
%{_includedir}/auplugin.h
188191
%{_datadir}/aclocal/audit.m4
189192
%{_libdir}/pkgconfig/audit.pc
190193
%{_libdir}/pkgconfig/auparse.pc
@@ -195,6 +198,7 @@ fi
195198
%license COPYING.LIB
196199
%{_libdir}/libaudit.a
197200
%{_libdir}/libauparse.a
201+
%{_libdir}/libauplugin.a
198202

199203
%files -n python3-audit
200204
%defattr(-,root,root,-)

0 commit comments

Comments
 (0)