misc__

add/refine options - workdir etc

options

include dummy_script called from experiment.sh

move to test-script-parameters

more utility funcs

directory name change

Author: d-w-moore

irods/test/dummy_script

@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "hello from script [$0]"

irods/test/harness/README.txt

@@ -19,7 +19,7 @@ Examples of options in driver script
 ------------------------------------
 
   1. To start container and run test script:
-     C=$(  ./docker_container_driver.sh -c -L -u testuser  ../pam.bats/experiment.sh )
+     C=$(  ./docker_container_driver.sh -c -L -u testuser  ../scripts/experiment.sh )
 
   2. To manually examine results afterward:
      docker exec -it $C bash 

irods/test/harness/docker_container_driver.sh

@@ -4,6 +4,7 @@ KILL_TEST_CONTAINER=1
 RUN_AS_USER=""
 ECHO_CONTAINER=""
 
+EXPLICIT_WORKDIR=""
 while [[ $1  = -* ]]; do
     if [ "$1" = -c ]; then
         ECHO_CONTAINER=1
@@ -17,6 +18,10 @@ while [[ $1  = -* ]]; do
         RUN_AS_USER="$2"
         shift 2
     fi
+    if [ "$1" = -w ]; then
+        EXPLICIT_WORKDIR="$2"
+        shift 2
+    fi
 done
 
 if [ "$1" = "" ]; then
@@ -29,15 +34,25 @@ testscript=${1}
 testscript_abspath=$(realpath "$testscript")
 DIR=$(dirname $0)
 cd $DIR
+. ./test_script_parameters
+
+image_basename=$(basename $testscript)
+image=${images[$image_basename]}
+
+if [ -z "$RUN_AS_USER" ]; then
+    RUN_AS_USER=${user[$image_basename]}
+fi
+
+# Tests are run as testuser by default
+: ${RUN_AS_USER:='testuser'}
+
+WORKDIR=""
+if [ -n "$EXPLICIT_WORKDIR" ]; then
+    WORKDIR="$EXPLICIT_WORKDIR"
+else
+    WORKDIR=${workdirs[$RUN_AS_USER]}
+fi
 
-declare -A images=(
-    [test_1.sh]=install-irods
-    [test_2.sh]=bats-python3
-    [test_3.bats]=bats-python3
-    [experiment.sh]=ssl-and-pam
-    [fail.sh]=ssl-and-pam
-)
-image=${images[$(basename $testscript)]}
 reporoot=$(realpath ./tests/repo)
 
 INNER_MOUNT=/prc
@@ -55,7 +70,10 @@ while :; do
     break
 done
 
-docker exec ${RUN_AS_USER:+"-u$RUN_AS_USER"} $CONTAINER $INNER_MOUNT/$(realpath --relative-to $reporoot "$testscript_abspath")
+docker exec ${RUN_AS_USER:+"-u$RUN_AS_USER"} \
+            ${WORKDIR:+"-w$WORKDIR"} \
+            $CONTAINER \
+            $INNER_MOUNT/$(realpath --relative-to $reporoot "$testscript_abspath")
 STATUS=$?
 
 if [ $((0+KILL_TEST_CONTAINER)) -ne 0 ]; then

irods/test/harness/test_script_parameters

@@ -0,0 +1,21 @@
+
+declare -A images=(
+    [test_1.sh]=install-irods
+    [test_2.sh]=bats-python3
+    [test_3.bats]=bats-python3
+    [experiment.sh]=ssl-and-pam
+    [fail.sh]=ssl-and-pam
+)
+
+declare -A user=(
+)
+
+declare -A workdirs=(
+    [testuser]=/home/testuser
+    [irods]=/var/lib/irods
+    [root]=/
+)
+
+declare -A wrappers=(
+    [login_auth_test.py]=./login_auth_test.sh
+)

irods/test/login_auth_test.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+. $(dirname $0)/scripts/funcs

irods/test/pam.bats/experiment.sh irods/test/scripts/experiment.shirods/test/pam.bats/experiment.sh renamed to irods/test/scripts/experiment.sh

@@ -3,3 +3,4 @@ DIR=$(dirname $0)
 . $DIR/funcs
 cd "$DIR"
 set_up_ssl sudo
+add_irods_to_system_pam_configuration

irods/test/pam.bats/funcs irods/test/scripts/funcsirods/test/pam.bats/funcs renamed to irods/test/scripts/funcs

@@ -128,3 +128,19 @@ age_out_pam_password() {
   local new_time=$((mtime - offset))
   sudo su - postgres -c "psql ICAT -c 'update r_user_password set create_ts=$new_time, modify_ts=$new_time where user_id=$id'"
 }
+
+add_irods_to_system_pam_configuration() {
+    local tempfile=/tmp/irods-pam-config.$$
+    cat <<-EOF >$tempfile
+	auth        required      pam_env.so
+	auth        sufficient    pam_unix.so
+	auth        requisite     pam_succeed_if.so uid >= 500 quiet
+	auth        required      pam_deny.so
+	EOF
+    sudo chown root.root $tempfile
+    sudo mv $tempfile /etc/pam.d/irods
+}
+
+setup_preconnect_preference() {
+    sudo su irods -c "sed -i.orig 's/\(^\s*acPreConnect.*CS_NEG\)\([A-Z_]*\)/\1_$1/' /etc/irods/core.re"
+}