From 69ac81112144a1274976bbb472ddeb8e159fac5a Mon Sep 17 00:00:00 2001 From: Priyam Mitra Date: Mon, 20 Dec 2021 14:09:31 +0530 Subject: [PATCH 1/4] added support to connect or disconnect VPN for >= mohave --- lazy-connect | 74 +++++++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/lazy-connect b/lazy-connect index 81b40b0..69da4a1 100755 --- a/lazy-connect +++ b/lazy-connect @@ -134,14 +134,15 @@ function _lazy_connect() { end tell end tell end connectVpn - connectVpn("$vpn_name", "$password", "$autofill") EOF } function _lazy_connect_mojave() { vpn_name=$1 - osx_vpn_name="${vpn_name/Connect /}, Not Connected" + osx_vpn_name_not_connected="${vpn_name/Connect /}, Not Connected" + osx_vpn_name_connected="${vpn_name/Connect /}, Connected" + osx_vpn_name="${vpn_name/Connect /}," _lazy_connect_get_totp $2 local autofill=$3 @@ -162,47 +163,50 @@ function _lazy_connect_mojave() { fi osascript < Date: Mon, 20 Dec 2021 17:28:44 +0530 Subject: [PATCH 2/4] updated corresponding readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f9fb84b..0bb7f6e 100644 --- a/README.md +++ b/README.md @@ -31,11 +31,12 @@ sudo ln -s ~/.lazy-connect/lazy-connect /usr/local/bin/lazy-connect ``` lazy-connect - Shell function to fuzzy search an IPSec VPN by name - and connect to it automatically. + and connect/disconnect to it automatically. -i - Initialize lazy-connect. Stores the TOTP secret and VPN list. -r - Refresh vpn list in ~/.config/lazy-connect . -n - Do not fill the password automatically. Instead copy the password to clipboard. +-y - Connect/disconnect automatically to the last connected VPN without prompt. -h - Show this help. ``` From 63ae07015d7135f3924b7c38971ae3a8a9b44e25 Mon Sep 17 00:00:00 2001 From: Priyam Mitra Date: Wed, 26 Jan 2022 18:26:52 +0530 Subject: [PATCH 3/4] added -y option to choose last selected VPN without prompt --- lazy-connect | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/lazy-connect b/lazy-connect index 69da4a1..9f243bc 100755 --- a/lazy-connect +++ b/lazy-connect @@ -66,6 +66,7 @@ lazy-connect - Shell function to fuzzy search an IPSec VPN by name -i - Initialize lazy-connect. Stores the TOTP secret and VPN list. -r - Refresh vpn list in ~/.config/lazy-connect . +-y - Select the last selected VPN. -n - Do not fill the password automatically. Instead copy the password to clipboard. -h - Show this help. EOF @@ -191,11 +192,13 @@ function _lazy_connect_mojave() { tell group 1 click button "Connect" end tell + log "Connected" else if (value of attribute "AXValue" of static text 1 of r as string) is equal to connectedVpnName then log "Disconnecting from vpn " & vpnName tell group 1 click button "Disconnect" end tell + log "Disconnected" else log "Couldn't connect or disconnect the VPN, didn't find any exact match. The network found was: " log (value of attribute "AXValue" of static text 1 of r as string) @@ -218,12 +221,24 @@ version_lt() { [ "$1" = "$2" ] && return 1 || version_lte $1 $2 } +_get_last_selected_vpn() { + if [ -f $_lazy_connect_config_dir/last_vpn ]; then + last_vpn=$(cat $_lazy_connect_config_dir/last_vpn) + fi + if [ -z "$last_vpn" ]; then + echo "0" + else + echo $last_vpn + fi +} + function lazy-connect() { local OPTIND local autofill="true" + local choose_last="false" mkdir -p $_lazy_connect_config_dir - while getopts "irnh" opt; do + while getopts "irnhy" opt; do case $opt in h) _lazy_connect_usage @@ -242,6 +257,10 @@ function lazy-connect() { autofill="false" shift $((OPTIND - 1)) ;; + y) + choose_last="true" + shift $((OPTIND - 1)) + ;; \?) echo "Invalid Option: -$OPTARG." _lazy_connect_usage @@ -261,8 +280,13 @@ function lazy-connect() { return 1 fi - vpn_name=$(cat $_lazy_connect_config_dir/vpns | - fzf --height=10 --ansi --reverse --query "$*" --select-1) + last_vpn=$(_get_last_selected_vpn) + if [ "true" == "$choose_last" -a "0" != "$last_vpn" ]; then + vpn_name=$last_vpn + else + vpn_name=$(cat $_lazy_connect_config_dir/vpns | + fzf --height=10 --ansi --reverse --query "$*" --select-1) + fi mac_version=$(sw_vers -productVersion) is_less_than_mojave=$(version_lt $mac_version 10.14 && echo "yes" || echo "no") @@ -271,7 +295,7 @@ function lazy-connect() { else [ -z "$vpn_name" ] || _lazy_connect_mojave "$vpn_name" "$secret" "$autofill" fi - + echo -n $vpn_name > $_lazy_connect_config_dir/last_vpn } lazy-connect "$@" From ddb56f67c1d44f73c49d8b9c7476cb9f40059eac Mon Sep 17 00:00:00 2001 From: Priyam Mitra Date: Fri, 25 Mar 2022 18:51:32 +0530 Subject: [PATCH 4/4] removed prefix from vpn list --- lazy-connect | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lazy-connect b/lazy-connect index 9f243bc..8733516 100755 --- a/lazy-connect +++ b/lazy-connect @@ -45,7 +45,7 @@ function _lazy_connect_vpn_refresh() { end tell end tell EOF - tr ',' '\n' | sed 's/^[[:space:]]//g' >$_lazy_connect_config_dir/vpns + tr ',' '\n' | sed 's/^[[:space:]]//g' | cut -d' ' -f2- >$_lazy_connect_config_dir/vpns echo "Storing the VPN list..." if [ -f $backup_file ]; then @@ -143,7 +143,7 @@ function _lazy_connect_mojave() { vpn_name=$1 osx_vpn_name_not_connected="${vpn_name/Connect /}, Not Connected" osx_vpn_name_connected="${vpn_name/Connect /}, Connected" - osx_vpn_name="${vpn_name/Connect /}," + osx_vpn_name="${vpn_name/Connect /}" _lazy_connect_get_totp $2 local autofill=$3