address sonarqube issues

Author: ed-silva-eb

src/common/memusage.c

@@ -27,6 +27,7 @@
 
 #include <stdio.h>
 #include <stddef.h>
+#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
@@ -60,29 +61,24 @@
 #include "bfind.h"
 
 #if defined(OS_LINUX) || defined(__FreeBSD__) || defined(OS_SOLARIS) || defined(OSCAP_TEST_READ_COMMON_SIZET)
-static int read_common_sizet(void *szp, char *strval)
+static int read_common_sizet(void *szp, const char *strval)
 {
 	char *end;
+	long long value;
 
 	if (szp == NULL || strval == NULL) {
 		return -1;
 	}
 
-	end = strchr(strval, ' ');
-
-	if (end == NULL)
-		return (-1);
-
-	*end = '\0';
-
 	errno = 0;
-	*(size_t *)szp = strtoll(strval, NULL, 10);
+	value = strtoll(strval, &end, 10);
 
-	if (errno == EINVAL ||
-	    errno == ERANGE)
-		return (-1);
+	if (end == strval || !isspace((unsigned char)*end) ||
+	    errno == EINVAL || errno == ERANGE || value < 0)
+		return -1;
 
-	return (0);
+	*(size_t *)szp = (size_t)value;
+	return 0;
 }
 
 #endif
@@ -91,7 +87,7 @@ static int read_common_sizet(void *szp, char *strval)
 
 struct stat_parser {
 	char *keyword;
-	int (*storval)(void *, char *);
+	int (*storval)(void *, const char *);
 	ptrdiff_t offset;
 };
 

tests/API/XCCDF/unittests/test_xccdf_result_sysinfo_platform.c

@@ -27,7 +27,7 @@ int main(void)
 	facts = xccdf_result_get_target_facts(result);
 
 	while (xccdf_target_fact_iterator_has_more(facts)) {
-		struct xccdf_target_fact *fact = xccdf_target_fact_iterator_next(facts);
+		const struct xccdf_target_fact *fact = xccdf_target_fact_iterator_next(facts);
 		const char *name = xccdf_target_fact_get_name(fact);
 
 		if (name == NULL)

tests/API/XCCDF/unittests/test_xccdf_result_sysinfo_platform.sh

@@ -2,7 +2,7 @@
 
 . $builddir/tests/test_common.sh
 
-if [ -n "${CUSTOM_OSCAP+x}" ] ; then
+if [[ -n "${CUSTOM_OSCAP+x}" ]] ; then
 	exit 255
 fi
 

tests/API/probes/test_memusage_freebsd_stress.sh

@@ -2,7 +2,7 @@
 
 . $builddir/tests/test_common.sh
 
-if [ "$(uname)" != "FreeBSD" ] ; then
+if [[ "$(uname)" != "FreeBSD" ]] ; then
 	exit 255
 fi
 

tests/API/probes/test_memusage_platform.sh

@@ -2,7 +2,7 @@
 
 . $builddir/tests/test_common.sh
 
-if [ -n "${CUSTOM_OSCAP+x}" ] ; then
+if [[ -n "${CUSTOM_OSCAP+x}" ]] ; then
 	exit 255
 fi
 

tests/probes/password/test_probes_password.xml.sh

@@ -1,16 +1,17 @@
 #!/usr/bin/env bash
 
-passwd_file=`mktemp`
+passwd_file=$(mktemp)
+readonly AWK_PRINT_FIRST_FIELD='{print $1}'
 
 # getpwent returns duplicate entries for root and nobody users
 # due to a bug in systemd-userdb.service that occurs
 # in systemd 245
 # https://github.com/systemd/systemd/issues/15160
-if which systemctl &>/dev/null && \
-		[[ `systemctl --version | grep "systemd 245"` =~ "245" ]] ; then
+if command -v systemctl >/dev/null 2>&1 && \
+		systemctl --version | grep -q "systemd 245" ; then
 	grep -Ev '^(root|nobody)' /etc/passwd > "$passwd_file"
 else
-	case `uname` in
+	case "$(uname)" in
 		# BSD passwd files may contain comments that are ignored by getpwent(3).
 		Darwin|FreeBSD)
 			grep -Ev '^(#|$)' /etc/passwd > "$passwd_file"
@@ -22,51 +23,58 @@ else
 	esac
 fi
 
-LINES_COUNT=`cat "$passwd_file" | wc -l`
+LINES_COUNT=$(wc -l < "$passwd_file")
 
 function getField {
-    LINE=`sed -n "${I}p" "$passwd_file"`
-    case $1 in 
+    local field_name="$1"
+    local line_number="$2"
+    local line
+    local username
+
+    line=$(sed -n "${line_number}p" "$passwd_file")
+    username=$(echo "$line" | awk -F':' "$AWK_PRINT_FIRST_FIELD")
+
+    case "$field_name" in
 	'username' )
-	    echo $LINE | awk -F':' '{print $1}'
+	    echo "$username"
 	    ;;
 	'password' )
-	    echo $LINE | awk -F':' '{print $2}'
+	    echo "$line" | awk -F':' '{print $2}'
 	    ;;
 	'user_id' )
-	    case `uname` in
+	    case "$(uname)" in
 		FreeBSD)
-		    id -u "`echo $LINE | awk -F':' '{print $1}'`"
+		    id -u "$username"
 			;;
 		Darwin)
