Fix textfilecontent54_probe behaviour (forward port to main branch)

src/OVAL/probes/independent/textfilecontent54_probe.c

@@ -123,12 +123,15 @@ struct pfdata {
 static int process_file(const char *prefix, const char *path, const char *file, struct pfdata *pfd, oval_schema_version_t over, struct oscap_list *blocked_paths)
 {
 	int ret = 0, path_len, file_len, cur_inst = 0, fd = -1, substr_cnt,
-		buf_size = 0, buf_used = 0, ofs = 0, buf_inc = 4096;
+		buf_size = 0, buf_used = 0, ofs = 0, buf_inc = 4096, instance_count = 0,
+		want_instance = 1, negative_instance_value = 0;
 	char **substrs = NULL;
 	char *whole_path = NULL, *whole_path_with_prefix = NULL, *buf = NULL;
-	SEXP_t *next_inst = NULL;
+	SEXP_t *next_inst = NULL, *items = SEXP_list_new(NULL), *instance_value_list = NULL,
+		*instance_value = NULL;
 	struct stat st;
 
+
 	if (file == NULL)
 		goto cleanup;
 
@@ -210,16 +213,6 @@ static int process_file(const char *prefix, const char *path, const char *file,
 	buf[buf_used++] = '\0';
 
 	do {
-		int want_instance;
-
-		next_inst = SEXP_number_newi_32(cur_inst + 1);
-
-		if (probe_entobj_cmp(pfd->instance_ent, next_inst) == OVAL_RESULT_TRUE)
-			want_instance = 1;
-		else
-			want_instance = 0;
-
-		SEXP_free(next_inst);
 		substr_cnt = oscap_pcre_get_substrings(buf, &ofs, pfd->compiled_regex, want_instance, &substrs);
 
 		if (substr_cnt < 0) {
@@ -235,27 +228,49 @@ static int process_file(const char *prefix, const char *path, const char *file,
 		}
 
 		if (substr_cnt > 0) {
-			++cur_inst;
-
-			if (want_instance) {
-				int k;
-				SEXP_t *item;
-
-				item = create_item(path, file, pfd->pattern,
-						cur_inst, substrs, substr_cnt, over);
-
-				for (k = 0; k < substr_cnt; ++k)
-					free(substrs[k]);
-				free(substrs);
-				int pic_ret = probe_item_collect(pfd->ctx, item);
-				if (pic_ret == 2 || pic_ret == -1) {
-					ret = -4;
-					break;
-				}
-			}
+			int k;
+			instance_count++;
+
+			SEXP_list_add(items, create_item(path, file, pfd->pattern,
+				instance_count, substrs, substr_cnt, over));
+
+			for (k = 0; k < substr_cnt; ++k)
+				free(substrs[k]);
+			free(substrs);
 		}
 	} while (substr_cnt > 0 && ofs < buf_used);
 
+	probe_ent_getvals(pfd->instance_ent, &instance_value_list);
+	instance_value = SEXP_list_first(instance_value_list);
+	negative_instance_value = SEXP_number_geti_64(instance_value) < 0;
+	SEXP_free(instance_value_list);
+	SEXP_free(instance_value);
+
+	for(cur_inst = 0; cur_inst < instance_count; cur_inst++){
+		if (negative_instance_value)
+			next_inst = SEXP_number_newi_32(cur_inst - instance_count);
+
+		else
+			next_inst = SEXP_number_newi_32(cur_inst + 1);
+
+		if (probe_entobj_cmp(pfd->instance_ent, next_inst) == OVAL_RESULT_TRUE)
+			want_instance = 1;
+		else
+			want_instance = 0;
+
+		SEXP_free(next_inst);
+
+		if (want_instance) {
+			int pic_ret = probe_item_collect(pfd->ctx, SEXP_list_nth(items, cur_inst + 1));
+			if (pic_ret == 2 || pic_ret == -1) {
+				ret = -4;
+				break;
+			}
+		}
+		else
+			SEXP_free(SEXP_list_nth(items, cur_inst + 1));
+	}
+
  cleanup:
 	if (fd != -1)
 		close(fd);

tests/probes/textfilecontent54/CMakeLists.txt

@@ -6,4 +6,5 @@ if(ENABLE_PROBES_INDEPENDENT)
 	add_oscap_test("test_recursion_limit.sh")
 	add_oscap_test("test_symlinks.sh")
 	add_oscap_test("test_validation_of_various_oval_versions.sh")
+	add_oscap_test("test_negative_instance.sh")
 endif()

tests/probes/textfilecontent54/test_negative_instance.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+. $builddir/tests/test_common.sh
+
+function test_negative_instance {
+
+    probecheck "textfilecontent54" || return 255
+
+    local ret_val=0;
+    local DF="${srcdir}/test_negative_instance.xml"
+    local RF="results.xml"
+
+    [ -f $RF ] && rm -f $RF
+
+    local FILE_A="/tmp/test_negative_instance.tmp_file"
+
+    touch "$FILE_A"
+
+    echo "valid_key = valid_value" > "$FILE_A"
+    echo "valid_key = valid_value" >> "$FILE_A"
+    echo "valid_key = valid_value" >> "$FILE_A"
+
+    $OSCAP oval eval --results $RF $DF
+
+    if [ -f $RF ]; then
+	verify_results "tst" $DF $RF 13 && verify_results "def" $DF $RF 1
+	ret_val=$?
+    else 
+	ret_val=1
+    fi
+
+    rm -f $FILE_A $FILE_B $FILE_C
+
+    return $ret_val
+}
+
+test_negative_instance

tests/probes/textfilecontent54/test_negative_instance.xml

@@ -0,0 +1,180 @@
+<?xml version="1.0"?>
+<oval_definitions xmlns:oval-def="http://oval.mitre.org/XMLSchema/oval-definitions-5" xmlns:oval="http://oval.mitre.org/XMLSchema/oval-common-5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ind-def="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent" xmlns:unix-def="http://oval.mitre.org/XMLSchema/oval-definitions-5#unix" xmlns:lin-def="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" xsi:schemaLocation="http://oval.mitre.org/XMLSchema/oval-definitions-5#unix unix-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-definitions-5#independent independent-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-definitions-5#linux linux-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-definitions-5 oval-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-common-5 oval-common-schema.xsd">
+
+  <generator>
+    <oval:schema_version>5.11.1</oval:schema_version>
+    <oval:timestamp>2025-03-24T00:00:00-00:00</oval:timestamp>
+  </generator>
+
+  <definitions>
+
+    <definition class="compliance" version="1" id="oval:0:def:1"> <!-- comment="true" -->
+      <metadata>
+        <title></title>
+        <description></description>
+      </metadata>
+      <criteria operator="AND">
+        <criterion test_ref="oval:0:tst:1"/>
+        <criterion test_ref="oval:0:tst:2"/>
+        <criterion test_ref="oval:0:tst:3"/>
+        <criterion test_ref="oval:0:tst:4"/>
+        <criterion test_ref="oval:0:tst:5"/>
+        <criterion test_ref="oval:0:tst:6"/>
+        <criterion test_ref="oval:0:tst:7"/>
+        <criterion test_ref="oval:0:tst:8"/>
+        <criterion test_ref="oval:0:tst:9"/>
+        <criterion test_ref="oval:0:tst:10"/>
+        <criterion test_ref="oval:0:tst:11"/>
+        <criterion test_ref="oval:0:tst:12"/>
+        <criterion test_ref="oval:0:tst:13"/>
+      </criteria>
+    </definition>
+
+  </definitions>
+
+  <tests>
+
+    <textfilecontent54_test check_existence="all_exist" version="1" id="oval:0:tst:1" check="all" comment="true" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <object object_ref="oval:0:obj:1"/>
+    </textfilecontent54_test>
+
+    <textfilecontent54_test check_existence="all_exist" version="1" id="oval:0:tst:2" check="all" comment="true" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <object object_ref="oval:0:obj:2"/>
+    </textfilecontent54_test>
+
+    <textfilecontent54_test check_existence="all_exist" version="1" id="oval:0:tst:3" check="all" comment="true" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <object object_ref="oval:0:obj:3"/>
+    </textfilecontent54_test>
+
+    <textfilecontent54_test check_existence="all_exist" version="1" id="oval:0:tst:4" check="all" comment="true" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <object object_ref="oval:0:obj:4"/>
+    </textfilecontent54_test>
+
+    <textfilecontent54_test check_existence="all_exist" version="1" id="oval:0:tst:5" check="all" comment="true" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <object object_ref="oval:0:obj:5"/>
+    </textfilecontent54_test>
+
+    <textfilecontent54_test check_existence="all_exist" version="1" id="oval:0:tst:6" check="all" comment="true" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <object object_ref="oval:0:obj:6"/>
+    </textfilecontent54_test>
+
+    <textfilecontent54_test check_existence="all_exist" version="1" id="oval:0:tst:7" check="all" comment="true" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <object object_ref="oval:0:obj:7"/>
+    </textfilecontent54_test>
+
+    <textfilecontent54_test check_existence="all_exist" version="1" id="oval:0:tst:8" check="all" comment="true" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <object object_ref="oval:0:obj:8"/>
+    </textfilecontent54_test>
+
+    <textfilecontent54_test check_existence="all_exist" version="1" id="oval:0:tst:9" check="all" comment="true" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <object object_ref="oval:0:obj:9"/>
+    </textfilecontent54_test>
+
+    <textfilecontent54_test check_existence="none_exist" version="1" id="oval:0:tst:10" check="all" comment="true" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <object object_ref="oval:0:obj:10"/>
+    </textfilecontent54_test>
+
+    <textfilecontent54_test check_existence="only_one_exists" version="1" id="oval:0:tst:11" check="all" comment="true" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <object object_ref="oval:0:obj:11"/>
+    </textfilecontent54_test>
+
+    <textfilecontent54_test check_existence="none_exist" version="1" id="oval:0:tst:12" check="all" comment="true" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <object object_ref="oval:0:obj:12"/>
+    </textfilecontent54_test>
+
+    <textfilecontent54_test check_existence="only_one_exists" version="1" id="oval:0:tst:13" check="all" comment="true" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <object object_ref="oval:0:obj:4"/>
+    </textfilecontent54_test>
+
+  </tests>
+
+  <objects>
+
+    <textfilecontent54_object version="1" id="oval:0:obj:1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <path>/tmp</path>
+      <filename>test_negative_instance.tmp_file</filename> 
+      <pattern operation="pattern match">(\s)*valid_key(\s)*=(\s)*valid_value(\s)*</pattern>
+      <instance operation="greater than or equal" datatype="int">1</instance>
+    </textfilecontent54_object>
+
+    <textfilecontent54_object version="1" id="oval:0:obj:2" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <path>/tmp</path>
+      <filename>test_negative_instance.tmp_file</filename>
+      <pattern operation="pattern match">(\s)*valid_key(\s)*=(\s)*valid_value(\s)*</pattern>
+      <instance operation="greater than or equal" datatype="int">2</instance>
+    </textfilecontent54_object>
+
+    <textfilecontent54_object version="1" id="oval:0:obj:3" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <path>/tmp</path>
+      <filename>test_negative_instance.tmp_file</filename> 
+      <pattern operation="pattern match">(\s)*valid_key(\s)*=(\s)*valid_value(\s)*</pattern>
+      <instance operation="greater than or equal" datatype="int">3</instance>
+    </textfilecontent54_object>
+
+    <textfilecontent54_object version="1" id="oval:0:obj:4" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <path>/tmp</path>
+      <filename>test_negative_instance.tmp_file</filename> 
+      <pattern operation="pattern match">(\s)*valid_key(\s)*=(\s)*valid_value(\s)*</pattern>
+      <instance operation="greater than or equal" datatype="int">-1</instance>
+    </textfilecontent54_object>
+
+    <textfilecontent54_object version="1" id="oval:0:obj:5" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <path>/tmp</path>
+      <filename>test_negative_instance.tmp_file</filename>
+      <pattern operation="pattern match">(\s)*valid_key(\s)*=(\s)*valid_value(\s)*</pattern>
+      <instance operation="greater than or equal" datatype="int">-2</instance>
+    </textfilecontent54_object>
+
+    <textfilecontent54_object version="1" id="oval:0:obj:6" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <path>/tmp</path>
+      <filename>test_negative_instance.tmp_file</filename> 
+      <pattern operation="pattern match">(\s)*valid_key(\s)*=(\s)*valid_value(\s)*</pattern>
+      <instance operation="greater than or equal" datatype="int">-3</instance>
+    </textfilecontent54_object>
+
+    <textfilecontent54_object version="1" id="oval:0:obj:7" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <path>/tmp</path>
+      <filename>test_negative_instance.tmp_file</filename> 
+      <pattern operation="pattern match">(\s)*valid_key(\s)*=(\s)*valid_value(\s)*</pattern>
+      <instance operation="equals" datatype="int">-1</instance>
+    </textfilecontent54_object>
+
+    <textfilecontent54_object version="1" id="oval:0:obj:8" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <path>/tmp</path>
+      <filename>test_negative_instance.tmp_file</filename>
+      <pattern operation="pattern match">(\s)*valid_key(\s)*=(\s)*valid_value(\s)*</pattern>
+      <instance operation="equals" datatype="int">-2</instance>
+    </textfilecontent54_object>
+
+    <textfilecontent54_object version="1" id="oval:0:obj:9" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <path>/tmp</path>
+      <filename>test_negative_instance.tmp_file</filename> 
+      <pattern operation="pattern match">(\s)*valid_key(\s)*=(\s)*valid_value(\s)*</pattern>
+      <instance operation="equals" datatype="int">-3</instance>
+    </textfilecontent54_object>
+
+    <textfilecontent54_object version="1" id="oval:0:obj:10" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <path>/tmp</path>
+      <filename>test_negative_instance.tmp_file</filename> 
+      <pattern operation="pattern match">(\s)*valid_key(\s)*=(\s)*valid_value(\s)*</pattern>
+      <instance operation="greater than" datatype="int">-1</instance>
+    </textfilecontent54_object>
+
+    <textfilecontent54_object version="1" id="oval:0:obj:11" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <path>/tmp</path>
+      <filename>test_negative_instance.tmp_file</filename> 
+      <pattern operation="pattern match">(\s)*valid_key(\s)*=(\s)*valid_value(\s)*</pattern>
+      <instance operation="less than" datatype="int">-2</instance>
+    </textfilecontent54_object>
+
+    <textfilecontent54_object version="1" id="oval:0:obj:12" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
+      <path>/tmp</path>
+      <filename>test_negative_instance.tmp_file</filename> 
+      <pattern operation="pattern match">(\s)*valid_key(\s)*=(\s)*valid_value(\s)*</pattern>
+      <instance operation="less than" datatype="int">-3</instance>
+    </textfilecontent54_object>
+
+
+  </objects>
+
+</oval_definitions>