clawbot
1308769a25
check / check (push) Waiting to run
The IRC listener relayed only the first line of a PRIVMSG or NOTICE body; it now sends one line per body line. A relayed MODE change now carries its key, limit or mask, each value its own parameter, also in the echo to the user who made it. CR, LF and NUL are removed from each parameter and from each whole line sent to an IRC listener connection, so no stored value can start a line of its own. The channel name check moved into service.JoinChannel, so the IRC listener's JOIN refuses the same names with 403. Model: opus-5-5 Co-authored-by: clawbot <sneak+clawbot@sneak.cloud>
149 lines
3.4 KiB
Go
149 lines
3.4 KiB
Go
package ircserver_test
|
|
|
|
import (
|
|
"bufio"
|
|
"log/slog"
|
|
"net"
|
|
"os"
|
|
"slices"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"sneak.berlin/go/neoirc/internal/config"
|
|
"sneak.berlin/go/neoirc/internal/ircserver"
|
|
)
|
|
|
|
// newKillVictim returns a Conn for the nick victim whose
|
|
// socket is one end of a net.Pipe, and the other end, from
|
|
// which the test reads what the victim is sent. A write to
|
|
// the pipe blocks until the other end reads.
|
|
func newKillVictim(t *testing.T) (*ircserver.Conn, net.Conn) {
|
|
t.Helper()
|
|
|
|
serverSide, clientSide := net.Pipe()
|
|
|
|
t.Cleanup(func() { _ = clientSide.Close() })
|
|
|
|
log := slog.New(slog.NewTextHandler(
|
|
os.Stderr,
|
|
&slog.HandlerOptions{Level: slog.LevelError},
|
|
))
|
|
cfg := &config.Config{ServerName: testServerName}
|
|
|
|
return ircserver.NewTestConn(
|
|
log, cfg, serverSide, "victim",
|
|
), clientSide
|
|
}
|
|
|
|
// TestDisconnectDoesNotBlockOnUnresponsiveVictim checks
|
|
// that Disconnect returns although the victim never reads,
|
|
// so a KILL cannot stall the operator who sent it. The
|
|
// limit is well below one KillWriteWindow, so a Disconnect
|
|
// that waits on any write to the victim fails.
|
|
func TestDisconnectDoesNotBlockOnUnresponsiveVictim(
|
|
t *testing.T,
|
|
) {
|
|
t.Parallel()
|
|
|
|
victim, _ := newKillVictim(t)
|
|
returned := make(chan struct{})
|
|
|
|
go func() {
|
|
victim.Disconnect("killed by oper")
|
|
close(returned)
|
|
}()
|
|
|
|
select {
|
|
case <-returned:
|
|
case <-time.After(ircserver.KillWriteWindow / 4):
|
|
t.Fatal("Disconnect waited for the victim to read")
|
|
}
|
|
}
|
|
|
|
// TestDisconnectNotifiesAndClosesVictim checks that a
|
|
// victim that reads is sent KILL and ERROR, and that its
|
|
// connection is then closed.
|
|
func TestDisconnectNotifiesAndClosesVictim(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
victim, clientSide := newKillVictim(t)
|
|
received := make(chan []string, 1)
|
|
|
|
go func() {
|
|
var lines []string
|
|
|
|
scanner := bufio.NewScanner(clientSide)
|
|
for scanner.Scan() {
|
|
lines = append(lines, scanner.Text())
|
|
}
|
|
|
|
received <- lines
|
|
}()
|
|
|
|
victim.Disconnect("killed by oper")
|
|
|
|
var lines []string
|
|
|
|
select {
|
|
case lines = <-received:
|
|
case <-time.After(testTimeout):
|
|
t.Fatal("the victim's connection was not closed")
|
|
}
|
|
|
|
joined := strings.Join(lines, "\n")
|
|
|
|
if !strings.Contains(joined, "KILL victim :killed by oper") {
|
|
t.Errorf("missing KILL line, got: %q", joined)
|
|
}
|
|
|
|
if !strings.Contains(joined, "ERROR :Closing Link:") {
|
|
t.Errorf("missing ERROR line, got: %q", joined)
|
|
}
|
|
}
|
|
|
|
// TestDisconnectReasonCannotStartLine checks that CR, LF and
|
|
// NUL in a KILL reason are removed from both the KILL line
|
|
// and the ERROR line, so the victim gets exactly those two
|
|
// lines. The ERROR line is not built with FormatMessage, so
|
|
// only the removal in sendWithin protects it.
|
|
func TestDisconnectReasonCannotStartLine(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
victim, clientSide := newKillVictim(t)
|
|
received := make(chan []string, 1)
|
|
|
|
go func() {
|
|
var lines []string
|
|
|
|
scanner := bufio.NewScanner(clientSide)
|
|
for scanner.Scan() {
|
|
lines = append(lines, scanner.Text())
|
|
}
|
|
|
|
received <- lines
|
|
}()
|
|
|
|
victim.Disconnect("bye\r\nPRIVMSG victim :forged\x00")
|
|
|
|
var lines []string
|
|
|
|
select {
|
|
case lines = <-received:
|
|
case <-time.After(testTimeout):
|
|
t.Fatal("the victim's connection was not closed")
|
|
}
|
|
|
|
// The test connection has no host name, hence the two
|
|
// spaces after "Closing Link:".
|
|
want := []string{
|
|
":" + testServerName +
|
|
" KILL victim :byePRIVMSG victim :forged",
|
|
"ERROR :Closing Link: (byePRIVMSG victim :forged)",
|
|
}
|
|
|
|
if !slices.Equal(lines, want) {
|
|
t.Errorf("got lines %q, want %q", lines, want)
|
|
}
|
|
}
|