mptyl/ThothII
1
0
Fork 0
Code Issues 25 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix(windows): finish contested auth cleanup

Browse Source
This commit is contained in:
marcopan
2026-08-18 14:35:07 +02:00
parent 6474118ec3
commit c01482c52d
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/tht/internal/safeio/claim_windows_test.go
+6 -5
View File
@@ -201,6 +201,7 @@ func TestCanonicalPrivateClaimConsumeHasOneConcurrentWinner(t *testing.T) {
type result struct { type result struct {
found bool found bool
stage string
err error err error
} }
results := make(chan result, 2) results := make(chan result, 2)
@@ -211,20 +212,20 @@ func TestCanonicalPrivateClaimConsumeHasOneConcurrentWinner(t *testing.T) {
defer group.Done() defer group.Done()
claimed, err := ClaimCanonicalPrivateRegular(source, claim) claimed, err := ClaimCanonicalPrivateRegular(source, claim)
if err != nil || !claimed { if err != nil || !claimed {
results <- result{err: err} results <- result{stage: "claim", err: err}
return return
} }
contents, found, err := ReadCanonicalPrivateClaim(source, claim, 32) contents, found, err := ReadCanonicalPrivateClaim(source, claim, 32)
if err != nil || !found || string(contents) != "state" { if err != nil || !found || string(contents) != "state" {
results <- result{err: err} results <- result{stage: "read", err: err}
return return
} }
removed, err := RemoveCanonicalPrivateClaim(source, claim) removed, err := RemoveCanonicalPrivateClaim(source, claim)
if err != nil || !removed { if err != nil || !removed {
results <- result{err: err} results <- result{stage: "remove", err: err}
return return
} }
results <- result{found: true} results <- result{found: true, stage: "complete"}
}() }()
} }
group.Wait() group.Wait()
@@ -233,7 +234,7 @@ func TestCanonicalPrivateClaimConsumeHasOneConcurrentWinner(t *testing.T) {
winners := 0 winners := 0
for got := range results { for got := range results {
if got.err != nil { if got.err != nil {
t.Fatalf("iteration %d concurrent consume error = %v", iteration, got.err) t.Fatalf("iteration %d concurrent consume %s error = %v", iteration, got.stage, got.err)
} }
if got.found { if got.found {
winners++ winners++
tools/tht/internal/safeio/private_root_windows.go
+8 -1
View File
@@ -1108,7 +1108,14 @@ func (directory *windowsPrivateDirectory) RemoveClaim(source, claim string) (boo
claimed.Close, claimed.Close,
func() error { return closeAndDeleteWindowsPrivateRegular(value) }, func() error { return closeAndDeleteWindowsPrivateRegular(value) },
func() error { func() error {
remaining, remainingErr := openWindowsPrivateRegularAt(directory.handle, claim, windows.FILE_GENERIC_READ|windows.DELETE, 1) // A concurrent loser can briefly hold the orphan observation read-only after
// source deletion. Preserve no-delete sharing and wait only for that close.
remaining, remainingErr := openWindowsPrivateClaimRegular(
directory.handle,
claim,
windows.FILE_GENERIC_READ|windows.DELETE,
1,
)
if remainingErr != nil { if remainingErr != nil {
return ErrUnsafeFile return ErrUnsafeFile
} }