Updating options to include ability to disable SSL checks

4 files changed, 39 insertions, 6 deletions

diff --git a/src/scripts/configure.sh b/src/scripts/configure.sh
index ef74822..3c3914c 100644
--- a/src/scripts/configure.sh
+++ b/src/scripts/configure.sh
@@ -100,7 +100,7 @@ configure_disk()
       # display main menu
       exec 3>&1
       RESULT="$(echo "" | xargs dialog \
-         --title " Disk Options " \
+         --title " Miscellaneous Options " \
          --backtitle "IP Engineering Rescue Disk Setup" \
          --ok-label "Change" \
          --cancel-label "Back" \
@@ -109,6 +109,7 @@ configure_disk()
          "usb"       "USB partition type (${CONFIG_PART_TYPE})" \
          "size"      "USB disk image size (${CONFIG_IMG_SIZE} MB)" \
          "iso"       "ISO partition type (${CONFIG_ISO_TYPE})" \
+         "tls"       "TLS Certificate check (${CONFIG_TLS_CHECK})" \
          2>&1 1>&3)"
       RC=$?
       exec 3>&-
@@ -177,6 +178,21 @@ configure_disk()
          RC=$?
          exec 3>&-
          CONFIG_ISO_TYPE="${RESULT}"
+      elif test $RC -eq 0 && test "x${RESULT}" == "xtls";then
+         exec 3>&1
+         RESULT="$(echo "" | xargs dialog \
+            --title " TLS Certificate Checks " \
+            --backtitle "IP Engineering Rescue Disk Setup" \
+            --yesno "\nEnable TLS certificate checks when downloading files?" \
+            7 70 \
+            2>&1 1>&3)"
+         RC=$?
+         exec 3>&-
+         if test $RC -eq 0;then
+            CONFIG_TLS_CHECK=yes
+         else
+            CONFIG_TLS_CHECK=no
+         fi
       fi
    done
 }
