requestlog: preserve audited connection upgrades
verify / verify (push) Successful in 3m26s

This commit is contained in:
2026-08-28 13:38:35 -04:00
parent a769d1ea7b
commit 7c8f0d708e
4 changed files with 63 additions and 4 deletions
+38
View File
@@ -3,8 +3,10 @@
package requestlog
import (
"bufio"
"context"
"encoding/json"
"net"
"net/http"
"net/http/httptest"
"net/netip"
@@ -24,6 +26,16 @@ type memorySink struct {
ctxErr error
}
type hijackableRecorder struct {
*httptest.ResponseRecorder
connection net.Conn
buffer *bufio.ReadWriter
}
func (recorder *hijackableRecorder) Hijack() (net.Conn, *bufio.ReadWriter, error) {
return recorder.connection, recorder.buffer, nil
}
func (sink *memorySink) WriteRecord(ctx context.Context, record Record) error {
sink.records = append(sink.records, record)
sink.ctxErr = ctx.Err()
@@ -208,3 +220,29 @@ func TestResponseStatusUsesFirstHeader(t *testing.T) {
t.Fatalf("status=%d", sink.records[0].Status)
}
}
func TestResponseCapturePreservesConnectionHijacking(t *testing.T) {
serverConnection, clientConnection := net.Pipe()
defer serverConnection.Close()
defer clientConnection.Close()
underlying := &hijackableRecorder{
ResponseRecorder: httptest.NewRecorder(),
connection: serverConnection,
buffer: bufio.NewReadWriter(bufio.NewReader(serverConnection), bufio.NewWriter(serverConnection)),
}
capture := &responseCapture{ResponseWriter: underlying, status: http.StatusOK}
hijacker, ok := any(capture).(http.Hijacker)
if !ok {
t.Fatal("request evidence wrapper does not expose http.Hijacker")
}
connection, buffer, err := hijacker.Hijack()
if err != nil {
t.Fatal(err)
}
if connection != serverConnection || buffer != underlying.buffer {
t.Fatal("hijacked connection was not passed through")
}
if capture.status != http.StatusSwitchingProtocols || !capture.wroteHeader || capture.bytes != 0 {
t.Fatalf("capture after hijack=%+v", capture)
}
}