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

allow options path segment to be omitted

Browse source
This commit is contained in:
Will Norris 2013-12-05 08:31:19 -08:00
parent 45d07f2378
commit fde104a7a1
2 changed files with 43 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

32
proxy/proxy.go
View file

@ -29,19 +29,26 @@ func (e URLError) Error() string {
// NewRequest parses an http.Request into an image request.
func NewRequest(r *http.Request) (*data.Request, error) {
path := strings.SplitN(r.URL.Path, "/", 3)
if len(path) != 3 {
return nil, URLError{"too few path segments", r.URL}
}
var err error
req := new(data.Request)
req.URL, err = url.Parse(path[2])
if err != nil {
return nil, URLError{
fmt.Sprintf("unable to parse remote URL: %v", err),
r.URL,
path := r.URL.Path[1:] // strip leading slash
req.URL, err = url.Parse(path)
if err != nil || !req.URL.IsAbs() {
// first segment is likely options
parts := strings.SplitN(path, "/", 2)
if len(parts) != 2 {
return nil, URLError{"too few path segments", r.URL}
}
req.URL, err = url.Parse(parts[1])
if err != nil {
return nil, URLError{fmt.Sprintf("unable to parse remote URL: %v", err), r.URL}
}
req.Options, err = data.ParseOptions(parts[0])
if err != nil {
return nil, URLError{err.Error(), r.URL}
}
}
@ -55,11 +62,6 @@ func NewRequest(r *http.Request) (*data.Request, error) {
// query string is always part of the remote URL
req.URL.RawQuery = r.URL.RawQuery
req.Options, err = data.ParseOptions(path[1])
if err != nil {
return nil, URLError{err.Error(), r.URL}
}
return req, nil
}