apunkt/imageproxy
1
0
Fork 0
mirror of https://github.com/willnorris/imageproxy.git synced 2026-04-27 13:56:25 +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

27
imageproxy.go
View file

@ -88,10 +88,10 @@ func (p *Proxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return
}
if !p.allowed(req.URL) {
msg := fmt.Sprintf("remote URL is not for an allowed host: %v", req.URL)
if !p.allowed(req) {
msg := fmt.Sprintf("request does not contain an allowed host")
glog.Error(msg)
http.Error(w, msg, http.StatusBadRequest)
http.Error(w, msg, http.StatusForbidden)
return
}
@ -135,13 +135,26 @@ func copyHeader(w http.ResponseWriter, r *http.Response, header string) {
}
}
// allowed returns whether the specified URL is on the whitelist of remote hosts.
func (p *Proxy) allowed(u *url.URL) bool {
// allowed returns whether the specified request is allowed because it matches
// a host in the proxy whitelist.
func (p *Proxy) allowed(r *Request) bool {
if len(p.Whitelist) == 0 {
return true
return true // no whitelist, all requests accepted
}
for _, host := range p.Whitelist {
if len(p.Whitelist) > 0 {
if validHost(p.Whitelist, r.URL) {
return true
}
glog.Infof("remote URL is not for an allowed host: %v", r.URL)
}
return false
}
// validHost returns whether the host in u matches one of hosts.
func validHost(hosts []string, u *url.URL) bool {
for _, host := range hosts {
if u.Host == host {
return true
}