From f9e8e23a8b7c3829ed73a43b424a0ad25217c34b Mon Sep 17 00:00:00 2001 From: Thomas Schmauder Date: Mon, 13 Feb 2023 16:53:58 +0100 Subject: [PATCH] Accounts werden aus der accounts.csv ausgelesen --- bibVPN.sh | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/bibVPN.sh b/bibVPN.sh index 3d7216e..58ee703 100755 --- a/bibVPN.sh +++ b/bibVPN.sh @@ -14,15 +14,19 @@ # Displays status of a VPN interface with option to connect/disconnect. # http://i.imgur.com/RkmptwO.png +mkdir -p "/Users/$USER/.log/" +logfile="/Users/$USER/.log/bibVPN.log" +echo -e "\nRun $0 , $(date)" >>$logfile +PATH=$PATH:/usr/local/bin VPN_EXECUTABLE=$(which openconnect) -VPN_EXECUTABLE_PARAMS="--servercert pin-sha256:NFR9+lG+7SvvEqnraijD1l5R1ShK9KKtwYjqedfx78U= --protocol=fortinet" # Optional -VPN_HOST="vpn.bib.de" +VPN_HOST="$3" VPN_USERNAME="$2" DIR=$(dirname "${BASH_SOURCE[0]}") OC_PIDFILE="/var/run/openconnect/vpn.bib.de.pid" SETTINGSFILE="$DIR/settings.csv" ACCOUNTFILE="$DIR/accounts.csv" SHOW_SETTINGS='ON' +NET_FILTER='172.[123][0-9].1[67][80].' # Icons ICON_connected="iVBORw0KGgoAAAANSUhEUgAAABgAAAAWCAYAAAGtemweAAAACXBIWXMAAAsSAAALEgHS3X78AAAA+klEQVR4nNRUwQ2DMAzMKy8WYIZOwb8LtUtAJSZp34zBCn3y4Y3cWLEr13KSllKhnnRKcvHZ4AScS6BJbUSMgRCncfJcaBG0KMcvMIj83ircWcUh9VTI46onO1A75sC2FIjpT0qHwMUy4AZSzuU6a7D2smDzLRu1Fi11aKRGJOHVyzKHlGExXu5MmlkJ6HpfRHbWx5SBR+tMtjNYOuQMfGV5Lecm8HSLQf8BH9iLC2BxoRiM/Qi9SnSlS1MRG9VLIM/bH4NM7Cgp/rImYkeaU4XQW8QsDBVpk9GeSRRnDb1FyCSWVtovYpcCtZG83rLALzwvuKskSNT2xwMAAP//L6vzxgAAAAJJREFUAwBX1u55AAAAAElFTkSuQmCC" ICON_disconnected="iVBORw0KGgoAAAANSUhEUgAAABgAAAAWCAYAAAGtemweAAAACXBIWXMAAAsSAAALEgHS3X78AAAA2klEQVR4nNxTQQ6DMAyrqvGAXfeK7Uh5wHbgyhlxaP//hDXClbLOXUHqhDZLFsGJEzUUYwq4lBIrpsiwhirQEDHxRSw69mFU/a1OJNHh+ZYILMHibThjHUtkXyuU9tdMD5GeGSQh1LF+/2hguQPRY0MTFlGEzQ6bOJYMnhzuBo1OCrjejqx0KhnSk32TdgamhyaGP4SNHNQFYPSokdpdGLJGd1yaDpT4kdWIZ/PPoBsLTriRM+igmWyQeKtYlKGDNpP1iGZQkzTxVqGbMK2Wr+KQAU09Xx/wW3gCAAD//+SvwXMAAAACSURBVAMAV9bueQAAAABJRU5ErkJggg==" @@ -30,7 +34,7 @@ ICON_disconnected="iVBORw0KGgoAAAANSUhEUgAAABgAAAAWCAYAAAGtemweAAAACXBIWXMAAAsSA # "security find-generic-password -g -a foo" where foo is an account # in your OSX Keychain, to avoid passwords stored in plain text GET_VPN_PASSWORD="security find-generic-password -g -a $VPN_USERNAME 2>&1 >/dev/null | cut -d'\"' -f2" -if [ -z $GET_VPN_PASSWORD ] ; then +if [[ -z $GET_VPN_PASSWORD ]] ; then if $(read "Es wurde kein Passwort im Schlüsselbund gefunden. Soll dort eins hinterlegt werden? (ja/nein)") == '[Jj][aA]' ; then local $keychainPW = $(read "Wie lautet das Password für den Benutzer $VPN_USERNAME ?") security add-generic-password -a $VPN_USERNAME -s openconnect -w $keychainPW @@ -38,21 +42,23 @@ if [ -z $GET_VPN_PASSWORD ] ; then fi # Command to determine if VPN is connected or disconnected -VPN_CONNECTED="ifconfig | egrep -A1 'inet 172.[123][0-9]' |cut -d' ' -f2" +VPN_CONNECTED="ifconfig | egrep -A1 'inet $NET_FILTER' |cut -d' ' -f2" # Command to run to disconnect VPN VPN_DISCONNECT_CMD="sudo killall -2 openconnect" # Get IP of Current VPN Tunnel -IP=$(ifconfig | egrep -A1 'inet 172.[123][0-9]' |cut -d' ' -f2) +IP=$(ifconfig | egrep -A1 'inet $NET_FILTER' |cut -d' ' -f2) case "$1" in connect) VPN_PASSWORD=$(eval "$GET_VPN_PASSWORD") + VPN_EXECUTABLE_PARAMS="--servercert $4 --protocol=fortinet" # Optional # VPN connection command, should eventually result in $VPN_CONNECTED, # may need to be modified for VPN clients other than openconnect - echo "$VPN_PASSWORD" | sudo "$VPN_EXECUTABLE" $VPN_EXECUTABLE_PARAMS --user "$VPN_USERNAME" --passwd-on-stdin "$VPN_HOST" --pid-file=$OC_PIDFILE --background #&> /dev/null & + echo "echo PASSWORT | sudo $VPN_EXECUTABLE $VPN_EXECUTABLE_PARAMS --user $VPN_USERNAME --passwd-on-stdin $VPN_HOST --pid-file=$OC_PIDFILE --background" > $logfile 2>&1 + echo "$VPN_PASSWORD" | sudo $VPN_EXECUTABLE $VPN_EXECUTABLE_PARAMS --user $VPN_USERNAME --passwd-on-stdin $VPN_HOST --pid-file=$OC_PIDFILE --background > $logfile 2>&1 - IP=$(ifconfig | egrep -A1 'inet 172.[123][0-9]' |cut -d' ' -f2) - while [ -z $IP ]; do echo "noch keine IP" ; sleep 0.5 ; IP=$(ifconfig | egrep -A1 'inet 172.[123][0-9]' |cut -d' ' -f2) ; done + IP=$(ifconfig | egrep -A1 'inet $NET_FILTER' |cut -d' ' -f2) + while [ -z $IP ]; do echo "noch keine IP" ; sleep 0.5 ; IP=$(ifconfig | egrep -A1 'inet $NET_FILTER' |cut -d' ' -f2) ; done msg='display notification "Erfolgreich verbunden \nConnected User: '$VPN_USERNAME'" with title "OpenFortiVPN" subtitle "Deine IP lautet: '$IP'" sound name "Brise"' errmsg='display notification "Verbindungsversuch nicht erfolgreich" with title "OpenFortiVPN" subtitle "Schade" sound name "Brise"' if [[ $IP =~ 172 ]] ; then osascript -e "$msg" ; else osascript -e "$errmsg" ; fi @@ -93,14 +99,17 @@ else echo "| templateImage=$ICON_disconnected" #echo "VPN ❌ | color=Crimson" echo '---' - for config in $(cat $ACCOUNTFILE) ; do - cfgName=$config - cfgMail= - cfgHost= - echo "Connect $cfgName VPN | bash='$0' param1=connect param2=$cfgMail param3=$cfgHost terminal=false refresh=true" + # Alle User aus der accounts.csv auslesen und dann zur Auswahl anbieten. + cat "$ACCOUNTFILE" | while IFS= read config; + do + cfgName=$(echo $config|cut -d',' -f1) + cfgMail=$(echo $config|cut -d',' -f2) + cfgHost=$(echo $config|cut -d',' -f3) + cfgPubKey=$(echo $config|cut -d',' -f4) + echo "Connect $cfgName VPN | bash='$0' param1=connect param2=$cfgMail param3=$cfgHost param4=$cfgPubKey terminal=false refresh=true" done - echo "Connect Admin VPN | bash='$0' param1=connect param2=admsct@bib.de terminal=false refresh=true" - echo "Connect ScT VPN | bash='$0' param1=connect param2=thomas.schmauder@bib.de terminal=false refresh=true" + #echo "Connect Admin VPN | bash='$0' param1=connect param2=admsct@bib.de terminal=false refresh=true" + #echo "Connect ScT VPN | bash='$0' param1=connect param2=thomas.schmauder@bib.de terminal=false refresh=true" if [[ $SHOW_SETTINGS == "ON" ]]; then echo "---" echo "Settings"