Commitb06417f

committed

Extend DialOptions to allow Host header override

1 parent8dee580 commitb06417fCopy full SHA for b06417f

File tree

+57

-0

lines changed

+57

-0

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,10 @@ type DialOptions struct {`
`30`	`30`	`// HTTPHeader specifies the HTTP headers included in the handshake request.`
`31`	`31`	`HTTPHeader http.Header`
`32`	`32`
	`33`	`+// Host optionally overrides the Host HTTP header to send. If empty, the value`
	`34`	`+// of URL.Host will be used.`
	`35`	`+Hoststring`
	`36`	`+`
`33`	`37`	`// Subprotocols lists the WebSocket subprotocols to negotiate with the server.`
`34`	`38`	`Subprotocols []string`
`35`	`39`
`@@ -158,6 +162,9 @@ func handshakeRequest(ctx context.Context, urls string, opts *DialOptions, copts`
`158`	`162`	`}`
`159`	`163`
`160`	`164`	`req,_:=http.NewRequestWithContext(ctx,"GET",u.String(),nil)`
	`165`	`+iflen(opts.Host)>0 {`
	`166`	`+req.Host=opts.Host`
	`167`	`+}`
`161`	`168`	`req.Header=opts.HTTPHeader.Clone()`
`162`	`169`	`req.Header.Set("Connection","Upgrade")`
`163`	`170`	`req.Header.Set("Upgrade","websocket")`

Lines changed: 50 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,56 @@ func TestBadDials(t *testing.T) {`
`108`	`108`	`})`
`109`	`109`	`}`
`110`	`110`
	`111`	`+funcTest_verifyHostOverride(t*testing.T) {`
	`112`	`+testCases:= []struct {`
	`113`	`+namestring`
	`114`	`+hoststring`
	`115`	`+expstring`
	`116`	`+}{`
	`117`	`+{`
	`118`	`+name:"noOverride",`
	`119`	`+host:"",`
	`120`	`+exp:"example.com",`
	`121`	`+},`
	`122`	`+{`
	`123`	`+name:"hostOverride",`
	`124`	`+host:"example.net",`
	`125`	`+exp:"example.net",`
	`126`	`+},`
	`127`	`+}`
	`128`	`+`
	`129`	`+for_,tc:=rangetestCases {`
	`130`	`+tc:=tc`
	`131`	`+t.Run(tc.name,func(t*testing.T) {`
	`132`	`+t.Parallel()`
	`133`	`+`
	`134`	`+ctx,cancel:=context.WithTimeout(context.Background(),time.Second*5)`
	`135`	`+defercancel()`
	`136`	`+`
	`137`	`+rt:=func(rhttp.Request) (http.Response,error) {`
	`138`	`+assert.Equal(t,"Host",tc.exp,r.Host)`
	`139`	`+`
	`140`	`+h:= http.Header{}`
	`141`	`+h.Set("Connection","Upgrade")`
	`142`	`+h.Set("Upgrade","websocket")`
	`143`	`+h.Set("Sec-WebSocket-Accept",secWebSocketAccept(r.Header.Get("Sec-WebSocket-Key")))`
	`144`	`+`
	`145`	`+return&http.Response{`
	`146`	`+StatusCode:http.StatusSwitchingProtocols,`
	`147`	`+Header:h,`
	`148`	`+Body:ioutil.NopCloser(strings.NewReader("hi")),`
	`149`	`+},nil`
	`150`	`+}`
	`151`	`+`
	`152`	`+_,_,_=Dial(ctx,"ws://example.com",&DialOptions{`
	`153`	`+HTTPClient:mockHTTPClient(rt),`
	`154`	`+Host:tc.host,`
	`155`	`+})`
	`156`	`+})`
	`157`	`+}`
	`158`	`+`
	`159`	`+}`
	`160`	`+`
`111`	`161`	`funcTest_verifyServerHandshake(t*testing.T) {`
`112`	`162`	`t.Parallel()`
`113`	`163`

Comments

(0)