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
82b04922
Commit
82b04922
authored
Jan 23, 2016
by
Matthew Holt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
proxy: Add basic proxying test and InsecureSkipVerify transport test
parent
fae612d5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
109 additions
and
6 deletions
+109
-6
middleware/proxy/proxy.go
middleware/proxy/proxy.go
+5
-1
middleware/proxy/proxy_test.go
middleware/proxy/proxy_test.go
+104
-5
No files found.
middleware/proxy/proxy.go
View file @
82b04922
...
...
@@ -57,6 +57,10 @@ func (uh *UpstreamHost) Down() bool {
return
uh
.
CheckDown
(
uh
)
}
// tryDuration is how long to try upstream hosts; failures result in
// immediate retries until this duration ends or we get a nil host.
var
tryDuration
=
60
*
time
.
Second
// ServeHTTP satisfies the middleware.Handler interface.
func
(
p
Proxy
)
ServeHTTP
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
(
int
,
error
)
{
...
...
@@ -68,7 +72,7 @@ func (p Proxy) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error) {
// Since Select() should give us "up" hosts, keep retrying
// hosts until timeout (or until we get a nil host).
for
time
.
Now
()
.
Sub
(
start
)
<
(
60
*
time
.
Second
)
{
for
time
.
Now
()
.
Sub
(
start
)
<
tryDuration
{
host
:=
upstream
.
Select
()
if
host
==
nil
{
return
http
.
StatusBadGateway
,
errUnreachable
...
...
middleware/proxy/proxy_test.go
View file @
82b04922
...
...
@@ -4,10 +4,13 @@ import (
"bufio"
"bytes"
"io"
"io/ioutil"
"log"
"net"
"net/http"
"net/http/httptest"
"net/url"
"os"
"strings"
"testing"
"time"
...
...
@@ -15,6 +18,70 @@ import (
"golang.org/x/net/websocket"
)
func
init
()
{
tryDuration
=
50
*
time
.
Millisecond
// prevent tests from hanging
}
func
TestReverseProxy
(
t
*
testing
.
T
)
{
log
.
SetOutput
(
ioutil
.
Discard
)
defer
log
.
SetOutput
(
os
.
Stderr
)
var
requestReceived
bool
backend
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
requestReceived
=
true
w
.
Write
([]
byte
(
"Hello, client"
))
}))
defer
backend
.
Close
()
// set up proxy
p
:=
&
Proxy
{
Upstreams
:
[]
Upstream
{
newFakeUpstream
(
backend
.
URL
,
false
)},
}
// create request and response recorder
r
,
err
:=
http
.
NewRequest
(
"GET"
,
"/"
,
nil
)
if
err
!=
nil
{
t
.
Fatalf
(
"Failed to create request: %v"
,
err
)
}
w
:=
httptest
.
NewRecorder
()
p
.
ServeHTTP
(
w
,
r
)
if
!
requestReceived
{
t
.
Error
(
"Expected backend to receive request, but it didn't"
)
}
}
func
TestReverseProxyInsecureSkipVerify
(
t
*
testing
.
T
)
{
log
.
SetOutput
(
ioutil
.
Discard
)
defer
log
.
SetOutput
(
os
.
Stderr
)
var
requestReceived
bool
backend
:=
httptest
.
NewTLSServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
requestReceived
=
true
w
.
Write
([]
byte
(
"Hello, client"
))
}))
defer
backend
.
Close
()
// set up proxy
p
:=
&
Proxy
{
Upstreams
:
[]
Upstream
{
newFakeUpstream
(
backend
.
URL
,
true
)},
}
// create request and response recorder
r
,
err
:=
http
.
NewRequest
(
"GET"
,
"/"
,
nil
)
if
err
!=
nil
{
t
.
Fatalf
(
"Failed to create request: %v"
,
err
)
}
w
:=
httptest
.
NewRecorder
()
p
.
ServeHTTP
(
w
,
r
)
if
!
requestReceived
{
t
.
Error
(
"Even with insecure HTTPS, expected backend to receive request, but it didn't"
)
}
}
func
TestWebSocketReverseProxyServeHTTPHandler
(
t
*
testing
.
T
)
{
// No-op websocket backend simply allows the WS connection to be
// accepted then it will be immediately closed. Perfect for testing.
...
...
@@ -93,25 +160,57 @@ func TestWebSocketReverseProxyFromWSClient(t *testing.T) {
}
}
func
newFakeUpstream
(
name
string
,
insecure
bool
)
*
fakeUpstream
{
uri
,
_
:=
url
.
Parse
(
name
)
u
:=
&
fakeUpstream
{
name
:
name
,
host
:
&
UpstreamHost
{
Name
:
name
,
ReverseProxy
:
NewSingleHostReverseProxy
(
uri
,
""
),
},
}
if
insecure
{
u
.
host
.
ReverseProxy
.
Transport
=
InsecureTransport
}
return
u
}
type
fakeUpstream
struct
{
name
string
host
*
UpstreamHost
}
func
(
u
*
fakeUpstream
)
From
()
string
{
return
"/"
}
func
(
u
*
fakeUpstream
)
Select
()
*
UpstreamHost
{
return
u
.
host
}
func
(
u
*
fakeUpstream
)
IsAllowedPath
(
requestPath
string
)
bool
{
return
true
}
// newWebSocketTestProxy returns a test proxy that will
// redirect to the specified backendAddr. The function
// also sets up the rules/environment for testing WebSocket
// proxy.
func
newWebSocketTestProxy
(
backendAddr
string
)
*
Proxy
{
return
&
Proxy
{
Upstreams
:
[]
Upstream
{
&
fakeUpstream
{
name
:
backendAddr
}},
Upstreams
:
[]
Upstream
{
&
fake
Ws
Upstream
{
name
:
backendAddr
}},
}
}
type
fakeUpstream
struct
{
type
fake
Ws
Upstream
struct
{
name
string
}
func
(
u
*
fakeUpstream
)
From
()
string
{
func
(
u
*
fake
Ws
Upstream
)
From
()
string
{
return
"/"
}
func
(
u
*
fakeUpstream
)
Select
()
*
UpstreamHost
{
func
(
u
*
fake
Ws
Upstream
)
Select
()
*
UpstreamHost
{
uri
,
_
:=
url
.
Parse
(
u
.
name
)
return
&
UpstreamHost
{
Name
:
u
.
name
,
...
...
@@ -122,7 +221,7 @@ func (u *fakeUpstream) Select() *UpstreamHost {
}
}
func
(
u
*
fakeUpstream
)
IsAllowedPath
(
requestPath
string
)
bool
{
func
(
u
*
fake
Ws
Upstream
)
IsAllowedPath
(
requestPath
string
)
bool
{
return
true
}
...
...
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