Compare commits

..

No commits in common. "4dd92e34278cb9a8c7ecd82160308e81e0323c86" and "35080343654080e49f30495ee36326161947f1cc" have entirely different histories.

3 changed files with 12 additions and 37 deletions

View File

@ -1,2 +0,0 @@
#Name,E-Mail,Host,ServerFingerprint
bib,vorname.nachname@bib.de,vpn.bib.de,pin-sha265:asdasdasdasdasdasdasdasdasdasdadasd

1
.gitignore vendored
View File

@ -1 +0,0 @@
.DS_Store

View File

@ -21,15 +21,12 @@ PATH=$PATH:/usr/local/bin
VPN_EXECUTABLE=$(which openconnect)
VPN_HOST="$3"
VPN_USERNAME="$2"
#DIR=$(dirname "${BASH_SOURCE[0]}")
DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
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'
SET_ICONS='no'
NET_FILTER='172.[123][0-9].1[67][80].'
FONT=( 'size=14' 'font=UbuntuMono' )
# Icons
ICON_connected="iVBORw0KGgoAAAANSUhEUgAAABgAAAAWCAYAAAGtemweAAAACXBIWXMAAAsSAAALEgHS3X78AAAA+klEQVR4nNRUwQ2DMAzMKy8WYIZOwb8LtUtAJSZp34zBCn3y4Y3cWLEr13KSllKhnnRKcvHZ4AScS6BJbUSMgRCncfJcaBG0KMcvMIj83ircWcUh9VTI46onO1A75sC2FIjpT0qHwMUy4AZSzuU6a7D2smDzLRu1Fi11aKRGJOHVyzKHlGExXu5MmlkJ6HpfRHbWx5SBR+tMtjNYOuQMfGV5Lecm8HSLQf8BH9iLC2BxoRiM/Qi9SnSlS1MRG9VLIM/bH4NM7Cgp/rImYkeaU4XQW8QsDBVpk9GeSRRnDb1FyCSWVtovYpcCtZG83rLALzwvuKskSNT2xwMAAP//L6vzxgAAAAJJREFUAwBX1u55AAAAAElFTkSuQmCC"
ICON_disconnected="iVBORw0KGgoAAAANSUhEUgAAABgAAAAWCAYAAAGtemweAAAACXBIWXMAAAsSAAALEgHS3X78AAAA2klEQVR4nNxTQQ6DMAyrqvGAXfeK7Uh5wHbgyhlxaP//hDXClbLOXUHqhDZLFsGJEzUUYwq4lBIrpsiwhirQEDHxRSw69mFU/a1OJNHh+ZYILMHibThjHUtkXyuU9tdMD5GeGSQh1LF+/2hguQPRY0MTFlGEzQ6bOJYMnhzuBo1OCrjejqx0KhnSk32TdgamhyaGP4SNHNQFYPSokdpdGLJGd1yaDpT4kdWIZ/PPoBsLTriRM+igmWyQeKtYlKGDNpP1iGZQkzTxVqGbMK2Wr+KQAU09Xx/wW3gCAAD//+SvwXMAAAACSURBVAMAV9bueQAAAABJRU5ErkJggg=="
@ -51,17 +48,6 @@ VPN_DISCONNECT_CMD="sudo killall -2 openconnect"
# Get IP of Current VPN Tunnel
IP=$(ifconfig | egrep -A1 'inet $NET_FILTER' |cut -d' ' -f2)
function askForVPNName(){
results=$( /usr/bin/osascript -e 'display dialog "Wie lautet die E-Mail des Benutzers, der zum Verbinden verwendet werden soll?" default answer "vorname.nachname@bib.de" buttons {"Cancel","OK"} default button {"OK"} with title "Neuen User für das VPN anlegen"' )
theButton=$( echo "$results" | /usr/bin/awk -F "button returned:|," '{print $2}' )
theText=$( echo "$results" | /usr/bin/awk -F "text returned:" '{print $2}' )
if [[ $theButton == "OK" ]] ;then
echo $theText;
fi
}
case "$1" in
connect)
VPN_PASSWORD=$(eval "$GET_VPN_PASSWORD")
@ -86,28 +72,19 @@ case "$1" in
osascript -e 'display notification "VPN Tunnel erfolgreich geschlossen" with title "OpenFortiVPN" subtitle "Mach Feierabend" sound name "Submarine"'
;;
newuser)
echo "Sie wollen einen weiteren Benutzer für das VPN anlegen. Geben Sie dazu die folgenden Dinge ein."
#echo -n "Wie lautet der Name der neuen Verbindung? " ; read NEW_VPN_NAME
NEW_VPN_NAME=$(askForVPNName)
echo -n "Wie lautet der VPN-Server? "; read NEW_VPN_HOST
echo -n "Wie lautet die E-Mail des Benutzers? " ; read NEW_VPN_USERNAME
NEW_VPN_PUBKEY=$(gnutls-cli --print-cert $NEW_VPN_HOST |grep -e 'pin-.*:'|awk '{$1=$1;print}')
NEW_VPN_PASSWORD=$(security find-generic-password -g -a $NEW_VPN_USERNAME 2>&1 >/dev/null)
if [[ $NEW_VPN_PASSWORD =~ password ]] ; then
echo "Es ist bereits ein Passwort im Schlüsselbund für $NEW_VPN_USERNAME hinterlegt."
else
NEWUSER=$(read "Wie lautet die E-Mail des neuen Benutzers?")
NEW_VPN_PASSWORD=$("security find-generic-password -g -a $NEWUSER 2>&1 >/dev/null | cut -d'\"' -f2")
if [ -z $NEW_VPN_PASSWORD ] ; then
echo -n "Es ist noch kein Passwort im Schlüsselbund hinterlegt Bitte einmal das Passwort angeben : " ;
NEW_VPN_PASS = $(read )
security add-generic-password -a $NEW_VPN_USERNAME -s openconnect -w $NEW_VPN_PASS
$GET_NEW_PASS = $(read)
fi
echo "$NEW_VPN_NAME,$NEW_VPN_USERNAME,$NEW_VPN_HOST,$NEW_VPN_PUBKEY" #>> $ACCOUNTFILE
;;
esac
#if [ -n "$(eval "$VPN_CONNECTED")" ]; then
if [ -f $OC_PIDFILE ]; then
if [ $SET_ICONS == 'yes']; then echo "| templateImage=$ICON_connected" ; else echo "VPN ✔ |$FONT color=green" ; fi
#
#echo "VPN ✔ | color=green"
echo "| templateImage=$ICON_connected"
echo '---'
echo "Disconnect VPN | bash='$0' param1=disconnect terminal=false refresh=true"
echo "User: $(ps -ef | grep -e '--user\ ' | cut -d' ' -f 33)"
@ -116,10 +93,11 @@ if [ -f $OC_PIDFILE ]; then
echo "Settings"
echo "--Farbige Icons aus"
echo "--Tunnelblick Icons aus"
echo "--Neuen User anlegen| shell='/Users/$USER/Library/Application\ Support/xbar/plugins/$(basename $0)' param1=newuser terminal=true refresh=true"
echo "--Neuen User anlegen| bash='$0' param1=newuser terminal=true refresh=true"
exit
else
if [ $SET_ICONS == 'yes' ] ; then echo "| templateImage=$ICON_disconnected" ; else echo "VPN ❌ | $FONT color=Crimson" ; fi
echo "| templateImage=$ICON_disconnected"
#echo "VPN ❌ | color=Crimson"
echo '---'
# Alle User aus der accounts.csv auslesen und dann zur Auswahl anbieten.
cat "$ACCOUNTFILE" | while IFS= read config;
@ -128,7 +106,7 @@ else
cfgMail=$(echo $config|cut -d',' -f2)
cfgHost=$(echo $config|cut -d',' -f3)
cfgPubKey=$(echo $config|cut -d',' -f4)
echo "Connect $cfgName VPN | shell='...$0' param1=connect param2=$cfgMail param3=$cfgHost param4=$cfgPubKey terminal=false refresh=true"
echo "Connect $cfgName VPN | bash='$0' param1=connect param2=$cfgMail param3=$cfgHost param4=$cfgPubKey terminal=false refresh=true"
done
if [[ $SHOW_SETTINGS == "ON" ]]; then
@ -137,7 +115,7 @@ else
echo "--$SETTINGSFILE"
echo "--Farbige Icons aus"
echo "--Tunnelblick Icons aus"
echo "--Neuen User anlegen| bash=$0 param1=newuser terminal=true refresh=true"
echo "--Neuen User anlegen| bash='$0' param1=newuser terminal=true refresh=true"
fi
exit
fi