highperfocused/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-10-09 19:52:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling # symbols in non-HTTP(S) source URLs

Browse Source
This commit is contained in:
DarthSim
2024-08-19 18:26:47 +03:00
parent ec7f698904
commit 1f828b475b
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -1,9 +1,13 @@
# Changelog # Changelog
## [Unreleased] ## [Unreleased]
# Add
- (pro) Add [monochrome](https://docs.imgproxy.net/latest/usage/processing#monochrome) processing option. - (pro) Add [monochrome](https://docs.imgproxy.net/latest/usage/processing#monochrome) processing option.
- (pro) Add [duotone](https://docs.imgproxy.net/latest/usage/processing#duotone) processing option. - (pro) Add [duotone](https://docs.imgproxy.net/latest/usage/processing#duotone) processing option.
# Fix
- Fix handling `#` symbols in `local://`, `s3://`, `gcs://`, `abs://`, and `swift://` URLs.
## [3.25.0] - 2024-07-08 ## [3.25.0] - 2024-07-08
### Add ### Add
- Add [IMGPROXY_S3_ASSUME_ROLE_EXTERNAL_ID](https://docs.imgproxy.net/latest/configuration/options#IMGPROXY_S3_ASSUME_ROLE_EXTERNAL_ID) config. - Add [IMGPROXY_S3_ASSUME_ROLE_EXTERNAL_ID](https://docs.imgproxy.net/latest/configuration/options#IMGPROXY_S3_ASSUME_ROLE_EXTERNAL_ID) config.
@@ -28,7 +32,7 @@
### Fix ### Fix
- Fix HEIC/AVIF dimension limit handling. - Fix HEIC/AVIF dimension limit handling.
- Fix SVG detection when the root element has a namespace. - Fix SVG detection when the root element has a namespace.
- Fix treating percent-encoded symbols in `s3://`, `gcs://`, `abs://`, and `swift://` URLs. - Fix treating percent-encoded symbols in `local://`, `s3://`, `gcs://`, `abs://`, and `swift://` URLs.
- (pro) Fix style injection to SVG. - (pro) Fix style injection to SVG.
- (pro) Fix video tiles generation when the video's SAR is not `1`. - (pro) Fix video tiles generation when the video's SAR is not `1`.

12
imagedata/download.go
View File

@@ -7,6 +7,7 @@ import (
"io" "io"
"net/http" "net/http"
"net/http/cookiejar" "net/http/cookiejar"
"net/url"
"strings" "strings"
"time" "time"
@@ -139,6 +140,17 @@ func BuildImageRequest(ctx context.Context, imageURL string, header http.Header,
return nil, func() {}, ierrors.New(404, err.Error(), msgSourceImageIsUnreachable) return nil, func() {}, ierrors.New(404, err.Error(), msgSourceImageIsUnreachable)
} }
// S3, GCS, etc object keys may contain `#` symbol.
// `url.ParseRequestURI` unlike `url.Parse` does not cut-off the fragment part from the URL path.
if req.URL.Scheme != "http" && req.URL.Scheme != "https" {
u, err := url.ParseRequestURI(imageURL)
if err != nil {
reqCancel()
return nil, func() {}, ierrors.New(404, err.Error(), msgSourceImageIsUnreachable)
}
req.URL = u
}
if _, ok := enabledSchemes[req.URL.Scheme]; !ok { if _, ok := enabledSchemes[req.URL.Scheme]; !ok {
reqCancel() reqCancel()
return nil, func() {}, ierrors.New( return nil, func() {}, ierrors.New(