apunkt/imageproxy
1
0
Fork 0
mirror of https://github.com/willnorris/imageproxy.git synced 2026-04-26 13:26:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor whitelist check in preparation for signature check

Browse source
This commit is contained in:
Will Norris 2015-05-11 21:35:07 -07:00
parent 6553dd0603
commit 9d6f8fdf7d
2 changed files with 56 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

49
imageproxy_test.go
View file

@ -15,7 +15,7 @@ import (
)
func TestAllowed(t *testing.T) {
whitelist := []string{"a.test", "*.b.test", "*c.test"}
whitelist := []string{"good.test"}
tests := []struct {
url string
@ -25,16 +25,8 @@ func TestAllowed(t *testing.T) {
{"http://foo/image", nil, true},
{"http://foo/image", []string{}, true},
{"http://a.test/image", whitelist, true},
{"http://x.a.test/image", whitelist, false},
{"http://b.test/image", whitelist, true},
{"http://x.b.test/image", whitelist, true},
{"http://x.y.b.test/image", whitelist, true},
{"http://c.test/image", whitelist, false},
{"http://xc.test/image", whitelist, false},
{"/image", whitelist, false},
{"http://good.test/image", whitelist, true},
{"http://bad.test/image", whitelist, false},
}
for _, tt := range tests {
@ -45,12 +37,43 @@ func TestAllowed(t *testing.T) {
if err != nil {
t.Errorf("error parsing url %q: %v", tt.url, err)
}
if got, want := p.allowed(u), tt.allowed; got != want {
req := &Request{u, emptyOptions}
if got, want := p.allowed(req), tt.allowed; got != want {
t.Errorf("allowed(%q) returned %v, want %v", u, got, want)
}
}
}
func TestValidHost(t *testing.T) {
whitelist := []string{"a.test", "*.b.test", "*c.test"}
tests := []struct {
url string
valid bool
}{
{"http://a.test/image", true},
{"http://x.a.test/image", false},
{"http://b.test/image", true},
{"http://x.b.test/image", true},
{"http://x.y.b.test/image", true},
{"http://c.test/image", false},
{"http://xc.test/image", false},
{"/image", false},
}
for _, tt := range tests {
u, err := url.Parse(tt.url)
if err != nil {
t.Errorf("error parsing url %q: %v", tt.url, err)
}
if got, want := validHost(whitelist, u), tt.valid; got != want {
t.Errorf("validHost(%v, %q) returned %v, want %v", whitelist, u, got, want)
}
}
}
func TestCheck304(t *testing.T) {
tests := []struct {
req, resp string
@ -168,7 +191,7 @@ func TestProxy_ServeHTTP(t *testing.T) {
}{
{"/favicon.ico", http.StatusOK},
{"//foo", http.StatusBadRequest}, // invalid request URL
{"/http://bad.test/", http.StatusBadRequest}, // Disallowed host
{"/http://bad.test/", http.StatusForbidden}, // Disallowed host
{"/http://good.test/error", http.StatusInternalServerError}, // HTTP protocol error
{"/http://good.test/nocontent", http.StatusNoContent}, // non-OK response