Skip to content
Merged
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
25 changes: 14 additions & 11 deletions internal/ipc/ipc.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"encoding/json"
"errors"
"fmt"
"io"
"net"
"os"
"path/filepath"
Expand All @@ -22,6 +21,7 @@ const (
SocketDirMode os.FileMode = 0o700
SocketFileMode os.FileMode = 0o600
DefaultSocket = "daemon.sock"
MaxEventBytes = 1 << 20
)

var sendRetryDelays = []time.Duration{
Expand Down Expand Up @@ -95,20 +95,23 @@ func (s Server) ListenAndServe(ctx context.Context) error {
func (s Server) handleConn(ctx context.Context, conn net.Conn) {
defer conn.Close()

reader := bufio.NewReader(conn)
for {
line, err := reader.ReadBytes('\n')
if len(bytes.TrimSpace(line)) > 0 {
if err := s.handleLine(ctx, line); err != nil {
s.handleError(err)
}
scanner := bufio.NewScanner(conn)
scanner.Buffer(make([]byte, 0, 64*1024), MaxEventBytes)
for scanner.Scan() {
line := scanner.Bytes()
if len(bytes.TrimSpace(line)) == 0 {
continue
}
if errors.Is(err, io.EOF) {
return
if err := s.handleLine(ctx, line); err != nil {
s.handleError(err)
}
if err != nil {
}
if err := scanner.Err(); err != nil {
if strings.Contains(err.Error(), "token too long") {
s.handleError(fmt.Errorf("read event: event line exceeds %d bytes", MaxEventBytes))
return
}
s.handleError(fmt.Errorf("read event: %w", err))
}
}

Expand Down
60 changes: 60 additions & 0 deletions internal/ipc/ipc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"net"
"os"
"path/filepath"
"strings"
"testing"
"time"

Expand Down Expand Up @@ -260,6 +261,65 @@ func TestServerReportsInvalidLines(t *testing.T) {
}
}

func TestServerRejectsOversizedEventLines(t *testing.T) {
socketPath := filepath.Join(t.TempDir(), "daemon.sock")
rejected := make(chan error, 1)
received := make(chan core.Event, 1)

ctx, cancel := context.WithCancel(context.Background())
defer cancel()

server := Server{
SocketPath: socketPath,
Handler: HandlerFunc(func(_ context.Context, event core.Event) error {
received <- event
return nil
}),
ErrorHandler: func(err error) {
rejected <- err
},
}

errCh := make(chan error, 1)
go func() {
errCh <- server.ListenAndServe(ctx)
}()
waitForSocket(t, socketPath)

conn, err := net.Dial("unix", socketPath)
if err != nil {
t.Fatalf("dial socket: %v", err)
}
oversizedLine := strings.Repeat("a", MaxEventBytes+1) + "\n"
if _, err := conn.Write([]byte(oversizedLine)); err != nil {
t.Fatalf("write oversized event: %v", err)
}
_ = conn.Close()

select {
case err := <-rejected:
if err == nil {
t.Fatal("error handler received nil")
}
if !strings.Contains(err.Error(), "event line exceeds") {
t.Fatalf("rejected error = %v, want event size error", err)
}
case <-time.After(time.Second):
t.Fatal("timed out waiting for oversized event rejection")
}

select {
case event := <-received:
t.Fatalf("handler received oversized event: %s", event.EventID)
default:
}

cancel()
if err := <-errCh; err != nil {
t.Fatalf("ListenAndServe returned error after cancellation: %v", err)
}
}

func TestPrepareSocketRejectsNonSocket(t *testing.T) {
path := filepath.Join(t.TempDir(), "daemon.sock")
if err := os.WriteFile(path, []byte("not a socket"), 0o600); err != nil {
Expand Down