From b93c8a3ec57a5fd18868de3a1abfda488fa0013d Mon Sep 17 00:00:00 2001
From: Jan Cerny <jcerny@redhat.com>
Date: Tue, 23 Jan 2018 17:19:46 +0100
Subject: [PATCH] Revert "Merge pull request #630 from
mpreisler/warning_default_verbose_level"
This reverts commit 91feb5cc9658598db8e2b374b92ddae5f8577762, reversing
changes made to ef57380289a6548ea7abb6627fa1fd4845000bf8.
---
src/XCCDF/public/xccdf_session.h | 3 ---
src/XCCDF/tailoring.c | 2 +-
src/XCCDF/xccdf_session.c | 11 +++------
src/XCCDF_POLICY/check_engine_plugin.c | 26 ++++++++--------------
src/XCCDF_POLICY/public/check_engine_plugin.h | 1 -
src/common/debug.c | 2 +-
tests/API/OVAL/unittests/test_external_variable.sh | 6 +----
.../OVAL/unittests/test_object_component_type.sh | 2 ++
.../unittests/test_remediation_subs_unresolved.sh | 2 --
tests/probes/sql57/unsupported_engine.sh | 2 --
tests/probes/sysctl/test_sysctl_probe_all.sh | 2 --
utils/oscap.c | 3 +--
12 files changed, 18 insertions(+), 44 deletions(-)
diff --git a/src/XCCDF/public/xccdf_session.h b/src/XCCDF/public/xccdf_session.h
index f9992399..6b6e09e7 100644
--- a/src/XCCDF/public/xccdf_session.h
+++ b/src/XCCDF/public/xccdf_session.h
@@ -414,11 +414,8 @@ int xccdf_session_load_oval(struct xccdf_session *session);
*
* @memberof xccdf_session
* @param session XCCDF Session
- * @param plugin_name Name of the plugin to load
- * @param quiet If true we will not output errors if loading fails
* @returns zero on success
*/
-int xccdf_session_load_check_engine_plugin2(struct xccdf_session *session, const char* plugin_name, bool quiet);
int xccdf_session_load_check_engine_plugin(struct xccdf_session *session, const char* plugin_name);
/**
diff --git a/src/XCCDF/tailoring.c b/src/XCCDF/tailoring.c
index 62661040..51b05f9e 100644
--- a/src/XCCDF/tailoring.c
+++ b/src/XCCDF/tailoring.c
@@ -187,7 +187,7 @@ struct xccdf_tailoring *xccdf_tailoring_parse(xmlTextReaderPtr reader, struct xc
}
case XCCDFE_PROFILE: {
if (benchmark != NULL) {
- dI("Parsing Tailoring Profiles without reference to Benchmark");
+ dW("Parsing Tailoring Profiles without reference to Benchmark");
}
struct xccdf_item *item = xccdf_profile_parse(reader, benchmark);
if (!xccdf_tailoring_add_profile(tailoring, XPROFILE(item))) {
diff --git a/src/XCCDF/xccdf_session.c b/src/XCCDF/xccdf_session.c
index ccb95821..7b1a6df5 100644
--- a/src/XCCDF/xccdf_session.c
+++ b/src/XCCDF/xccdf_session.c
@@ -1072,9 +1072,9 @@ int xccdf_session_load_oval(struct xccdf_session *session)
return 0;
}
-int xccdf_session_load_check_engine_plugin2(struct xccdf_session *session, const char *plugin_name, bool quiet)
+int xccdf_session_load_check_engine_plugin(struct xccdf_session *session, const char *plugin_name)
{
- struct check_engine_plugin_def *plugin = check_engine_plugin_load2(plugin_name, quiet);
+ struct check_engine_plugin_def *plugin = check_engine_plugin_load(plugin_name);
if (!plugin)
return -1; // error already set
@@ -1091,11 +1091,6 @@ int xccdf_session_load_check_engine_plugin2(struct xccdf_session *session, const
}
}
-int xccdf_session_load_check_engine_plugin(struct xccdf_session *session, const char *plugin_name)
-{
- return xccdf_session_load_check_engine_plugin2(session, plugin_name, false);
-}
-
int xccdf_session_load_check_engine_plugins(struct xccdf_session *session)
{
xccdf_session_unload_check_engine_plugins(session);
@@ -1105,7 +1100,7 @@ int xccdf_session_load_check_engine_plugins(struct xccdf_session *session)
while (*known_plugins) {
// We do not report failure when a known plugin doesn't load properly, that's because they
// are optional and we don't know if it's not there or if it just failed to load.
- if (xccdf_session_load_check_engine_plugin2(session, *known_plugins, true) != 0)
+ if (xccdf_session_load_check_engine_plugin(session, *known_plugins) != 0)
oscap_clearerr();
known_plugins++;
diff --git a/src/XCCDF_POLICY/check_engine_plugin.c b/src/XCCDF_POLICY/check_engine_plugin.c
index d36f4cd9..9f3024c5 100644
--- a/src/XCCDF_POLICY/check_engine_plugin.c
+++ b/src/XCCDF_POLICY/check_engine_plugin.c
@@ -47,7 +47,7 @@ static void check_engine_plugin_def_free(struct check_engine_plugin_def *plugin)
free(plugin);
}
-struct check_engine_plugin_def *check_engine_plugin_load2(const char* path, bool quiet)
+struct check_engine_plugin_def *check_engine_plugin_load(const char* path)
{
struct check_engine_plugin_def *ret = check_engine_plugin_def_new();
@@ -61,10 +61,9 @@ struct check_engine_plugin_def *check_engine_plugin_load2(const char* path, bool
if (!ret->module_handle) {
error = dlerror();
- if (!quiet)
- oscap_seterr(OSCAP_EFAMILY_GLIBC,
- "Failed to load extra check engine from '%s'. Details: '%s'.",
- path, error);
+ oscap_seterr(OSCAP_EFAMILY_GLIBC,
+ "Failed to load extra check engine from '%s'. Details: '%s'.",
+ path, error);
check_engine_plugin_def_free(ret);
return NULL;
@@ -74,10 +73,9 @@ struct check_engine_plugin_def *check_engine_plugin_load2(const char* path, bool
*(void **)(&entry_fn) = dlsym(ret->module_handle, STRINGIZE(OPENSCAP_CHECK_ENGINE_PLUGIN_ENTRY));
if ((error = dlerror()) != NULL) {
- if (!quiet)
- oscap_seterr(OSCAP_EFAMILY_GLIBC,
- "Failed to retrieve module entry '%s' from loaded extra check engine '%s'. Details: '%s'.",
- STRINGIZE(OPENSCAP_CHECK_ENGINE_PLUGIN_ENTRY), path, error);
+ oscap_seterr(OSCAP_EFAMILY_GLIBC,
+ "Failed to retrieve module entry '%s' from loaded extra check engine '%s'. Details: '%s'.",
+ STRINGIZE(OPENSCAP_CHECK_ENGINE_PLUGIN_ENTRY), path, error);
dlclose(ret->module_handle);
check_engine_plugin_def_free(ret);
@@ -85,9 +83,8 @@ struct check_engine_plugin_def *check_engine_plugin_load2(const char* path, bool
}
if ((*entry_fn)(ret) != 0) {
- if (!quiet)
- oscap_seterr(OSCAP_EFAMILY_GLIBC,
- "Failed to fill check_engine_plugin_def when loading check engine plugin '%s'.", path);
+ oscap_seterr(OSCAP_EFAMILY_GLIBC,
+ "Failed to fill check_engine_plugin_def when loading check engine plugin '%s'.", path);
dlclose(ret->module_handle);
check_engine_plugin_def_free(ret);
@@ -97,11 +94,6 @@ struct check_engine_plugin_def *check_engine_plugin_load2(const char* path, bool
return ret;
}
-struct check_engine_plugin_def *check_engine_plugin_load(const char* path)
-{
- return check_engine_plugin_load2(path, false);
-}
-
void check_engine_plugin_unload(struct check_engine_plugin_def *plugin)
{
if (!plugin->module_handle) {
diff --git a/src/XCCDF_POLICY/public/check_engine_plugin.h b/src/XCCDF_POLICY/public/check_engine_plugin.h
index 4a992ae3..7878fe07 100644
--- a/src/XCCDF_POLICY/public/check_engine_plugin.h
+++ b/src/XCCDF_POLICY/public/check_engine_plugin.h
@@ -52,7 +52,6 @@ struct check_engine_plugin_def
const char *(*get_capabilities_fn)(void**);
};
-struct check_engine_plugin_def *check_engine_plugin_load2(const char* path, bool quiet);
struct check_engine_plugin_def *check_engine_plugin_load(const char* path);
void check_engine_plugin_unload(struct check_engine_plugin_def *plugin);
diff --git a/src/common/debug.c b/src/common/debug.c
index 80731b0f..cb1f9290 100644
--- a/src/common/debug.c
+++ b/src/common/debug.c
@@ -86,7 +86,7 @@ oscap_verbosity_levels oscap_verbosity_level_from_cstr(const char *level_name)
bool oscap_set_verbose(const char *verbosity_level, const char *filename, bool is_probe)
{
if (verbosity_level == NULL) {
- verbosity_level = "WARNING";
+ return true;
}
__debuglog_level = oscap_verbosity_level_from_cstr(verbosity_level);
if (__debuglog_level == DBG_UNKNOWN) {
diff --git a/tests/API/OVAL/unittests/test_external_variable.sh b/tests/API/OVAL/unittests/test_external_variable.sh
index 8f6a2e8c..e23dd556 100755
--- a/tests/API/OVAL/unittests/test_external_variable.sh
+++ b/tests/API/OVAL/unittests/test_external_variable.sh
@@ -9,11 +9,7 @@ stderr=$(mktemp ${name}.err.XXXXXX)
echo "stderr file: $stderr"
$OSCAP oval eval --results $result --variables $srcdir/external_variables.xml $srcdir/$name.oval.xml 2> $stderr
-# filter out the expected warnings in stderr
-
-sed -i -E "/^W: oscap:[ ]+Referenced variable has no values \(oval:x:var:[13689]\)/d" "$stderr"
-[ -f $stderr ]; [ ! -s $stderr ]; rm $stderr
-
+[ ! -s $stderr ] && rm $stderr
[ -s $result ]
assert_exists 10 '/oval_results/oval_definitions/variables/external_variable'
diff --git a/tests/API/OVAL/unittests/test_object_component_type.sh b/tests/API/OVAL/unittests/test_object_component_type.sh
index f9189c08..30c84a44 100755
--- a/tests/API/OVAL/unittests/test_object_component_type.sh
+++ b/tests/API/OVAL/unittests/test_object_component_type.sh
@@ -8,6 +8,8 @@ set -o pipefail
$OSCAP oval eval $srcdir/test_object_component_type.oval.xml 2> $stderr || ret=$?
[ $ret -eq 1 ]
+stderr_line_count=`cat $stderr | wc -l`
+[ $stderr_line_count -eq 2 ]
grep -q "Entity [']something_bogus['] has not been found in textfilecontent_item (id: [0-9]\+) specified by object [']oval:oscap:obj:10[']." $stderr
grep -q "Expected record data type, but found string data type in subexpression entity in textfilecontent_item (id: [0-9]\+) specified by object [']oval:oscap:obj:10[']." $stderr
diff --git a/tests/API/XCCDF/unittests/test_remediation_subs_unresolved.sh b/tests/API/XCCDF/unittests/test_remediation_subs_unresolved.sh
index 44ae2f77..f48239d9 100755
--- a/tests/API/XCCDF/unittests/test_remediation_subs_unresolved.sh
+++ b/tests/API/XCCDF/unittests/test_remediation_subs_unresolved.sh
@@ -35,8 +35,6 @@ assert_exists 1 '//score[text()="0.000000"]'
ret=0
$OSCAP xccdf eval --remediate --results $result $srcdir/${name}.xccdf.xml 2> $stderr || ret=$?
[ $ret -eq 2 ]
-# filter out the expected warning in stderr
-sed -i -E "/^W: oscap: The xccdf:rule-result\/xccdf:instance element was not found./d" "$stderr"
[ -f $stderr ]; [ ! -s $stderr ]; rm $stderr
$OSCAP xccdf validate-xml $result
diff --git a/tests/probes/sql57/unsupported_engine.sh b/tests/probes/sql57/unsupported_engine.sh
index 6243cff3..f90d6c8b 100755
--- a/tests/probes/sql57/unsupported_engine.sh
+++ b/tests/probes/sql57/unsupported_engine.sh
@@ -10,8 +10,6 @@ echo "stderr file: $stderr"
echo "Evaluating content."
$OSCAP oval eval --results $result $srcdir/${name}.oval.xml 2> $stderr
-# filter out the expected error in stderr
-sed -i -E "/^E: lt-probe_sql57: DB engine not supported: sqlserver/d" "$stderr"
[ -f $stderr ]; [ ! -s $stderr ]; rm $stderr
echo "Validating results."
#$OSCAP oval validate-xml --results --schematron $result
diff --git a/tests/probes/sysctl/test_sysctl_probe_all.sh b/tests/probes/sysctl/test_sysctl_probe_all.sh
index 435eaf5d..fa353925 100755
--- a/tests/probes/sysctl/test_sysctl_probe_all.sh
+++ b/tests/probes/sysctl/test_sysctl_probe_all.sh
@@ -29,8 +29,6 @@ grep unix-sys:name "$result" | sed -E 's;.*>(.*)<.*;\1;g' | sort > "$ourNames"
diff "$sysctlNames" "$ourNames"
-# remove oscap error message related to permissions from stderr
-sed -i -E "/^E: lt-probe_sysctl: Can't read sysctl value from /d" "$stderr"
[ ! -s $stderr ]
rm $stderr $result $ourNames $sysctlNames
diff --git a/utils/oscap.c b/utils/oscap.c
index 9d3386fd..1f22c49b 100644
--- a/utils/oscap.c
+++ b/utils/oscap.c
@@ -130,8 +130,7 @@ static int print_versions(const struct oscap_action *action)
const char * const *known_plugins = check_engine_plugin_get_known_plugins();
bool known_plugin_found = false;
while (*known_plugins) {
- // try to load the plugin but output no errors if it fails (quiet=true)
- struct check_engine_plugin_def *plugin = check_engine_plugin_load2(*known_plugins, true);
+ struct check_engine_plugin_def *plugin = check_engine_plugin_load(*known_plugins);
if (plugin) {
printf("%s (from %s)\n", check_engine_plugin_get_capabilities(plugin), *known_plugins);
check_engine_plugin_unload(plugin);
--
2.14.3