Merge pull request #1431 from jan-cerny/offline_mode_fix

Move the chroot call to probe_worker

Author: evgenyz

src/OVAL/probes/probe/input_handler.c

@@ -122,99 +122,86 @@ void *probe_input_handler(void *arg)
 
 		if (oid != NULL) {
 			SEXP_VALIDATE(oid);
+			probe_out = probe_rcache_sexp_get(probe->rcache, oid);
 
-			if (probe->offline_mode && probe->supported_offline_mode == PROBE_OFFLINE_NONE) {
-				dW("Requested offline mode is not supported by %s.", probe->name);
-				/* Return a dummy. */
-				probe_out = probe_cobj_new(SYSCHAR_FLAG_NOT_APPLICABLE, NULL, NULL, NULL);
-				probe_ret = 0;
-				SEXP_free(oid);
+			if (probe_out == NULL) { /* cache miss */
+				SEXP_t *skip_flag, *obj_mask;
+
+				skip_flag = probe_obj_getattrval(probe_in, "skip_eval");
+				obj_mask = probe_obj_getmask(probe_in);
 				SEXP_free(probe_in);
-				oid = NULL;
 				probe_in = NULL;
-			}
-			else {
-				probe_out = probe_rcache_sexp_get(probe->rcache, oid);
-
-				if (probe_out == NULL) { /* cache miss */
-					SEXP_t *skip_flag, *obj_mask;
 
-					skip_flag = probe_obj_getattrval(probe_in, "skip_eval");
-	                                obj_mask  = probe_obj_getmask(probe_in);
-					SEXP_free(probe_in);
-					probe_in = NULL;
+				if (skip_flag != NULL) {
+					oval_syschar_collection_flag_t cobj_flag;
 
-					if (skip_flag != NULL) {
-						oval_syschar_collection_flag_t cobj_flag;
+					cobj_flag = SEXP_number_geti_32(skip_flag);
+					probe_out = probe_cobj_new(cobj_flag, NULL, NULL, obj_mask);
 
-						cobj_flag = SEXP_number_geti_32(skip_flag);
-						probe_out = probe_cobj_new(cobj_flag, NULL, NULL, obj_mask);
+					if (probe_rcache_sexp_add(probe->rcache, oid, probe_out) != 0) {
+						/* TODO */
+						abort();
+					}
 
-						if (probe_rcache_sexp_add(probe->rcache, oid, probe_out) != 0) {
-							/* TODO */
-							abort();
-						}
+					probe_ret = 0;
+					SEXP_free(oid);
+					SEXP_free(skip_flag);
+					SEXP_free(obj_mask);
+				} else {
 
-						probe_ret = 0;
-						SEXP_free(oid);
-	                                        SEXP_free(skip_flag);
-	                                        SEXP_free(obj_mask);
+					SEXP_free(oid);
+					SEXP_free(skip_flag);
+					SEXP_free(obj_mask);
+
+					probe_pwpair_t *pair = malloc(sizeof(probe_pwpair_t));
+					pair->probe = probe;
+					pair->pth = probe_worker_new();
+					pair->pth->sid = SEAP_msg_id(seap_request);
+					pair->pth->msg = seap_request;
+					pair->pth->msg_handler = &probe_worker;
+
+					if (rbt_i32_add(probe->workers, pair->pth->sid, pair->pth, NULL) != 0) {
+						/*
+							* Getting here means that there is already a
+							* thread handling the message with the given
+							* ID.
+							*/
+						dW("Attempt to evaluate an object "
+							"(ID=%u) " // TODO: 64b IDs
+							"which is already being evaluated by an other thread.", pair->pth->sid);
+
+						free(pair->pth);
+						free(pair);
+						SEAP_msg_free(seap_request);
 					} else {
+						/* OK */
+
+						if (pthread_create(&pair->pth->tid, &pth_attr, &probe_worker_runfn, pair))
+						{
+							dE("Cannot start a new worker thread: %d, %s.", errno, strerror(errno));
 
-						SEXP_free(oid);
-						SEXP_free(skip_flag);
-						SEXP_free(obj_mask);
-
-						probe_pwpair_t *pair = malloc(sizeof(probe_pwpair_t));
-						pair->probe = probe;
-						pair->pth   = probe_worker_new();
-						pair->pth->sid = SEAP_msg_id(seap_request);
-						pair->pth->msg = seap_request;
-						pair->pth->msg_handler = &probe_worker;
-
-						if (rbt_i32_add(probe->workers, pair->pth->sid, pair->pth, NULL) != 0) {
-							/*
-							 * Getting here means that there is already a
-							 * thread handling the message with the given
-							 * ID.
-							 */
-							dW("Attempt to evaluate an object "
-							   "(ID=%u) " // TODO: 64b IDs
-							   "which is already being evaluated by an other thread.", pair->pth->sid);
+							if (rbt_i32_del(probe->workers, pair->pth->sid, NULL) != 0)
+								dE("rbt_i32_del: failed to remove worker thread (ID=%u)", pair->pth->sid);
 
+							SEAP_msg_free(pair->pth->msg);
 							free(pair->pth);
 							free(pair);
-							SEAP_msg_free(seap_request);
-						} else {
-							/* OK */
 
-							if (pthread_create(&pair->pth->tid, &pth_attr, &probe_worker_runfn, pair))
-							{
-								dE("Cannot start a new worker thread: %d, %s.", errno, strerror(errno));
+							probe_ret = PROBE_EUNKNOWN;
+							probe_out = NULL;
 
-								if (rbt_i32_del(probe->workers, pair->pth->sid, NULL) != 0)
-									dE("rbt_i32_del: failed to remove worker thread (ID=%u)", pair->pth->sid);
-
-								SEAP_msg_free(pair->pth->msg);
-								free(pair->pth);
-								free(pair);
-
-								probe_ret = PROBE_EUNKNOWN;
-								probe_out = NULL;
-
-								goto __error_reply;
-							}
+							goto __error_reply;
 						}
-
-						seap_request = NULL;
-						continue;
 					}
-				} else {
-					/* cache hit */
-					SEXP_free(oid);
-					SEXP_free(probe_in);
-					probe_ret = 0;
+
+					seap_request = NULL;
+					continue;
 				}
+			} else {
+				/* cache hit */
+				SEXP_free(oid);
+				SEXP_free(probe_in);
+				probe_ret = 0;
 			}
 		} else {
                         /* the `id' was not found in the input object */

src/OVAL/probes/probe/probe.h

@@ -47,7 +47,6 @@ typedef struct {
 	pthread_rwlock_t rwlock;
 	uint32_t         flags;
 
-	char       *name;
 	pid_t       pid;
 
         void       *probe_arg;

src/OVAL/probes/probe/probe_main.c

@@ -130,22 +130,6 @@ static int probe_opthandler_rcache(int option, int op, va_list args)
 	return (0);
 }
 
-// Dummy pthread routine
-static void * dummy_routine(void *dummy_param)
-{
-	return NULL;
-}
-
-static void preload_libraries_before_chroot()
-{
-	// Force to load dynamic libraries used by pthread_cancel
-	pthread_t t;
-	if (pthread_create(&t, NULL, dummy_routine, NULL))
-		fail(errno, "pthread_create(probe_preload)", __LINE__ - 1);
-	pthread_cancel(t);
-	pthread_join(t, NULL);
-}
-
 static void probe_common_main_cleanup(void *arg)
 {
 	dD("probe_common_main_cleanup started");
@@ -174,7 +158,6 @@ static void probe_common_main_cleanup(void *arg)
 	rbt_i32_free(probe->workers);
 	SEAP_CTX_free(probe->SEAP_ctx);
 	free(probe->option);
-	free(probe->name);
 
 	dD("probe_common_main_cleanup finished");
 }
@@ -183,7 +166,6 @@ void *probe_common_main(void *arg)
 {
 	pthread_attr_t th_attr;
 	probe_t        probe;
-	char *rootdir = NULL;
 	struct probe_common_main_argument *probe_argument = (struct probe_common_main_argument *) arg;
 	sch_queuedata_t *data = probe_argument->queuedata;
 	oval_subtype_t subtype = probe_argument->subtype;
@@ -210,7 +192,6 @@ void *probe_common_main(void *arg)
 	probe.selected_offline_mode = PROBE_OFFLINE_NONE;
 	probe.flags = 0;
 	probe.pid   = getpid();
-	probe.name = (char *) arg;
         probe.probe_exitcode = 0;
 
 	/*
@@ -250,52 +231,6 @@ void *probe_common_main(void *arg)
 	OSCAP_GSYM(probe_optdef) = probe.option;
 	OSCAP_GSYM(probe_optdef_count) = probe.optcnt;
 
-#ifndef OS_WINDOWS
-	probe_offline_mode_function_t offline_mode_function = probe_table_get_offline_mode_function(probe.subtype);
-	if (offline_mode_function != NULL) {
-		probe.supported_offline_mode = offline_mode_function();
-	}
-
-	/*
-	 * Setup offline mode(s)
-	 */
-	rootdir = getenv("OSCAP_PROBE_ROOT");
-	if ((rootdir != NULL) && (strlen(rootdir) > 0)) {
-		probe.offline_mode = true;
-
-		preload_libraries_before_chroot(); // todo - maybe useless for own mode
-
-		if (probe.supported_offline_mode & PROBE_OFFLINE_OWN) {
-			dI("Swiching probe to PROBE_OFFLINE_OWN mode.");
-			probe.selected_offline_mode = PROBE_OFFLINE_OWN;
-
-		} else if (probe.supported_offline_mode & PROBE_OFFLINE_CHROOT) {
-			probe.real_root_fd = open("/", O_RDONLY);
-			probe.real_cwd_fd = open(".", O_RDONLY);
-			if (chdir(rootdir) != 0) {
-				fail(errno, "chdir", __LINE__ -1);
-			}
-
-			if (chroot(rootdir) != 0) {
-				fail(errno, "chroot", __LINE__ - 1);
-			}
-			/* NOTE: We're running in a different root directory.
-			 * Unless /proc, /sys are somehow emulated for the new
-			 * environment, they are not relevant and so are other
-			 * runtime only things (e.g. getenv, uname, ...).
-			 * Switch to offline mode. We may add a separate
-			 * mechanism to control this behaviour in the future.
-			 */
-			dI("Swiching probe to PROBE_OFFLINE_CHROOT mode.");
-			probe.selected_offline_mode = PROBE_OFFLINE_CHROOT;
-		}
-	}
-
-	if (getenv("OSCAP_PROBE_RPMDB_PATH") != NULL) {
-		dI("Swiching probe to PROBE_OFFLINE_RPMDB mode.");
-		probe.selected_offline_mode = PROBE_OFFLINE_RPMDB;
-	}
-#endif
 
 	/*
 	 * Create input handler (detached)

src/OVAL/probes/probe/worker.c

@@ -25,6 +25,8 @@
 #endif
 
 #include "_seap.h"
+#include <stdio.h>
+#include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <pthread.h>
@@ -41,6 +43,23 @@
 extern bool  OSCAP_GSYM(varref_handling);
 extern void *OSCAP_GSYM(probe_arg);
 
+// Dummy pthread routine
+static void *dummy_routine(void *dummy_param)
+{
+	return NULL;
+}
+
+static void preload_libraries_before_chroot()
+{
+	// Force to load dynamic libraries used by pthread_cancel
+	pthread_t t;
+	if (pthread_create(&t, NULL, dummy_routine, NULL)) {
+		dE("pthread_create failed: %s", strerror(errno));
+	}
+	pthread_cancel(t);
+	pthread_join(t, NULL);
+}
+
 void *probe_worker_runfn(void *arg)
 {
 	dD("probe_worker_runfn has started");
@@ -945,6 +964,60 @@ static SEXP_t *probe_set_eval(probe_t *probe, SEXP_t *set, size_t depth)
  */
 SEXP_t *probe_worker(probe_t *probe, SEAP_msg_t *msg_in, int *ret)
 {
+#ifndef OS_WINDOWS
+	char *rootdir = NULL;
+	probe_offline_mode_function_t offline_mode_function = probe_table_get_offline_mode_function(probe->subtype);
+	if (offline_mode_function != NULL) {
+		probe->supported_offline_mode = offline_mode_function();
+	}
+
+	/*
+	 * Setup offline mode(s)
+	 */
+	rootdir = getenv("OSCAP_PROBE_ROOT");
+	if ((rootdir != NULL) && (strlen(rootdir) > 0)) {
+		preload_libraries_before_chroot(); // todo - maybe useless for own mode
+
+		if (probe->supported_offline_mode == PROBE_OFFLINE_NONE) {
+			dW("Requested offline mode is not supported by %s probe.", oval_subtype_get_text(probe->subtype));
+			*ret = 0;
+			return probe_cobj_new(SYSCHAR_FLAG_NOT_APPLICABLE, NULL, NULL, NULL);
+
+		} else if (probe->supported_offline_mode & PROBE_OFFLINE_OWN) {
+			dI("Switching probe to PROBE_OFFLINE_OWN mode.");
+			probe->offline_mode = true;
+			probe->selected_offline_mode = PROBE_OFFLINE_OWN;
+
+		} else if (probe->supported_offline_mode & PROBE_OFFLINE_CHROOT) {
+			probe->real_root_fd = open("/", O_RDONLY);
+			probe->real_cwd_fd = open(".", O_RDONLY);
+			if (chdir(rootdir) != 0) {
+				dE("chdir failed: %s", strerror(errno));
+			}
+
+			if (chroot(rootdir) != 0) {
+				dE("chroot failed: %s", strerror(errno));
+			}
+			/* NOTE: We're running in a different root directory.
+			 * Unless /proc, /sys are somehow emulated for the new
+			 * environment, they are not relevant and so are other
+			 * runtime only things (e.g. getenv, uname, ...).
+			 * Switch to offline mode. We may add a separate
+			 * mechanism to control this behaviour in the future.
+			 */
+			dI("Switching probe to PROBE_OFFLINE_CHROOT mode.");
+			probe->offline_mode = true;
+			probe->selected_offline_mode = PROBE_OFFLINE_CHROOT;
+		}
+	}
+
+	if (getenv("OSCAP_PROBE_RPMDB_PATH") != NULL) {
+		dI("Switching probe to PROBE_OFFLINE_RPMDB mode.");
+		probe->offline_mode = true;
+		probe->selected_offline_mode = PROBE_OFFLINE_RPMDB;
+	}
+#endif
+
 	SEXP_t *probe_in, *probe_out, *set;
 
 	if (msg_in == NULL) {