cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

openconnect: updated to 8.09

Browse Source 
Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
This commit is contained in:
Nikos Mavrogiannopoulos
2020-05-01 19:38:22 +02:00
parent b10a73c9a3
commit 1d5350fb48
3 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/openconnect/files/openconnect.sh
+29 -20
View File
@@ -3,6 +3,13 @@
. ../netifd-proto.sh
init_proto "$@"
append_args() {
while [ $# -gt 0 ]; do
append cmdline "'${1//\'/\'\\\'\'}'"
shift
done
}
proto_openconnect_init_config() {
proto_config_add_string "server"
proto_config_add_int "port"
@@ -12,6 +19,7 @@ proto_openconnect_init_config() {
proto_config_add_string "username"
proto_config_add_string "serverhash"
proto_config_add_string "authgroup"
proto_config_add_string "usergroup"
proto_config_add_string "password"
proto_config_add_string "password2"
proto_config_add_string "token_mode"
@@ -25,13 +33,13 @@ proto_openconnect_init_config() {
}
proto_openconnect_add_form_entry() {
[ -n "$1" ] && append cmdline "--form-entry $1"
[ -n "$1" ] && append_args --form-entry "$1"
}
proto_openconnect_setup() {
local config="$1"
json_get_vars server port interface username serverhash authgroup password password2 token_mode token_secret token_script os csd_wrapper mtu juniper form_entry
json_get_vars server port interface username serverhash authgroup usergroup password password2 token_mode token_secret token_script os csd_wrapper mtu juniper form_entry
grep -q tun /proc/modules || insmod tun
ifname="vpn-$config"
@@ -46,31 +54,32 @@ proto_openconnect_setup() {
[ -n "$port" ] && port=":$port"
cmdline="$server$port -i "$ifname" --non-inter --syslog --script /lib/netifd/vpnc-script"
[ -n "$mtu" ] && cmdline="$cmdline --mtu $mtu"
append_args "$server$port" -i "$ifname" --non-inter --syslog --script /lib/netifd/vpnc-script
[ -n "$mtu" ] && append_args --mtu "$mtu"
# migrate to standard config files
[ -f "/etc/config/openconnect-user-cert-vpn-$config.pem" ] && mv "/etc/config/openconnect-user-cert-vpn-$config.pem" "/etc/openconnect/user-cert-vpn-$config.pem"
[ -f "/etc/config/openconnect-user-key-vpn-$config.pem" ] && mv "/etc/config/openconnect-user-key-vpn-$config.pem" "/etc/openconnect/user-key-vpn-$config.pem"
[ -f "/etc/config/openconnect-ca-vpn-$config.pem" ] && mv "/etc/config/openconnect-ca-vpn-$config.pem" "/etc/openconnect/ca-vpn-$config.pem"
[ -f /etc/openconnect/user-cert-vpn-$config.pem ] && append cmdline "-c /etc/openconnect/user-cert-vpn-$config.pem"
[ -f /etc/openconnect/user-key-vpn-$config.pem ] && append cmdline "--sslkey /etc/openconnect/user-key-vpn-$config.pem"
[ -f /etc/openconnect/user-cert-vpn-$config.pem ] && append_args -c "/etc/openconnect/user-cert-vpn-$config.pem"
[ -f /etc/openconnect/user-key-vpn-$config.pem ] && append_args --sslkey "/etc/openconnect/user-key-vpn-$config.pem"
[ -f /etc/openconnect/ca-vpn-$config.pem ] && {
append cmdline "--cafile /etc/openconnect/ca-vpn-$config.pem"
append cmdline "--no-system-trust"
append_args --cafile "/etc/openconnect/ca-vpn-$config.pem"
append_args --no-system-trust
}
if [ "${juniper:-0}" -gt 0 ]; then
append cmdline "--juniper"
append_args --juniper
fi
[ -n "$serverhash" ] && {
append cmdline " --servercert=$serverhash"
append cmdline "--no-system-trust"
append_args "--servercert=$serverhash"
append_args --no-system-trust
}
[ -n "$authgroup" ] && append cmdline "--authgroup $authgroup"
[ -n "$username" ] && append cmdline "-u $username"
[ -n "$authgroup" ] && append_args --authgroup "$authgroup"
[ -n "$usergroup" ] && append_args --usergroup "$usergroup"
[ -n "$username" ] && append_args -u "$username"
[ -n "$password" ] || [ "$token_mode" = "script" ] && {
umask 077
mkdir -p /var/etc
@@ -85,13 +94,13 @@ proto_openconnect_setup() {
proto_setup_failed "$config"
}
}
append cmdline "--passwd-on-stdin"
append_args --passwd-on-stdin
}
[ -n "$token_mode" -a "$token_mode" != "script" ] && append cmdline "--token-mode=$token_mode"
[ -n "$token_secret" ] && append cmdline "--token-secret=$token_secret"
[ -n "$os" ] && append cmdline "--os=$os"
[ -n "$csd_wrapper" ] && [ -x "$csd_wrapper" ] && append cmdline "--csd-wrapper=$csd_wrapper"
[ -n "$token_mode" -a "$token_mode" != "script" ] && append_args "--token-mode=$token_mode"
[ -n "$token_secret" ] && append_args "--token-secret=$token_secret"
[ -n "$os" ] && append_args "--os=$os"
[ -n "$csd_wrapper" ] && [ -x "$csd_wrapper" ] && append_args "--csd-wrapper=$csd_wrapper"
json_for_each_item proto_openconnect_add_form_entry form_entry
@@ -99,9 +108,9 @@ proto_openconnect_setup() {
logger -t openconnect "executing 'openconnect $cmdline'"
if [ -f "$pwfile" ]; then
proto_run_command "$config" /usr/sbin/openconnect-wrapper $pwfile $cmdline
eval "proto_run_command '$config' /usr/sbin/openconnect-wrapper '$pwfile' $cmdline"
else
proto_run_command "$config" /usr/sbin/openconnect $cmdline
eval "proto_run_command '$config' /usr/sbin/openconnect $cmdline"
fi
}