Merge branch 'master' into gcphealthcheck
commit189bda3781424973e5d66a717d9da1848c764f0b
authorTim Spencer <timothy.spencer@gsa.gov>
dateMon 25 Mar 2019, 09:57 (8 years ago)
parent3d22a11a38b0dc
CHANGELOG.md+1
@@ -3,6 +3,7 @@
33## Changes since v3.1.0
44
55- [#110](https://github.com/pusher/oauth2_proxy/pull/110) Added GCP healthcheck option (@timothy-spencer)
6+- [#112](https://github.com/pusher/oauth2_proxy/pull/112) Improve websocket support (@gyson)
67- [#63](https://github.com/pusher/oauth2_proxy/pull/63) Use encoding/json for SessionState serialization (@yaegashi)
78 - Use JSON to encode session state to be stored in browser cookies
89 - Implement legacy decode function to support existing cookies generated by older versions
logging_handler.go+10
@@ -4,6 +4,8 @@
44package main
55
66import (
7+ "bufio"
8+ "errors"
79 "fmt"
810 "io"
911 "net"
@@ -32,6 +34,14 @@ func (l *responseLogger) Header() http.Header {
3234 return l.w.Header()
3335}
3436
37+// Support Websocket
38+func (l *responseLogger) Hijack() (rwc net.Conn, buf *bufio.ReadWriter, err error) {
39+ if hj, ok := l.w.(http.Hijacker); ok {
40+ return hj.Hijack()
41+ }
42+ return nil, nil, errors.New("http.Hijacker is not available on writer")
43+}
44+
3545// ExtractGAPMetadata extracts and removes GAP headers from the ResponseWriter's
3646// Header
3747func (l *responseLogger) ExtractGAPMetadata() {
logging_handler_test.go+5
@@ -24,6 +24,11 @@ func TestLoggingHandler_ServeHTTP(t *testing.T) {
2424 for _, test := range tests {
2525 buf := bytes.NewBuffer(nil)
2626 handler := func(w http.ResponseWriter, req *http.Request) {
27+ _, ok := w.(http.Hijacker)
28+ if !ok {
29+ t.Error("http.Hijacker is not available")
30+ }
31+
2732 w.Write([]byte("test"))
2833 }
2934
oauthproxy.go+1−1
@@ -110,7 +110,7 @@ func (u *UpstreamProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
110110 r.Header.Set("GAP-Auth", w.Header().Get("GAP-Auth"))
111111 u.auth.SignRequest(r)
112112 }
113− if u.wsHandler != nil && r.Header.Get("Connection") == "Upgrade" && r.Header.Get("Upgrade") == "websocket" {
113+ if u.wsHandler != nil && strings.ToLower(r.Header.Get("Connection")) == "upgrade" && r.Header.Get("Upgrade") == "websocket" {
114114 u.wsHandler.ServeHTTP(w, r)
115115 } else {
116116 u.handler.ServeHTTP(w, r)