-		    id -u "`echo $LINE | awk -F':' '{print $1}'`"
+		    id -u "$username"
 			;;
 		*)
-		    echo $LINE | awk -F':' '{print $3}'
+		    echo "$line" | awk -F':' '{print $3}'
 		    ;;
 	    esac
 	    ;;
 	'group_id' )
-	    case `uname` in
+	    case "$(uname)" in
 		FreeBSD)
-		    id -g "`echo $LINE | awk -F':' '{print $1}'`"
+		    id -g "$username"
 		    ;;
 		Darwin)
-		    id -g "`echo $LINE | awk -F':' '{print $1}'`"
+		    id -g "$username"
 		    ;;
 		*)
-		    echo $LINE | awk -F':' '{print $4}'
+		    echo "$line" | awk -F':' '{print $4}'
 		    ;;
 	    esac
 	    ;;
 	'gcos' )
-	    echo $LINE | awk -F':' '{gsub(/&/,"&amp;",$5); print $5}'
+	    echo "$line" | awk -F':' '{gsub(/&/,"&amp;",$5); print $5}'
 	    ;;
 	'home_dir' )
-	    echo $LINE | awk -F':' '{print $6}'
+	    echo "$line" | awk -F':' '{print $6}'
 	    ;;
 	'login_shell' )
-	    echo $LINE | awk -F':' '{print $7}'
+	    echo "$line" | awk -F':' '{print $7}'
 	    ;;
     esac
 }
@@ -129,7 +137,7 @@ I=1
 while [ $I -le $LINES_COUNT ]; do
     cat <<EOF
     <password_object version="1" id="oval:1:obj:${I}" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#unix">
-      <username>`getField "username" ${I}`</username>
+      <username>$(getField "username" "${I}")</username>
     </password_object>
 EOF
     I=$[$I+1]
@@ -145,13 +153,13 @@ I=1
 while [ $I -le $LINES_COUNT ]; do
     cat <<EOF
     <password_state version="1" id="oval:1:ste:${I}" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#unix">
-      <username>`getField 'username' $I`</username>
-      <password>`getField 'password' $I`</password>
-      <user_id datatype="int">`getField 'user_id' $I`</user_id>
-      <group_id datatype="int">`getField 'group_id' $I`</group_id>
-      <gcos>`getField 'gcos' $I`</gcos>
-      <home_dir>`getField 'home_dir' $I`</home_dir>
-      <login_shell>`getField 'login_shell' $I`</login_shell>
+      <username>$(getField 'username' "$I")</username>
+      <password>$(getField 'password' "$I")</password>
+      <user_id datatype="int">$(getField 'user_id' "$I")</user_id>
+      <group_id datatype="int">$(getField 'group_id' "$I")</group_id>
+      <gcos>$(getField 'gcos' "$I")</gcos>
+      <home_dir>$(getField 'home_dir' "$I")</home_dir>
+      <login_shell>$(getField 'login_shell' "$I")</login_shell>
     </password_state>
 EOF
     I=$[$I+1]

tests/probes/password/test_probes_password_offline_fallback.sh

@@ -13,9 +13,9 @@ function test_probes_password_offline_fallback {
 		*) return 255 ;;
 	esac
 
-	local DF="${srcdir}/test_probes_password_offline.xml"
-	local RF="results.xml"
-	[ -f "$RF" ] && rm -f "$RF"
+	local definition_file="${srcdir}/test_probes_password_offline.xml"
+	local results_file="results.xml"
+	[[ -f "$results_file" ]] && rm -f "$results_file"
 
 	tmpdir=$(mktemp -t -d "test_password_fallback.XXXXXX")
 	mkdir -p "$tmpdir/etc"
@@ -27,12 +27,12 @@ root:x:0:0:root:/root:/bin/bash
 EOF
 
 	set_offline_chroot_dir "$tmpdir"
-	$OSCAP oval eval --results "$RF" "$DF"
+		$OSCAP oval eval --results "$results_file" "$definition_file"
 	set_offline_chroot_dir ""
 	rm -rf "$tmpdir"
 
-	if [ -f "$RF" ]; then
-		result="$RF"
+	if [[ -f "$results_file" ]]; then
+		result="$results_file"
 		assert_exists 1 'oval_results/results/system/tests/test[@test_id="oval:1:tst:1"][@result="true"]'
 	else
 		return 1

tests/probes/runlevel/test_probes_runlevel_unsupported.sh

@@ -14,7 +14,7 @@ function test_probes_runlevel_unsupported {
 
 	local definition="${top_srcdir}/tests/oval_details/runlevel.oval.xml"
 	local results="results_unsupported.xml"
-	[ -f "$results" ] && rm -f "$results"
+	[[ -f "$results" ]] && rm -f "$results"
 
 	$OSCAP oval eval --results "$results" "$definition"
 

tests/probes/shadow/test_probes_shadow_offline_unsupported.sh

@@ -14,7 +14,7 @@ function test_probes_shadow_offline_unsupported {
 
 	local definition="${srcdir}/test_probes_shadow_offline.xml"
 	local results="results_unsupported.xml"
-	[ -f "$results" ] && rm -f "$results"
+	[[ -f "$results" ]] && rm -f "$results"
 
 	tmpdir=$(make_temp_dir /tmp "test_offline_mode_shadow_unsupported")
 	mkdir -p "${tmpdir}/etc"