Merge branch 'devel' of github.com:ORNL/DataFed into devel

Author: JoshuaSBrown

common/tests/security/tcp_secure/test_tcp_insecure.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
 
 # If no arguments are provided assume command paths have not been passed in
-if [ $# -eq 0 ]
-then
+if [ $# -eq 0 ]; then
   TIMEOUT_CMD="timeout"
   TCPDUMP_CMD="tcpdump"
   MAX_TEST_TIME_SEC=4
@@ -13,10 +12,8 @@ else
 fi
 
 # Check that pcap group exists and the user is part of it
-if [ $(getent group pcap) ]
-then
-  if id -nG "$USER" | grep -qw "pcap"
-  then
+if [ $(getent group pcap) ]; then
+  if id -nG "$USER" | grep -qw "pcap"; then
     echo "CONTINUE"
   else
     echo "SKIPPING - user does not belong to pcap group cannot run tcp_secure test"
@@ -27,28 +24,27 @@ else
   exit 0
 fi
 
-echo 
+echo
 echo "Running with:"
 echo "TCPDUMP:       ${TCPDUMP_CMD}"
 echo "TIMEOUT:       ${TIMEOUT_CMD}"
 echo "MAX_TEST_TIME: ${MAX_TEST_TIME_SEC}"
 
 # Grab the packets sent on the loop back interface (127.0.0.1) and port 7515
-output=$( ${TIMEOUT_CMD} ${MAX_TEST_TIME_SEC} ${TCPDUMP_CMD} -vvv -A port 7515 -i lo)
-match=$( echo "$output" | grep token)
+output=$(${TIMEOUT_CMD} ${MAX_TEST_TIME_SEC} ${TCPDUMP_CMD} -vvv -A port 7515 -i lo)
+match=$(echo "$output" | grep token)
 
 echo "Content of grep ${match}"
-# If '.magic_token' is returned from the network sniffer then we know that 
+# If '.magic_token' is returned from the network sniffer then we know that
 # the encryption is not working
-if [[ "${match}" == ".magic_token" ]]
-then
+if [[ "${match}" == ".magic_token" ]]; then
   echo "SUCCESS - the connection is expected to be insecure"
   exit 0
 else
   echo "FAILED - the connection is unreadable, either it is encrypted when it should not be or there is an error."
   echo "         it could be the case that the permissions have changed on tcpdump. See the README for settings"
   echo "         that must be enabled to run it correctly."
-  echo 
+  echo
   echo "$output"
   exit 1
 fi

common/tests/security/tcp_secure/test_tcp_secure.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
 
 # If no arguments are provided assume command paths have not been passed in
-if [ $# -eq 0 ]
-then
+if [ $# -eq 0 ]; then
   TIMEOUT_CMD="timeout"
   TCPDUMP_CMD="tcpdump"
   MAX_TEST_TIME_SEC=2
@@ -13,10 +12,8 @@ else
 fi
 
 # Check that pcap group exists and the user is part of it
-if [ $(getent group pcap) ]
-then
-  if id -nG "$USER" | grep -qw "pcap"
-  then
+if [ $(getent group pcap) ]; then
+  if id -nG "$USER" | grep -qw "pcap"; then
     echo "CONTINUE"
   else
     echo "SKIPPING - user does not belong to pcap group cannot run tcp_secure test"
@@ -34,13 +31,12 @@ echo "TIMEOUT:       ${TIMEOUT_CMD}"
 echo "MAX_TEST_TIME: ${MAX_TEST_TIME_SEC}"
 
 # Grab the first 30 packets sent on the loop back interface (127.0.0.1) and port 7515
-match=$( "${TIMEOUT_CMD}" "${MAX_TEST_TIME_SEC}" "${TCPDUMP_CMD}" -vvv -A port 7515 -i lo | grep token)
+match=$("${TIMEOUT_CMD}" "${MAX_TEST_TIME_SEC}" "${TCPDUMP_CMD}" -vvv -A port 7515 -i lo | grep token)
 
 echo "Content of grep ${match}"
-# If '.magic_token' is returned from the network sniffer then we know that 
+# If '.magic_token' is returned from the network sniffer then we know that
 # the encryption is not working
-if [[ "${match}" == ".magic_token" ]]
-then
+if [[ "${match}" == ".magic_token" ]]; then
   echo "FAILED - the connection is insecure we were able to pull out the token"
   exit 1
 else

compose/all/cleanup_globus_files.sh

@@ -4,4 +4,3 @@ SOURCE=$(dirname "$SCRIPT")
 PROJECT_ROOT=$(realpath "${SOURCE}/../../")
 
 "${PROJECT_ROOT}/scripts/compose_cleanup_globus_files.sh" -d "$(pwd)"
-

compose/all/generate_env.sh

@@ -7,4 +7,3 @@ PROJECT_ROOT=$(realpath "${SOURCE}/../../")
 export DATAFED_COMPOSE_REPO_DOMAIN="datafed-repo"
 
 "${PROJECT_ROOT}/scripts/compose_generate_env.sh" -d "$(pwd)" "$@"
-

compose/metadata/build_metadata_images_for_compose.sh

@@ -8,17 +8,16 @@ PROJECT_ROOT=$(realpath "${SOURCE}/../../")
 
 BUILD_ARG_FILE="$SOURCE/.build-args"
 if [ $# -gt 0 ]; then
-    # Do not check if file already exists becuase other generate scripts
-    # from a different repo might have already put their args in the file
-    # and calling this script might be the second step. Where this step would
-    # be appending to an existing file.
-    BUILD_ARG_FILE="$1/.build-args"
+  # Do not check if file already exists becuase other generate scripts
+  # from a different repo might have already put their args in the file
+  # and calling this script might be the second step. Where this step would
+  # be appending to an existing file.
+  BUILD_ARG_FILE="$1/.build-args"
 fi
 
 # Generate arg list
 
-if [ ! -f "$BUILD_ARG_FILE" ]
-then
+if [ ! -f "$BUILD_ARG_FILE" ]; then
   echo "Missing .build-args file, please run generate_build_args.sh first."
 fi
 

compose/metadata/generate_build_args.sh

@@ -22,14 +22,13 @@ if [ $# -gt 0 ]; then
 else
 
   # Force the user to manaully rm the file to avoid accidental overwrites.
-  if [ -f "$BUILD_ARG_FILE" ]
-  then
+  if [ -f "$BUILD_ARG_FILE" ]; then
     echo "$BUILD_ARG_FILE already exist! Will not overwrite!"
     exit 0
   fi
 fi
 
 # Needs to append to the ./build-args.sh file not overwrite.
-cat << EOF >> "$BUILD_ARG_FILE"
+cat <<EOF >>"$BUILD_ARG_FILE"
 BASE_IMAGE=debian:bookworm-slim
 EOF

compose/metadata/generate_env.sh

@@ -4,4 +4,3 @@ SOURCE=$(dirname "$SCRIPT")
 PROJECT_ROOT=$(realpath "${SOURCE}/../../")
 
 "${PROJECT_ROOT}/scripts/compose_generate_env.sh" -d "$(pwd)" -m
-

compose/repo/cleanup_globus_files.sh

@@ -4,4 +4,3 @@ SOURCE=$(dirname "$SCRIPT")
 PROJECT_ROOT=$(realpath "${SOURCE}/../../")
 
 "${PROJECT_ROOT}/scripts/compose_cleanup_globus_files.sh" -d "$(pwd)"
-

compose/repo/generate_env.sh

@@ -4,4 +4,3 @@ SOURCE=$(dirname "$SCRIPT")
 PROJECT_ROOT=$(realpath "${SOURCE}/../../")
 
 "${PROJECT_ROOT}/scripts/compose_generate_env.sh" -d "$(pwd)" -r
-

core/database/tests/test_fixture_setup.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-
 set -uef -o pipefail
 
 SCRIPT=$(realpath "$BASH_SOURCE[0]")
@@ -10,8 +9,7 @@ source "${PROJECT_ROOT}/config/datafed.sh"
 source "${PROJECT_ROOT}/scripts/dependency_versions.sh"
 source "${PROJECT_ROOT}/scripts/dependency_install_functions.sh"
 
-Help()
-{
+Help() {
   echo "$(basename $0) Will initialize fixtures for Foxx tests"
   echo
   echo "Syntax: $(basename $0) [-h|u|p|y]"
@@ -31,74 +29,71 @@ Help()
 local_DATABASE_NAME="sdms"
 local_DATABASE_USER="root"
 
-if [ -z "${DATAFED_DATABASE_HOST:-}" ]
-then
+if [ -z "${DATAFED_DATABASE_HOST:-}" ]; then
   local_DATAFED_DATABASE_HOST="localhost"
 else
   local_DATAFED_DATABASE_HOST=$(printenv DATAFED_DATABASE_HOST)
 fi
 
-if [ -z "${DATAFED_DATABASE_PASSWORD:-}" ]
-then
+if [ -z "${DATAFED_DATABASE_PASSWORD:-}" ]; then
   local_DATAFED_DATABASE_PASSWORD=""
 else
   local_DATAFED_DATABASE_PASSWORD=$(printenv DATAFED_DATABASE_PASSWORD)
 fi
 
-if [ -z "${FOXX_MAJOR_API_VERSION:-}" ]
-then
-  local_FOXX_MAJOR_API_VERSION=$(cat ${PROJECT_ROOT}/cmake/Version.cmake | grep -o -P "(?<=FOXX_API_MAJOR).*(?=\))" | xargs )
+if [ -z "${FOXX_MAJOR_API_VERSION:-}" ]; then
+  local_FOXX_MAJOR_API_VERSION=$(cat ${PROJECT_ROOT}/cmake/Version.cmake | grep -o -P "(?<=FOXX_API_MAJOR).*(?=\))" | xargs)
 else
   local_FOXX_MAJOR_API_VERSION=$(printenv FOXX_MAJOR_API_VERSION)
 fi
 
 VALID_ARGS=$(getopt -o hu:p:f: --long 'help',database-user:,database-password:,foxx-api-major-version: -- "$@")
 if [[ $? -ne 0 ]]; then
-      exit 1;
+  exit 1
 fi
 eval set -- "$VALID_ARGS"
 while [ : ]; do
   echo "$1"
   case "$1" in
-    -h | --help)
-        Help
-        exit 0
-        ;;
-    -u | --database-user)
-        echo "Processing 'Database user' option. Input argument is '$2'"
-        local_DATABASE_USER=$2
-        shift 2
-        ;;
-    -p | --database-password)
-        echo "Processing 'Database password' option. Input argument is '$2'"
-        local_DATAFED_DATABASE_PASSWORD=$2
-        shift 2
-        ;;
-    -f | --foxx-api-major-version)
-        echo "Processing 'Foxx major api version' option. Input argument is '$2'"
-        local_FOXX_MAJOR_API_VERSION=$2
-        shift 2
-        ;;
-    --) shift;
-        break
-        ;;
-    \?) # incorrect option
-        echo "Error: Invalid option"
-        exit;;
+  -h | --help)
+    Help
+    exit 0
+    ;;
+  -u | --database-user)
+    echo "Processing 'Database user' option. Input argument is '$2'"
+    local_DATABASE_USER=$2
+    shift 2
+    ;;
+  -p | --database-password)
+    echo "Processing 'Database password' option. Input argument is '$2'"
+    local_DATAFED_DATABASE_PASSWORD=$2
+    shift 2
+    ;;
+  -f | --foxx-api-major-version)
+    echo "Processing 'Foxx major api version' option. Input argument is '$2'"
+    local_FOXX_MAJOR_API_VERSION=$2
+    shift 2
+    ;;
+  --)
+    shift
+    break
+    ;;
+  \?) # incorrect option
+    echo "Error: Invalid option"
+    exit
+    ;;
   esac
 done
 
 ERROR_DETECTED=0
