Goatworks/RoadSign
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Reverse proxy fixes
All checks were successful
release-nightly / build-docker (push) Successful in 1m10s
Details

Browse Source
This commit is contained in:
LittleSheep 2023-12-10 19:42:27 +08:00
parent 996827968d
commit 9f6415203f
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/sign/responder.go
View File

@ -18,28 +18,28 @@ import (
"github.com/valyala/fasthttp" "github.com/valyala/fasthttp"
) )
func makeHypertextResponse(ctx *fiber.Ctx, upstream *UpstreamConfig) error { func makeHypertextResponse(c *fiber.Ctx, upstream *UpstreamConfig) error {
timeout := time.Duration(viper.GetInt64("performance.network_timeout")) * time.Millisecond timeout := time.Duration(viper.GetInt64("performance.network_timeout")) * time.Millisecond
return proxy.Do(ctx, upstream.MakeURI(ctx), &fasthttp.Client{ return proxy.Do(c, upstream.MakeURI(c), &fasthttp.Client{
ReadTimeout: timeout, ReadTimeout: timeout,
WriteTimeout: timeout, WriteTimeout: timeout,
}) })
} }
func makeFileResponse(ctx *fiber.Ctx, upstream *UpstreamConfig) error { func makeFileResponse(c *fiber.Ctx, upstream *UpstreamConfig) error {
uri, queries := upstream.GetRawURI() uri, queries := upstream.GetRawURI()
root := http.Dir(uri) root := http.Dir(uri)
method := ctx.Method() method := c.Method()
// We only serve static assets for GET and HEAD methods // We only serve static assets for GET and HEAD methods
if method != fiber.MethodGet && method != fiber.MethodHead { if method != fiber.MethodGet && method != fiber.MethodHead {
return ctx.Next() return c.Next()
} }
// Strip prefix // Strip prefix
prefix := ctx.Route().Path prefix := c.Route().Path
path := strings.TrimPrefix(ctx.Path(), prefix) path := strings.TrimPrefix(c.Path(), prefix)
if !strings.HasPrefix(path, "/") { if !strings.HasPrefix(path, "/") {
path = "/" + path path = "/" + path
} }
@ -88,35 +88,35 @@ func makeFileResponse(ctx *fiber.Ctx, upstream *UpstreamConfig) error {
} }
} }
ctx.Status(fiber.StatusOK) c.Status(fiber.StatusOK)
modTime := stat.ModTime() modTime := stat.ModTime()
contentLength := int(stat.Size()) contentLength := int(stat.Size())
// Set Content-Type header // Set Content-Type header
if queries.Get("charset") == "" { if queries.Get("charset") == "" {
ctx.Type(filepath.Ext(stat.Name())) c.Type(filepath.Ext(stat.Name()))
} else { } else {
ctx.Type(filepath.Ext(stat.Name()), queries.Get("charset")) c.Type(filepath.Ext(stat.Name()), queries.Get("charset"))
} }
// Set Last-Modified header // Set Last-Modified header
if !modTime.IsZero() { if !modTime.IsZero() {
ctx.Set(fiber.HeaderLastModified, modTime.UTC().Format(http.TimeFormat)) c.Set(fiber.HeaderLastModified, modTime.UTC().Format(http.TimeFormat))
} }
if method == fiber.MethodGet { if method == fiber.MethodGet {
maxAge, err := strconv.Atoi(queries.Get("maxAge")) maxAge, err := strconv.Atoi(queries.Get("maxAge"))
if lo.Ternary(err != nil, maxAge, 0) > 0 { if lo.Ternary(err != nil, maxAge, 0) > 0 {
ctx.Set(fiber.HeaderCacheControl, "public, max-age="+queries.Get("maxAge")) c.Set(fiber.HeaderCacheControl, "public, max-age="+queries.Get("maxAge"))
} }
ctx.Response().SetBodyStream(file, contentLength) c.Response().SetBodyStream(file, contentLength)
return nil return nil
} }
if method == fiber.MethodHead { if method == fiber.MethodHead {
ctx.Request().ResetBody() c.Request().ResetBody()
ctx.Response().SkipBody = true c.Response().SkipBody = true
ctx.Response().Header.SetContentLength(contentLength) c.Response().Header.SetContentLength(contentLength)
if err := file.Close(); err != nil { if err := file.Close(); err != nil {
return fmt.Errorf("failed to close: %w", err) return fmt.Errorf("failed to close: %w", err)
} }

4
pkg/sign/upstream.go
View File

@ -43,7 +43,9 @@ func (v *UpstreamConfig) GetRawURI() (string, url.Values) {
func (v *UpstreamConfig) MakeURI(ctx *fiber.Ctx) string { func (v *UpstreamConfig) MakeURI(ctx *fiber.Ctx) string {
var queries []string var queries []string
for k, v := range ctx.Queries() { for k, v := range ctx.Queries() {
queries = append(queries, fmt.Sprintf("%s=%s", k, v)) parsed, _ := url.QueryUnescape(v)
value := url.QueryEscape(parsed)
queries = append(queries, fmt.Sprintf("%s=%s", k, value))
} }
path := string(ctx.Request().URI().Path()) path := string(ctx.Request().URI().Path())