Add more test coverage to auparse

Added a new C test exercising lesser used API pieces such as buffer
replacement, feed handling, normalization and event comparisons.

Integrated the new test binary into the automake rules and test list

Updated the test runner script to execute the extra coverage test during
make check. These additions cover previously untested areas like
auparse_new_buffer, feed status helpers, normalization routines and
timestamp comparison, guarding against regressions in those complex
functions.

Author: stevegrubb

auparse/test/Makefile.am

@@ -21,8 +21,10 @@
 #
 
 CONFIG_CLEAN_FILES = *.loT *.rej *.orig *.cur
-noinst_PROGRAMS = auparse_test auparselol_test lookup_test databuf_test
-TESTS = run_auparse_tests.sh run_auparselol_test.sh lookup_test databuf_test
+noinst_PROGRAMS = auparse_test auparselol_test lookup_test databuf_test \
+	auparse_extra_test
+TESTS = run_auparse_tests.sh run_auparselol_test.sh lookup_test \
+	databuf_test auparse_extra_test
 dist_check_SCRIPTS = run_auparse_tests.sh run_auparselol_test.sh
 EXTRA_DIST = auparse_test.ref auparse_test.ref.py test.log test2.log test3.log test4.log auditd_raw.sed run_auparse_tests.sh auparse_test.py run_auparselol_test.sh
 CLEANFILES = run_auparse_tests.sh run_auparselol_test.sh
@@ -53,6 +55,12 @@ databuf_test_LDADD = ${top_builddir}/auparse/libauparse.la \
 	${top_builddir}/lib/libaudit.la ${top_builddir}/common/libaucommon.la
 databuf_test_DEPENDENCIES = ${top_builddir}/auparse/libauparse.la ${top_builddir}/lib/libaudit.la ${top_builddir}/common/libaucommon.la
 
+auparse_extra_test_SOURCES = auparse_extra_test.c
+auparse_extra_test_LDFLAGS = -static
+auparse_extra_test_LDADD = ${top_builddir}/auparse/libauparse.la \
+	${top_builddir}/lib/libaudit.la ${top_builddir}/common/libaucommon.la
+auparse_extra_test_DEPENDENCIES = ${top_builddir}/auparse/libauparse.la ${top_builddir}/lib/libaudit.la ${top_builddir}/common/libaucommon.la
+
 drop_srcdir = sed 's,$(srcdir)/test,test,'
 
 

auparse/test/auparse_extra_test.c

@@ -0,0 +1,80 @@
+#include "config.h"
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include "libaudit.h"
+#include "auparse.h"
+
+static void test_new_buffer(void)
+{
+	const char buf1[] = "type=LOGIN msg=audit(1143146623.787:142): pid=1\n";
+	const char buf2[] = "type=USER_LOGIN msg=audit(1143146623.879:146): pid=2\n";
+	auparse_state_t *au = auparse_init(AUSOURCE_BUFFER, buf1);
+	assert(au != NULL);
+	assert(auparse_next_event(au) > 0);
+	assert(auparse_get_type(au) == AUDIT_LOGIN);
+	assert(auparse_new_buffer(au, buf2, strlen(buf2)) == 0);
+	assert(auparse_next_event(au) > 0);
+	assert(auparse_get_type(au) == AUDIT_USER_LOGIN);
+	auparse_destroy(au);
+}
+
+static int cb_count;
+static void ready_cb(auparse_state_t *au, auparse_cb_event_t e, void *d)
+{
+	if (e == AUPARSE_CB_EVENT_READY)
+		cb_count++;
+}
+
+static void test_feed_state(void)
+{
+	const char buf[] = "type=LOGIN msg=audit(1143146623.787:142): pid=1\n";
+	auparse_state_t *au = auparse_init(AUSOURCE_FEED, NULL);
+	assert(au != NULL);
+	auparse_add_callback(au, ready_cb, NULL, NULL);
+	assert(auparse_feed_has_data(au) == 0);
+	assert(auparse_feed(au, buf, strlen(buf)) == 0);
+	assert(auparse_feed_has_data(au) == 1);
+	auparse_flush_feed(au);
+	assert(cb_count == 1);
+	auparse_destroy(au);
+}
+
+static void test_normalize(void)
+{
+	auparse_state_t *au = auparse_init(AUSOURCE_FILE, "./test.log");
+	assert(au != NULL);
+	assert(auparse_next_event(au) > 0);
+	assert(auparse_normalize(au, NORM_OPT_ALL) == 0);
+	const char *kind = auparse_normalize_get_event_kind(au);
+	assert(kind && strcmp(kind, "mac-decision") == 0);
+	assert(auparse_normalize_subject_primary(au) == 1);
+	assert(auparse_get_field_str(au) != NULL);
+	auparse_normalize_object_primary(au);
+	auparse_interpret_realpath(au);
+	auparse_destroy(au);
+}
+
+static void test_compare(void)
+{
+	auparse_state_t *au = auparse_init(AUSOURCE_FILE, "./test.log");
+	assert(au != NULL);
+	assert(auparse_next_event(au) > 0);
+	const au_event_t *e1 = auparse_get_timestamp(au);
+	assert(auparse_next_event(au) > 0);
+	const au_event_t *e2 = auparse_get_timestamp(au);
+	assert(auparse_node_compare(e1, e2) == 0);
+	assert(auparse_timestamp_compare(e1, e2) < 0);
+	auparse_destroy(au);
+}
+
+int main(void)
+{
+	test_new_buffer();
+	test_feed_state();
+	test_normalize();
+	test_compare();
+	printf("extra auparse tests: all passed\n");
+	return 0;
+}
+

lib/Makefile.am

@@ -21,7 +21,7 @@
 #   Steve Grubb <[email protected]>
 #
 
-SUBDIRS = test
+SUBDIRS = . test
 CLEANFILES = $(BUILT_SOURCES)
 CONFIG_CLEAN_FILES = *.loT *.rej *.orig
 EXTRA_DIST = syscall-update.txt gen_tables64.c