Skip to content

PasteFerry (隔空贴): clipboard and file sync across macOS, Windows and Linux. Direct-first, end-to-end encrypted. Optional official access: no server to host. Independent self-hosting remains available.

fix(server): release disconnected signaling sockets

baiyuze085cfde858df
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0c1cf4..22ca09c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,8 @@ relay access. LAN and custom servers continue to work independently.
- Retire closed official relay tunnels immediately so clipboard updates made
after a quota interruption enter the retry queue instead of a stale channel.
+- Release authenticated signaling sockets after abrupt or half-closed TCP
+ disconnects so reconnects do not accumulate server connections.
### Upgrade notes
diff --git a/server/signal/server.go b/server/signal/server.go
index 18b34ae..2a5cf9e 100644
--- a/server/signal/server.go
+++ b/server/signal/server.go
@@ -69,6 +69,9 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
s.log.Warn("websocket 握手失败", "err", err, "remote", r.RemoteAddr)
return
}
+ // HTTP hijacking transfers socket ownership to us. Release it even when
+ // the peer disappears without completing a WebSocket close handshake.
+ defer ws.CloseNow()
ws.SetReadLimit(maxMessageBytes)
ctx, cancel := context.WithCancel(r.Context())
diff --git a/server/signal/server_test.go b/server/signal/server_test.go
new file mode 100644
index 0000000..b78dac0
--- /dev/null
+++ b/server/signal/server_test.go
@@ -0,0 +1,72 @@
+package signal
+
+import (
+ "context"
+ "crypto/ed25519"
+ "crypto/rand"
+ "io"
+ "log/slog"
+ "net"
+ "net/http"
+ "net/http/httptest"
+ "strings"
+ "testing"
+ "time"
+
+ "github.com/baiyuze/pasteferry/proto/deviceid"
+ pb "github.com/baiyuze/pasteferry/proto/gen/pasteferry/v1"
+ "github.com/coder/websocket"
+)
+
+func TestAuthenticatedHalfCloseReleasesSocket(t *testing.T) {
+ s := NewServer(Options{Logger: slog.New(slog.NewTextHandler(io.Discard, nil))})
+ server := httptest.NewServer(s)
+ defer server.Close()
+ var raw *net.TCPConn
+ transport := &http.Transport{DialContext: func(ctx context.Context, network, address string) (net.Conn, error) {
+ conn, err := (&net.Dialer{}).DialContext(ctx, network, address)
+ if err == nil {
+ raw = conn.(*net.TCPConn)
+ }
+ return conn, err
+ }}
+ defer transport.CloseIdleConnections()
+ ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+ defer cancel()
+ ws, _, err := websocket.Dial(ctx, "ws"+strings.TrimPrefix(server.URL, "http"), &websocket.DialOptions{HTTPClient: &http.Client{Transport: transport}})
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer ws.CloseNow()
+ var hello pb.ServerEnvelope
+ if err = readProto(ctx, ws, &hello); err != nil {
+ t.Fatal(err)
+ }
+ pub, private, err := ed25519.GenerateKey(rand.Reader)
+ if err != nil {
+ t.Fatal(err)
+ }
+ err = writeProto(ctx, ws, &pb.ClientEnvelope{Payload: &pb.ClientEnvelope_Hello{Hello: &pb.ClientHello{
+ DeviceId: deviceid.For(pub), PublicKey: pub, Signature: ed25519.Sign(private, hello.GetHello().GetChallenge()),
+ }}})
+ if err != nil {
+ t.Fatal(err)
+ }
+ for s.Hub().Count() != 1 {
+ select {
+ case <-ctx.Done():
+ t.Fatal("authenticated client never registered")
+ case <-time.After(time.Millisecond):
+ }
+ }
+ if err = raw.CloseWrite(); err != nil {
+ t.Fatal(err)
+ }
+ _ = raw.SetReadDeadline(time.Now().Add(time.Second))
+ if _, err = io.Copy(io.Discard, raw); err != nil {
+ t.Fatalf("server retained a disconnected authenticated socket: %v", err)
+ }
+ if s.Hub().Count() != 0 {
+ t.Fatal("disconnected client is still registered")
+ }
+}