Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: lock TOC/TOU condition #51

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions internal/local/lock.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,17 @@ func NewLockFile(path string) (*LockFile, error) {
path: path,
temp: temp,
}
// If the lock file already exists, return an error.
if _, err := os.Stat(temp); err == nil {
f, err := os.Open(temp)
if err != nil {
return nil, transfer.ErrConflict
}

if f, err := os.OpenFile(temp, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0666); err == nil {
lf.tempFile = f
return lf, transfer.ErrConflict
}
f, err := os.Create(temp)
if err != nil {
return nil, err
return lf, nil
} else if os.IsExist(err) {
if f, err = os.OpenFile(temp, os.O_RDONLY, 0666); err == nil {
lf.tempFile = f
return lf, transfer.ErrConflict
}
}
lf.tempFile = f
return lf, nil
return nil, transfer.ErrConflict
}

// Write writes the given data to the lock file.
Expand Down
37 changes: 37 additions & 0 deletions internal/local/lock_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package local_test

import (
"path/filepath"
"testing"

"github.com/stretchr/testify/assert"

"github.com/charmbracelet/git-lfs-transfer/internal/local"
"github.com/charmbracelet/git-lfs-transfer/transfer"
)

func TestTakeLock(t *testing.T) {
tb := testing.TB(t)
tb.Helper()
path := filepath.Join(tb.TempDir(), "test_subject")
testfile, err := local.NewLockFile(path)
defer func() { _ = testfile.Close() }()
assert.Equal(t, err, nil)
assert.NotEqual(t, testfile, nil)
}

func TestMissLock(t *testing.T) {
tb := testing.TB(t)
tb.Helper()
path := filepath.Join(tb.TempDir(), "test_subject")
testfile, err := local.NewLockFile(path)
defer testfile.Close()
assert.Equal(t, err, nil)
assert.NotEqual(t, testfile, nil)
t2, e2 := local.NewLockFile(path)
if t2 != nil {
defer t2.Close()
}
assert.Equal(t, e2, transfer.ErrConflict)
assert.NotEqual(t, t2, nil)
}