Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
caddy
Commits
d534a213
Commit
d534a213
authored
Aug 01, 2016
by
Nimi Wariboko Jr
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Proxy: When connecting to websocket backend, reuse the connection isntead of starting a new one.
parent
c4e65df2
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
87 additions
and
7 deletions
+87
-7
caddyhttp/proxy/reverseproxy.go
caddyhttp/proxy/reverseproxy.go
+87
-7
No files found.
caddyhttp/proxy/reverseproxy.go
View file @
d534a213
...
...
@@ -183,9 +183,80 @@ var hopHeaders = []string{
type
respUpdateFn
func
(
resp
*
http
.
Response
)
type
hijackedConn
struct
{
net
.
Conn
hj
*
connHijackerTransport
}
func
(
c
*
hijackedConn
)
Read
(
b
[]
byte
)
(
n
int
,
err
error
)
{
n
,
err
=
c
.
Conn
.
Read
(
b
)
c
.
hj
.
Replay
=
append
(
c
.
hj
.
Replay
,
b
[
:
n
]
...
)
return
}
func
(
c
*
hijackedConn
)
Close
()
error
{
return
nil
}
type
connHijackerTransport
struct
{
*
http
.
Transport
Conn
net
.
Conn
Replay
[]
byte
}
func
newConnHijackerTransport
(
base
http
.
RoundTripper
)
*
connHijackerTransport
{
transport
:=
&
http
.
Transport
{
Proxy
:
http
.
ProxyFromEnvironment
,
Dial
:
(
&
net
.
Dialer
{
Timeout
:
30
*
time
.
Second
,
KeepAlive
:
30
*
time
.
Second
,
})
.
Dial
,
TLSHandshakeTimeout
:
10
*
time
.
Second
,
TLSClientConfig
:
&
tls
.
Config
{
InsecureSkipVerify
:
true
},
}
if
base
!=
nil
{
if
baseTransport
,
ok
:=
base
.
(
*
http
.
Transport
);
ok
{
transport
.
Proxy
=
baseTransport
.
Proxy
transport
.
TLSClientConfig
=
baseTransport
.
TLSClientConfig
transport
.
TLSHandshakeTimeout
=
baseTransport
.
TLSHandshakeTimeout
transport
.
Dial
=
baseTransport
.
Dial
transport
.
DialTLS
=
baseTransport
.
DialTLS
transport
.
DisableKeepAlives
=
true
}
}
hjTransport
:=
&
connHijackerTransport
{
transport
,
nil
,
bufferPool
.
Get
()
.
([]
byte
)[
:
0
]}
oldDial
:=
transport
.
Dial
oldDialTLS
:=
transport
.
DialTLS
if
oldDial
==
nil
{
oldDial
=
(
&
net
.
Dialer
{
Timeout
:
30
*
time
.
Second
,
KeepAlive
:
30
*
time
.
Second
,
})
.
Dial
}
hjTransport
.
Dial
=
func
(
network
,
addr
string
)
(
net
.
Conn
,
error
)
{
c
,
err
:=
oldDial
(
network
,
addr
)
hjTransport
.
Conn
=
c
return
&
hijackedConn
{
c
,
hjTransport
},
err
}
if
oldDialTLS
!=
nil
{
hjTransport
.
DialTLS
=
func
(
network
,
addr
string
)
(
net
.
Conn
,
error
)
{
c
,
err
:=
oldDialTLS
(
network
,
addr
)
hjTransport
.
Conn
=
c
return
&
hijackedConn
{
c
,
hjTransport
},
err
}
}
return
hjTransport
}
func
requestIsWebsocket
(
req
*
http
.
Request
)
bool
{
return
!
(
strings
.
ToLower
(
req
.
Header
.
Get
(
"Upgrade"
))
!=
"websocket"
||
!
strings
.
Contains
(
strings
.
ToLower
(
req
.
Header
.
Get
(
"Connection"
)),
"upgrade"
))
}
func
(
p
*
ReverseProxy
)
ServeHTTP
(
rw
http
.
ResponseWriter
,
outreq
*
http
.
Request
,
respUpdateFn
respUpdateFn
)
error
{
transport
:=
p
.
Transport
if
transport
==
nil
{
if
requestIsWebsocket
(
outreq
)
{
transport
=
newConnHijackerTransport
(
transport
)
}
else
if
transport
==
nil
{
transport
=
http
.
DefaultTransport
}
...
...
@@ -216,13 +287,22 @@ func (p *ReverseProxy) ServeHTTP(rw http.ResponseWriter, outreq *http.Request, r
}
defer
conn
.
Close
()
backendConn
,
err
:=
net
.
Dial
(
"tcp"
,
outreq
.
URL
.
Host
)
var
backendConn
net
.
Conn
if
hj
,
ok
:=
transport
.
(
*
connHijackerTransport
);
ok
{
backendConn
=
hj
.
Conn
if
_
,
err
:=
conn
.
Write
(
hj
.
Replay
);
err
!=
nil
{
return
err
}
bufferPool
.
Put
(
hj
.
Replay
)
}
else
{
backendConn
,
err
=
net
.
Dial
(
"tcp"
,
outreq
.
URL
.
Host
)
if
err
!=
nil
{
return
err
}
defer
backendConn
.
Close
()
outreq
.
Write
(
backendConn
)
}
go
func
()
{
io
.
Copy
(
backendConn
,
conn
)
// write tcp stream to backend.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment