Merge pull request #1980 from evgenyz/fix-systemd-probes

OVAL/probes/systemd*: Use ListUnitFiles D-Bus method to fetch all units

Author: jan-cerny

src/OVAL/probes/unix/linux/systemdshared.h

@@ -85,6 +85,8 @@ static char *get_path_by_unit(DBusConnection *conn, const char *unit)
 		// if it hasn't been loaded yet.
 		"LoadUnit"
 	);
+	dD("LoadUnit: %s", unit);
+
 	if (msg == NULL) {
 		dD("Failed to create dbus_message via dbus_message_new_method_call!");
 		goto cleanup;
@@ -124,7 +126,7 @@ static char *get_path_by_unit(DBusConnection *conn, const char *unit)
 	}
 
 	if (dbus_message_iter_get_arg_type(&args) != DBUS_TYPE_OBJECT_PATH) {
-		dD("Expected string argument in reply. Instead received: %s.", dbus_message_type_to_string(dbus_message_iter_get_arg_type(&args)));
+		dD("Expected object path argument in reply. Instead received: %s.", dbus_message_type_to_string(dbus_message_iter_get_arg_type(&args)));
 		goto cleanup;
 	}
 
@@ -152,7 +154,7 @@ static int get_all_systemd_units(DBusConnection* conn, int(*callback)(const char
 		"org.freedesktop.systemd1",
 		"/org/freedesktop/systemd1",
 		"org.freedesktop.systemd1.Manager",
-		"ListUnits"
+		"ListUnitFiles"
 	);
 	if (msg == NULL) {
 		dD("Failed to create dbus_message via dbus_message_new_method_call!");
@@ -201,17 +203,18 @@ static int get_all_systemd_units(DBusConnection* conn, int(*callback)(const char
 			goto cleanup;
 		}
 
-		DBusMessageIter unit_name;
-		dbus_message_iter_recurse(&unit_iter, &unit_name);
+		DBusMessageIter unit_full_path_and_name;
+		dbus_message_iter_recurse(&unit_iter, &unit_full_path_and_name);
 
-		if (dbus_message_iter_get_arg_type(&unit_name) != DBUS_TYPE_STRING) {
-			dD("Expected string as the first element in the unit struct. Instead received: %s.", dbus_message_type_to_string(dbus_message_iter_get_arg_type(&unit_name)));
+		if (dbus_message_iter_get_arg_type(&unit_full_path_and_name) != DBUS_TYPE_STRING) {
+			dD("Expected string as the first element in the unit struct. Instead received: %s.", dbus_message_type_to_string(dbus_message_iter_get_arg_type(&unit_full_path_and_name)));
 			goto cleanup;
 		}
 
 		_DBusBasicValue value;
-		dbus_message_iter_get_basic(&unit_name, &value);
-		char *unit_name_s = oscap_strdup(value.str);
+		dbus_message_iter_get_basic(&unit_full_path_and_name, &value);
+		char *unit_name_s = oscap_strdup(basename(value.str));
+		oscap_strrm(unit_name_s, "@");
 		int cbret = callback(unit_name_s, cbarg);
 		free(unit_name_s);
 		if (cbret != 0) {

src/common/util.h

@@ -313,6 +313,24 @@ static inline char *oscap_strdup(const char *str) {
 #endif
 }
 
+/**
+ * Removes all occurrences of substr from str by shifting the contents to
+ * the left. If string is NULL, does nothing.
+ * @param str String we want to process
+ * @param substr Sub-string we want to get rid of
+ */
+static inline void oscap_strrm(char *str, const char *substr) {
+	if (str == NULL)
+		return;
+
+	size_t sublen = strlen(substr);
+	char *ptr = strstr(str, substr);
+	while (ptr != NULL) {
+		memmove(ptr, ptr+sublen, strlen(ptr) - sublen + 1);
+		ptr = strstr(str, substr);
+	}
+}
+
 /// Just like strcmp except it's NULL-safe. Use the standard strcmp directly if possible.
 static inline int oscap_strcmp(const char *s1, const char *s2) {
 	if (s1 == NULL) s1 = "";

tests/CMakeLists.txt

@@ -39,3 +39,4 @@ add_subdirectory("sce")
 add_subdirectory("schemas")
 add_subdirectory("sources")
 add_subdirectory("utils")
+add_subdirectory("common")

tests/common/CMakeLists.txt

@@ -0,0 +1,5 @@
+add_oscap_test_executable(test_oscap_util
+	"test_oscap_util.c"
+)
+
+add_oscap_test("test_oscap_util.sh")

tests/common/test_oscap_util.c

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2023 Red Hat Inc., Durham, North Carolina.
+ * All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Authors:
+ *      Evgenii Kolesnikov <[email protected]>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "common/util.h"
+
+int test_oscap_strrm(void);
+
+int test_oscap_strrm()
+{
+	char str[] = "abcdef12345678def90";
+	size_t len = strlen(str);
+
+	oscap_strrm(str, "0");
+	if (strncmp(str, "abcdef12345678def9", len) != 0)
+		return 1;
+
+	oscap_strrm(str, "abc");
+	if (strcmp(str, "def12345678def9") != 0)
+		return 2;
+
+	oscap_strrm(str, "def");
+	if (strcmp(str, "123456789") != 0)
+		return 3;
+
+	oscap_strrm(str, "5");
+	if (strcmp(str, "12346789") != 0)
+		return 4;
+
+	return 0;
+}
+
+int main (int argc, char *argv[])
+{
+	int retval = 0;
+
+	if ((retval = test_oscap_strrm()) != 0)
+		return retval;
+
+	return retval;
+}

tests/common/test_oscap_util.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+# Copyright 2023 Red Hat Inc., Durham, North Carolina.
+# All Rights Reserved.
+#
+# OpenScap Test Suite
+#
+# Authors:
+#      Evgenii Kolesnikov <[email protected]>
+
+. $builddir/tests/test_common.sh
+
+# Test cases.
+
+function test_oscap_util {
+    ./test_oscap_util
+}
+
+# Testing.
+
+test_init
+
+if [ -z ${CUSTOM_OSCAP+x} ] ; then
+    test_run "test_oscap_util" test_oscap_util
+fi
+
+test_exit