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

Normalize IMGPROXY_PATH_PREFIX and IMGPROXY_HEALTH_CHECK_PATH

Browse Source
This commit is contained in:
DarthSim
2023-05-17 17:47:20 +03:00
parent aad0186b0a
commit aaaf1c706d
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.go
View File

@@ -406,7 +406,7 @@ func Configure() error {
configurators.Bool(&SoReuseport, "IMGPROXY_SO_REUSEPORT") configurators.Bool(&SoReuseport, "IMGPROXY_SO_REUSEPORT")
configurators.String(&PathPrefix, "IMGPROXY_PATH_PREFIX") configurators.URLPath(&PathPrefix, "IMGPROXY_PATH_PREFIX")
configurators.MegaInt(&MaxSrcResolution, "IMGPROXY_MAX_SRC_RESOLUTION") configurators.MegaInt(&MaxSrcResolution, "IMGPROXY_MAX_SRC_RESOLUTION")
configurators.Int(&MaxSrcFileSize, "IMGPROXY_MAX_SRC_FILE_SIZE") configurators.Int(&MaxSrcFileSize, "IMGPROXY_MAX_SRC_FILE_SIZE")
@@ -449,7 +449,7 @@ func Configure() error {
configurators.Bool(&EnforceAvif, "IMGPROXY_ENFORCE_AVIF") configurators.Bool(&EnforceAvif, "IMGPROXY_ENFORCE_AVIF")
configurators.Bool(&EnableClientHints, "IMGPROXY_ENABLE_CLIENT_HINTS") configurators.Bool(&EnableClientHints, "IMGPROXY_ENABLE_CLIENT_HINTS")
configurators.String(&HealthCheckPath, "IMGPROXY_HEALTH_CHECK_PATH") configurators.URLPath(&HealthCheckPath, "IMGPROXY_HEALTH_CHECK_PATH")
if err := configurators.ImageTypes(&PreferredFormats, "IMGPROXY_PREFERRED_FORMATS"); err != nil { if err := configurators.ImageTypes(&PreferredFormats, "IMGPROXY_PREFERRED_FORMATS"); err != nil {
return err return err

19
config/configurators/configurators.go
View File

@@ -102,6 +102,25 @@ func Bool(b *bool, name string) {
} }
} }
func URLPath(s *string, name string) {
if env := os.Getenv(name); len(env) > 0 {
if i := strings.IndexByte(env, '?'); i >= 0 {
env = env[:i]
}
if i := strings.IndexByte(env, '#'); i >= 0 {
env = env[:i]
}
if len(env) > 0 && env[len(env)-1] == '/' {
env = env[:len(env)-1]
}
if len(env) > 0 && env[0] != '/' {
env = "/" + env
}
*s = env
}
}
func ImageTypes(it *[]imagetype.Type, name string) error { func ImageTypes(it *[]imagetype.Type, name string) error {
if env := os.Getenv(name); len(env) > 0 { if env := os.Getenv(name); len(env) > 0 {
parts := strings.Split(env, ",") parts := strings.Split(env, ",")

2
healthcheck.go
View File

@@ -19,7 +19,7 @@ func healthcheck() int {
configurators.String(&network, "IMGPROXY_NETWORK") configurators.String(&network, "IMGPROXY_NETWORK")
configurators.String(&bind, "IMGPROXY_BIND") configurators.String(&bind, "IMGPROXY_BIND")
configurators.String(&pathprefix, "IMGPROXY_PATH_PREFIX") configurators.URLPath(&pathprefix, "IMGPROXY_PATH_PREFIX")
httpc := http.Client{ httpc := http.Client{
Transport: &http.Transport{ Transport: &http.Transport{