vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-02 10:39:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #901 from safing/fix/add-per-user-locking-for-notifier

Browse source 
Add per-user locking option to portmaster-start run cmds
This commit is contained in:
Daniel Hovie 2022-09-29 11:11:06 +02:00 • committed by GitHub
commit b4325845bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
cmds/portmaster-start/lock.go
View file

@ -6,6 +6,7 @@ import (
"io/ioutil"
"log"
"os"
"os/user"
"path/filepath"
"strconv"
"strings"
@ -13,8 +14,22 @@ import (
processInfo "github.com/shirou/gopsutil/process"
)
func checkAndCreateInstanceLock(path, name string) (pid int32, err error) {
lockFilePath := filepath.Join(dataRoot.Path, path, fmt.Sprintf("%s-lock.pid", name))
func checkAndCreateInstanceLock(path, name string, perUser bool) (pid int32, err error) {
var lockFilePath string
if perUser {
// Get user ID for per-user lock file.
var userID string
usr, err := user.Current()
if err != nil {
log.Printf("failed to get current user: %s\n", err)
userID = "no-user"
} else {
userID = usr.Uid
}
lockFilePath = filepath.Join(dataRoot.Path, path, fmt.Sprintf("%s-%s-lock.pid", name, userID))
} else {
lockFilePath = filepath.Join(dataRoot.Path, path, fmt.Sprintf("%s-lock.pid", name))
}
// read current pid file
data, err := ioutil.ReadFile(lockFilePath)

4
cmds/portmaster-start/run.go
View file

@ -46,6 +46,7 @@ type Options struct {
Identifier string // component identifier
ShortIdentifier string // populated automatically
LockPathPrefix string
LockPerUser bool
PIDFile bool
SuppressArgs bool // do not use any args
AllowDownload bool // allow download of component if it is not yet available
@ -73,6 +74,7 @@ func init() {
{
Name: "Portmaster Notifier",
Identifier: "notifier/portmaster-notifier",
LockPerUser: true,
AllowDownload: false,
AllowHidingWindow: true,
PIDFile: true,
@ -162,7 +164,7 @@ func run(opts *Options, cmdArgs []string) (err error) {
// check for duplicate instances
if opts.PIDFile {
pid, err := checkAndCreateInstanceLock(opts.LockPathPrefix, opts.ShortIdentifier)
pid, err := checkAndCreateInstanceLock(opts.LockPathPrefix, opts.ShortIdentifier, opts.LockPerUser)
if err != nil {
return fmt.Errorf("failed to exec lock: %w", err)
}