go/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2024-11-24 08:12:38 +02:00
Code Releases Activity

More verbose path parsing errors

Browse Source
This commit is contained in:
DarthSim 2019-08-28 20:36:11 +06:00
parent 4409b08c24
commit 1cbc4eb973
3 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -2,6 +2,8 @@
## master
- More verbose URL parsing errors;
## v2.4.0
- Better handling if non-sRGB images;

53
processing_options.go
View File

@ -140,13 +140,6 @@ const (
msgInvalidURL = "Invalid URL"
)
var (
errInvalidImageURL = errors.New("Invalid image url")
errInvalidURLEncoding = errors.New("Invalid url encoding")
errResultingImageFormatIsNotSupported = errors.New("Resulting image format is not supported")
errInvalidPath = newError(404, "Invalid path", msgInvalidURL)
)
func (gt gravityType) String() string {
for k, v := range gravityTypes {
if v == gt {
@ -200,10 +193,15 @@ func colorFromHex(hexcolor string) (rgbColor, error) {
func decodeBase64URL(parts []string) (string, string, error) {
var format string
urlParts := strings.Split(strings.Join(parts, ""), ".")
encoded := strings.Join(parts, "")
urlParts := strings.Split(encoded, ".")
if len(urlParts[0]) == 0 {
return "", "", errors.New("Image URL is empty")
}
if len(urlParts) > 2 {
return "", "", errInvalidURLEncoding
return "", "", fmt.Errorf("Multiple formats are specified: %s", encoded)
}
if len(urlParts) == 2 && len(urlParts[1]) > 0 {
@ -212,13 +210,13 @@ func decodeBase64URL(parts []string) (string, string, error) {
imageURL, err := base64.RawURLEncoding.DecodeString(strings.TrimRight(urlParts[0], "="))
if err != nil {
return "", "", errInvalidURLEncoding
return "", "", fmt.Errorf("Invalid url encoding: %s", encoded)
}
fullURL := fmt.Sprintf("%s%s", conf.BaseURL, string(imageURL))
if _, err := url.ParseRequestURI(fullURL); err != nil {
return "", "", errInvalidImageURL
return "", "", fmt.Errorf("Invalid image url: %s", fullURL)
}
return fullURL, format, nil
@ -227,29 +225,38 @@ func decodeBase64URL(parts []string) (string, string, error) {
func decodePlainURL(parts []string) (string, string, error) {
var format string
urlParts := strings.Split(strings.Join(parts, "/"), "@")
encoded := strings.Join(parts, "/")
urlParts := strings.Split(encoded, "@")
if len(urlParts[0]) == 0 {
return "", "", errors.New("Image URL is empty")
}
if len(urlParts) > 2 {
return "", "", errInvalidURLEncoding
return "", "", fmt.Errorf("Multiple formats are specified: %s", encoded)
}
if len(urlParts) == 2 && len(urlParts[1]) > 0 {
format = urlParts[1]
}
if unescaped, err := url.PathUnescape(urlParts[0]); err == nil {
fullURL := fmt.Sprintf("%s%s", conf.BaseURL, unescaped)
if _, err := url.ParseRequestURI(fullURL); err == nil {
return fullURL, format, nil
}
unescaped, err := url.PathUnescape(urlParts[0])
if err != nil {
return "", "", fmt.Errorf("Invalid url encoding: %s", encoded)
}
return "", "", errInvalidImageURL
fullURL := fmt.Sprintf("%s%s", conf.BaseURL, unescaped)
if _, err := url.ParseRequestURI(fullURL); err != nil {
return "", "", fmt.Errorf("Invalid image url: %s", fullURL)
}
return fullURL, format, nil
}
func decodeURL(parts []string) (string, string, error) {
if len(parts) == 0 {
return "", "", errInvalidURLEncoding
return "", "", errors.New("Image URL is empty")
}
if parts[0] == urlTokenPlain && len(parts) > 1 {
@ -621,7 +628,7 @@ func applyFormatOption(po *processingOptions, args []string) error {
}
if !vipsTypeSupportSave[po.Format] {
return errResultingImageFormatIsNotSupported
return fmt.Errorf("Resulting image format is not supported: %s", po.Format)
}
return nil
@ -831,7 +838,7 @@ func parsePathBasic(parts []string, headers *processingHeaders) (string, *proces
var err error
if len(parts) < 6 {
return "", nil, errInvalidPath
return "", nil, fmt.Errorf("Invalid basic URL format arguments: %s", strings.Join(parts, "/"))
}
po, err := defaultProcessingOptions(headers)
@ -879,7 +886,7 @@ func parsePath(ctx context.Context, r *http.Request) (context.Context, error) {
parts := strings.Split(strings.TrimPrefix(path, "/"), "/")
if len(parts) < 3 {
return ctx, errInvalidPath
return ctx, newError(404, fmt.Sprintf("Invalid path: %s", path), msgInvalidURL)
}
if !conf.AllowInsecure {

6
processing_options_test.go
View File

@ -58,7 +58,7 @@ func (s *ProcessingOptionsTestSuite) TestParseBase64URLInvalid() {
_, err := parsePath(context.Background(), req)
require.Error(s.T(), err)
assert.Equal(s.T(), errInvalidImageURL.Error(), err.Error())
assert.Contains(s.T(), err.Error(), "Invalid image url")
}
func (s *ProcessingOptionsTestSuite) TestParsePlainURL() {
@ -121,7 +121,7 @@ func (s *ProcessingOptionsTestSuite) TestParsePlainURLInvalid() {
_, err := parsePath(context.Background(), req)
require.Error(s.T(), err)
assert.Equal(s.T(), errInvalidImageURL.Error(), err.Error())
assert.Contains(s.T(), err.Error(), "Invalid image url")
}
func (s *ProcessingOptionsTestSuite) TestParsePlainURLEscapedInvalid() {
@ -130,7 +130,7 @@ func (s *ProcessingOptionsTestSuite) TestParsePlainURLEscapedInvalid() {
_, err := parsePath(context.Background(), req)
require.Error(s.T(), err)
assert.Equal(s.T(), errInvalidImageURL.Error(), err.Error())
assert.Contains(s.T(), err.Error(), "Invalid image url")
}
func (s *ProcessingOptionsTestSuite) TestParsePathBasic() {