Functionalizing and improving siteciphers

Added httpGet, checkOpenSSL, update, better usage, options, internet check, set delay with flag

siteciphers/siteciphers

@@ -1,28 +1,175 @@
 #!/bin/bash
-if [[ -z $1 ]]; then
-  echo "usage: siteciphers <domain>"
-  exit
-fi
-SERVER=$1:443
 DELAY=1
-ciphers=$(openssl ciphers 'ALL:eNULL' | sed -e 's/:/ /g')
+configuredClient=""
+currentVersion="1.11.2"
 
-for cipher in ${ciphers[@]}
+checkOpenSSL()
-do
+{
-result=$(echo -n | openssl s_client -cipher "$cipher" -connect $SERVER 2>&1)
+  if  ! command -v openssl &>/dev/null ;then
-if [[ "$result" =~ ":error:" ]] ; then
+    echo "Error: to use this tool openssl must be installed" >&2
-  if [[ -z $2 ]]; then
+    return 1
-    error=$(echo -n $result | cut -d':' -f6)
-    echo "${cipher} - NO (${error})"
-  fi
-else
-  if [[ "$result" =~ "Cipher is ${cipher}" || "$result" =~ "Cipher    :" ]] ; then
-    echo "${cipher} - YES"
   else
-    if [[ -z $2 ]]; then
+    return 0
-      echo "${cipher} - UNKNOWN RESPONSE - ${result}"
+  fi
+}
+
+getConfiguredClient()
+{
+    if  command -v curl &>/dev/null ; then
+      configuredClient="curl"
+    elif command -v wget &>/dev/null ; then
+      configuredClient="wget"
+    elif command -v fetch &>/dev/null ; then
+      configuredClient="fetch"
+    else
+      echo "Error: This tool reqires either curl, wget, or fetch to be installed."
+      return 1
+    fi
+}
+
+## Allows to call the users configured client without if statements everywhere
+httpGet()
+{
+  case "$configuredClient" in
+    curl) curl -A curl -s "$@";;
+    wget) wget -qO- "$@";;
+    fetch) fetch -o "...";;
+  esac
+}
+
+update()
+{
+  # Author: Alexander Epstein https://github.com/alexanderepstein
+  # Update utility version 1.2.0
+  # To test the tool enter in the defualt values that are in the examples for each variable
+  repositoryName="Bash-Snippets" #Name of repostiory to be updated ex. Sandman-Lite
+  githubUserName="alexanderepstein" #username that hosts the repostiory ex. alexanderepstein
+  nameOfInstallFile="install.sh" # change this if the installer file has a different name be sure to include file extension if there is one
+  latestVersion=$(httpGet https://api.github.com/repos/$githubUserName/$repositoryName/tags | grep -Eo '"name":.*?[^\\]",'| head -1 | grep -Eo "[0-9.]+" ) #always grabs the tag without the v option
+
+  if [[ $currentVersion == "" || $repositoryName == "" || $githubUserName == "" || $nameOfInstallFile == "" ]];then
+    echo "Error: update utility has not been configured correctly." >&2
+    exit 1
+  elif [[ $latestVersion == "" ]];then
+    echo "Error: no active internet connection" >&2
+    exit 1
+  else
+    if [[ "$latestVersion" != "$currentVersion" ]]; then
+      echo "Version $latestVersion available"
+      echo -n "Do you wish to update $repositoryName [Y/n]: "
+      read -r answer
+      if [[ "$answer" == "Y" || "$answer" == "y" ]] ;then
+        cd  ~ || { echo 'Update Failed' ; exit 1 ; }
+        if [[ -d  ~/$repositoryName ]]; then rm -r -f $repositoryName  ||  { echo "Permissions Error: try running the update as sudo"; exit 1; } ; fi
+        git clone "https://github.com/$githubUserName/$repositoryName" || { echo "Couldn't download latest version" ; exit 1; }
+        cd $repositoryName ||  { echo 'Update Failed' ; exit 1 ;}
+        git checkout "v$latestVersion" 2> /dev/null || git checkout "$latestVersion" 2> /dev/null || echo "Couldn't git checkout to stable release, updating to latest commit."
+        chmod a+x install.sh #this might be necessary in your case but wasnt in mine.
+        ./$nameOfInstallFile "update" || exit 1
+        cd ..
+        rm -r -f $repositoryName ||  { echo "Permissions Error: update succesfull but cannot delete temp files located at ~/$repositoryName delete this directory with sudo"; exit 1; }
+      else
+        exit 1
+      fi
+    else
+      echo "$repositoryName is already the latest version"
     fi
   fi
+
+}
+
+usage()
+{
+  echo "Siteciphers"
+  echo "Description: Checks the available ciphers for the SSL of an https site."
+  echo "Usage: siteciphers [flag] or siteciphers [optionalDFlag] [website]"
+  echo "  -u Update Bash-Snippet Tools"
+  echo "  -h Show the help"
+  echo "  -v Get the tool version"
+  echo "  -d Set the delay between requests sent to the site (default is 1 sec)"
+  echo "Examples:"
+  echo "  siteciphers github.com"
+  echo "  siteciphers -d 0.5 github.com"
+}
+
+checkInternet()
+{
+  httpGet google.com > /dev/null 2>&1 || { echo "Error: no active internet connection" >&2; return 1; } # query google with a get request
+}
+
+checkCiphers()
+{
+  ciphers=$(openssl ciphers 'ALL:eNULL' | sed -e 's/:/ /g') # grab all ciphers
+  SERVER=$1:443 # setup the connection server
+  for cipher in ${ciphers[*]} # for all possible ciphers
+  do
+    result=$(echo | openssl s_client -cipher "$cipher" -connect $SERVER 2>&1)
+    if [[ "$result" =~ ":error:" ]] ; then
+      if [[ -z $2 ]]; then
+        error=$(echo -n $result | cut -d':' -f6)
+        echo "$cipher - NO ($error)"
+      fi
+    else
+      if [[ "$result" =~ "Cipher is $cipher" || "$result" =~ "Cipher    :" ]] ; then
+        echo "$cipher - YES"
+      else
+        if [[ -z $2 ]]; then
+          echo "$cipher - UNKNOWN RESPONSE - $result"
+        fi
+      fi
+    fi
+    sleep $DELAY # sleep as to not overload the requests to the server
+  done
+}
+
+
+
+
+checkOpenSSL || exit 1
+getConfiguredClient || exit 1
+checkInternet || exit 1
+
+
+if [[ $# == "0" ]]; then
+  usage
+  exit 1
+elif [[ $1 == "update" ]];then
+  update
+  exit 0
+elif [[ $1 == "help" ]];then
+  usage
+  exit 0
 fi
-sleep $DELAY
+
+while getopts "huvd:" opt; do ## alows for using options in bash
+  case $opt in
+    \?)
+      echo "Invalid option: -$OPTARG" >&2
+      exit 1
+    ;;
+    d) #set the delay with the -d option
+      DELAY=$OPTARG
+      dFlag="1"
+    ;;
+    u)
+
+      update
+      exit 0
+    ;;
+    h)
+      usage
+      exit 0
+    ;;
+    v)
+      echo "Version $currentVersion"
+      exit 0
+    ;;
+    :) ## will run when no arguments are provided to to e or d options
+      echo "Option -$OPTARG requires an argument." >&2
+      exit 1
+    ;;
+  esac
 done
+
+if [[ $dFlag == "1" ]];then checkCiphers $3 || exit 1; # if dflag is present input will look like siteciphers -d 0.5 github.com making the website the third arg
+else  checkCiphers $1 || exit 1; fi