-if [ -z "$local_DATAFED_DATABASE_PASSWORD" ]
-then
+if [ -z "$local_DATAFED_DATABASE_PASSWORD" ]; then
   echo "Error DATAFED_DATABASE_PASSWORD is not defined, this is a required argument"
   echo "      This variable can be set using the command line option -p, --database-password"
   echo "      or with the environment variable DATAFED_DATABASE_PASSWORD."
   ERROR_DETECTED=1
 fi
 
-if [ "$ERROR_DETECTED" == "1" ]
-then
+if [ "$ERROR_DETECTED" == "1" ]; then
   exit 1
 fi
 
@@ -116,30 +111,30 @@ install_nvm
 install_node
 
 FOXX_PREFIX=""
-if ! command -v foxx > /dev/null 2>&1; then
-    FOXX_PREFIX="${DATAFED_DEPENDENCIES_INSTALL_PATH}/npm/bin/"
+if ! command -v foxx >/dev/null 2>&1; then
+  FOXX_PREFIX="${DATAFED_DEPENDENCIES_INSTALL_PATH}/npm/bin/"
 fi
 
 PATH_TO_PASSWD_FILE=${SOURCE}/database_temp.password
 
 # set up test user fixtures, this script should be idempotent, this script is described in the manifest
 "${FOXX_PREFIX}foxx" script -u "${local_DATABASE_USER}" \
