Thanks to visit codestin.com
Credit goes to github.com

Skip to content

accept: Add unwrapping for hijack like http.ResponseController #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 22, 2024
Merged

accept: Add unwrapping for hijack like http.ResponseController #472

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12cbf54
Implement http.ResponseWriter unwrapping like http.ResponseController
mafredri Aug 15, 2024
ee7b9af
Add tests
mafredri Aug 21, 2024
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
Prev Previous commit
Add tests
  • Loading branch information
@mafredri
mafredri committed Aug 21, 2024
commit ee7b9af6e3430cd1f84c47882b7ae517cba08439
38 changes: 38 additions & 0 deletions accept_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,33 @@ func TestAccept(t *testing.T) {
_, err := Accept(w, r, nil)
assert.Contains(t, err, `failed to hijack connection`)
})

t.Run("wrapperHijackerIsUnwrapped", func(t *testing.T) {
t.Parallel()

rr := httptest.NewRecorder()
w := mockUnwrapper{
ResponseWriter: rr,
unwrap: func() http.ResponseWriter {
return mockHijacker{
ResponseWriter: rr,
hijack: func() (conn net.Conn, writer *bufio.ReadWriter, err error) {
return nil, nil, errors.New("haha")
},
}
},
}

r := httptest.NewRequest("GET", "/", nil)
r.Header.Set("Connection", "Upgrade")
r.Header.Set("Upgrade", "websocket")
r.Header.Set("Sec-WebSocket-Version", "13")
r.Header.Set("Sec-WebSocket-Key", xrand.Base64(16))

_, err := Accept(w, r, nil)
assert.Contains(t, err, "failed to hijack connection")
})

t.Run("closeRace", func(t *testing.T) {
t.Parallel()

Expand Down Expand Up @@ -534,3 +561,14 @@ var _ http.Hijacker = mockHijacker{}
func (mj mockHijacker) Hijack() (net.Conn, *bufio.ReadWriter, error) {
return mj.hijack()
}

type mockUnwrapper struct {
http.ResponseWriter
unwrap func() http.ResponseWriter
}

var _ rwUnwrapper = mockUnwrapper{}

func (mu mockUnwrapper) Unwrap() http.ResponseWriter {
return mu.unwrap()
}
38 changes: 38 additions & 0 deletions hijack_go120_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
//go:build !js && go1.20

package websocket

import (
"bufio"
"errors"
"net"
"net/http"
"net/http/httptest"
"testing"

"github.com/coder/websocket/internal/test/assert"
)

func Test_hijackerHTTPResponseControllerCompatibility(t *testing.T) {
t.Parallel()

rr := httptest.NewRecorder()
w := mockUnwrapper{
ResponseWriter: rr,
unwrap: func() http.ResponseWriter {
return mockHijacker{
ResponseWriter: rr,
hijack: func() (conn net.Conn, writer *bufio.ReadWriter, err error) {
return nil, nil, errors.New("haha")
},
}
},
}

_, _, err := http.NewResponseController(w).Hijack()
assert.Contains(t, err, "haha")
hj, ok := hijacker(w)
assert.Equal(t, "hijacker found", ok, true)
_, _, err = hj.Hijack()
assert.Contains(t, err, "haha")
}
Loading