fix: handle Accept-Encoding properly for compressed webui srcs
Some checks failed
Build Snapshot Release / build (push) Has been cancelled
Release Please / release-please (push) Has been cancelled
Test / test-nix (push) Has been cancelled
Test / test-win (push) Has been cancelled
Update Restic / update-restic-version (push) Has been cancelled

This commit is contained in:
Gareth George
2025-05-05 00:35:33 -07:00
parent 9982761aa8
commit 7930b9c2d9

View File

@@ -2,10 +2,10 @@ package webui
import (
"bytes"
"compress/gzip"
"crypto/md5"
"encoding/hex"
"io"
"io/fs"
"net/http"
"strings"
"sync"
@@ -38,8 +38,20 @@ func Handler() http.Handler {
f, err := content.Open(contentPrefix + r.URL.Path + ".gz")
if err == nil {
defer f.Close()
w.Header().Set("Content-Encoding", "gzip")
serveFile(f, w, r, r.URL.Path)
// Check if gzip encoding is supported
var fr io.Reader = f
if !strings.Contains(r.Header.Get("Accept-Encoding"), "gzip") {
gzr, err := gzip.NewReader(f)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
defer gzr.Close()
fr = gzr
} else {
w.Header().Set("Content-Encoding", "gzip")
}
serveFile(fr, w, r, r.URL.Path)
return
}
@@ -54,7 +66,7 @@ func Handler() http.Handler {
})
}
func serveFile(f fs.File, w http.ResponseWriter, r *http.Request, path string) {
func serveFile(f io.Reader, w http.ResponseWriter, r *http.Request, path string) {
data, err := io.ReadAll(f)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)