[feat] lookup the config vars at runtime

- Resolves: #326

3 files changed, 9 insertions, 13 deletions

diff --git a/pkg/vpn/bonafide/bonafide.go b/pkg/vpn/bonafide/bonafide.go
index 6630352..e65e193 100644
--- a/pkg/vpn/bonafide/bonafide.go
+++ b/pkg/vpn/bonafide/bonafide.go
@@ -40,10 +40,6 @@ const (
 	certPathv1 = "1/cert"
 	certPathv3 = "3/cert"
 	authPathv3 = "3/auth"
-
-	certAPI  = config.APIURL + certPathv1
-	certAPI3 = config.APIURL + certPathv3
-	authAPI  = config.APIURL + authPathv3
 )
 
 type Bonafide struct {
@@ -185,11 +181,11 @@ func (b *Bonafide) getURL(object string) string {
 	if b.apiURL == "" {
 		switch object {
 		case "cert":
-			return certAPI
+			return config.APIURL + certPathv1
 		case "certv3":
-			return certAPI3
+			return config.APIURL + certPathv3
 		case "auth":
-			return authAPI
+			return config.APIURL + authPathv3
 		}
 	} else {
 		switch object {
diff --git a/pkg/vpn/bonafide/eip_service.go b/pkg/vpn/bonafide/eip_service.go
index 961ac40..21cc8e8 100644
--- a/pkg/vpn/bonafide/eip_service.go
+++ b/pkg/vpn/bonafide/eip_service.go
@@ -14,11 +14,6 @@ import (
 	"0xacab.org/leap/bitmask-vpn/pkg/config"
 )
 
-const (
-	eip1API = config.APIURL + "1/config/eip-service.json"
-	eip3API = config.APIURL + "3/config/eip-service.json"
-)
-
 type eipService struct {
 	Gateways             []gatewayV3
 	Locations            map[string]location
@@ -83,6 +78,7 @@ func (b *Bonafide) setupAuthentication(i interface{}) {
 }
 
 func (b *Bonafide) fetchEipJSON() error {
+	eip3API := config.APIURL + "3/config/eip-service.json"
 	resp, err := b.client.Post(eip3API, "", nil)
 	for err != nil {
 		log.Printf("Error fetching eip v3 json: %v", err)
@@ -98,6 +94,7 @@ func (b *Bonafide) fetchEipJSON() error {
 		buf := make([]byte, 128)
 		resp.Body.Read(buf)
 		log.Printf("Error fetching eip v3 json")
+		eip1API := config.APIURL + "1/config/eip-service.json"
 		resp, err = b.client.Post(eip1API, "", nil)
 		if err != nil {
 			return err
diff --git a/pkg/vpn/launcher_linux.go b/pkg/vpn/launcher_linux.go
index 1280eae..3a29789 100644
--- a/pkg/vpn/launcher_linux.go
+++ b/pkg/vpn/launcher_linux.go
@@ -29,7 +29,10 @@ import (
 )
 
 const (
-	systemOpenvpnPath   = "/usr/sbin/openvpn"
+	systemOpenvpnPath = "/usr/sbin/openvpn"
+)
+
+var (
 	snapOpenvpnPath     = "/snap/bin/" + config.BinaryName + ".openvpn"
 	snapBitmaskRootPath = "/snap/bin/" + config.BinaryName + ".bitmask-root"
 )