public_git
/
orchard
mirror of https://github.com/cirruslabs/orchard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use a separate lock file on Windows to protect configuration (#216)

This commit is contained in:
Nikolay Edigaryev 2024-11-01 19:38:25 +01:00 committed by GitHub
parent e40ce6d999
commit 9da91fa21a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 50 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
internal/config/handle.go
View File

@ -5,7 +5,6 @@ import (
"fmt"
"github.com/cirruslabs/orchard/internal/netconstants"
"github.com/cirruslabs/orchard/internal/orchardhome"
"github.com/gofrs/flock"
"gopkg.in/yaml.v3"
"os"
"path/filepath"
@ -66,13 +65,11 @@ func (handle *Handle) SetConfig(config *Config) error {
}
func (handle *Handle) CreateContext(name string, context Context, force bool) error {
lock := flock.New(handle.configPath)
if err := lock.Lock(); err != nil {
unlock, err := handle.Lock()
if err != nil {
return err
}
defer func() {
_ = lock.Unlock()
}()
defer unlock()
config, err := handle.Config()
if err != nil {
@ -90,13 +87,11 @@ func (handle *Handle) CreateContext(name string, context Context, force bool) er
}
func (handle *Handle) DefaultContext() (Context, error) {
lock := flock.New(handle.configPath)
if err := lock.Lock(); err != nil {
unlock, err := handle.Lock()
if err != nil {
return Context{}, err
}
defer func() {
_ = lock.Unlock()
}()
defer unlock()
config, err := handle.Config()
if err != nil {
@ -131,13 +126,11 @@ func (handle *Handle) DefaultContext() (Context, error) {
}
func (handle *Handle) SetDefaultContext(name string) error {
lock := flock.New(handle.configPath)
if err := lock.Lock(); err != nil {
unlock, err := handle.Lock()
if err != nil {
return err
}
defer func() {
_ = lock.Unlock()
}()
defer unlock()
config, err := handle.Config()
if err != nil {
@ -155,13 +148,11 @@ func (handle *Handle) SetDefaultContext(name string) error {
}
func (handle *Handle) DeleteContext(name string) error {
lock := flock.New(handle.configPath)
if err := lock.Lock(); err != nil {
unlock, err := handle.Lock()
if err != nil {
return err
}
defer func() {
_ = lock.Unlock()
}()
defer unlock()
config, err := handle.Config()
if err != nil {

17
internal/config/lock.go Normal file
View File

@ -0,0 +1,17 @@
//go:build !windows
package config
import "github.com/gofrs/flock"
func (handle *Handle) Lock() (func(), error) {
lock := flock.New(handle.configPath)
if err := lock.Lock(); err != nil {
return nil, err
}
return func() {
_ = lock.Unlock()
}, nil
}

21
internal/config/lock_windows.go Normal file
View File

@ -0,0 +1,21 @@
package config
import (
"github.com/gofrs/flock"
"os"
)
func (handle *Handle) Lock() (func(), error) {
lockPath := handle.configPath + ".lock"
lock := flock.New(lockPath)
if err := lock.Lock(); err != nil {
return nil, err
}
return func() {
_ = lock.Unlock()
_ = os.Remove(lockPath)
}, nil
}