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

🐛 Bug fixes
All checks were successful
release-nightly / build-docker (push) Successful in 58s
Details

Browse Source
This commit is contained in:
LittleSheep 2023-11-25 23:56:55 +08:00
parent 3dab1dbd46
commit a64e7499bc
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/example.json
View File

@ -14,7 +14,7 @@
{ {
"id": "example", "id": "example",
"name": "Example Upstream", "name": "Example Upstream",
"uri": "file://C:\\site" "uri": "files://./test/benchmark/data"
} }
] ]
} }

9
pkg/sign/responder.go
View File

@ -62,10 +62,9 @@ func makeFileResponse(ctx *fiber.Ctx, upstream *UpstreamConfig) error {
file, err = root.Open(queries.Get("fallback")) file, err = root.Open(queries.Get("fallback"))
} }
} }
if err != nil { if err != nil {
if errors.Is(err, fs.ErrNotExist) { if errors.Is(err, fs.ErrNotExist) {
return ctx.Status(fiber.StatusNotFound).Next() return fiber.ErrNotFound
} }
return fmt.Errorf("failed to open: %w", err) return fmt.Errorf("failed to open: %w", err)
} }
@ -77,7 +76,8 @@ func makeFileResponse(ctx *fiber.Ctx, upstream *UpstreamConfig) error {
// Serve index if path is directory // Serve index if path is directory
if stat.IsDir() { if stat.IsDir() {
indexPath := utils.TrimRight(path, '/') + queries.Get("index") indexFile := lo.Ternary(len(queries.Get("index")) > 0, queries.Get("index"), "index.html")
indexPath := utils.TrimRight(path, '/') + indexFile
index, err := root.Open(indexPath) index, err := root.Open(indexPath)
if err == nil { if err == nil {
indexStat, err := index.Stat() indexStat, err := index.Stat()
@ -105,7 +105,6 @@ func makeFileResponse(ctx *fiber.Ctx, upstream *UpstreamConfig) error {
ctx.Set(fiber.HeaderLastModified, modTime.UTC().Format(http.TimeFormat)) ctx.Set(fiber.HeaderLastModified, modTime.UTC().Format(http.TimeFormat))
} }
// Set Cache-Control header
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 {
@ -124,5 +123,5 @@ func makeFileResponse(ctx *fiber.Ctx, upstream *UpstreamConfig) error {
return nil return nil
} }
return ctx.Next() return fiber.ErrNotFound
} }