Add openconnect executable to config

configs/oc-client.json

@@ -5,6 +5,7 @@
     "XMLProfile": "/var/lib/oc-daemon/profile.xml",
     "VPNServer": "My VPN Server Name",
     "User": "$USER",
+    "OpenConnect": "openconnect",
     "Protocol": "anyconnect",
     "UserAgent": "AnyConnect",
     "Quiet": true,

configs/oc-daemon.json

@@ -21,6 +21,7 @@
 		"ListenTCP": true
 	},
 	"OpenConnect": {
+		"OpenConnect": "openconnect",
 		"XMLProfile": "/var/lib/oc-daemon/profile.xml",
 		"VPNCScript": "/usr/bin/oc-daemon-vpncscript",
 		"VPNDevice": "oc-daemon-tun0",

internal/daemon/config_test.go

@@ -93,6 +93,7 @@ func TestConfigLoad(t *testing.T) {
 		"ListenTCP": true
 	},
 	"OpenConnect": {
+		"OpenConnect": "openconnect",
 		"XMLProfile": "/var/lib/oc-daemon/profile.xml",
 		"VPNCScript": "/usr/bin/oc-daemon-vpncscript",
 		"VPNDevice": "oc-daemon-tun0",

internal/ocrunner/config.go

@@ -3,6 +3,9 @@ package ocrunner
 import "strconv"
 
 var (
+	// OpenConnect is the default openconnect executable
+	OpenConnect = "openconnect"
+
 	// XMLProfile is the default AnyConnect Profile
 	XMLProfile = "/var/lib/oc-daemon/profile.xml"
 
@@ -36,6 +39,8 @@ var (
 
 // Config is the configuration for an openconnect connection runner
 type Config struct {
+	OpenConnect string
+
 	XMLProfile string
 	VPNCScript string
 	VPNDevice  string
@@ -53,6 +58,7 @@ type Config struct {
 // Valid returns whether the openconnect configuration is valid
 func (c *Config) Valid() bool {
 	if c == nil ||
+		c.OpenConnect == "" ||
 		c.XMLProfile == "" ||
 		c.VPNCScript == "" ||
 		c.VPNDevice == "" ||
@@ -76,6 +82,8 @@ func (c *Config) Valid() bool {
 // NewConfig returns a new configuration for an openconnect connection runner
 func NewConfig() *Config {
 	return &Config{
+		OpenConnect: OpenConnect,
+
 		XMLProfile: XMLProfile,
 		VPNCScript: VPNCScript,
 		VPNDevice:  VPNDevice,

internal/ocrunner/config_test.go

@@ -12,13 +12,15 @@ func TestConfigValid(t *testing.T) {
 		nil,
 		{},
 		{
+			OpenConnect:    "openconnect",
 			XMLProfile:     "/test/profile",
 			VPNCScript:     "/test/vpncscript",
 			VPNDevice:      "test-device",
 			PIDFile:        "/test/pid",
 			PIDPermissions: "invalid",
 		},
 		{
+			OpenConnect:    "openconnect",
 			XMLProfile:     "/test/profile",
 			VPNCScript:     "/test/vpncscript",
 			VPNDevice:      "test-device",
@@ -38,6 +40,7 @@ func TestConfigValid(t *testing.T) {
 	for _, valid := range []*Config{
 		NewConfig(),
 		{
+			OpenConnect:    "openconnect",
 			XMLProfile:     "/test/profile",
 			VPNCScript:     "/test/vpncscript",
 			VPNDevice:      "test-device",
@@ -57,6 +60,8 @@ func TestConfigValid(t *testing.T) {
 // TestNewConfig tests NewConfig
 func TestNewConfig(t *testing.T) {
 	want := &Config{
+		OpenConnect: OpenConnect,
+
 		XMLProfile: XMLProfile,
 		VPNCScript: VPNCScript,
 		VPNDevice:  VPNDevice,

internal/ocrunner/connect.go

@@ -160,7 +160,7 @@ func (c *Connect) handleConnect(e *ConnectEvent) {
 		parameters = append(parameters, device)
 	}
 	parameters = append(parameters, c.config.ExtraArgs...)
-	c.command = exec.Command("openconnect", parameters...)
+	c.command = exec.Command(c.config.OpenConnect, parameters...)
 
 	// run command, pass login info to stdin
 	b := bytes.NewBufferString(e.login.Cookie)
@@ -316,7 +316,7 @@ func CleanupConnect(config *Config) {
 		return
 	}
 
-	if !strings.HasPrefix(string(cmdLine), "openconnect") {
+	if !strings.HasPrefix(string(cmdLine), config.OpenConnect) {
 		return
 	}
 

pkg/client/client.go

@@ -424,7 +424,7 @@ var authenticate = func(d *DBusClient) error {
 	parameters = append(parameters, config.ExtraArgs...)
 	parameters = append(parameters, config.VPNServer)
 
-	command := exec.Command("openconnect", parameters...)
+	command := exec.Command(config.OpenConnect, parameters...)
 
 	// run command: allow user input, show stderr, buffer stdout
 	var b bytes.Buffer

pkg/client/config.go

@@ -22,6 +22,9 @@ var (
 	// of the system configuration is stored
 	SystemConfigDirPath = "/var/lib"
 
+	// OpenConnect is the openconnect executable
+	OpenConnect = "openconnect"
+
 	// Protocol is the protocol used by openconnect
 	Protocol = "anyconnect"
 
@@ -51,12 +54,13 @@ type Config struct {
 	User              string
 	Password          string `json:"-"`
 
-	Protocol  string
-	UserAgent string
-	Quiet     bool
-	NoProxy   bool
-	ExtraEnv  []string
-	ExtraArgs []string
+	OpenConnect string
+	Protocol    string
+	UserAgent   string
+	Quiet       bool
+	NoProxy     bool
+	ExtraEnv    []string
+	ExtraArgs   []string
 }
 
 // Copy returns a copy of Config
@@ -87,6 +91,7 @@ func (c *Config) Valid() bool {
 		c.ClientKey == "" ||
 		c.XMLProfile == "" ||
 		c.VPNServer == "" ||
+		c.OpenConnect == "" ||
 		c.Protocol == "" ||
 		c.UserAgent == "" {
 		// invalid
@@ -136,13 +141,14 @@ func (c *Config) Save(file string) error {
 // NewConfig returns a new Config
 func NewConfig() *Config {
 	return &Config{
-		XMLProfile: xmlprofile.SystemProfile,
-		Protocol:   Protocol,
-		UserAgent:  UserAgent,
-		Quiet:      Quiet,
-		NoProxy:    NoProxy,
-		ExtraEnv:   ExtraEnv,
-		ExtraArgs:  ExtraArgs,
+		XMLProfile:  xmlprofile.SystemProfile,
+		OpenConnect: OpenConnect,
+		Protocol:    Protocol,
+		UserAgent:   UserAgent,
+		Quiet:       Quiet,
+		NoProxy:     NoProxy,
+		ExtraEnv:    ExtraEnv,
+		ExtraArgs:   ExtraArgs,
 	}
 }
 

pkg/client/config_test.go

@@ -107,12 +107,13 @@ func TestLoadConfig(t *testing.T) {
 		VPNServer:         "server.example.com",
 		User:              "user1",
 
-		Protocol:  "test",
-		UserAgent: "agent",
-		Quiet:     true,
-		NoProxy:   true,
-		ExtraEnv:  []string{"oc_daemon_var_is_not=used"},
-		ExtraArgs: []string{"--arg-does-not=exist"},
+		OpenConnect: "openconnect",
+		Protocol:    "test",
+		UserAgent:   "agent",
+		Quiet:       true,
+		NoProxy:     true,
+		ExtraEnv:    []string{"oc_daemon_var_is_not=used"},
+		ExtraArgs:   []string{"--arg-does-not=exist"},
 	}
 
 	// create temporary file