highperfocused/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-10-11 12:42:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use r.RequestURI in path parsing and logging

Browse Source
This commit is contained in:
DarthSim
2020-07-08 18:57:24 +06:00
parent 399995deea
commit 3cc674caf6
5 changed files with 70 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
processing_options.go
View File

@@ -1089,23 +1089,22 @@ func parsePathBasic(parts []string, headers *processingHeaders) (string, *proces
func parsePath(ctx context.Context, r *http.Request) (context.Context, error) {
var err error
path := r.URL.RawPath
if len(path) == 0 {
path = r.URL.Path
}
path := trimAfter(r.RequestURI, '?')
if len(conf.PathPrefix) > 0 {
path = strings.TrimPrefix(path, conf.PathPrefix)
}
parts := strings.Split(strings.TrimPrefix(path, "/"), "/")
path = strings.TrimPrefix(path, "/")
parts := strings.Split(path, "/")
if len(parts) < 2 {
return ctx, newError(404, fmt.Sprintf("Invalid path: %s", path), msgInvalidURL)
}
if !conf.AllowInsecure {
if err = validatePath(parts[0], strings.TrimPrefix(path, fmt.Sprintf("/%s", parts[0]))); err != nil {
if err = validatePath(parts[0], strings.TrimPrefix(path, parts[0])); err != nil {
return ctx, newError(403, err.Error(), msgForbidden)
}
}