@@ -270,7 +286,7 @@ configure_distros_image()
 configure_save()
 {
    # save variables
-   for STR in "CONFIG_PART_TYPE" "CONFIG_IMG_SIZE" "CONFIG_ISO_TYPE";do
+   for STR in "CONFIG_PART_TYPE" "CONFIG_IMG_SIZE" "CONFIG_ISO_TYPE" "CONFIG_TLS_CHECK";do
       egrep "^${STR}=" "${CONFIG}.new" > /dev/null
       if test $? -ne 0;then
          echo "${STR}=" >> "${CONFIG}.new"
@@ -281,6 +297,7 @@ configure_save()
       -e "s/^CONFIG_IMG_SIZE=.*$/CONFIG_IMG_SIZE=${CONFIG_IMG_SIZE}/g" \
       -e "s/^CONFIG_PART_TYPE=.*$/CONFIG_PART_TYPE=${CONFIG_PART_TYPE}/g" \
       -e "s/^CONFIG_PART_SIZE=.*$/CONFIG_PART_SIZE=${CONFIG_PART_SIZE}/g" \
+      -e "s/^CONFIG_TLS_CHECK=.*$/CONFIG_TLS_CHECK=${CONFIG_TLS_CHECK}/g" \
       "${CONFIG}.new" \
       > "${CONFIG}.new.tmp"
    mv "${CONFIG}.new.tmp" "${CONFIG}.new"
@@ -352,7 +369,7 @@ while test true;do
       --cancel-label "Exit" \
       --menu "Select item to configure:" \
       20 70 13 \
-      "disk"      "Change disk image options" \
+      "options"   "Change miscellaneous options" \
       "images"    "Select individual boot images" \
       "all"       "Select all available images" \
       "defaults"  "Load defaults" \
@@ -375,7 +392,7 @@ while test true;do
    elif test $RC -eq 126;then # (save)
       configure_save
       exit 0
-   elif test $RC -eq 0 && test "x${RESULT}" == "xdisk";then
+   elif test $RC -eq 0 && test "x${RESULT}" == "xoptions";then
       configure_disk
    elif test $RC -eq 0 && test "x${RESULT}" == "ximages";then
       configure_distros
@@ -385,7 +402,8 @@ while test true;do
       CONFIG_PART_TYPE="${DEFAULT_PART_TYPE}"
       CONFIG_PART_SIZE="${DEFAULT_PART_SIZE}"
       CONFIG_IMG_SIZE="${DEFAULT_IMG_SIZE}"
-      CONFIG_ISO_TYPE="${DEFAULT_ISO_SIZE}"
+      CONFIG_ISO_TYPE="${DEFAULT_ISO_TYPE}"
+      CONFIG_TLS_CHECK="${DEFAULT_TLS_CHECK}"
       cat /dev/null > ${CONFIG}.new
       dialog \
          --backtitle "IP Engineering Rescue Disk Setup" \
diff --git a/src/scripts/download.sh b/src/scripts/download.sh
index 2ed5d12..cf79b8c 100755
--- a/src/scripts/download.sh
+++ b/src/scripts/download.sh
@@ -39,8 +39,15 @@
 # |           |
 # +-=-=-=-=-=-+
 
-# set program name for errors
+# set PROG_NAME and load profile
 PROG_NAME="$(basename "${0}")"
+IPERD_PROFILE="$(dirname "${0}")/iperd.profile"
+if test ! -f "${IPERD_PROFILE}";then
+   echo "${PROG_NAME}: unable to find iperd.profile" 1>&2;
+   exit 1;
+fi
+. "${IPERD_PROFILE}"
+
 
 # set logging function
 LOGGER="/usr/bin/sed -e s/^/${PROGRAM_NAME}:/g"
@@ -145,6 +152,7 @@ unset HASH_FILE
 unset HASH_DATA
 unset KEEPTEMPFILE
 unset EXTRACT_MKTEMP
+unset WGET_FLAGS
 
 
 # parse CLI arguments
@@ -183,6 +191,9 @@ fi
 
 
 # adjust options
+if test "x${CONFIG_TLS_CHECK}" == "xno";then
+   WGET_FLAGS="${WGET_FLAGS} --no-check-certificate";
+fi
 if test -z "${TMPFILE}";then
    TMPFILE="${FILE}.tmp"
 fi
@@ -240,6 +251,7 @@ trap cleanup SIGHUP SIGINT SIGTERM EXIT
 if test ! -f "${TMPFILE}" && test ! -f "${FILE}";then
    mkdir -p "$(dirname "${TMPFILE}")" || exit 1;
    wget \
+      ${WGET_FLAGS} \
       -q \
       -O "${TMPFILE}.new" \
       "${URL}" \
diff --git a/src/scripts/genfiles.sh b/src/scripts/genfiles.sh
index c257c34..ed3b68a 100755
--- a/src/scripts/genfiles.sh
+++ b/src/scripts/genfiles.sh
@@ -95,6 +95,7 @@ generate_makefile_config()
       echo "DISKSIZE    ?= ${CONFIG_IMG_SIZE}"
       echo "DISKTYPE    ?= ${CONFIG_PART_TYPE}"
       echo "PARTSIZE    ?= ${CONFIG_PART_SIZE}"
+      echo "TLSCHECK    ?= ${CONFIG_TLS_CHECK}"
 
       # define standard dependencies
       STD_DEP_FILES="src/scripts/genfiles.sh"
diff --git a/src/scripts/iperd.profile b/src/scripts/iperd.profile
index 97f8b1f..862b77d 100644
--- a/src/scripts/iperd.profile
+++ b/src/scripts/iperd.profile
@@ -52,10 +52,12 @@ DEFAULT_PART_TYPE="hybrid"
 DEFAULT_PART_SIZE="0"
 DEFAULT_IMG_SIZE="1900"
 DEFAULT_ISO_TYPE="bios"
+DEFAULT_TLS_CHECK="yes"
 CONFIG_PART_TYPE="${CONFIG_PART_TYPE:-${DEFAULT_PART_TYPE}}"
 CONFIG_PART_SIZE="${CONFIG_PART_SIZE:-${DEFAULT_PART_SIZE}}"
 CONFIG_IMG_SIZE="${CONFIG_IMG_SIZE:-${DEFAULT_IMG_SIZE}}"
 CONFIG_ISO_TYPE="${CONFIG_ISO_TYPE:-${DEFAULT_ISO_TYPE}}"
+CONFIG_TLS_CHECK="${CONFIG_TLS_CHECK:-${DEFAULT_TLS_CHECK}}"
 
 
 # set exit codes to trigger specific xargs exit codes