From 9da91fa21a60750e624d4fe09d9a8295506f2822 Mon Sep 17 00:00:00 2001
From: Nikolay Edigaryev <edigaryev@gmail.com>
Date: Fri, 1 Nov 2024 19:38:25 +0100
Subject: [PATCH] Use a separate lock file on Windows to protect configuration
 (#216)

---
 internal/config/handle.go       | 33 ++++++++++++---------------------
 internal/config/lock.go         | 17 +++++++++++++++++
 internal/config/lock_windows.go | 21 +++++++++++++++++++++
 3 files changed, 50 insertions(+), 21 deletions(-)
 create mode 100644 internal/config/lock.go
 create mode 100644 internal/config/lock_windows.go

diff --git a/internal/config/handle.go b/internal/config/handle.go
index 2a4e0e4..80dadfc 100644
--- a/internal/config/handle.go
+++ b/internal/config/handle.go
@@ -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 {
diff --git a/internal/config/lock.go b/internal/config/lock.go
new file mode 100644
index 0000000..f551a07
--- /dev/null
+++ b/internal/config/lock.go
@@ -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
+}
diff --git a/internal/config/lock_windows.go b/internal/config/lock_windows.go
new file mode 100644
index 0000000..20d8eba
--- /dev/null
+++ b/internal/config/lock_windows.go
@@ -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
+}