From bea32af5d45702e5608d347bf2bf6314d899f2e0 Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Sat, 12 Jan 2019 18:18:23 +0100 Subject: [feat] Reorganize code Let's use a more structured folder system: https://github.com/golang-standards/project-layout - Resolves: #99 --- pkg/bitmask/autostart.go | 32 ++++++++++++++++++++ pkg/bitmask/bitmask.go | 30 +++++++++++++++++++ pkg/bitmask/bitmaskd.go | 44 ++++++++++++++++++++++++++++ pkg/bitmask/standalone.go | 74 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 180 insertions(+) create mode 100644 pkg/bitmask/autostart.go create mode 100644 pkg/bitmask/bitmask.go create mode 100644 pkg/bitmask/bitmaskd.go create mode 100644 pkg/bitmask/standalone.go (limited to 'pkg/bitmask') diff --git a/pkg/bitmask/autostart.go b/pkg/bitmask/autostart.go new file mode 100644 index 0000000..ebab428 --- /dev/null +++ b/pkg/bitmask/autostart.go @@ -0,0 +1,32 @@ +// 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 . + +package bitmask + +// Autostart holds the functions to enable and disable the application autostart +type Autostart interface { + Disable() error + Enable() error +} + +type dummyAutostart struct{} + +func (a *dummyAutostart) Disable() error { + return nil +} + +func (a *dummyAutostart) Enable() error { + return nil +} diff --git a/pkg/bitmask/bitmask.go b/pkg/bitmask/bitmask.go new file mode 100644 index 0000000..a7aabaa --- /dev/null +++ b/pkg/bitmask/bitmask.go @@ -0,0 +1,30 @@ +// 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 . + +package bitmask + +type Bitmask interface { + GetStatusCh() <-chan string + Close() + Version() (string, error) + StartVPN(provider string) error + StopVPN() error + ReloadFirewall() error + GetStatus() (string, error) + InstallHelpers() error + VPNCheck() (helpers bool, priviledge bool, err error) + ListGateways(provider string) ([]string, error) + UseGateway(name string) error +} diff --git a/pkg/bitmask/bitmaskd.go b/pkg/bitmask/bitmaskd.go new file mode 100644 index 0000000..ad4da31 --- /dev/null +++ b/pkg/bitmask/bitmaskd.go @@ -0,0 +1,44 @@ +// +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 . + +package bitmask + +import ( + "errors" + "log" + + "0xacab.org/leap/bitmask-systray/pkg/bitmaskd" + "golang.org/x/text/message" +) + +const ( + notRunning = `Is bitmaskd running? Start bitmask and try again.` +) + +// Init bitmask +func Init(printer *message.Printer) (Bitmask, error) { + b, err := bitmaskd.Init() + if err != nil { + log.Printf("An error ocurred starting bitmaskd: %v", err) + err = errors.New(printer.Sprintf(notRunning)) + } + return b, err +} + +// NewAutostart creates a handler for the autostart of your platform +func NewAutostart(appName string, iconPath string) Autostart { + return &dummyAutostart{} +} diff --git a/pkg/bitmask/standalone.go b/pkg/bitmask/standalone.go new file mode 100644 index 0000000..f3f7602 --- /dev/null +++ b/pkg/bitmask/standalone.go @@ -0,0 +1,74 @@ +// +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 . + +package bitmask + +import ( + "errors" + "fmt" + "log" + "os" + "path/filepath" + "regexp" + + "0xacab.org/leap/bitmask-systray/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, + } +} -- cgit v1.2.3