From 1038fa83b820bbdaa9bcf37118cf23b0e48a86c5 Mon Sep 17 00:00:00 2001 From: "kali kaneko (leap communications)" Date: Fri, 12 Jun 2020 19:05:59 +0200 Subject: [refactor] reorganize modules bitmaskd: so long and thanks for all the fish! Signed-off-by: kali kaneko (leap communications) --- gui/backend.go | 40 ++---------- pkg/bitmask/autostart.go | 6 +- pkg/bitmask/bitmaskd.go | 44 ------------- pkg/bitmask/init.go | 137 ++++++++++++++++++++++++++++++++++++++ pkg/bitmask/standalone.go | 4 +- pkg/bitmaskd/events.go | 50 -------------- pkg/bitmaskd/main.go | 163 ---------------------------------------------- pkg/bitmaskd/vpn.go | 103 ----------------------------- pkg/config/gui.go | 108 ++++++++++++++++++++++++++++++ pkg/pid/pid.go | 114 ++++++++++++++++++++++++++++++++ pkg/pid/pid_test.go | 21 ++++++ pkg/systray2/config.go | 108 ------------------------------ pkg/systray2/pid.go | 99 ---------------------------- pkg/systray2/pid_test.go | 21 ------ pkg/systray2/run.go | 106 ------------------------------ 15 files changed, 392 insertions(+), 732 deletions(-) delete mode 100644 pkg/bitmask/bitmaskd.go create mode 100644 pkg/bitmask/init.go delete mode 100644 pkg/bitmaskd/events.go delete mode 100644 pkg/bitmaskd/main.go delete mode 100644 pkg/bitmaskd/vpn.go create mode 100644 pkg/config/gui.go create mode 100644 pkg/pid/pid.go create mode 100644 pkg/pid/pid_test.go delete mode 100644 pkg/systray2/config.go delete mode 100644 pkg/systray2/pid.go delete mode 100644 pkg/systray2/pid_test.go delete mode 100644 pkg/systray2/run.go diff --git a/gui/backend.go b/gui/backend.go index d05ba7a..cf7c0fb 100644 --- a/gui/backend.go +++ b/gui/backend.go @@ -6,22 +6,16 @@ import ( "bytes" "encoding/json" "fmt" - "io" "log" "net/http" "os" - "path" "reflect" "sync" //"time" "unsafe" "0xacab.org/leap/bitmask-vpn/pkg/bitmask" - "0xacab.org/leap/bitmask-vpn/pkg/config" "0xacab.org/leap/bitmask-vpn/pkg/pickle" - "0xacab.org/leap/bitmask-vpn/pkg/systray2" - "github.com/jmshal/go-locale" - "golang.org/x/text/message" ) // typedef void (*cb)(); @@ -184,37 +178,17 @@ func setStatusFromStr(stStr string) { setStatus(unknown.fromString(stStr)) } -func initPrinter() *message.Printer { - locale, err := go_locale.DetectLocale() - if err != nil { - log.Println("Error detecting the system locale: ", err) - } - - return message.NewPrinter(message.MatchLanguage(locale, "en")) -} - -const logFile = "systray.log" - -var logger io.Closer - // initializeBitmask instantiates a bitmask connection func initializeBitmask() { - _, err := config.ConfigureLogger(path.Join(config.Path, logFile)) - - if err != nil { - log.Println("Can't configure logger: ", err) - } - if ctx == nil { log.Println("error: cannot initialize bitmask, ctx is nil") os.Exit(1) } - conf := systray.ParseConfig() - conf.Version = "unknown" - conf.Printer = initPrinter() - b, err := bitmask.Init(conf.Printer) + bitmask.InitializeLogger() + + b, err := bitmask.InitializeBitmask() if err != nil { - log.Fatal(err) + log.Println("error: cannot initialize bitmask") } ctx.bm = b } @@ -318,10 +292,10 @@ func SubscribeToEvent(event string, f unsafe.Pointer) { //export InitializeBitmaskContext func InitializeBitmaskContext() { - provider := config.Provider - appName := config.ApplicationName + pi := bitmask.GetConfiguredProvider() + initOnce.Do(func() { - initializeContext(provider, appName) + initializeContext(pi.Provider, pi.AppName) }) go ctx.updateStatus() diff --git a/pkg/bitmask/autostart.go b/pkg/bitmask/autostart.go index 32b931a..ebab428 100644 --- a/pkg/bitmask/autostart.go +++ b/pkg/bitmask/autostart.go @@ -21,12 +21,12 @@ type Autostart interface { Enable() error } -type DummyAutostart struct{} +type dummyAutostart struct{} -func (a *DummyAutostart) Disable() error { +func (a *dummyAutostart) Disable() error { return nil } -func (a *DummyAutostart) Enable() error { +func (a *dummyAutostart) Enable() error { return nil } diff --git a/pkg/bitmask/bitmaskd.go b/pkg/bitmask/bitmaskd.go deleted file mode 100644 index a8c4e5d..0000000 --- a/pkg/bitmask/bitmaskd.go +++ /dev/null @@ -1,44 +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 . - -package bitmask - -import ( - "errors" - "log" - - "0xacab.org/leap/bitmask-vpn/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/init.go b/pkg/bitmask/init.go new file mode 100644 index 0000000..9af7948 --- /dev/null +++ b/pkg/bitmask/init.go @@ -0,0 +1,137 @@ +// 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 +// 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 ( + "log" + "os" + "path" + + "github.com/jmshal/go-locale" + "golang.org/x/text/message" + + "0xacab.org/leap/bitmask-vpn/pkg/config" + "0xacab.org/leap/bitmask-vpn/pkg/pid" +) + +type ProviderInfo struct { + Provider string + AppName string +} + +func GetConfiguredProvider() *ProviderInfo { + provider := config.Provider + appName := config.ApplicationName + return &ProviderInfo{provider, appName} +} + +func InitializeLogger() { + _, err := config.ConfigureLogger(path.Join(config.LogPath)) + if err != nil { + log.Println("Can't configure logger: ", err) + } +} + +func InitializeBitmask() (Bitmask, error) { + if _, err := os.Stat(config.Path); os.IsNotExist(err) { + os.MkdirAll(config.Path, os.ModePerm) + } + + err := pid.AcquirePID() + if err != nil { + log.Fatal(err) + } + defer pid.ReleasePID() + + conf := config.ParseConfig() + conf.Version = "unknown" + conf.Printer = initPrinter() + + b, err := Init(conf.Printer) + if err != nil { + // TODO notify failure + log.Fatal(err) + } + go checkAndStartBitmask(b, conf) + + var as Autostart + if conf.DisableAustostart { + as = &dummyAutostart{} + } else { + as = newAutostart(config.ApplicationName, "") + } + err = as.Enable() + if err != nil { + log.Printf("Error enabling autostart: %v", err) + } + return b, nil +} + +func initPrinter() *message.Printer { + locale, err := go_locale.DetectLocale() + if err != nil { + log.Println("Error detecting the system locale: ", err) + } + + return message.NewPrinter(message.MatchLanguage(locale, "en")) +} + +func checkAndStartBitmask(b Bitmask, conf *config.Config) { + if conf.Obfs4 { + err := b.UseTransport("obfs4") + if err != nil { + log.Printf("Error setting transport: %v", err) + } + } + err := checkAndInstallHelpers(b) + if err != nil { + log.Printf("Is bitmask running? %v", err) + os.Exit(1) + } + err = maybeStartVPN(b, conf) + if err != nil { + log.Println("Error starting VPN: ", err) + } +} + +func checkAndInstallHelpers(b Bitmask) error { + helpers, privilege, err := b.VPNCheck() + if (err != nil && err.Error() == "nopolkit") || (err == nil && !privilege) { + log.Printf("No polkit found") + os.Exit(1) + } else if err != nil { + log.Printf("Error checking vpn: %v", err) + return err + } + + if !helpers { + err = b.InstallHelpers() + if err != nil { + log.Println("Error installing helpers: ", err) + } + } + return nil +} + +func maybeStartVPN(b Bitmask, conf *config.Config) error { + if !conf.StartVPN { + return nil + } + + err := b.StartVPN(config.Provider) + conf.SetUserStoppedVPN(false) + return err +} diff --git a/pkg/bitmask/standalone.go b/pkg/bitmask/standalone.go index 8ae6f39..92ea542 100644 --- a/pkg/bitmask/standalone.go +++ b/pkg/bitmask/standalone.go @@ -43,8 +43,8 @@ func Init(printer *message.Printer) (Bitmask, error) { return b, err } -// NewAutostart creates a handler for the autostart of your platform -func NewAutostart(appName string, iconPath string) Autostart { +// 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/([^/]*)/") diff --git a/pkg/bitmaskd/events.go b/pkg/bitmaskd/events.go deleted file mode 100644 index 3c8bb2c..0000000 --- a/pkg/bitmaskd/events.go +++ /dev/null @@ -1,50 +0,0 @@ -// 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 bitmaskd - -import ( - "log" - "net/http" -) - -const ( - statusEvent = "VPN_STATUS_CHANGED" -) - -func (b *Bitmask) eventsHandler() { - b.send("events", "register", statusEvent) - client := &http.Client{ - Timeout: 0, - } - for { - resJSON, err := send(b.apiToken, client, "events", "poll") - res, ok := resJSON.([]interface{}) - if err != nil || !ok || len(res) < 1 { - continue - } - event, ok := res[0].(string) - if !ok || event != statusEvent { - continue - } - - status, err := b.GetStatus() - if err != nil { - log.Printf("Error receiving status: %v", err) - continue - } - b.statusCh <- status - } -} diff --git a/pkg/bitmaskd/main.go b/pkg/bitmaskd/main.go deleted file mode 100644 index b0d0349..0000000 --- a/pkg/bitmaskd/main.go +++ /dev/null @@ -1,163 +0,0 @@ -// 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 bitmaskd - -import ( - "bytes" - "encoding/json" - "errors" - "io/ioutil" - "log" - "net/http" - "path" - "time" - - "0xacab.org/leap/bitmask-vpn/pkg/config" -) - -const ( - timeout = time.Second * 15 - url = "http://localhost:7070/API/" - headerAuth = "X-Bitmask-Auth" -) - -// Bitmask holds the bitmask client data -type Bitmask struct { - client *http.Client - apiToken string - statusCh chan string -} - -// Init the connection to bitmask -func Init() (*Bitmask, error) { - statusCh := make(chan string) - client := &http.Client{ - Timeout: timeout, - } - - err := waitForBitmaskd() - if err != nil { - return nil, err - } - - apiToken, err := getToken() - if err != nil { - return nil, err - } - - b := Bitmask{client, apiToken, statusCh} - go b.eventsHandler() - return &b, nil -} - -// GetStatusCh returns a channel that will recieve VPN status changes -func (b *Bitmask) GetStatusCh() <-chan string { - return b.statusCh -} - -// Close the connection to bitmask -func (b *Bitmask) Close() { - _, err := b.send("core", "stop") - if err != nil { - log.Printf("Got an error stopping bitmaskd: %v", err) - } -} - -// Version gets the bitmask version string -func (b *Bitmask) Version() (string, error) { - res, err := b.send("core", "version") - if err != nil { - return "", err - } - return res["version_core"].(string), nil -} - -func waitForBitmaskd() error { - var err error - for i := 0; i < 30; i++ { - resp, err := http.Post(url, "", nil) - if err == nil { - resp.Body.Close() - return nil - } - log.Printf("Bitmask is not ready (iteration %d): %v", i, err) - time.Sleep(1 * time.Second) - } - return err -} - -func (b *Bitmask) send(parts ...interface{}) (map[string]interface{}, error) { - resJSON, err := send(b.apiToken, b.client, parts...) - if err != nil { - return nil, err - } - result, ok := resJSON.(map[string]interface{}) - if !ok { - return nil, errors.New("Not valid response") - } - return result, nil -} - -func send(apiToken string, client *http.Client, parts ...interface{}) (interface{}, error) { - apiSection, _ := parts[0].(string) - reqBody, err := json.Marshal(parts[1:]) - if err != nil { - return nil, err - } - req, err := http.NewRequest("POST", url+apiSection, bytes.NewReader(reqBody)) - if err != nil { - return nil, err - } - req.Header.Add(headerAuth, apiToken) - - resp, err := client.Do(req) - if err != nil { - return nil, err - } - defer resp.Body.Close() - - resJSON, err := ioutil.ReadAll(resp.Body) - if err != nil { - return nil, err - } - return parseResponse(resJSON) -} - -func parseResponse(resJSON []byte) (interface{}, error) { - var response struct { - Result interface{} - Error string - } - err := json.Unmarshal(resJSON, &response) - if response.Error != "" { - return nil, errors.New(response.Error) - } - return response.Result, err -} - -func getToken() (string, error) { - var err error - path := path.Join(config.Path, "authtoken") - for i := 0; i < 30; i++ { - b, err := ioutil.ReadFile(path) - if err == nil { - return string(b), nil - } - log.Printf("Auth token is not ready (iteration %d): %v", i, err) - time.Sleep(1 * time.Second) - } - return "", err -} diff --git a/pkg/bitmaskd/vpn.go b/pkg/bitmaskd/vpn.go deleted file mode 100644 index 2747441..0000000 --- a/pkg/bitmaskd/vpn.go +++ /dev/null @@ -1,103 +0,0 @@ -// 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 bitmaskd - -import ( - "errors" - "log" -) - -// StartVPN for provider -func (b *Bitmask) StartVPN(provider string) error { - _, err := b.send("vpn", "start", provider) - return err -} - -// StopVPN or cancel -func (b *Bitmask) StopVPN() error { - _, err := b.send("vpn", "stop") - return err -} - -// ReloadFirewall restarts the firewall -func (b *Bitmask) ReloadFirewall() error { - _, err := b.send("vpn", "fw_reload") - return err -} - -// GetStatus returns the VPN status -func (b *Bitmask) GetStatus() (string, error) { - res, err := b.send("vpn", "status") - if err != nil { - return "", err - } - return res["status"].(string), nil -} - -// InstallHelpers into the system -func (b *Bitmask) InstallHelpers() error { - _, err := b.send("vpn", "install") - return err -} - -// VPNCheck returns if the helpers are installed and up to date and if polkit is running -func (b *Bitmask) VPNCheck() (helpers bool, priviledge bool, err error) { - res, err := b.send("vpn", "check", "") - if err != nil { - return false, false, err - } - installed, ok := res["installed"].(bool) - if !ok { - log.Printf("Unexpected value for installed on 'vpn check': %v", res) - return false, false, errors.New("Invalid response format") - } - privcheck, ok := res["privcheck"].(bool) - if !ok { - log.Printf("Unexpected value for privcheck on 'vpn check': %v", res) - return installed, false, errors.New("Invalid response format") - } - return installed, privcheck, nil -} - -// ListGateways return the names of the gateways -func (b *Bitmask) ListGateways(provider string) ([]string, error) { - res, err := b.send("vpn", "list") - if err != nil { - return nil, err - } - - names := []string{} - locations, ok := res[provider].([]interface{}) - if !ok { - return nil, errors.New("Can't read the locations for provider " + provider) - } - for i := range locations { - loc := locations[i].(map[string]interface{}) - names = append(names, loc["name"].(string)) - } - return names, nil -} - -// UseGateway selects name as the default gateway -func (b *Bitmask) UseGateway(name string) error { - _, err := b.send("vpn", "locations", name) - return err -} - -// UseTransport selects an obfuscation transport to use -func (b *Bitmask) UseTransport(transport string) error { - return errors.New("Transport " + transport + " not implemented") -} diff --git a/pkg/config/gui.go b/pkg/config/gui.go new file mode 100644 index 0000000..ce3f14d --- /dev/null +++ b/pkg/config/gui.go @@ -0,0 +1,108 @@ +// 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 +// 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 config + +import ( + "encoding/json" + "os" + "path" + "time" + + "golang.org/x/text/message" +) + +const ( + oneDay = time.Hour * 24 + oneMonth = oneDay * 30 +) + +var ( + configPath = path.Join(Path, "systray.json") + LogPath = path.Join(Path, "systray.log") +) + +// Config holds the configuration of the systray +type Config struct { + file struct { + LastNotification time.Time + Donated time.Time + SelectGateway bool + Obfs4 bool + UserStoppedVPN bool + DisableAustostart bool + } + SelectGateway bool + Obfs4 bool + DisableAustostart bool + StartVPN bool + Version string + Printer *message.Printer +} + +// ParseConfig reads the configuration from the configuration file +func ParseConfig() *Config { + var conf Config + + f, err := os.Open(configPath) + if err != nil { + conf.save() + } else { + defer f.Close() + dec := json.NewDecoder(f) + err = dec.Decode(&conf.file) + } + + conf.SelectGateway = conf.file.SelectGateway + conf.Obfs4 = conf.file.Obfs4 + conf.DisableAustostart = conf.file.DisableAustostart + conf.StartVPN = !conf.file.UserStoppedVPN + return &conf +} + +func (c *Config) SetUserStoppedVPN(vpnStopped bool) error { + c.file.UserStoppedVPN = vpnStopped + return c.save() +} + +func (c *Config) HasDonated() bool { + return c.file.Donated.Add(oneMonth).After(time.Now()) +} + +func (c *Config) NeedsNotification() bool { + return !c.HasDonated() && c.file.LastNotification.Add(oneDay).Before(time.Now()) +} + +func (c *Config) SetNotification() error { + c.file.LastNotification = time.Now() + return c.save() +} + +func (c *Config) SetDonated() error { + c.file.Donated = time.Now() + return c.save() +} + +func (c *Config) save() error { + f, err := os.Create(configPath) + if err != nil { + return err + } + defer f.Close() + + enc := json.NewEncoder(f) + enc.SetIndent("", " ") + return enc.Encode(c.file) +} diff --git a/pkg/pid/pid.go b/pkg/pid/pid.go new file mode 100644 index 0000000..1124210 --- /dev/null +++ b/pkg/pid/pid.go @@ -0,0 +1,114 @@ +// 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 +// 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 pid + +import ( + "fmt" + "io/ioutil" + "log" + "os" + "path/filepath" + "strconv" + "strings" + "syscall" + + "0xacab.org/leap/bitmask-vpn/pkg/config" + "github.com/keybase/go-ps" +) + +var pidFile = filepath.Join(config.Path, "systray.pid") + +func AcquirePID() error { + pid := syscall.Getpid() + current, err := getPID() + if err != nil { + return err + } + + if current != pid && pidRunning(current) { + return fmt.Errorf("Another systray is running with pid: %d", current) + } + + return setPID(pid) +} + +func ReleasePID() error { + pid := syscall.Getpid() + current, err := getPID() + if err != nil { + return err + } + if current != 0 && current != pid { + return fmt.Errorf("Can't release pid file, is not own by this process") + } + + if current == pid { + return os.Remove(pidFile) + } + return nil +} + +func getPID() (int, error) { + _, err := os.Stat(pidFile) + if os.IsNotExist(err) { + return 0, nil + } + if err != nil { + return 0, err + } + + file, err := os.Open(pidFile) + if err != nil { + return 0, err + } + defer file.Close() + + b, err := ioutil.ReadAll(file) + if err != nil { + return 0, err + } + if len(b) == 0 { + return 0, nil + } + return strconv.Atoi(string(b)) +} + +func setPID(pid int) error { + file, err := os.Create(pidFile) + if err != nil { + return err + } + defer file.Close() + + _, err = file.WriteString(fmt.Sprintf("%d", pid)) + return err +} + +func pidRunning(pid int) bool { + if pid == 0 { + return false + } + proc, err := ps.FindProcess(pid) + if err != nil { + log.Printf("An error ocurred finding process: %v", err) + return false + } + if proc == nil { + return false + } + log.Printf("There is a running process with the pid %d and executable: %s", pid, proc.Executable()) + return strings.Contains(os.Args[0], proc.Executable()) +} diff --git a/pkg/pid/pid_test.go b/pkg/pid/pid_test.go new file mode 100644 index 0000000..dbc76f3 --- /dev/null +++ b/pkg/pid/pid_test.go @@ -0,0 +1,21 @@ +package pid + +import ( + "syscall" + "testing" +) + +const ( + invalidPid = 345678 +) + +func TestPidRunning(t *testing.T) { + pid := syscall.Getpid() + if !pidRunning(pid) { + t.Errorf("pid %v is not running", pid) + } + + if pidRunning(invalidPid) { + t.Errorf("pid %v is running", invalidPid) + } +} diff --git a/pkg/systray2/config.go b/pkg/systray2/config.go deleted file mode 100644 index 75a4a98..0000000 --- a/pkg/systray2/config.go +++ /dev/null @@ -1,108 +0,0 @@ -// 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 systray - -import ( - "encoding/json" - "os" - "path" - "time" - - "0xacab.org/leap/bitmask-vpn/pkg/config" - "golang.org/x/text/message" -) - -const ( - oneDay = time.Hour * 24 - oneMonth = oneDay * 30 -) - -var ( - configPath = path.Join(config.Path, "systray.json") -) - -// Config holds the configuration of the systray -type Config struct { - file struct { - LastNotification time.Time - Donated time.Time - SelectGateway bool - Obfs4 bool - UserStoppedVPN bool - DisableAustostart bool - } - SelectGateway bool - Obfs4 bool - DisableAustostart bool - StartVPN bool - Version string - Printer *message.Printer -} - -// ParseConfig reads the configuration from the configuration file -func ParseConfig() *Config { - var conf Config - - f, err := os.Open(configPath) - if err != nil { - conf.save() - } else { - defer f.Close() - dec := json.NewDecoder(f) - err = dec.Decode(&conf.file) - } - - conf.SelectGateway = conf.file.SelectGateway - conf.Obfs4 = conf.file.Obfs4 - conf.DisableAustostart = conf.file.DisableAustostart - conf.StartVPN = !conf.file.UserStoppedVPN - return &conf -} - -func (c *Config) setUserStoppedVPN(vpnStopped bool) error { - c.file.UserStoppedVPN = vpnStopped - return c.save() -} - -func (c *Config) hasDonated() bool { - return c.file.Donated.Add(oneMonth).After(time.Now()) -} - -func (c *Config) needsNotification() bool { - return !c.hasDonated() && c.file.LastNotification.Add(oneDay).Before(time.Now()) -} - -func (c *Config) setNotification() error { - c.file.LastNotification = time.Now() - return c.save() -} - -func (c *Config) setDonated() error { - c.file.Donated = time.Now() - return c.save() -} - -func (c *Config) save() error { - f, err := os.Create(configPath) - if err != nil { - return err - } - defer f.Close() - - enc := json.NewEncoder(f) - enc.SetIndent("", " ") - return enc.Encode(c.file) -} diff --git a/pkg/systray2/pid.go b/pkg/systray2/pid.go deleted file mode 100644 index b898d4e..0000000 --- a/pkg/systray2/pid.go +++ /dev/null @@ -1,99 +0,0 @@ -package systray - -import ( - "fmt" - "io/ioutil" - "log" - "os" - "path/filepath" - "strconv" - "strings" - "syscall" - - "0xacab.org/leap/bitmask-vpn/pkg/config" - "github.com/keybase/go-ps" -) - -var pidFile = filepath.Join(config.Path, "systray.pid") - -func acquirePID() error { - pid := syscall.Getpid() - current, err := getPID() - if err != nil { - return err - } - - if current != pid && pidRunning(current) { - return fmt.Errorf("Another systray is running with pid: %d", current) - } - - return setPID(pid) -} - -func releasePID() error { - pid := syscall.Getpid() - current, err := getPID() - if err != nil { - return err - } - if current != 0 && current != pid { - return fmt.Errorf("Can't release pid file, is not own by this process") - } - - if current == pid { - return os.Remove(pidFile) - } - return nil -} - -func getPID() (int, error) { - _, err := os.Stat(pidFile) - if os.IsNotExist(err) { - return 0, nil - } - if err != nil { - return 0, err - } - - file, err := os.Open(pidFile) - if err != nil { - return 0, err - } - defer file.Close() - - b, err := ioutil.ReadAll(file) - if err != nil { - return 0, err - } - if len(b) == 0 { - return 0, nil - } - return strconv.Atoi(string(b)) -} - -func setPID(pid int) error { - file, err := os.Create(pidFile) - if err != nil { - return err - } - defer file.Close() - - _, err = file.WriteString(fmt.Sprintf("%d", pid)) - return err -} - -func pidRunning(pid int) bool { - if pid == 0 { - return false - } - proc, err := ps.FindProcess(pid) - if err != nil { - log.Printf("An error ocurred finding process: %v", err) - return false - } - if proc == nil { - return false - } - log.Printf("There is a running process with the pid %d and executable: %s", pid, proc.Executable()) - return strings.Contains(os.Args[0], proc.Executable()) -} diff --git a/pkg/systray2/pid_test.go b/pkg/systray2/pid_test.go deleted file mode 100644 index dda8384..0000000 --- a/pkg/systray2/pid_test.go +++ /dev/null @@ -1,21 +0,0 @@ -package systray - -import ( - "syscall" - "testing" -) - -const ( - invalidPid = 345678 -) - -func TestPidRunning(t *testing.T) { - pid := syscall.Getpid() - if !pidRunning(pid) { - t.Errorf("pid %v is not running", pid) - } - - if pidRunning(invalidPid) { - t.Errorf("pid %v is running", invalidPid) - } -} diff --git a/pkg/systray2/run.go b/pkg/systray2/run.go deleted file mode 100644 index 00c2c94..0000000 --- a/pkg/systray2/run.go +++ /dev/null @@ -1,106 +0,0 @@ -// 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 systray - -import ( - "log" - "os" - - "0xacab.org/leap/bitmask-vpn/pkg/bitmask" - "0xacab.org/leap/bitmask-vpn/pkg/config" -) - -/* -func initialize(conf *Config, bt *bmTray, finishedCh chan bool) { - defer func() { finishedCh <- true }() - if _, err := os.Stat(config.Path); os.IsNotExist(err) { - os.MkdirAll(config.Path, os.ModePerm) - } - - err := acquirePID() - if err != nil { - log.Fatal(err) - } - defer releasePID() - - b, err := bitmask.Init(conf.Printer) - if err != nil { - // TODO notify failure - return - } - defer b.Close() - go checkAndStartBitmask(b, conf) - go listenSignals(b) - - var as bitmask.Autostart - if conf.DisableAustostart { - as = &bitmask.DummyAutostart{} - } else { - as = bitmask.NewAutostart(config.ApplicationName, "") - } - err = as.Enable() - if err != nil { - log.Printf("Error enabling autostart: %v", err) - } -} -*/ - -func checkAndStartBitmask(b bitmask.Bitmask, conf *Config) { - if conf.Obfs4 { - err := b.UseTransport("obfs4") - if err != nil { - log.Printf("Error setting transport: %v", err) - } - } - err := checkAndInstallHelpers(b) - if err != nil { - log.Printf("Is bitmask running? %v", err) - os.Exit(1) - } - err = maybeStartVPN(b, conf) - if err != nil { - log.Println("Error starting VPN: ", err) - } -} - -func checkAndInstallHelpers(b bitmask.Bitmask) error { - helpers, priviledge, err := b.VPNCheck() - if (err != nil && err.Error() == "nopolkit") || (err == nil && !priviledge) { - log.Printf("No polkit found") - os.Exit(1) - } else if err != nil { - log.Printf("Error checking vpn: %v", err) - return err - } - - if !helpers { - err = b.InstallHelpers() - if err != nil { - log.Println("Error installing helpers: ", err) - } - } - return nil -} - -func maybeStartVPN(b bitmask.Bitmask, conf *Config) error { - if !conf.StartVPN { - return nil - } - - err := b.StartVPN(config.Provider) - conf.setUserStoppedVPN(false) - return err -} -- cgit v1.2.3