Skip to content

Commit d409b82

Browse files
committed
fix(pair): protect pairing PIN pipe lifecycle
1 parent 29ad325 commit d409b82

2 files changed

Lines changed: 145 additions & 9 deletions

File tree

‎internal/manager/pair_manager.go‎

Lines changed: 39 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ package manager
22

33
import (
44
"context"
5+
"errors"
56
"fmt"
6-
"io"
77
"os"
8+
"sync"
89
"time"
910

1011
"github.com/bitxeno/atvloadly/internal/app"
@@ -15,10 +16,13 @@ import (
1516
)
1617

1718
type PairManager struct {
19+
runMu sync.Mutex
20+
stateMu sync.Mutex
21+
1822
outputStdout *pairOutputWriter
1923
outputStderr *pairOutputWriter
2024

21-
stdin io.WriteCloser
25+
stdin *os.File
2226

2327
cancel context.CancelFunc
2428
em *event.Manager
@@ -35,21 +39,40 @@ func NewPairManager() *PairManager {
3539
}
3640

3741
func (t *PairManager) Start(ctx context.Context, device model.Device) error {
42+
if !t.runMu.TryLock() {
43+
return errors.New("pairing already in progress")
44+
}
45+
defer t.runMu.Unlock()
46+
3847
// Set execute timeout to 1 minute.
3948
timeout := time.Minute
4049
ctx, cancel := context.WithCancel(ctx)
50+
t.stateMu.Lock()
4151
t.cancel = cancel
52+
t.stateMu.Unlock()
53+
defer func() {
54+
t.stateMu.Lock()
55+
t.cancel = nil
56+
t.stateMu.Unlock()
57+
cancel()
58+
}()
4259

4360
stdinReader, stdinWriter, err := os.Pipe()
4461
if err != nil {
4562
log.Err(err).Msg("Error creating stdin pipe: ")
4663
return err
4764
}
65+
t.stateMu.Lock()
4866
t.stdin = stdinWriter
67+
t.stateMu.Unlock()
4968
defer func() {
50-
_ = stdinReader.Close()
51-
_ = t.stdin.Close()
69+
// Drop the active pipe before closing it; a late PIN write may
70+
// safely finish with a closed-pipe error.
71+
t.stateMu.Lock()
5272
t.stdin = nil
73+
t.stateMu.Unlock()
74+
_ = stdinWriter.Close()
75+
_ = stdinReader.Close()
5376
}()
5477

5578
port := fmt.Sprintf("%d", device.Port)
@@ -71,9 +94,12 @@ func (t *PairManager) Start(ctx context.Context, device model.Device) error {
7194
}
7295

7396
func (t *PairManager) Close() {
74-
if t.cancel != nil {
75-
t.cancel()
76-
t.cancel = nil
97+
t.stateMu.Lock()
98+
cancel := t.cancel
99+
t.cancel = nil
100+
t.stateMu.Unlock()
101+
if cancel != nil {
102+
cancel()
77103
}
78104
if t.em != nil {
79105
_ = t.em.CloseWait()
@@ -88,8 +114,12 @@ func (t *PairManager) OnOutput(fn func(string)) {
88114
}
89115

90116
func (t *PairManager) Write(p []byte) {
91-
if t.stdin != nil {
92-
_, _ = t.stdin.Write(p)
117+
t.stateMu.Lock()
118+
writer := t.stdin
119+
t.stateMu.Unlock()
120+
// Do not hold stateMu during an OS-pipe write: the reader may block.
121+
if writer != nil {
122+
_, _ = writer.Write(p)
93123
}
94124
}
95125

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
package manager
2+
3+
import (
4+
"context"
5+
"io"
6+
"os"
7+
"strings"
8+
"sync"
9+
"testing"
10+
11+
"github.com/bitxeno/atvloadly/internal/model"
12+
)
13+
14+
func TestPairWriteWithoutActiveProcess(t *testing.T) {
15+
mgr := &PairManager{}
16+
mgr.Write([]byte("1234\n"))
17+
}
18+
19+
func TestPairWriteToActivePipe(t *testing.T) {
20+
reader, writer, err := os.Pipe()
21+
if err != nil {
22+
t.Fatal(err)
23+
}
24+
defer func() { _ = reader.Close() }()
25+
defer func() { _ = writer.Close() }()
26+
27+
mgr := &PairManager{stdin: writer}
28+
mgr.Write([]byte("1234\n"))
29+
buf := make([]byte, len("1234\n"))
30+
if _, err := io.ReadFull(reader, buf); err != nil {
31+
t.Fatal(err)
32+
}
33+
if string(buf) != "1234\n" {
34+
t.Fatalf("wrong pairing input: %q", buf)
35+
}
36+
}
37+
38+
func TestPairWriteConcurrentShutdown(t *testing.T) {
39+
reader, writer, err := os.Pipe()
40+
if err != nil {
41+
t.Fatal(err)
42+
}
43+
defer func() { _ = reader.Close() }()
44+
mgr := &PairManager{stdin: writer}
45+
46+
var wg sync.WaitGroup
47+
for n := 0; n < 8; n++ {
48+
wg.Add(1)
49+
go func() {
50+
defer wg.Done()
51+
for i := 0; i < 100; i++ {
52+
mgr.Write([]byte("x"))
53+
}
54+
}()
55+
}
56+
wg.Add(1)
57+
go func() {
58+
defer wg.Done()
59+
mgr.stateMu.Lock()
60+
mgr.stdin = nil
61+
mgr.stateMu.Unlock()
62+
_ = writer.Close()
63+
}()
64+
wg.Wait()
65+
mgr.Write([]byte("late PIN"))
66+
}
67+
68+
func TestPairConcurrentStartIsRejected(t *testing.T) {
69+
mgr := &PairManager{}
70+
mgr.runMu.Lock()
71+
defer mgr.runMu.Unlock()
72+
err := mgr.Start(context.Background(), model.Device{})
73+
if err == nil || !strings.Contains(err.Error(), "already in progress") {
74+
t.Fatalf("expected pairing busy error, got %v", err)
75+
}
76+
}
77+
78+
func TestPairCloseCancelsActiveAttempt(t *testing.T) {
79+
ctx, cancel := context.WithCancel(context.Background())
80+
defer cancel()
81+
mgr := &PairManager{cancel: cancel}
82+
mgr.Close()
83+
if ctx.Err() != context.Canceled {
84+
t.Fatalf("Close did not cancel active pairing: %v", ctx.Err())
85+
}
86+
mgr.Close()
87+
}
88+
89+
func TestPairConcurrentClose(t *testing.T) {
90+
ctx, cancel := context.WithCancel(context.Background())
91+
defer cancel()
92+
mgr := &PairManager{cancel: cancel}
93+
94+
var wg sync.WaitGroup
95+
for n := 0; n < 8; n++ {
96+
wg.Add(1)
97+
go func() {
98+
defer wg.Done()
99+
mgr.Close()
100+
}()
101+
}
102+
wg.Wait()
103+
if ctx.Err() != context.Canceled {
104+
t.Fatalf("Close did not cancel active pairing: %v", ctx.Err())
105+
}
106+
}

0 commit comments

Comments
 (0)
⌂ 换网址