Merge pull request #18628 from mcb30/openconnect-proxy

OpenConnect proxy support

diff --git a/net/openconnect/README b/net/openconnect/README
index e7c60d76546e5952af4cc4800ac6fa36a43b3e40..0647916fd890275d89bd3ed55f4995cd2c8f74d2 100644 (file)
--- a/net/openconnect/README
+++ b/net/openconnect/README
@@ -11,10 +11,14 @@ config interface 'MYVPN'
        option password 'secret'
        option serverhash 'AE7FF6A0426F0A0CD0A02EB9EC3C5066FAEB0B25'
        option defaultroute '0'
+       # option proxy 'http://proxy.example.com:8080'
        option authgroup 'DEFAULT'
        # usergroup option, if required by some servers
        # option usergroup 'USERGROUP'
 
+       # Reconnect after a temporary network down time (in seconds)
+       #option reconnect_timeout '30'
+
        # For second factor auth:
 
        # when a fixed 2FA password can be used

diff --git a/net/openconnect/files/openconnect.sh b/net/openconnect/files/openconnect.sh
index 6a7d122750e01e9c9339193a842680074eac7919..25fb7d542468b2e4cf5a7446541a356a9936caec 100755 (executable)
--- a/net/openconnect/files/openconnect.sh
+++ b/net/openconnect/files/openconnect.sh
@@ -18,6 +18,7 @@ proto_openconnect_init_config() {
        proto_config_add_int "port"
        proto_config_add_int "mtu"
        proto_config_add_int "juniper"
+       proto_config_add_int "reconnect_timeout"
        proto_config_add_string "vpn_protocol"
        proto_config_add_boolean "no_dtls"
        proto_config_add_string "interface"
@@ -32,6 +33,7 @@ proto_openconnect_init_config() {
        proto_config_add_string "token_script"
        proto_config_add_string "os"
        proto_config_add_string "csd_wrapper"
+       proto_config_add_string "proxy"
        proto_config_add_array 'form_entry:regex("[^:]+:[^=]+=.*")'
        no_device=1
        available=1
@@ -57,6 +59,8 @@ proto_openconnect_setup() {
                password \
                password2 \
                port \
+               proxy \
+               reconnect_timeout \
                server \
                serverhash \
                token_mode \
@@ -131,6 +135,8 @@ proto_openconnect_setup() {
        [ -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"
+       [ -n "$proxy" ] && append_args "--proxy=$proxy"
+       [ -n "$reconnect_timeout" ] && append_args "--reconnect-timeout=$reconnect_timeout"
 
        json_for_each_item proto_openconnect_add_form_entry form_entry