[Open-scap] [PATCH 11/11] Moving xinetd probe test
Marshall Miller
mmiller at tresys.com
Wed May 11 19:31:30 UTC 2011
From: Francisco Slavin <fslavin at tresys.com>
The xinetd probe test should be in tests/probes/xinetd instead of tests/API/probes
Re: Dan Kopecek feedback on list 5/10/2011
---
configure.ac | 1 +
tests/API/probes/Makefile.am | 16 +------
tests/API/probes/test_api_probes.sh | 47 ------------------
tests/API/probes/test_api_probes_xinetd.c | 73 -----------------------------
tests/API/probes/xinetd_A.conf | 50 --------------------
tests/API/probes/xinetd_B.conf | 17 -------
tests/API/probes/xinetd_C.conf | 18 -------
tests/API/probes/xinetd_D.conf | 22 ---------
tests/API/probes/xinetd_E.conf | 20 --------
tests/API/probes/xinetd_F.conf | 27 -----------
tests/probes/Makefile.am | 2 +-
tests/probes/xinetd/Makefile.am | 36 ++++++++++++++
tests/probes/xinetd/test_probe_xinetd.c | 73 +++++++++++++++++++++++++++++
tests/probes/xinetd/test_xinetd_probe.sh | 71 ++++++++++++++++++++++++++++
tests/probes/xinetd/xinetd_A.conf | 50 ++++++++++++++++++++
tests/probes/xinetd/xinetd_B.conf | 17 +++++++
tests/probes/xinetd/xinetd_C.conf | 18 +++++++
tests/probes/xinetd/xinetd_D.conf | 22 +++++++++
tests/probes/xinetd/xinetd_E.conf | 20 ++++++++
tests/probes/xinetd/xinetd_F.conf | 27 +++++++++++
20 files changed, 338 insertions(+), 289 deletions(-)
delete mode 100644 tests/API/probes/test_api_probes_xinetd.c
delete mode 100644 tests/API/probes/xinetd_A.conf
delete mode 100644 tests/API/probes/xinetd_B.conf
delete mode 100644 tests/API/probes/xinetd_C.conf
delete mode 100644 tests/API/probes/xinetd_D.conf
delete mode 100644 tests/API/probes/xinetd_E.conf
delete mode 100644 tests/API/probes/xinetd_F.conf
create mode 100644 tests/probes/xinetd/Makefile.am
create mode 100644 tests/probes/xinetd/test_probe_xinetd.c
create mode 100755 tests/probes/xinetd/test_xinetd_probe.sh
create mode 100644 tests/probes/xinetd/xinetd_A.conf
create mode 100644 tests/probes/xinetd/xinetd_B.conf
create mode 100644 tests/probes/xinetd/xinetd_C.conf
create mode 100644 tests/probes/xinetd/xinetd_D.conf
create mode 100644 tests/probes/xinetd/xinetd_E.conf
create mode 100644 tests/probes/xinetd/xinetd_F.conf
diff --git a/configure.ac b/configure.ac
index 05a0452..6cb2c02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -765,6 +765,7 @@ AC_CONFIG_FILES([Makefile
tests/probes/interface/Makefile
tests/probes/textfilecontent54/Makefile
tests/probes/environmentvariable/Makefile
+ tests/probes/xinetd/Makefile
utils/Makefile
xsl/Makefile
schemas/Makefile
diff --git a/tests/API/probes/Makefile.am b/tests/API/probes/Makefile.am
index 6f4f816..0b340e0 100644
--- a/tests/API/probes/Makefile.am
+++ b/tests/API/probes/Makefile.am
@@ -23,22 +23,10 @@ CLEANFILES = *.log *.out*
TESTS_ENVIRONMENT= LD_PRELOAD=$(top_builddir)/src/.libs/libopenscap_testing.so LD_LIBRARY_PATH=$(top_builddir)/src/.libs OVAL_PROBE_DIR=$(top_builddir)/src/OVAL/probes $(SHELL) -x
TESTS = test_api_probes.sh
-check_PROGRAMS = test_api_probes_smoke test_api_probes_xinetd
+check_PROGRAMS = test_api_probes_smoke
test_api_probes_smoke_SOURCES = test_api_probes_smoke.c
-test_api_probes_xinetd_SOURCES = test_api_probes_xinetd.c
-test_api_probes_xinetd_CFLAGS= -I$(top_srcdir) -I$(top_srcdir)/src/common -I$(top_srcdir)/src/common/public
-test_api_probes_xinetd_LDADD = $(LDADD) $(top_srcdir)/src/common/liboscapcommon.la
-
EXTRA_DIST += test_api_probes.sh \
- test_api_probes_smoke.c \
- test_api_probes_xinetd.c \
- xinetd_A.conf \
- xinetd_B.conf \
- xinetd_C.conf \
- xinetd_D.conf \
- xinetd_E.conf \
- xinetd_F.conf
-
+ test_api_probes_smoke.c
endif
diff --git a/tests/API/probes/test_api_probes.sh b/tests/API/probes/test_api_probes.sh
index b136624..96557f4 100755
--- a/tests/API/probes/test_api_probes.sh
+++ b/tests/API/probes/test_api_probes.sh
@@ -21,57 +21,10 @@ function test_api_probes_smoke {
return $?
}
-function test_api_probes_xinetd_parser {
- local ret_val=0;
-
- ./test_api_probes_xinetd ${srcdir}/xinetd_A.conf foo tcp
- if [ $? -ne 3 ]; then
- ret_val=$[$ret_val + 1]
- fi
-
- ./test_api_probes_xinetd ${srcdir}/xinetd_B.conf foo tcp
- if [ $? -ne 0 ]; then
- ret_val=$[$ret_val + 1]
- fi
-
- ./test_api_probes_xinetd ${srcdir}/xinetd_C.conf a tcp
- if [ $? -ne 0 ]; then
- ret_val=$[$ret_val + 1]
- fi
-
- ./test_api_probes_xinetd ${srcdir}/xinetd_D.conf f udp
- if [ $? -ne 0 ]; then
- ret_val=$[$ret_val + 1]
- fi
-
- ./test_api_probes_xinetd ${srcdir}/xinetd_E.conf foo udp
- if [ $? -ne 0 ]; then
- ret_val=$[$ret_val + 1]
- fi
-
- ./test_api_probes_xinetd ${srcdir}/xinetd_E.conf foo tcp
- if [ $? -ne 0 ]; then
- ret_val=$[$ret_val + 1]
- fi
-
- ./test_api_probes_xinetd ${srcdir}/xinetd_F.conf foo udp
- if [ $? -ne 0 ]; then
- ret_val=$[$ret_val + 1]
- fi
-
- ./test_api_probes_xinetd ${srcdir}/xinetd_F.conf foo tcp
- if [ $? -ne 0 ]; then
- ret_val=$[$ret_val + 1]
- fi
-
- return $ret_val
-}
-
# Testing.
test_init "test_probes_api.log"
test_run "test_api_probes_smoke" test_api_probes_smoke
-test_run "test_api_probes_xinetd_parser" test_api_probes_xinetd_parser
test_exit
diff --git a/tests/API/probes/test_api_probes_xinetd.c b/tests/API/probes/test_api_probes_xinetd.c
deleted file mode 100644
index d73daac..0000000
--- a/tests/API/probes/test_api_probes_xinetd.c
+++ /dev/null
@@ -1,73 +0,0 @@
-#define XINETD_TEST
-#include <../../../../src/OVAL/probes/unix/xinetd.c>
-
-int main (int argc, char *argv[])
-{
- xiconf_t *xcfg;
- xiconf_strans_t *xres;
-
- char *path, *serv, *prot;
-
- if (argc != 4) {
- fprintf(stderr, "Usage: %s <path> <service> <protocol>\n", argv[0]);
- return (1);
- }
-
- path = argv[1];
- serv = argv[2];
- prot = argv[3];
-
- xcfg = xiconf_parse (path, 32);
-
- if (xcfg == NULL) {
- fprintf(stderr, "Parse error.\n");
- return (2);
- }
-
- xres = xiconf_getservice (xcfg, serv, prot);
-
- if (xres == NULL) {
- fprintf(stderr, "Not found.\n");
- return (3);
- } else {
- register unsigned int l;
-
- for (l = 0; l < xres->cnt; ++l) {
- fprintf(stdout,
- "xiconf_service_t(%s):\n"
- " type: %s\n"
- " flags: %s\n"
- " socket_type: %s\n"
- " name: %s\n"
- " protocol: %s\n"
- " user: %s\n"
- " server: %s\n"
- " server_args: %s\n"
- " only_from: %s\n"
- " no_access: %s\n"
- " port: %d\n"
- " disable: %d\n"
- " wait: %d\n"
- " def_disabled: %d\n"
- " def_enabled: %d\n",
- xres->srv[l]->id,
- xres->srv[l]->type,
- xres->srv[l]->flags,
- xres->srv[l]->socket_type,
- xres->srv[l]->name,
- xres->srv[l]->protocol,
- xres->srv[l]->user,
- xres->srv[l]->server,
- xres->srv[l]->server_args,
- xres->srv[l]->only_from,
- xres->srv[l]->no_access,
- xres->srv[l]->port,
- xres->srv[l]->disable,
- xres->srv[l]->wait,
- xres->srv[l]->def_disabled,
- xres->srv[l]->def_enabled);
- }
- }
-
- return (0);
-}
diff --git a/tests/API/probes/xinetd_A.conf b/tests/API/probes/xinetd_A.conf
deleted file mode 100644
index 8539ba3..0000000
--- a/tests/API/probes/xinetd_A.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-##
-###
-####
-#####
-####
-###
-##
-#
-
-#
-#
-#
-#
-
-#
-
-
-#
-
-
-
-#
-
-
-
-
-#
-
-
-
-
-
-
-#
-
-
-
-
-#
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/API/probes/xinetd_B.conf b/tests/API/probes/xinetd_B.conf
deleted file mode 100644
index 0a182df..0000000
--- a/tests/API/probes/xinetd_B.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-service foo
-{
- ignore_me = 1
- ignore_me_too = foo
- disable = 1
- wait = 1
- protocol = tcp
-}
-
-service bar
-{
- ignore_me = 1
- ignore_me_too = foo
- disable = 0
- wait = 0
- protocol = tcp
-}
diff --git a/tests/API/probes/xinetd_C.conf b/tests/API/probes/xinetd_C.conf
deleted file mode 100644
index 8fb1489..0000000
--- a/tests/API/probes/xinetd_C.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-defaults
-{
- enabled = a b c d
- disabled = e f g h
- ignore_me = asdf
-}
-
-service a
-{
- protocol = tcp
- disable = 1
-}
-
-service f
-{
- protocol = udp
- wait = 1
-}
diff --git a/tests/API/probes/xinetd_D.conf b/tests/API/probes/xinetd_D.conf
deleted file mode 100644
index 5099b88..0000000
--- a/tests/API/probes/xinetd_D.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# hello
-#
-service a
-{
- protocol = tcp
- disable = 1
-}
-
-# comment ...
-# comment ...
-# comment ...
-
-service f
-{
- protocol = udp
- wait = 1
-}
-
-# very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very veryvery very veryvery very very very very very very very veryvery very very loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong and useful coment
-#
-# foo
diff --git a/tests/API/probes/xinetd_E.conf b/tests/API/probes/xinetd_E.conf
deleted file mode 100644
index d0053f9..0000000
--- a/tests/API/probes/xinetd_E.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Two services with equal names but different IDs (which is required)
-# and with different protocols set.
-#
-
-service foo
-{
- id = foo0
- protocol = tcp
- server = /sbin/foo
- server_args = -t
-}
-
-service foo
-{
- id = foo1
- protocol = udp
- server = /sbin/foo
- server_args = -u
-}
diff --git a/tests/API/probes/xinetd_F.conf b/tests/API/probes/xinetd_F.conf
deleted file mode 100644
index c967cf5..0000000
--- a/tests/API/probes/xinetd_F.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Two services with equal names but different IDs (which is required)
-# and with different protocols set.
-#
-
-defaults
-{
- disabled = foo0
- enabled = foo1
- no_access = 192.168.0.0/24
-}
-
-service foo
-{
- id = foo0
- protocol = tcp
- server = /sbin/foo
- server_args = -t
-}
-
-service foo
-{
- id = foo1
- protocol = udp
- server = /sbin/foo
- server_args = -u
-}
diff --git a/tests/probes/Makefile.am b/tests/probes/Makefile.am
index 214f21e..3671377 100644
--- a/tests/probes/Makefile.am
+++ b/tests/probes/Makefile.am
@@ -3,7 +3,7 @@ INDEPENDENT_SUBDIRS = family filehash textfilecontent54 sysinfo
endif
if WANT_PROBES_UNIX
-UNIX_SUBDIRS = file uname shadow process password runlevel interface
+UNIX_SUBDIRS = file uname shadow process password runlevel interface xinetd
endif
if WANT_PROBES_LINUX
diff --git a/tests/probes/xinetd/Makefile.am b/tests/probes/xinetd/Makefile.am
new file mode 100644
index 0000000..f4ef720
--- /dev/null
+++ b/tests/probes/xinetd/Makefile.am
@@ -0,0 +1,36 @@
+AM_CPPFLAGS = -I$(top_srcdir)/tests/include \
+ -I$(top_srcdir)/src/CVE/public \
+ -I${top_srcdir}/src/CVSS/public \
+ -I$(top_srcdir)/src/CPE/public \
+ -I$(top_srcdir)/src/CCE/public \
+ -I$(top_srcdir)/src/OVAL/public \
+ -I$(top_srcdir)/src/XCCDF/public \
+ -I$(top_srcdir)/src/common/public \
+ -I$(top_srcdir)/src/OVAL/probes/public \
+ -I$(top_srcdir)/src/OVAL/probes/SEAP/public \
+ -I$(top_srcdir)/src \
+ @libxml_cflags@
+
+LDADD = $(top_builddir)/src/libopenscap_testing.la $(top_builddir)/src/common/liboscapcommon.la @pcre_libs@
+
+EXTRA_DIST = $(top_srcdir)/tests/test_common.sh \
+ $(top_srcdir)/tests/assume.h
+
+DISTCLEANFILES = *.log *.out*
+CLEANFILES = *.log *.out*
+
+TESTS_ENVIRONMENT= LD_PRELOAD=$(top_builddir)/src/.libs/libopenscap_testing.so LD_LIBRARY_PATH=$(top_builddir)/src/.libs OVAL_PROBE_DIR=$(top_builddir)/src/OVAL/probes $(SHELL) -x
+TESTS = test_xinetd_probe.sh
+check_PROGRAMS = test_probe_xinetd
+
+test_probe_xinetd_SOURCES = test_probe_xinetd.c
+test_probe_xinetd_CFLAGS= -I$(top_srcdir) -I$(top_srcdir)/src/common -I$(top_srcdir)/src/common/public
+
+EXTRA_DIST += test_xinetd_probe.sh \
+ test_probe_xinetd.c \
+ xinetd_A.conf \
+ xinetd_B.conf \
+ xinetd_C.conf \
+ xinetd_D.conf \
+ xinetd_E.conf \
+ xinetd_F.conf
diff --git a/tests/probes/xinetd/test_probe_xinetd.c b/tests/probes/xinetd/test_probe_xinetd.c
new file mode 100644
index 0000000..d73daac
--- /dev/null
+++ b/tests/probes/xinetd/test_probe_xinetd.c
@@ -0,0 +1,73 @@
+#define XINETD_TEST
+#include <../../../../src/OVAL/probes/unix/xinetd.c>
+
+int main (int argc, char *argv[])
+{
+ xiconf_t *xcfg;
+ xiconf_strans_t *xres;
+
+ char *path, *serv, *prot;
+
+ if (argc != 4) {
+ fprintf(stderr, "Usage: %s <path> <service> <protocol>\n", argv[0]);
+ return (1);
+ }
+
+ path = argv[1];
+ serv = argv[2];
+ prot = argv[3];
+
+ xcfg = xiconf_parse (path, 32);
+
+ if (xcfg == NULL) {
+ fprintf(stderr, "Parse error.\n");
+ return (2);
+ }
+
+ xres = xiconf_getservice (xcfg, serv, prot);
+
+ if (xres == NULL) {
+ fprintf(stderr, "Not found.\n");
+ return (3);
+ } else {
+ register unsigned int l;
+
+ for (l = 0; l < xres->cnt; ++l) {
+ fprintf(stdout,
+ "xiconf_service_t(%s):\n"
+ " type: %s\n"
+ " flags: %s\n"
+ " socket_type: %s\n"
+ " name: %s\n"
+ " protocol: %s\n"
+ " user: %s\n"
+ " server: %s\n"
+ " server_args: %s\n"
+ " only_from: %s\n"
+ " no_access: %s\n"
+ " port: %d\n"
+ " disable: %d\n"
+ " wait: %d\n"
+ " def_disabled: %d\n"
+ " def_enabled: %d\n",
+ xres->srv[l]->id,
+ xres->srv[l]->type,
+ xres->srv[l]->flags,
+ xres->srv[l]->socket_type,
+ xres->srv[l]->name,
+ xres->srv[l]->protocol,
+ xres->srv[l]->user,
+ xres->srv[l]->server,
+ xres->srv[l]->server_args,
+ xres->srv[l]->only_from,
+ xres->srv[l]->no_access,
+ xres->srv[l]->port,
+ xres->srv[l]->disable,
+ xres->srv[l]->wait,
+ xres->srv[l]->def_disabled,
+ xres->srv[l]->def_enabled);
+ }
+ }
+
+ return (0);
+}
diff --git a/tests/probes/xinetd/test_xinetd_probe.sh b/tests/probes/xinetd/test_xinetd_probe.sh
new file mode 100755
index 0000000..a6479bb
--- /dev/null
+++ b/tests/probes/xinetd/test_xinetd_probe.sh
@@ -0,0 +1,71 @@
+#!/usr/bin/env bash
+
+# Copyright 2009 Red Hat Inc., Durham, North Carolina.
+# All Rights Reserved.
+#
+# OpenScap Probes Test Suite.
+#
+# Created on: Nov 30, 2009
+#
+# Authors:
+# Peter Vrabec, <pvrabec at redhat.com>
+# David Niemoller
+# Ondrej Moris, <omoris at redhat.com>
+
+. ${srcdir}/../../test_common.sh
+
+# Test Cases.
+
+function test_probe_xinetd_parser {
+ local ret_val=0;
+
+ ./test_probe_xinetd ${srcdir}/xinetd_A.conf foo tcp
+ if [ $? -ne 3 ]; then
+ ret_val=$[$ret_val + 1]
+ fi
+
+ ./test_probe_xinetd ${srcdir}/xinetd_B.conf foo tcp
+ if [ $? -ne 0 ]; then
+ ret_val=$[$ret_val + 1]
+ fi
+
+ ./test_probe_xinetd ${srcdir}/xinetd_C.conf a tcp
+ if [ $? -ne 0 ]; then
+ ret_val=$[$ret_val + 1]
+ fi
+
+ ./test_probe_xinetd ${srcdir}/xinetd_D.conf f udp
+ if [ $? -ne 0 ]; then
+ ret_val=$[$ret_val + 1]
+ fi
+
+ ./test_probe_xinetd ${srcdir}/xinetd_E.conf foo udp
+ if [ $? -ne 0 ]; then
+ ret_val=$[$ret_val + 1]
+ fi
+
+ ./test_probe_xinetd ${srcdir}/xinetd_E.conf foo tcp
+ if [ $? -ne 0 ]; then
+ ret_val=$[$ret_val + 1]
+ fi
+
+ ./test_probe_xinetd ${srcdir}/xinetd_F.conf foo udp
+ if [ $? -ne 0 ]; then
+ ret_val=$[$ret_val + 1]
+ fi
+
+ ./test_probe_xinetd ${srcdir}/xinetd_F.conf foo tcp
+ if [ $? -ne 0 ]; then
+ ret_val=$[$ret_val + 1]
+ fi
+
+ return $ret_val
+}
+
+# Testing.
+
+test_init "test_probe_xinetd.log"
+
+test_run "test_probe_xinetd_parser" test_probe_xinetd_parser
+
+test_exit
diff --git a/tests/probes/xinetd/xinetd_A.conf b/tests/probes/xinetd/xinetd_A.conf
new file mode 100644
index 0000000..8539ba3
--- /dev/null
+++ b/tests/probes/xinetd/xinetd_A.conf
@@ -0,0 +1,50 @@
+#
+##
+###
+####
+#####
+####
+###
+##
+#
+
+#
+#
+#
+#
+
+#
+
+
+#
+
+
+
+#
+
+
+
+
+#
+
+
+
+
+
+
+#
+
+
+
+
+#
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/probes/xinetd/xinetd_B.conf b/tests/probes/xinetd/xinetd_B.conf
new file mode 100644
index 0000000..0a182df
--- /dev/null
+++ b/tests/probes/xinetd/xinetd_B.conf
@@ -0,0 +1,17 @@
+service foo
+{
+ ignore_me = 1
+ ignore_me_too = foo
+ disable = 1
+ wait = 1
+ protocol = tcp
+}
+
+service bar
+{
+ ignore_me = 1
+ ignore_me_too = foo
+ disable = 0
+ wait = 0
+ protocol = tcp
+}
diff --git a/tests/probes/xinetd/xinetd_C.conf b/tests/probes/xinetd/xinetd_C.conf
new file mode 100644
index 0000000..8fb1489
--- /dev/null
+++ b/tests/probes/xinetd/xinetd_C.conf
@@ -0,0 +1,18 @@
+defaults
+{
+ enabled = a b c d
+ disabled = e f g h
+ ignore_me = asdf
+}
+
+service a
+{
+ protocol = tcp
+ disable = 1
+}
+
+service f
+{
+ protocol = udp
+ wait = 1
+}
diff --git a/tests/probes/xinetd/xinetd_D.conf b/tests/probes/xinetd/xinetd_D.conf
new file mode 100644
index 0000000..5099b88
--- /dev/null
+++ b/tests/probes/xinetd/xinetd_D.conf
@@ -0,0 +1,22 @@
+#
+# hello
+#
+service a
+{
+ protocol = tcp
+ disable = 1
+}
+
+# comment ...
+# comment ...
+# comment ...
+
+service f
+{
+ protocol = udp
+ wait = 1
+}
+
+# very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very veryvery very veryvery very very very very very very very veryvery very very loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong and useful coment
+#
+# foo
diff --git a/tests/probes/xinetd/xinetd_E.conf b/tests/probes/xinetd/xinetd_E.conf
new file mode 100644
index 0000000..d0053f9
--- /dev/null
+++ b/tests/probes/xinetd/xinetd_E.conf
@@ -0,0 +1,20 @@
+#
+# Two services with equal names but different IDs (which is required)
+# and with different protocols set.
+#
+
+service foo
+{
+ id = foo0
+ protocol = tcp
+ server = /sbin/foo
+ server_args = -t
+}
+
+service foo
+{
+ id = foo1
+ protocol = udp
+ server = /sbin/foo
+ server_args = -u
+}
diff --git a/tests/probes/xinetd/xinetd_F.conf b/tests/probes/xinetd/xinetd_F.conf
new file mode 100644
index 0000000..c967cf5
--- /dev/null
+++ b/tests/probes/xinetd/xinetd_F.conf
@@ -0,0 +1,27 @@
+#
+# Two services with equal names but different IDs (which is required)
+# and with different protocols set.
+#
+
+defaults
+{
+ disabled = foo0
+ enabled = foo1
+ no_access = 192.168.0.0/24
+}
+
+service foo
+{
+ id = foo0
+ protocol = tcp
+ server = /sbin/foo
+ server_args = -t
+}
+
+service foo
+{
+ id = foo1
+ protocol = udp
+ server = /sbin/foo
+ server_args = -u
+}
--
1.6.2.5
More information about the Open-scap-list
mailing list