Merge pull request #41 from edwintorok/offhost

CA-336056: off-host xe wasn't working when run as non-root

Author: lindig

.travis.yml

@@ -1,12 +1,13 @@
 language: c
 services: docker
 install:
-    - wget https://raw.githubusercontent.com/xenserver/xenserver-build-env/master/utils/travis-build-repo.sh
-script: bash travis-build-repo.sh
+  - wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-docker.sh
+  - wget https://raw.githubusercontent.com/xapi-project/xs-opam/master/tools/xs-opam-ci.env
+  - source xs-opam-ci.env
+script: bash -ex .travis-docker.sh
 sudo: true
 env:
-    global:
-        - REPO_PACKAGE_NAME=forkexecd
-        - REPO_CONFIGURE_CMD=true
-        - REPO_BUILD_CMD='make'
-        - REPO_TEST_CMD='make test'
+  global:
+    - PINS="forkexec:. xapi-forkexecd:."
+  jobs:
+    - PACKAGE="xapi-forkexecd"

Makefile

@@ -20,7 +20,7 @@ clean:
 	dune clean
 
 test:
-	dune runtest --profile=release
+	dune runtest --profile=release --no-buffer
 
 # requires odoc
 doc:

lib/forkhelpers.ml

@@ -70,13 +70,18 @@ let getpid (_sock, pid) = pid
 
 type 'a result = Success of string * 'a | Failure of string * exn
 
-let temp_dir = "/var/run/nonpersistent/forkexecd/"
+let temp_dir_server = "/var/run/nonpersistent/forkexecd/"
+let temp_dir =
+  try
+    Unix.access temp_dir_server [Unix.W_OK; Unix.R_OK; Unix.X_OK];
+    Some temp_dir_server
+  with _ -> None
 
 (** Creates a temporary file and opens it for logging. The fd is passed to the function
     'f'. The logfile is guaranteed to be closed afterwards, and unlinked if either the delete flag is set or the call fails. If the
     function 'f' throws an error then the log file contents are read in *)
 let with_logfile_fd ?(delete = true) prefix f =
-  let logfile = Filename.temp_file ~temp_dir prefix ".log" in
+  let logfile = Filename.temp_file ?temp_dir prefix ".log" in
   let read_logfile () = 
     let contents = Xapi_stdext_unix.Unixext.string_of_file logfile in
     Unix.unlink logfile;

lib/forkhelpers.mli

@@ -107,6 +107,6 @@ type 'a result =
 val with_logfile_fd : ?delete:bool -> string -> (Unix.file_descr -> 'a) -> 'a result
 
 (** Temporary directory used for communication *)
-val temp_dir: string
+val temp_dir_server: string
 
 

src/fe_main.ml

@@ -1,7 +1,7 @@
 open Fe_debug
 
 let setup sock cmdargs id_to_fd_map syslog_stdout redirect_stderr_to_stdout env =
-  let fd_sock_path = Printf.sprintf "%s/fd_%s" Forkhelpers.temp_dir
+  let fd_sock_path = Printf.sprintf "%s/fd_%s" Forkhelpers.temp_dir_server
       (Uuidm.to_string (Uuidm.create `V4)) in
   let fd_sock = Fecomms.open_unix_domain_sock () in
   Xapi_stdext_unix.Unixext.unlink_safe fd_sock_path;
@@ -44,7 +44,7 @@ let _ =
   Sys.set_signal Sys.sigpipe (Sys.Signal_ignore);
 
   let main_sock = Fecomms.open_unix_domain_sock_server "/var/xapi/forker/main" in
-  Xapi_stdext_unix.Unixext.mkdir_rec (Forkhelpers.temp_dir) 0o755;
+  Xapi_stdext_unix.Unixext.mkdir_rec (Forkhelpers.temp_dir_server) 0o755;
 
   Daemon.notify Daemon.State.Ready |> ignore;
 

test/fe_test.ml

@@ -17,7 +17,7 @@ type config = {
 }
 
 let min_fds = 7
-let max_fds = 1024 - 8 (* fe daemon has a bunch for its own use *)
+let max_fds = 1024 - 11 (* fe daemon has a bunch for its own use *)
 
 let all_combinations fds = 
   let y = {
@@ -114,12 +114,13 @@ let test_exitcode () =
   Printf.printf "\nCompleted exitcode tests\n"
 
 let master fds =
+  Printf.printf "\nPerforming timeout tests\n%!";
   test_delay ();
   test_notimeout ();
-  Printf.printf "\nCompleted timeout test\n";
+  Printf.printf "\nCompleted timeout test\n%!";
   test_exitcode ();
   let combinations = shuffle (all_combinations fds) in
-  Printf.printf "Starting %d tests\n" (List.length combinations);
+  Printf.printf "Starting %d tests\n%!" (List.length combinations);
   let i = ref 0 in
   let update_progress f x = 
     incr i;

test/fe_test.sh

@@ -1,7 +1,12 @@
 #!/bin/sh
 
 ../src/fe_main.exe &
-for x in `seq 1 10`; do
+MAIN=$!
+cleanup () {
+    kill $MAIN
+}
+trap cleanup EXIT
+for _ in $(seq 1 10); do
 	test -S /var/xapi/forker/main || sleep 1
 done
 ./fe_test.exe 16