-   --server "tcp://${local_DATAFED_DATABASE_HOST}:8529" \
-    -p "${PATH_TO_PASSWD_FILE}" \
-    --database "${local_DATABASE_NAME}" \
-    "/api/${local_FOXX_MAJOR_API_VERSION}" user-fixture
+  --server "tcp://${local_DATAFED_DATABASE_HOST}:8529" \
+  -p "${PATH_TO_PASSWD_FILE}" \
+  --database "${local_DATABASE_NAME}" \
+  "/api/${local_FOXX_MAJOR_API_VERSION}" user-fixture
 
 # set up test globus collection fixtures, this script should be idempotent, this script is described in the manifest
 "${FOXX_PREFIX}foxx" script -u "${local_DATABASE_USER}" \
-   --server "tcp://${local_DATAFED_DATABASE_HOST}:8529" \
-    -p "${PATH_TO_PASSWD_FILE}" \
-    --database "${local_DATABASE_NAME}" \
-    "/api/${local_FOXX_MAJOR_API_VERSION}" collection-fixture
+  --server "tcp://${local_DATAFED_DATABASE_HOST}:8529" \
+  -p "${PATH_TO_PASSWD_FILE}" \
+  --database "${local_DATABASE_NAME}" \
+  "/api/${local_FOXX_MAJOR_API_VERSION}" collection-fixture
 
 # set up test globus token fixtures, this script should be idempotent, this script is described in the manifest
 # order matters, must follow user and collection fixtures
 "${FOXX_PREFIX}foxx" script -u "${local_DATABASE_USER}" \
-   --server "tcp://${local_DATAFED_DATABASE_HOST}:8529" \
-    -p "${PATH_TO_PASSWD_FILE}" \
-    --database "${local_DATABASE_NAME}" \
-    "/api/${local_FOXX_MAJOR_API_VERSION}" globus-token-fixture
+  --server "tcp://${local_DATAFED_DATABASE_HOST}:8529" \
+  -p "${PATH_TO_PASSWD_FILE}" \
+  --database "${local_DATABASE_NAME}" \
+  "/api/${local_FOXX_MAJOR_API_VERSION}" globus-token-fixture