diff --git a/pkg/bitmask/autostart.go b/pkg/bitmask/autostart.go
index ebab428a72af5e2dc78c7b4044864ffd26cddeb0..1ba9162721f70e9307987d16d3ad1dc577a5d878 100644
--- a/pkg/bitmask/autostart.go
+++ b/pkg/bitmask/autostart.go
@@ -1,3 +1,4 @@
+// +build !bitmaskd
// Copyright (C) 2018 LEAP
//
// This program is free software: you can redistribute it and/or modify
@@ -15,12 +16,56 @@
package bitmask
+import (
+ "fmt"
+ "log"
+ "os"
+ "path/filepath"
+ "regexp"
+
+ pmautostart "github.com/ProtonMail/go-autostart"
+)
+
+const (
+ errorMsg = `An error has ocurred initializing the VPN: %v`
+)
+
// Autostart holds the functions to enable and disable the application autostart
type Autostart interface {
Disable() error
Enable() error
}
+// newAutostart creates a handler for the autostart of your platform
+func newAutostart(appName string, iconPath string) Autostart {
+ exec := os.Args
+ if os.Getenv("SNAP") != "" {
+ re := regexp.MustCompile("/snap/([^/]*)/")
+ match := re.FindStringSubmatch(os.Args[0])
+ if len(match) > 1 {
+ snapName := match[1]
+ exec = []string{fmt.Sprintf("/snap/bin/%s.launcher", snapName)}
+ } else {
+ log.Printf("Snap binary has unknown path: %v", os.Args[0])
+ }
+ }
+
+ if exec[0][:2] == "./" || exec[0][:2] == ".\\" {
+ var err error
+ exec[0], err = filepath.Abs(exec[0])
+ if err != nil {
+ log.Printf("Error making the path absolute directory: %v", err)
+ }
+ }
+
+ return &pmautostart.App{
+ Name: appName,
+ Exec: exec,
+ DisplayName: appName,
+ Icon: iconPath,
+ }
+}
+
type dummyAutostart struct{}
func (a *dummyAutostart) Disable() error {
diff --git a/pkg/bitmask/init.go b/pkg/bitmask/init.go
index 9af79489578ad9e2745caf06dd8673aa84798085..7f10ab9db2aee61a399b2cc56132a5599e293b10 100644
--- a/pkg/bitmask/init.go
+++ b/pkg/bitmask/init.go
@@ -16,6 +16,7 @@
package bitmask
import (
+ "errors"
"log"
"os"
"path"
@@ -25,6 +26,7 @@ import (
"0xacab.org/leap/bitmask-vpn/pkg/config"
"0xacab.org/leap/bitmask-vpn/pkg/pid"
+ "0xacab.org/leap/bitmask-vpn/pkg/vpn"
)
type ProviderInfo struct {
@@ -45,6 +47,15 @@ func InitializeLogger() {
}
}
+func initBitmask(printer *message.Printer) (Bitmask, error) {
+ b, err := vpn.Init()
+ if err != nil {
+ log.Printf("An error ocurred starting bitmask: %v", err)
+ err = errors.New(printer.Sprintf(errorMsg, err))
+ }
+ return b, err
+}
+
func InitializeBitmask() (Bitmask, error) {
if _, err := os.Stat(config.Path); os.IsNotExist(err) {
os.MkdirAll(config.Path, os.ModePerm)
@@ -60,7 +71,7 @@ func InitializeBitmask() (Bitmask, error) {
conf.Version = "unknown"
conf.Printer = initPrinter()
- b, err := Init(conf.Printer)
+ b, err := initBitmask(conf.Printer)
if err != nil {
// TODO notify failure
log.Fatal(err)
diff --git a/pkg/bitmask/standalone.go b/pkg/bitmask/standalone.go
deleted file mode 100644
index 92ea542ce9a6dd76df8eefb966deb56544d37846..0000000000000000000000000000000000000000
--- a/pkg/bitmask/standalone.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// +build !bitmaskd
-// Copyright (C) 2018 LEAP
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-package bitmask
-
-import (
- "errors"
- "fmt"
- "log"
- "os"
- "path/filepath"
- "regexp"
-
- "0xacab.org/leap/bitmask-vpn/pkg/standalone"
- pmautostart "github.com/ProtonMail/go-autostart"
- "golang.org/x/text/message"
-)
-
-const (
- errorMsg = `An error has ocurred initializing the VPN: %v`
-)
-
-// Init bitmask
-func Init(printer *message.Printer) (Bitmask, error) {
- b, err := standalone.Init()
- if err != nil {
- log.Printf("An error ocurred starting standalone bitmask: %v", err)
- err = errors.New(printer.Sprintf(errorMsg, err))
- }
- return b, err
-}
-
-// newAutostart creates a handler for the autostart of your platform
-func newAutostart(appName string, iconPath string) Autostart {
- exec := os.Args
- if os.Getenv("SNAP") != "" {
- re := regexp.MustCompile("/snap/([^/]*)/")
- match := re.FindStringSubmatch(os.Args[0])
- if len(match) > 1 {
- snapName := match[1]
- exec = []string{fmt.Sprintf("/snap/bin/%s.launcher", snapName)}
- } else {
- log.Printf("Snap binary has unknown path: %v", os.Args[0])
- }
- }
-
- if exec[0][:2] == "./" || exec[0][:2] == ".\\" {
- var err error
- exec[0], err = filepath.Abs(exec[0])
- if err != nil {
- log.Printf("Error making the path absolute directory: %v", err)
- }
- }
-
- return &pmautostart.App{
- Name: appName,
- Exec: exec,
- DisplayName: appName,
- Icon: iconPath,
- }
-}
diff --git a/pkg/standalone/bonafide/bonafide.go b/pkg/vpn/bonafide/bonafide.go
similarity index 100%
rename from pkg/standalone/bonafide/bonafide.go
rename to pkg/vpn/bonafide/bonafide.go
diff --git a/pkg/vpn/bonafide/bonafide_api_test.go b/pkg/vpn/bonafide/bonafide_api_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..7b48d8f4d03c07927c9437ec7f2807ba37a234a6
--- /dev/null
+++ b/pkg/vpn/bonafide/bonafide_api_test.go
@@ -0,0 +1,15 @@
+package bonafide
+
+import (
+ "log"
+ "testing"
+)
+
+func TestBonafideAPI(t *testing.T) {
+ b := New()
+ cert, err := b.GetCertPem()
+ if err != nil {
+ log.Fatal(err)
+ }
+ log.Println(string(cert))
+}
diff --git a/pkg/standalone/bonafide/bonafide_integration_test.go b/pkg/vpn/bonafide/bonafide_integration_test.go
similarity index 100%
rename from pkg/standalone/bonafide/bonafide_integration_test.go
rename to pkg/vpn/bonafide/bonafide_integration_test.go
diff --git a/pkg/standalone/bonafide/bonafide_test.go b/pkg/vpn/bonafide/bonafide_test.go
similarity index 100%
rename from pkg/standalone/bonafide/bonafide_test.go
rename to pkg/vpn/bonafide/bonafide_test.go
diff --git a/pkg/standalone/bonafide/eip_service.go b/pkg/vpn/bonafide/eip_service.go
similarity index 100%
rename from pkg/standalone/bonafide/eip_service.go
rename to pkg/vpn/bonafide/eip_service.go
diff --git a/pkg/standalone/bonafide/testdata/cert b/pkg/vpn/bonafide/testdata/cert
similarity index 100%
rename from pkg/standalone/bonafide/testdata/cert
rename to pkg/vpn/bonafide/testdata/cert
diff --git a/pkg/standalone/bonafide/testdata/eip-service.json b/pkg/vpn/bonafide/testdata/eip-service.json
similarity index 100%
rename from pkg/standalone/bonafide/testdata/eip-service.json
rename to pkg/vpn/bonafide/testdata/eip-service.json
diff --git a/pkg/standalone/bonafide/testdata/eip-service3.json b/pkg/vpn/bonafide/testdata/eip-service3.json
similarity index 100%
rename from pkg/standalone/bonafide/testdata/eip-service3.json
rename to pkg/vpn/bonafide/testdata/eip-service3.json
diff --git a/pkg/standalone/launcher.go b/pkg/vpn/launcher.go
similarity index 98%
rename from pkg/standalone/launcher.go
rename to pkg/vpn/launcher.go
index 621ba4c35883b46d2388e4e932b9bcb6aaa6078c..e18fdc67d58473db77eebb45ceb393e5ee27128c 100644
--- a/pkg/standalone/launcher.go
+++ b/pkg/vpn/launcher.go
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-package standalone
+package vpn
import (
"bytes"
@@ -29,7 +29,7 @@ import (
"time"
"0xacab.org/leap/bitmask-vpn/pkg/config"
- "0xacab.org/leap/bitmask-vpn/pkg/standalone/bonafide"
+ "0xacab.org/leap/bitmask-vpn/pkg/vpn/bonafide"
)
type launcher struct {
diff --git a/pkg/standalone/launcher_linux.go b/pkg/vpn/launcher_linux.go
similarity index 98%
rename from pkg/standalone/launcher_linux.go
rename to pkg/vpn/launcher_linux.go
index 5b66415b3dc470b6e437e797214f9f5bd3895fcb..71a74eafd443ef89da49b92266ed23397ed2ccf0 100644
--- a/pkg/standalone/launcher_linux.go
+++ b/pkg/vpn/launcher_linux.go
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-package standalone
+package vpn
import (
"errors"
@@ -24,7 +24,7 @@ import (
"strings"
"0xacab.org/leap/bitmask-vpn/pkg/config"
- "0xacab.org/leap/bitmask-vpn/pkg/standalone/bonafide"
+ "0xacab.org/leap/bitmask-vpn/pkg/vpn/bonafide"
"github.com/keybase/go-ps"
)
diff --git a/pkg/standalone/main.go b/pkg/vpn/main.go
similarity index 95%
rename from pkg/standalone/main.go
rename to pkg/vpn/main.go
index 4ac577698a0f8315622587ec79e52bbc92a350d3..ce599c94db1571cf2d40ebb187334c5d33c4dee3 100644
--- a/pkg/standalone/main.go
+++ b/pkg/vpn/main.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 LEAP
+// Copyright (C) 2018-2020 LEAP
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-package standalone
+package vpn
import (
"io/ioutil"
@@ -21,7 +21,7 @@ import (
"os"
"0xacab.org/leap/bitmask-vpn/pkg/config"
- "0xacab.org/leap/bitmask-vpn/pkg/standalone/bonafide"
+ "0xacab.org/leap/bitmask-vpn/pkg/vpn/bonafide"
"0xacab.org/leap/shapeshifter"
"github.com/apparentlymart/go-openvpn-mgmt/openvpn"
)
diff --git a/pkg/standalone/vpn.go b/pkg/vpn/openvpn.go
similarity index 99%
rename from pkg/standalone/vpn.go
rename to pkg/vpn/openvpn.go
index 4682a47e46fc0959836f3925752e41b36cbe382a..a75b830af0ea7abef18f8f30240f2f6e1fade0a2 100644
--- a/pkg/standalone/vpn.go
+++ b/pkg/vpn/openvpn.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 LEAP
+// Copyright (C) 2018-2020 LEAP
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-package standalone
+package vpn
import (
"fmt"
diff --git a/pkg/standalone/status.go b/pkg/vpn/status.go
similarity index 98%
rename from pkg/standalone/status.go
rename to pkg/vpn/status.go
index 96177e18fd8fbcde7dc2988696b0e4c45128d6d6..a4d7ada3cc8ff1eedae8ec25f1b730946195e90f 100644
--- a/pkg/standalone/status.go
+++ b/pkg/vpn/status.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 LEAP
+// Copyright (C) 2018-2020 LEAP
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-package standalone
+package vpn
import (
"fmt"